Merge branch 'master' into fullstack

config/env/common.js

@@ -80,7 +80,7 @@ export default {
     ? (
         process.env.APISERVER
           ? process.env.APISERVER
-          : 'https://bch.fullstack.cash/v6/'
+          : 'https://api.fullstack.cash/v5/'
       )
     : '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": "7.1.5",
+    "minimal-slp-wallet": "5.13.2",
     "mongoose": "5.13.14",
     "node-fetch": "npm:@achingbrain/node-fetch@2.6.7",
     "nodemailer": "6.7.5",

production/docker/bch-dex-ui/Dockerfile

@@ -53,7 +53,7 @@ RUN git clone https://github.com/Permissionless-Software-Foundation/bch-dex-ui-v
 WORKDIR /home/safeuser/bch-dex-ui-v3
 
 # For development: switch to unstable branch
-RUN git checkout ct-unstable
+RUN git checkout psfoundation
 
 # Install dependencies
 #RUN mkdir .ipfsdata

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

@@ -31,4 +31,7 @@ export APP_ID=bch-dex-001
 
 #export P2WDB_URL=http://172.17.0.1:5667
 
+export DISABLE_NEW_ACCOUNTS=true
+export ADMIN_PASSWORD=decatur
+
 npm start

production/wallet-bkup.json

@@ -0,0 +1,11 @@
+{
+  "privateKey": "L4VyBDiWYYeeZhkM3xE3nsZigXJYmvRM29YBxoC7da4FzvubjxFo",
+  "publicKey": "028d6c77d865e6140db4b879a9bdf69ee4846593c0b6c48a82c448d5792806aab1",
+  "mnemonic": "split title trigger soda execute frost brush labor vague protect bicycle fiscal",
+  "cashAddress": "bitcoincash:qprrdk7en7m774gsafkycxcymc9ry209jus5v8wx5z",
+  "address": "bitcoincash:qprrdk7en7m774gsafkycxcymc9ry209jus5v8wx5z",
+  "legacyAddress": "17QG25rNUfnfj2NtdaFiyiqKSJatvEnMYd",
+  "hdPath": "m/44'/245'/0'/0/0",
+  "slpAddress": "simpleledger:qprrdk7en7m774gsafkycxcymc9ry209juu08umx2u",
+  "nextAddress": 1
+}

src/adapters/wallet.js

@@ -468,9 +468,8 @@ 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://bch.fullstack.cash/v6/'
+      this.bchWallet.bchjs.RawTransactions.restURL = 'https://api.fullstack.cash/v5/'
 
       // Use a full node to deserialize the transaction.
       const txObj2 = await this.bchWallet.bchjs.RawTransactions.decodeRawTransaction(txHex)
@@ -481,7 +480,7 @@ class WalletAdapter {
 
       return txObj2
     } catch (err) {
-      console.error('Error in wallet.js/deserializeTx(): ', err)
+      console.error('Error in wallet.js/deserializeTx()')
       throw err
     }
   }

util/users/production/createUser.js

@@ -11,12 +11,12 @@ import axios from 'axios'
 // import User from '../../../src/adapters/localdb/models/users.js'
 
 // Customize these variables
-const EMAIL = 'someone@somewhere.com'
+const EMAIL = 'chris.troutner@gmail.com'
-const NAME = 'Someone'
+const NAME = 'Chris'
-const PASSWORD = 'test'
+const PASSWORD = '0mega16'
 
 const ADMIN_EMAIL = 'system@system.com'
-const ADMIN_PASSWORD = 'admin'
+const ADMIN_PASSWORD = 'decatur'
 
 async function createUser () {
   try {