Merge pull request #40 from Permissionless-Software-Foundation/ct-unstable

fix(garbage collection): Replacing web2 with web3 calls to validate UTXO
fix(production): Creating new v1.9.6 docker images for amd64 and arm64
2026-09-22 09:11:59 -07:00 · 2022-09-04 15:49:43 -07:00 · 2022-09-04 15:35:50 -07:00 · 2022-09-04 14:38:11 -07:00 · 2022-09-04 14:27:51 -07:00 · 2022-08-28 16:20:45 -07:00
11 changed files with 155 additions and 178 deletions
@@ -9,14 +9,14 @@
      "version": "1.0.0",
      "license": "MIT",
      "dependencies": {
-        "@psf/bch-js": "6.4.1",
+        "@psf/bch-js": "6.4.5",
        "axios": "0.27.2",
-        "bch-message-lib": "2.2.0",
+        "bch-message-lib": "2.2.1",
        "bcryptjs": "2.4.3",
        "bitcoincashjs-lib": "3.3.3",
        "glob": "7.1.6",
        "ipfs": "0.62.3",
-        "ipfs-coord": "8.0.2",
+        "ipfs-coord": "8.0.5",
        "ipfs-http-client": "55.0.0",
        "jsonrpc-lite": "2.2.0",
        "jsonwebtoken": "8.5.1",
@@ -34,7 +34,7 @@
        "koa2-ratelimit": "0.9.1",
        "libp2p": "^0.36.2",
        "line-reader": "0.4.0",
-        "minimal-slp-wallet": "4.6.5",
+        "minimal-slp-wallet": "5.0.3",
        "mongoose": "5.13.13",
        "node-fetch": "npm:@achingbrain/node-fetch@2.6.7",
        "nodemailer": "6.7.5",
@@ -1311,8 +1311,9 @@
      "license": "BSD-3-Clause"
    },
    "node_modules/@psf/bch-js": {
-      "version": "6.4.1",
-      "license": "MIT",
+      "version": "6.4.5",
+      "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-6.4.5.tgz",
+      "integrity": "sha512-sH72zbJJI5oe9EUMczFQb0jCaNQb8rc3/86E6xXKl3325HCwBqE80BX7JFvZ97Qv1gGxwp/3WROp59v6Dz2NKA==",
      "dependencies": {
        "@chris.troutner/bip32-utils": "1.0.5",
        "@psf/bip21": "2.0.1",
@@ -2695,54 +2696,19 @@
      }
    },
    "node_modules/bch-consumer": {
-      "version": "1.3.0",
-      "license": "MIT",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/bch-consumer/-/bch-consumer-1.3.1.tgz",
+      "integrity": "sha512-8ZoyFp4pLJFAOzM482K22sVL2FpuxhkYRtZuLLsMH9L442mRABjsAP7fTh91W5er40r8RGN/CSKi2TMyUmrY1Q==",
      "dependencies": {
-        "@psf/bch-js": "6.3.4",
+        "@psf/bch-js": "6.4.5",
        "apidoc": "0.51.0",
        "axios": "0.25.0"
      }
    },
