Splitting tests

.github/workflows/check-PRs.yml

@@ -42,7 +42,8 @@ jobs:
       - name: Run integration test
         run: |
           npm ci
-          npm test
+          VERBOSE=true npm run test-e2e-protocol
+          VERBOSE=true npm run test-e2e-tokens
 
       - name: debug logs - after integration test run
         if: always()
@@ -59,42 +60,6 @@ jobs:
           name: ganache-test-logs
           path: ./ganache-test.log
 
-  wallet-test:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@master
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '14.17.0'
-
-      - name: Start Containers
-        run: |
-          docker build --no-cache	-t ghcr.io/eyblockchain/local-zokrates -f zokrates.Dockerfile .
-          docker-compose build
-          ./start-nightfall -wt -s &
-
-      - name: wait 2500s for Containers startup and test completion
-        run: sleep 2500
-
-      - name: Retrieve Wallet test logs
-        run: docker logs $(docker ps -aqf "name=wallet-test") > wallet-test.log; cat wallet-test.log;
-
-      - name: debug logs - after container startup
-        if: always()
-        run: if [ -z "$(cat wallet-test.log | grep FAILED)" ]; then exit 0; else exit 1; fi
-
-      - name: If integration test failed, shutdown the Containers
-        if: failure()
-        run: docker-compose -f docker-compose.yml -f docker-compose.ganache.yml -f docker-compose.wallet-test.yml down -v
-
-      - name: If integration test failed, upload logs files as artifacts
-        if: failure()
-        uses: actions/upload-artifact@master
-        with:
-          name: wallet-test-logs
-          path: ./wallet-test.log
-
-
   test-gas:
     name: check gas for 32 transactions per block
     runs-on: ubuntu-20.04

cli/lib/nf3.mjs

