Adding local web2 interface

- dex-ui Dockerfile: Use FullStack-Agents/bch-dex-ui-v3 fork, fullstackcash branch
- start-production.sh: Add OPERATOR_ADDRESS and OPERATOR_PERCENTAGE env vars

config/env/common.js

@@ -80,7 +80,7 @@ export default {
     ? (
         process.env.APISERVER
           ? process.env.APISERVER
-          : 'https://api.fullstack.cash/v5/'
+          : 'https://bch.fullstack.cash/v6/'
       )
     : 'https://free-bch.fullstack.cash/',
 

package.json

@@ -74,7 +74,7 @@
     "koa2-ratelimit": "0.9.1",
     "libp2p": "2.7.2",
     "line-reader": "0.4.0",
-    "minimal-slp-wallet": "5.13.2",
+    "minimal-slp-wallet": "7.1.5",
     "mongoose": "5.13.14",
     "node-fetch": "npm:@achingbrain/node-fetch@2.6.7",
     "nodemailer": "6.7.5",

production/docker/bch-dex-ui/Dockerfile

@@ -46,14 +46,14 @@ WORKDIR /home/safeuser
 
 # Clone the rest.bitcoin.com repository
 WORKDIR /home/safeuser
-RUN git clone https://github.com/Permissionless-Software-Foundation/bch-dex-ui-v3
+RUN git clone https://github.com/FullStack-Agents/bch-dex-ui-v3
 
 # Switch to the desired branch. `master` is usually stable,
 # and `stage` has the most up-to-date changes.
 WORKDIR /home/safeuser/bch-dex-ui-v3
 
 # For development: switch to unstable branch
-RUN git checkout ct-unstable
+RUN git checkout fullstackcash
 
 # Install dependencies
 #RUN mkdir .ipfsdata

production/docker/bch-dex/start-production.sh

@@ -31,4 +31,12 @@ export APP_ID=bch-dex-001
 
 #export P2WDB_URL=http://172.17.0.1:5667
 
+export OPERATOR_ADDRESS=bitcoincash:qzauj67nsqqmtu2pql7wcak3ct7lu2fppqkj0xwvwl
+export OPERATOR_PERCENTAGE=10.0
+
+export FULLSTACKCASH=false
+export APISERVER=http://192.168.2.156:5942/v6/
+export WALLET_INTERFACE=web2
+
+
 npm start

production/docker/docker-compose.yml

@@ -38,7 +38,7 @@ services:
       - '4005:4005' # WebRTC
 
     volumes:
-      - ../scripts/wallet.json:/home/safeuser/bch-dex/wallet.json
+      - ../../../scripts/wallet.json:/home/safeuser/bch-dex/wallet.json
       - ./bch-dex/start-production.sh:/home/safeuser/bch-dex/start-production.sh
     restart: always
 

src/adapters/wallet.js

@@ -468,8 +468,9 @@ class WalletAdapter {
       }
       // Ensure the URL points at FullStack.cash, since the web 3 infra does not
       // yet support this call.
+      // TODO: Remove this once the web 3 infra supports this call.
       const oldUrl = this.bchWallet.bchjs.RawTransactions.restURL
-      this.bchWallet.bchjs.RawTransactions.restURL = 'https://api.fullstack.cash/v5/'
+      this.bchWallet.bchjs.RawTransactions.restURL = 'https://bch.fullstack.cash/v6/'
 
       // Use a full node to deserialize the transaction.
       const txObj2 = await this.bchWallet.bchjs.RawTransactions.decodeRawTransaction(txHex)
@@ -480,7 +481,7 @@ class WalletAdapter {
 
       return txObj2
     } catch (err) {
-      console.error('Error in wallet.js/deserializeTx()')
+      console.error('Error in wallet.js/deserializeTx(): ', err)
       throw err
     }
   }