-    "node_modules/bch-consumer/node_modules/@psf/bch-js": {
-      "version": "6.3.4",
-      "license": "MIT",
-      "dependencies": {
-        "@chris.troutner/bip32-utils": "1.0.5",
-        "@psf/bip21": "2.0.1",
-        "@psf/bitcoincash-ops": "2.0.0",
-        "@psf/bitcoincashjs-lib": "4.0.2",
-        "@psf/coininfo": "4.0.0",
-        "axios": "0.26.1",
-        "bc-bip68": "1.0.5",
-        "bchaddrjs-slp": "0.2.5",
-        "bigi": "1.4.2",
-        "bignumber.js": "9.0.0",
-        "bip-schnorr": "0.3.0",
-        "bip38": "2.0.2",
-        "bip39": "3.0.2",
-        "bip66": "1.1.5",
-        "bitcoinjs-message": "2.0.0",
-        "bs58": "4.0.1",
-        "ecashaddrjs": "1.0.7",
-        "ini": "1.3.8",
-        "randombytes": "2.0.6",
-        "safe-buffer": "5.1.2",
-        "satoshi-bitcoin": "1.0.4",
-        "slp-mdm": "0.0.6",
-        "slp-parser": "0.0.4",
-        "wif": "2.0.6"
-      }
-    },
-    "node_modules/bch-consumer/node_modules/@psf/bch-js/node_modules/axios": {
-      "version": "0.26.1",
-      "license": "MIT",
-      "dependencies": {
-        "follow-redirects": "^1.14.8"
-      }
-    },
    "node_modules/bch-consumer/node_modules/apidoc": {
      "version": "0.51.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/apidoc/-/apidoc-0.51.0.tgz",
+      "integrity": "sha512-3P4srhm6NA+kE/YRM4qL5jESElpQQJL+Z8n7hyr4uC+1DSwGzmE6adXPVxuT/hpDyShrqmRlHk8hf40RSqEsNw==",
      "os": [
        "darwin",
        "freebsd",
@@ -2783,14 +2749,16 @@
    },
    "node_modules/bch-consumer/node_modules/axios": {
      "version": "0.25.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
+      "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
      "dependencies": {
        "follow-redirects": "^1.14.7"
      }
    },
    "node_modules/bch-consumer/node_modules/glob": {
      "version": "7.2.3",
-      "license": "ISC",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
      "dependencies": {
        "fs.realpath": "^1.0.0",
        "inflight": "^1.0.4",
@@ -2881,10 +2849,11 @@
      }
    },
    "node_modules/bch-message-lib": {
-      "version": "2.2.0",
-      "license": "MIT",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/bch-message-lib/-/bch-message-lib-2.2.1.tgz",
+      "integrity": "sha512-1hWLC0v0jdPWVdxxhLNpREoW91PZGy69PxxOs4wZmlZo00bHm7OPGhmaugh7ilMw+ouLn59vY//lSX2rOn65Kw==",
      "peerDependencies": {
-        "minimal-slp-wallet": "^4.4.5"
+        "minimal-slp-wallet": ">= 4"
      }
    },
    "node_modules/bch-token-sweep": {
@@ -7518,10 +7487,9 @@
      }
    },
    "node_modules/ipfs-coord": {
-      "version": "8.0.2",
-      "resolved": "http://94.130.170.209:4873/ipfs-coord/-/ipfs-coord-8.0.2.tgz",
-      "integrity": "sha512-CdUH4GLLFArUDb8LIRAXxPlhbRQ44A5PEWB4J9zzDB3by93O7DLEgjqPqLDolalzrtiQBVzoARO/exZvdxBF+w==",
-      "license": "MIT",
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/ipfs-coord/-/ipfs-coord-8.0.5.tgz",
+      "integrity": "sha512-V4pqR+MU290ZxFRE+Rx/7JuxR7LsOFBLuL0av3eVU5ZQWqeF/Zi9vh52zCqpp1IBCXi4QXNZGlysvm16xFDXww==",
      "dependencies": {
        "axios": "0.21.4",
        "bch-encrypt-lib": "2.0.0",
@@ -10622,12 +10590,13 @@
      }
    },
    "node_modules/minimal-slp-wallet": {
-      "version": "4.6.5",
-      "license": "MIT",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/minimal-slp-wallet/-/minimal-slp-wallet-5.0.3.tgz",
+      "integrity": "sha512-tB2H0udGovM5TDUQIGqnpABnAh3fZafYFv1QLXUqKlSpLYxkI1GaKVzAuq5VdRu6GlIpKggN057AL02KTooNQg==",
      "dependencies": {
-        "@psf/bch-js": "6.4.1",
+        "@psf/bch-js": "6.4.5",
        "apidoc": "0.51.0",
-        "bch-consumer": "1.3.0",
+        "bch-consumer": "1.3.1",
        "bch-donation": "1.1.2",
        "crypto-js": "4.0.0"
      }
@@ -11502,6 +11471,8 @@
    "node_modules/node-fetch": {
      "name": "@achingbrain/node-fetch",
      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/@achingbrain/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-iTASGs+HTFK5E4ZqcMsHmeJ4zodyq8L38lZV33jwqcBJYoUt3HjN4+ot+O9/0b+ke8ddE7UgOtVuZN/OkV19/g==",
      "license": "MIT",
      "engines": {
        "node": "4.x || >=6.0.0"
@@ -20382,7 +20353,9 @@
      "version": "1.1.0"
    },
    "@psf/bch-js": {
-      "version": "6.4.1",
+      "version": "6.4.5",
+      "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-6.4.5.tgz",
+      "integrity": "sha512-sH72zbJJI5oe9EUMczFQb0jCaNQb8rc3/86E6xXKl3325HCwBqE80BX7JFvZ97Qv1gGxwp/3WROp59v6Dz2NKA==",
      "requires": {
        "@chris.troutner/bip32-utils": "1.0.5",
        "@psf/bip21": "2.0.1",
@@ -21363,52 +21336,19 @@
      "version": "1.0.5"
    },
    "bch-consumer": {
-      "version": "1.3.0",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/bch-consumer/-/bch-consumer-1.3.1.tgz",
+      "integrity": "sha512-8ZoyFp4pLJFAOzM482K22sVL2FpuxhkYRtZuLLsMH9L442mRABjsAP7fTh91W5er40r8RGN/CSKi2TMyUmrY1Q==",
      "requires": {
-        "@psf/bch-js": "6.3.4",
+        "@psf/bch-js": "6.4.5",
        "apidoc": "0.51.0",
        "axios": "0.25.0"
      },
      "dependencies": {
-        "@psf/bch-js": {
-          "version": "6.3.4",
-          "requires": {
-            "@chris.troutner/bip32-utils": "1.0.5",
-            "@psf/bip21": "2.0.1",
-            "@psf/bitcoincash-ops": "2.0.0",
-            "@psf/bitcoincashjs-lib": "4.0.2",
-            "@psf/coininfo": "4.0.0",
-            "axios": "0.26.1",
-            "bc-bip68": "1.0.5",
-            "bchaddrjs-slp": "0.2.5",
-            "bigi": "1.4.2",
-            "bignumber.js": "9.0.0",
-            "bip-schnorr": "0.3.0",
-            "bip38": "2.0.2",
-            "bip39": "3.0.2",
-            "bip66": "1.1.5",
-            "bitcoinjs-message": "2.0.0",
-            "bs58": "4.0.1",
-            "ecashaddrjs": "1.0.7",
-            "ini": "1.3.8",
-            "randombytes": "2.0.6",
-            "safe-buffer": "5.1.2",
-            "satoshi-bitcoin": "1.0.4",
-            "slp-mdm": "0.0.6",
-            "slp-parser": "0.0.4",
-            "wif": "2.0.6"
-          },
-          "dependencies": {
-            "axios": {
-              "version": "0.26.1",
-              "requires": {
-                "follow-redirects": "^1.14.8"
-              }
-            }
-          }
-        },
        "apidoc": {
          "version": "0.51.0",
+          "resolved": "https://registry.npmjs.org/apidoc/-/apidoc-0.51.0.tgz",
+          "integrity": "sha512-3P4srhm6NA+kE/YRM4qL5jESElpQQJL+Z8n7hyr4uC+1DSwGzmE6adXPVxuT/hpDyShrqmRlHk8hf40RSqEsNw==",
          "requires": {
            "bootstrap": "3.4.1",
            "commander": "^8.3.0",
@@ -21436,12 +21376,16 @@
        },
        "axios": {
          "version": "0.25.0",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
+          "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
          "requires": {
            "follow-redirects": "^1.14.7"
          }
        },
        "glob": {
          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
          "requires": {
            "fs.realpath": "^1.0.0",
            "inflight": "^1.0.4",
@@ -21507,7 +21451,9 @@
      }
    },
    "bch-message-lib": {
-      "version": "2.2.0",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/bch-message-lib/-/bch-message-lib-2.2.1.tgz",
+      "integrity": "sha512-1hWLC0v0jdPWVdxxhLNpREoW91PZGy69PxxOs4wZmlZo00bHm7OPGhmaugh7ilMw+ouLn59vY//lSX2rOn65Kw==",
      "requires": {}
    },
    "bch-token-sweep": {
@@ -24562,9 +24508,9 @@
      }
    },
    "ipfs-coord": {
-      "version": "8.0.2",
-      "resolved": "http://94.130.170.209:4873/ipfs-coord/-/ipfs-coord-8.0.2.tgz",
-      "integrity": "sha512-CdUH4GLLFArUDb8LIRAXxPlhbRQ44A5PEWB4J9zzDB3by93O7DLEgjqPqLDolalzrtiQBVzoARO/exZvdxBF+w==",
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/ipfs-coord/-/ipfs-coord-8.0.5.tgz",
+      "integrity": "sha512-V4pqR+MU290ZxFRE+Rx/7JuxR7LsOFBLuL0av3eVU5ZQWqeF/Zi9vh52zCqpp1IBCXi4QXNZGlysvm16xFDXww==",
      "requires": {
        "axios": "0.21.4",
        "bch-encrypt-lib": "2.0.0",
@@ -26802,11 +26748,13 @@
      "dev": true
    },
    "minimal-slp-wallet": {
-      "version": "4.6.5",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/minimal-slp-wallet/-/minimal-slp-wallet-5.0.3.tgz",
+      "integrity": "sha512-tB2H0udGovM5TDUQIGqnpABnAh3fZafYFv1QLXUqKlSpLYxkI1GaKVzAuq5VdRu6GlIpKggN057AL02KTooNQg==",
      "requires": {
-        "@psf/bch-js": "6.4.1",
+        "@psf/bch-js": "6.4.5",
        "apidoc": "0.51.0",
-        "bch-consumer": "1.3.0",
+        "bch-consumer": "1.3.1",
        "bch-donation": "1.1.2",
        "crypto-js": "4.0.0"
      },
@@ -27374,7 +27322,9 @@
      }
    },
    "node-fetch": {
-      "version": "npm:@achingbrain/node-fetch@2.6.7"
+      "version": "npm:@achingbrain/node-fetch@2.6.7",
+      "resolved": "https://registry.npmjs.org/@achingbrain/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-iTASGs+HTFK5E4ZqcMsHmeJ4zodyq8L38lZV33jwqcBJYoUt3HjN4+ot+O9/0b+ke8ddE7UgOtVuZN/OkV19/g=="
    },
    "node-forge": {
      "version": "1.3.1"
@@ -27,14 +27,14 @@
  },
  "repository": "Permissionless-Software-Foundation/bch-dex",
  "dependencies": {
-    "@psf/bch-js": "6.4.1",
+    "@psf/bch-js": "6.4.5",
    "axios": "0.27.2",
-    "bch-message-lib": "2.2.0",
+    "bch-message-lib": "2.2.1",
    "bcryptjs": "2.4.3",
    "bitcoincashjs-lib": "3.3.3",
    "glob": "7.1.6",
    "ipfs": "0.62.3",
-    "ipfs-coord": "8.0.2",
+    "ipfs-coord": "8.0.5",
    "ipfs-http-client": "55.0.0",
    "jsonrpc-lite": "2.2.0",
    "jsonwebtoken": "8.5.1",
@@ -52,7 +52,7 @@
    "koa2-ratelimit": "0.9.1",
    "libp2p": "^0.36.2",
    "line-reader": "0.4.0",
-    "minimal-slp-wallet": "4.6.5",
+    "minimal-slp-wallet": "5.0.3",
    "mongoose": "5.13.13",
    "node-fetch": "npm:@achingbrain/node-fetch@2.6.7",
    "nodemailer": "6.7.5",
@@ -37,7 +37,7 @@ WORKDIR /home/safeuser
 RUN npm install -g npm

 # npm mirror to prevent direct dependency on npm.
-RUN npm set registry http://94.130.170.209:4873/
+#RUN npm set registry http://94.130.170.209:4873/

 # Switch to user account.
 #USER safeuser
@@ -46,11 +46,11 @@ RUN npm set registry http://94.130.170.209:4873/

 # Clone the rest.bitcoin.com repository
 WORKDIR /home/safeuser
-RUN git clone https://github.com/Permissionless-Software-Foundation/bch-dex-ui
+RUN git clone https://github.com/Permissionless-Software-Foundation/bch-dex-ui-v2

 # Switch to the desired branch. `master` is usually stable,
 # and `stage` has the most up-to-date changes.
-WORKDIR /home/safeuser/bch-dex-ui
+WORKDIR /home/safeuser/bch-dex-ui-v2

 # For development: switch to unstable branch
 RUN git checkout ct-unstable
@@ -58,7 +58,7 @@ RUN git checkout ct-unstable
 # Install dependencies
 #RUN mkdir .ipfsdata
 #RUN npm install -g @mapbox/node-pre-gyp
-RUN npm install --force
+RUN npm install

 # Build the site
 RUN CI=true npm run build
@@ -68,6 +68,6 @@ FROM nginx
 EXPOSE 80

 # Copy the files built in the first container to the new NGINX container.
-COPY --from=builder /home/safeuser/bch-dex-ui/public /usr/share/nginx/html
+COPY --from=builder /home/safeuser/bch-dex-ui-v2/build /usr/share/nginx/html

 #USER safeuser
@@ -4,7 +4,7 @@ version: '3.9'

 services:
  mongo-p2wdb-service:
-    image: mongo:4.4.2-bionic
+    image: mongo:4.2.0
    container_name: mongo-p2wdb-service
    ports:
      - '5666:27017' # <host port>:<container port>
@@ -14,10 +14,16 @@ services:
    restart: always

  ipfs:
-    image: ipfs/go-ipfs:v0.13.0
+    # https://github.com/christroutner/trickle-ipfs
+    image: christroutner/trickle-ipfs:v1.0.1
+    #build:
+    #  context: ./
+    #  dockerfile: Dockerfile
    container_name: ipfs
    environment:
-      MY_ENV_VAR: 'placeholder'
+      IPFS_DAEMON_ARGUMENTS: '--enable-pubsub-experiment --migrate=true --agent-version-suffix=docker --routing=dhtclient'
+      UPLOAD_KBPS: '1000'
+      DOWNLOAD_KBPS: '1000'
    logging:
      driver: 'json-file'
      options:
@@ -26,27 +32,21 @@ services:
    mem_limit: 2000mb
    ports:
      - 4001:4001
+      - 4003:4003
      - 172.17.0.1:5001:5001
      - 172.17.0.1:8080:8080
+    command: [
+      './start-ipfs.sh'
+    ]
    volumes:
-      - ../data/go-ipfs/data:/data/ipfs
-      #- ../../swarm.key:/data/ipfs/swarm.key
-    # https://docs.docker.com/compose/compose-file/compose-file-v3/#command
-    # https://github.com/ipfs/go-ipfs/blob/91c52657166bcf86f2476926e4fe56694dc26562/Dockerfile#L115
-    command:
-      [
-        'daemon',
-        '--migrate=true',
-        '--agent-version-suffix=docker',
-        '--enable-pubsub-experiment'
-      ]
+      - ../data/go-ipfs/data:/root/.ipfs
    restart: always

  p2wdb:
    #build:
    #  context: ./p2wdb/
    #  dockerfile: Dockerfile
-    image: christroutner/p2wdb:v3.0.6
+    image: christroutner/p2wdb:v3.0.9
    container_name: p2wdb
    environment:
      CONSUMER_URL: 'https://free-bch.fullstack.cash'
@@ -70,10 +70,10 @@ services:
    restart: always

  bch-dex:
-    #build:
-    #  context: ./bch-dex/
-    #  dockerfile: Dockerfile
-    image: christroutner/bch-dex:v1.9.1
+    build:
+      context: ./bch-dex/
+      dockerfile: Dockerfile
+    #image: christroutner/bch-dex:v1.9.2
    container_name: bch-dex
    environment:
      CONSUMER_URL: 'https://free-bch.fullstack.cash'
@@ -97,7 +97,7 @@ services:
    #build:
    #  context: ./bch-dex-ui/
    #  dockerfile: Dockerfile
-    image: christroutner/bch-dex-ui:v1.6.5
+    image: christroutner/bch-dex-ui:v1.6.6
    container_name: dex-ui
    environment:
      SERVER: 'http://192.168.2.3'
@@ -46,11 +46,11 @@ RUN npm set registry http://94.130.170.209:4873/

 # Clone the rest.bitcoin.com repository
 WORKDIR /home/safeuser
-RUN git clone https://github.com/Permissionless-Software-Foundation/bch-dex-ui
+RUN git clone https://github.com/Permissionless-Software-Foundation/bch-dex-ui-v2

 # Switch to the desired branch. `master` is usually stable,
 # and `stage` has the most up-to-date changes.
-WORKDIR /home/safeuser/bch-dex-ui
+WORKDIR /home/safeuser/bch-dex-ui-v2

 # For development: switch to unstable branch
 RUN git checkout ct-unstable
@@ -58,7 +58,7 @@ RUN git checkout ct-unstable
 # Install dependencies
 #RUN mkdir .ipfsdata
 #RUN npm install -g @mapbox/node-pre-gyp
-RUN npm install --force
+RUN npm install

 # Build the site
 RUN CI=true npm run build
@@ -68,6 +68,6 @@ FROM nginx
 EXPOSE 80

 # Copy the files built in the first container to the new NGINX container.
-COPY --from=builder /home/safeuser/bch-dex-ui/public /usr/share/nginx/html
+COPY --from=builder /home/safeuser/bch-dex-ui-v2/build /usr/share/nginx/html

 #USER safeuser
@@ -14,40 +14,36 @@ services:
    restart: always

  ipfs:
-    #image: ipfs/go-ipfs:v0.13.0
-    image: odanado/go-ipfs:v0.11.0
+    image: christroutner/trickle-ipfs-rpi:v1.0.1
+    #image: odanado/go-ipfs:v0.11.0
    container_name: ipfs
    environment:
-      MY_ENV_VAR: 'placeholder'
+      IPFS_DAEMON_ARGUMENTS: '--enable-pubsub-experiment --migrate=true --agent-version-suffix=docker --routing=dhtclient'
+      UPLOAD_KBPS: '25'
+      DOWNLOAD_KBPS: '25'
    logging:
      driver: 'json-file'
      options:
        max-size: '10m'
        max-file: '10'
-    mem_limit: 2000mb
+    mem_limit: 1000mb
    ports:
      - 4001:4001
+      - 4003:4003
      - 172.17.0.1:5001:5001
      - 172.17.0.1:8080:8080
    volumes:
-      - ../data/go-ipfs/data:/data/ipfs
-    #  - ../../swarm.key:/data/ipfs/swarm.key
-    # https://docs.docker.com/compose/compose-file/compose-file-v3/#command
-    # https://github.com/ipfs/go-ipfs/blob/91c52657166bcf86f2476926e4fe56694dc26562/Dockerfile#L115
-    command:
-      [
-        'daemon',
-        '--migrate=true',
-        '--agent-version-suffix=docker',
-        '--enable-pubsub-experiment'
-      ]
+      - ./data/go-ipfs:/root/.ipfs
+    command: [
+      './start-ipfs.sh'
+    ]
    restart: always

  p2wdb:
    #build:
    #  context: ./p2wdb/
    #  dockerfile: Dockerfile
-    image: christroutner/p2wdb-rpi-v3.0.6
+    image: christroutner/p2wdb-rpi:v3.0.10
    container_name: p2wdb
    environment:
      CONSUMER_URL: 'https://free-bch.fullstack.cash'
@@ -72,9 +68,9 @@ services:

  bch-dex:
    #build:
-    #  context: ./bch-dex/
+    # context: ./bch-dex/
    #  dockerfile: Dockerfile
-    image: christroutner/bch-dex-rpi:v1.8.2
+    image: christroutner/bch-dex-rpi:v1.8.3
    container_name: bch-dex
    environment:
      CONSUMER_URL: 'https://free-bch.fullstack.cash'
@@ -98,7 +94,7 @@ services:
    #build:
    #  context: ./bch-dex-ui/
    #  dockerfile: Dockerfile
-    image: christroutner/bch-dex-ui-rpi:v1.7.4
+    image: christroutner/bch-dex-ui-rpi:v1.7.5
    container_name: dex-ui
    logging:
      driver: 'json-file'
@@ -40,6 +40,7 @@ export P2W_ENV=production
 export IPFS_HOST=172.17.0.1
 export IPFS_API_PORT=5001
 export IPFS_TCP_PORT=4001
+export IPFS_WS_PORT=4003

 # P2WDB specific env vars
 export ORBITDB_NAME=/orbitdb/zdpuAqNiwLiJBfbRK7uihV2hAbNSXj78ufzv5VyQb8GuvRwDh/psf-bch-p2wdb-keyvalue-v3.0.0-0001
@@ -5,6 +5,7 @@
 // Local libraries
 const IpfsAdapter = require('./ipfs')
 const IpfsCoordAdapter = require('./ipfs-coord')
+const config = require('../../../config')

 class IPFS {
  constructor (localConfig = {}) {
@@ -12,6 +13,7 @@ class IPFS {
    this.ipfsAdapter = new IpfsAdapter()
    this.IpfsCoordAdapter = IpfsCoordAdapter
    this.process = process
+    this.config = config

    this.ipfsCoordAdapter = {} // placeholder

@@ -32,7 +34,9 @@ class IPFS {

      // Start ipfs-coord
      this.ipfsCoordAdapter = new this.IpfsCoordAdapter({
-        ipfs: this.ipfs
+        ipfs: this.ipfs,
+        tcpPort: this.config.ipfsTcpPort,
+        wsPort: this.config.ipfsWsPort
      })
      await this.ipfsCoordAdapter.start()
      console.log('ipfs-coord is ready.')
@@ -352,10 +352,17 @@ class OfferUseCases {
        let utxoStatus = null
        try {
          // Get the status of the UTXO associate with this Offer.
-          utxoStatus = await this.adapters.bchjs.Blockchain.getTxOut(
-            thisOffer.utxoTxid,
-            thisOffer.utxoVout
-          )
+          // utxoStatus = await this.adapters.bchjs.Blockchain.getTxOut(
+          //   thisOffer.utxoTxid,
+          //   thisOffer.utxoVout
+          // )
+
+          // Get the status of the UTXO associate with this Offer.
+          const utxo = {
+            tx_hash: thisOffer.utxoTxid,
+            tx_pos: thisOffer.utxoVout
+          }
+          utxoStatus = await this.adapters.wallet.bchWallet.utxoIsValid(utxo)
          // console.log('utxoStatus: ', utxoStatus)
        } catch (err) {
          // Handle corner case of bad-data in the Offer model.
@@ -364,7 +371,7 @@ class OfferUseCases {
            await thisOffer.remove()
            continue
          } else if (err.isAxiosError) {
-            console.log('Error trying to contact api.fullstack.cash')
+            console.log('Error trying to contact wallet service: ', err)
            continue
          } else {
            throw err
@@ -198,10 +198,17 @@ class OrderLib {
        let utxoStatus = null
        try {
          // Get the status of the UTXO associate with this Order.
-          utxoStatus = await this.adapters.bchjs.Blockchain.getTxOut(
-            thisOrder.utxoTxid,
-            thisOrder.utxoVout
-          )
+          // utxoStatus = await this.adapters.bchjs.Blockchain.getTxOut(
+          //   thisOrder.utxoTxid,
+          //   thisOrder.utxoVout
+          // )
+
+          // Get the status of the UTXO associate with this Order.
+          const utxo = {
+            tx_hash: thisOrder.utxoTxid,
+            tx_pos: thisOrder.utxoVout
+          }
+          utxoStatus = await this.adapters.wallet.bchWallet.utxoIsValid(utxo)
          // console.log('utxoStatus: ', utxoStatus)
        } catch (err) {
          // Handle corner case of bad-data in the Order model.
@@ -210,7 +217,7 @@ class OrderLib {
            await thisOrder.remove()
            continue
          } else if (err.isAxiosError) {
-            console.log('Error trying to contact api.fullstack.cash')
+            console.log('Error trying to contact wallet service: ', err)
            continue
          } else {
            throw err
@@ -1,16 +1,22 @@
 /*
  Mocks for the Adapter library.
 */
-
 const BCHJS = require('@psf/bch-js')
 const bchjs = new BCHJS()

-const ipfs = {
-  ipfsAdapter: {
-    ipfs: {}
-  },
-  ipfsCoordAdapter: {
-    ipfsCoord: {
+class IpfsAdapter {
+  constructor () {
+    this.ipfs = {
+      files: {
+        stat: () => {}
+      }
+    }
+  }
+}
+
+class IpfsCoordAdapter {
+  constructor () {
+    this.ipfsCoord = {
      useCases: {
        peer: {
          sendPrivateMessage: () => {
@@ -21,6 +27,12 @@ const ipfs = {
  }
 }

+const ipfs = {
+  ipfsAdapter: new IpfsAdapter(),
+  ipfsCoordAdapter: new IpfsCoordAdapter()
+}
+ipfs.ipfs = ipfs.ipfsAdapter.ipfs
+
 const localdb = {
  Users: class Users {
    static findById () {}
Author	SHA1	Message	Date
Chris Troutner	dd8d992b8a	Merge pull request #40 from Permissionless-Software-Foundation/ct-unstable fix(garbage collection): Replacing web2 with web3 calls to validate UTXO	2022-09-04 15:49:43 -07:00
Chris Troutner	4ed657ae28	fix(production): Creating new v1.9.6 docker images for amd64 and arm64	2022-09-04 15:35:50 -07:00
Chris Troutner	e14633db79	Updating bch-message-lib	2022-09-04 14:38:11 -07:00
Chris Troutner	6a4e749218	fix(garbage collection): Replacing web2 with web3 calls to validate UTXO	2022-09-04 14:27:51 -07:00
Chris Troutner	7a5036e3aa	Merge pull request #39 from Permissionless-Software-Foundation/ct-unstable fix(production): Created new RPi images	2022-08-28 16:20:45 -07:00
Chris Troutner	cca10452c0	fix(production): Created new RPi images	2022-08-28 16:17:33 -07:00
Chris Troutner	309ea0774d	Merge pull request #38 from Permissionless-Software-Foundation/ct-unstable New Docker images	2022-08-28 10:15:13 -07:00
Chris Troutner	c2b68a0787	fix(production): Using new docker images	2022-08-28 10:12:36 -07:00
Chris Troutner	2bb4cd7cae	fix(production): Updating Dockerfiles	2022-08-28 09:23:47 -07:00
Chris Troutner	9ca581e998	Merge pull request #37 from Permissionless-Software-Foundation/ct-unstable Syncing with upstream ipfs-service-provider	2022-08-27 15:43:49 -07:00
Chris Troutner	02adbd5634	fixing merge conflicts	2022-08-27 15:40:59 -07:00
Chris Troutner	da637df44a	Merge pull request #98 from Permissionless-Software-Foundation/ct-unstable Using bandwidth limited IPFS Docker container	2022-08-27 13:43:51 -07:00
Chris Troutner	9315e6f166	fix(production): Updating docker image	2022-08-27 13:39:06 -07:00
Chris Troutner	7e965e8415	Adding comments	2022-08-27 12:59:20 -07:00
Chris Troutner	a5916c95f9	fix(production): Using bandwidth limited IPFS Docker container	2022-08-27 12:58:41 -07:00
Chris Troutner	708f97d107	More dependency updates	2022-08-27 12:55:24 -07:00
Chris Troutner	637738bfb9	Updated npm deps	2022-08-27 12:53:43 -07:00
Chris Troutner	d8e82c5ad2	fix(ipfs-coord): Updating to v8.0.5	2022-08-27 12:52:16 -07:00
Chris Troutner	b23acd3cdc	Merge pull request #97 from Permissionless-Software-Foundation/ct-unstable fix(production): Switching to Docker Image	2022-07-25 19:17:27 -07:00
Chris Troutner	c71fda38ff	fix(production): Switching to Docker Image	2022-07-25 19:14:44 -07:00
Chris Troutner	f99f49d840	Merge pull request #96 from Permissionless-Software-Foundation/ct-unstable Configuring ports with env vars	2022-07-25 17:58:40 -07:00
Chris Troutner	2edd924c57	fix(production): Adding 4003 websocket port	2022-07-25 17:56:02 -07:00
Chris Troutner	689c8fd8d9	fix(ipfs): Using config to set ports	2022-07-25 17:40:05 -07:00
Chris Troutner	ffd6c452c9	Merge pull request #95 from Permissionless-Software-Foundation/ct-unstable fix(mocks): Another update to IPFS test mocks	2022-07-24 08:15:55 -07:00
Chris Troutner	fc8e160874	fix(mocks): Another update to IPFS test mocks	2022-07-24 08:14:27 -07:00
Chris Troutner	d2f83307e6	Merge pull request #94 from Permissionless-Software-Foundation/ct-unstable fix(mocks): Improvement to adapter mocks used in tests	2022-07-24 08:08:13 -07:00
Chris Troutner	1a09fcd26f	fix(mocks): Improvement to adapter mocks used in tests	2022-07-24 08:06:32 -07:00