fix: pass tests using adminwalelt and multiple admin addresses

.env.dev

@@ -3,7 +3,8 @@ GUNDB_PASS=password
 GUNDB_SERVERMODE=false
 GUNDB_PEERS="https://goodgun-dev.herokuapp.com/gun"
 JWT_PASS=G00DDAPP
-MNEMONIC="myth like bonus scare over problem client lizard pioneer submit female collect"
+#MNEMONIC="myth like bonus scare over problem client lizard pioneer submit female collect"
+MNEMONIC="they bus duty candy uncover assault bullet kitchen kit acid spin physical"
 INFURA_API=
 NETWORK=develop
 LOG_LEVEL=debug
@@ -29,6 +30,6 @@ FUSE_API=https://explorer.fuse.io
 TWILIO_AUTH_ID=
 TWILIO_AUTH_TOKEN=
 TWILIO_PHONE_NUMBER=
-NUMBER_OF_ADMIN_WALLET_ACCOUNTS=1
+NUMBER_OF_ADMIN_WALLET_ACCOUNTS=5
 ADMIN_MIN_BALANCE=100000
 MARKET_PASSWORD=markettokenmarkettokenmarkettoke

.env.test

@@ -3,7 +3,8 @@ PORT=3004
 NODE_ENV=test
 GUNDB_PASS=password
 GUNDB_SERVERMODE=true
-MNEMONIC="myth like bonus scare over problem client lizard pioneer submit female collect"
+#MNEMONIC="myth like bonus scare over problem client lizard pioneer submit female collect"
+MNEMONIC="they bus duty candy uncover assault bullet kitchen kit acid spin physical"
 INFURA_API=a2eaa99cd7224a6db590ea38babff108
 NETWORK=develop
 LOG_LEVEL=silent
@@ -41,4 +42,4 @@ MARKET_PASSWORD=markettokenmarkettokenmarkettoke
 SECURE_KEY=d41d8cd98f00b204e9800998ecf8427e
 ENABLE_MONGO_LOCK=false
 MONGO_DB_URI=mongodb+srv://gooddollar:nN0oCoatunBLWSxw@cluster0-h5vxm.mongodb.net/gooddollar-test4?retryWrites=true&w=majority
-NUMBER_OF_ADMIN_WALLET_ACCOUNTS=1
+NUMBER_OF_ADMIN_WALLET_ACCOUNTS=5

.travis.yml

@@ -8,7 +8,7 @@ env:
     - GUNDB_PASS=test
     - JWT_PASS=test
     - MNEMONIC="myth like bonus scare over problem client lizard pioneer submit female collect"
-    - ADMIN_MNEMONIC="myth like bonus scare over problem client lizard pioneer submit female collect"
+    - ADMIN_MNEMONIC="they bus duty candy uncover assault bullet kitchen kit acid spin physical"
 
     - NETWORK=develop
     - CI=false
@@ -26,6 +26,7 @@ before_script:
   - popd
 
 script:
+  - export MNEMONIC=$ADMIN_MNEMONIC
   - npm link @gooddollar/goodcontracts
   - npm run coverage -- --silent
   - npm run coveralls

src/server/blockchain/AdminWallet.js

@@ -389,7 +389,7 @@ export class Wallet {
       let userBalance = await this.web3.eth.getBalance(address)
       let maxTopWei = parseInt(web3Utils.toWei('1000000', 'gwei'))
       let toTop = maxTopWei - userBalance
-      log.debug('TopWallet:', { userBalance, toTop })
+      log.debug('TopWallet:', { address, userBalance, toTop })
       if (toTop > 0 && (force || toTop / maxTopWei >= 0.75)) {
         let res = await this.sendTransaction(this.proxyContract.methods.topWallet(address))
         log.debug('Topwallet result:', { res })
@@ -462,9 +462,10 @@ export class Wallet {
           })
           .on('confirmation', c => onConfirmation && onConfirmation(c))
           .on('error', async e => {
+            log.error('sendTransaction error:', e.message, e)
             if (isNonceError(e)) {
               let netNonce = parseInt(await this.web3.eth.getTransactionCount(address))
-              log.error('sendTransaciton nonce failure retry', {
+              log.warn('sendTransaciton nonce failure retry', {
                 errMessage: e.message,
                 nonce,
                 gas,

src/server/blockchain/__tests__/adminWallet.test.js

@@ -1,6 +1,7 @@
 import AdminWallet from '../AdminWallet'
 import txManager from '../../utils/tx-manager'
 import Web3 from 'web3'
+import delay from 'delay'
 
 const web3 = new Web3()
 const generateWalletAddress = () => web3.eth.accounts.create().address
@@ -14,6 +15,8 @@ describe('adminwallet', () => {
   test(`adminWallet top wallet shouldn't throws an error when user is not whitelisted/verified`, async () => {
     const unverifiedAddress = generateWalletAddress()
     const tx = await AdminWallet.topWallet(unverifiedAddress, null).catch(e => false)
+    const balance = await AdminWallet.web3.eth.getBalance(unverifiedAddress)
+    expect(balance).toEqual('1000000000000000')
     expect(tx).toBeTruthy()
   })
 
@@ -47,11 +50,18 @@ describe('adminwallet', () => {
   test('adminWallet receive queue nonce', async () => {
     const promises = []
     for (let i = 0; i < 5; i++) {
+      await delay(100) //hack otherwise txes fail, looks like a web3 issue, sending txes out of order
       const unverifiedAddress = generateWalletAddress()
-      // console.log('unverifiedAddress', unverifiedAddress)
-      promises.push(AdminWallet.topWallet(unverifiedAddress, null, true))
+      promises.push(
+        AdminWallet.topWallet(unverifiedAddress)
+          .then(tx => tx.blockNumber)
+          .catch(e => e)
+      )
     }
-    const res = await Promise.all(promises).catch(_ => false)
+    const res = await Promise.all(promises)
+    const uniqueBlocks = new Set(res)
+    res.forEach(n => expect(n).toEqual(expect.any(Number))) //check it was excuted on one or two block
+    expect(uniqueBlocks.size).toBeLessThanOrEqual(2)
     expect(res).toBeTruthy()
   })
 

src/server/utils/tx-manager/queueMutex.js

@@ -18,8 +18,8 @@ export default class queueMutex {
   async createListIfNotExists(addresses) {
     for (let address of addresses) {
       if (!this.getWallet(address)) {
-        await this.createWallet(address)
-        log.info('created mutex for address:', { address })
+        const data = await this.createWallet(address)
+        log.info('created mutex for address:', { address, nonce: data.nonce })
       }
     }
   }
@@ -118,15 +118,17 @@ export default class queueMutex {
   async getFirstFreeAddress(addresses) {
     return new Promise(resolve => {
       const interval = setInterval(() => {
-        for (let address of addresses) {
-          if (this.isLocked(address) === false) {
-            log.debug('getFirstFreeAddress: address not locked', { address })
+        //use random to simulate real conditions, otherwise same address will be taken on single host
+        const address = addresses[Math.floor(Math.random() * addresses.length)]
+        // for (let address of addresses) {
+        if (this.isLocked(address) === false) {
+          log.debug('getFirstFreeAddress: address not locked', { address })
 
-            clearInterval(interval)
-            return resolve(address)
-          }
-          log.debug('getFirstFreeAddress: address locked', { address })
+          clearInterval(interval)
+          return resolve(address)
         }
+        log.debug('getFirstFreeAddress: address locked', { address })
+        // }
       }, 100)
     })
   }