@@ -65,19 +65,19 @@ class Nf3 {
   currentEnvironment;
 
   constructor(
-    web3WsUrl,
     ethereumSigningKey,
     environment = {
       clientApiUrl: 'http://localhost:8080',
       optimistApiUrl: 'http://localhost:8081',
       optimistWsUrl: 'ws://localhost:8082',
+      web3WsUrl: 'ws://localhost:8546',
     },
     zkpKeys,
   ) {
     this.clientBaseUrl = environment.clientApiUrl;
     this.optimistBaseUrl = environment.optimistApiUrl;
     this.optimistWsUrl = environment.optimistWsUrl;
-    this.web3WsUrl = web3WsUrl;
+    this.web3WsUrl = environment.web3WsUrl;
     this.ethereumSigningKey = ethereumSigningKey;
     this.zkpKeys = zkpKeys;
     this.currentEnvironment = environment;
@@ -164,6 +164,16 @@ class Nf3 {
     return this.subscribeToIncomingViewingKeys();
   }
 
+  /**
+  Gets the number of unprocessed transactions on the optimist
+  @async
+  */
+
+  async unprocessedTransactionCount() {
+    const { result: mempool } = (await axios.get(`${this.optimistBaseUrl}/proposer/mempool`)).data;
+    return mempool.filter(e => e.mempool).length;
+  }
+
   /**
   Method for signing and submitting an Ethereum transaction to the
   blockchain.
@@ -186,7 +196,7 @@ class Nf3 {
     let tx;
     await this.nonceMutex.runExclusive(async () => {
       // if we don't have a nonce, we must get one from the ethereum client
-      if (!this.nonce) this.nonce = await this.web3.eth.getTransactionCount(this.ethereumAddress);
+      this.nonce = await this.web3.eth.getTransactionCount(this.ethereumAddress);
 
       let gasPrice = 20000000000;
       const gas = (await this.web3.eth.getBlock('latest')).gasLimit;
@@ -210,20 +220,24 @@ class Nf3 {
       // rather than waiting until we have a receipt, wait until we have enough confirmation blocks
       // then return the receipt.
       // TODO does this still work if there is a chain reorg or do we have to handle that?
-      return new Promise(resolve => {
-        console.log(`Confirming transaction ${signed.transactionHash}`);
+      return new Promise((resolve, reject) => {
+        if (process.env.VERBOSE) console.log(`Confirming transaction ${signed.transactionHash}`);
         this.notConfirmed++;
         this.web3.eth
           .sendSignedTransaction(signed.rawTransaction)
           .on('confirmation', (number, receipt) => {
             if (number === 12) {
               this.notConfirmed--;
-              console.log(
-                `Transaction ${receipt.transactionHash} has been confirmed ${number} times.`,
-                `Number of unconfirmed transactions is ${this.notConfirmed}`,
-              );
+              if (process.env.VERBOSE)
+                console.log(
+                  `Transaction ${receipt.transactionHash} has been confirmed ${number} times.`,
+                  `Number of unconfirmed transactions is ${this.notConfirmed}`,
+                );
               resolve(receipt);
             }
+          })
+          .on('error', err => {
+            reject(err);
           });
       });
     }
@@ -270,7 +284,7 @@ class Nf3 {
   */
   async getContractAddress(contractName) {
     const res = await axios.get(`${this.clientBaseUrl}/contract-address/${contractName}`);
-    return res.data.address;
+    return res.data.address.toLowerCase();
   }
 
   /**
@@ -424,7 +438,7 @@ class Nf3 {
     });
     this.latestWithdrawHash = res.data.transaction.transactionHash;
     if (!offchain) {
-      const receiptPromise = this.submitTransaction(
+      const receiptPromise = await this.submitTransaction(
         res.data.txDataToSign,
         this.shieldContractAddress,
         fee,
@@ -767,33 +781,12 @@ class Nf3 {
   @method
   @async
   @param {Array} ercList - list of erc contract addresses to filter.
-  @param {Boolean} filterByCompressedPkd - flag to indicate if request is filtered
-  ones compressed pkd
   @returns {Promise} This promise resolves into an object whose properties are the
   addresses of the ERC contracts of the tokens held by this account in Layer 2. The
   value of each propery is the number of tokens originating from that contract.
   */
-  async getLayer2Balances(ercList, filterByCompressedPkd) {
+  async getLayer2Balances({ ercList } = {}) {
     const res = await axios.get(`${this.clientBaseUrl}/commitment/balance`, {
-      params: {
-        compressedPkd: filterByCompressedPkd === true ? this.zkpKeys.compressedPkd : null,
-        ercList,
-      },
-    });
-    return res.data.balance;
-  }
-
-  /**
-  Returns the balance details of tokens held in layer 2
-  @method
-  @async
-  @param {Array} ercList - list of erc contract addresses to filter.
-  @returns {Promise} This promise resolves into an object whose properties are the
-  addresses of the ERC contracts of the tokens held by this account in Layer 2. The
-  value of each propery is the number of tokens originating from that contract.
-  */
-  async getLayer2BalancesDetails(ercList) {
-    const res = await axios.get(`${this.clientBaseUrl}/commitment/balance-details`, {
       params: {
         compressedPkd: this.zkpKeys.compressedPkd,
         ercList,

docker-compose.yml

@@ -45,7 +45,7 @@ services:
       OPTIMIST_PORT: 80
       USE_STUBS: 'false' # make sure this flag is the same as in deployer service
       RETRIES: 80
-    command: ['npm', 'run', 'dev']
+    command: [ 'npm', 'run', 'dev' ]
 
   client2:
     build:
@@ -89,7 +89,7 @@ services:
       OPTIMIST_HOST: optimist2
       OPTIMIST_PORT: 80
       USE_STUBS: 'false' # make sure this flag is the same as in deployer service
-    command: ['npm', 'run', 'dev']
+    command: [ 'npm', 'run', 'dev' ]
 
   worker:
     #  image: 3800decac71d
@@ -115,7 +115,6 @@ services:
       - nightfall_network
     environment:
       LOG_LEVEL: info
-
     # Temporary container to deploy contracts and circuits and populate volumes
   deployer:
     #image: docker.pkg.github.com/eyblockchain/nightfall-deployer/nightfall_deployer:1.1.0
@@ -211,7 +210,7 @@ services:
       LOG_LEVEL: debug
       IS_CHALLENGER: 'true'
       TRANSACTIONS_PER_BLOCK: ${TRANSACTIONS_PER_BLOCK:-2}
-    command: ['npm', 'run', 'dev']
+    command: [ 'npm', 'run', 'dev' ]
 
   optimist2:
     build:
@@ -246,7 +245,7 @@ services:
       LOG_LEVEL: error
       IS_CHALLENGER: 'true'
       TRANSACTIONS_PER_BLOCK: ${TRANSACTIONS_PER_BLOCK:-2}
-    command: ['npm', 'run', 'dev']
+    command: [ 'npm', 'run', 'dev' ]
 
 volumes:
   mongodb1:

nightfall-client/src/routes/commitment.mjs

@@ -10,7 +10,6 @@ import {
   getWalletBalanceUnfiltered,
   getWalletCommitments,
   getWithdrawCommitments,
-  getWalletBalanceDetails,
   getWalletPendingDepositBalance,
   getWalletPendingSpentBalance,
 } from '../services/commitment-storage.mjs';
@@ -46,18 +45,6 @@ router.get('/balance', async (req, res, next) => {
   }
 });
 
-router.get('/balance-details', async (req, res, next) => {
-  logger.debug('commitment/balance details endpoint received GET');
-  try {
-    const { compressedPkd, ercList } = req.query;
-    const balance = await getWalletBalanceDetails(compressedPkd, ercList);
-    res.json({ balance });
-  } catch (err) {
-    logger.error(err);
-    next(err);
-  }
-});
-
 router.get('/pending-deposit', async (req, res, next) => {
   logger.debug('commitment/pending-deposit endpoint received GET');
   try {