fix: wip

Author: ChaitanyaKonda

config/default.js

@@ -41,12 +41,31 @@ module.exports = {
 process.env.USER_ETHEREUM_SIGNING_KEY ||
 '0x4775af73d6dc84a0ae76f8726bda4b9ecf187c377229cb39e1afa7a18236a69e',
 userAddress: process.env.USER_ADDRESS,
+user1EthereumSigningKey:
+process.env.USER_ETHEREUM_SIGNING_KEY ||
+'0xb0fa8745bd6e77a67ec6a27e701971d659937140cc3159d9f85210da3444eb45', // Change associated user1EthereumAddress
+user2EthereumSigningKey:
+process.env.USER2_ETHEREUM_SIGNING_KEY ||
+'0xd42905d0582c476c4b74757be6576ec323d715a0c7dcff231b6348b7ab0190eb', // Change associated user2EthereumAddress
+userEthereumAddress: process.env.ETHEREUM_ADDRESS || '0x9c8b2276d490141ae1440da660e470e7c0349c63', // Change associated userEthereumSigningKey
+user1EthereumAddress:
+process.env.ETHEREUM_ADDRESS || '0x4ca4902a6f456b488947074ad4140317c7e21996', // Change associated user1EthereumSigningKey
+user2EthereumAddress:
+process.env.ETHEREUM_ADDRESS || '0xfCb059A4dB5B961d3e48706fAC91a55Bad0035C9', // Change associated user2EthereumSigningKey
 zkpMnemonic:
 process.env.ZKP_MNEMONIC ||
 'hurt labor ketchup seven scan swap dirt brown brush path goat together',
 proposerEthereumSigningKey:
 process.env.PROPOSER_ETHEREUM_SIGNING_KEY ||
 '0x4775af73d6dc84a0ae76f8726bda4b9ecf187c377229cb39e1afa7a18236a69d',
+user1Pkd: process.env.RECIPIENT_PKD || [
+'0x193a37cd7973373aceae05d133f3d69ab6e7ef2f4321461173871ec7611244e2',
+'0x27234a8721e73c9aa160154ee63d2470101fc5fd841221eeb675a91ec2d66e78',
+],
+user2Pkd: process.env.RECIPIENT_PKD || [
+'0x105651c0c5bb97582b3270e0f5a07ca81410ffd1920e86697efddaec03dccef8',
+'0x1ac3b61ecba1448e697b23d37efe290fb86554b2f905aaca3a6df59805eca366',
+],
 WEB3_OPTIONS: {
 gas: process.env.GAS || 8000000,
 gasPrice: process.env.GAS_PRICE || '20000000000',

nightfall-deployer/contracts/ERC20Mock1.sol

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import '@openzeppelin/contracts/token/ERC20/ERC20.sol';
+
+contract ERC20Mock1 is ERC20 {
+constructor(uint256 initialSupply) ERC20('ERC20Mock1', 'E1_20') {
+_mint(msg.sender, initialSupply);
+}
+
+function decimals() public view virtual override returns (uint8) {
+return 9;
+}
+}

nightfall-deployer/contracts/ERC20Mock2.sol

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import '@openzeppelin/contracts/token/ERC20/ERC20.sol';
+
+contract ERC20Mock2 is ERC20 {
+constructor(uint256 initialSupply) ERC20('ERC20Mock2', 'E2_20') {
+_mint(msg.sender, initialSupply);
+}
+
+function decimals() public view virtual override returns (uint8) {
+return 9;
+}
+}

nightfall-deployer/migrations/4_test_tokens_migration.js

@@ -1,4 +1,14 @@
+const config = require('config');
+
+const {
+userEthereumAddress,
+user1EthereumAddress,
+user2EthereumAddress
+} = config;
+
 const ERC20Mock = artifacts.require('ERC20Mock.sol');
+const ERC20Mock1 = artifacts.require('ERC20Mock1.sol');
+const ERC20Mock2 = artifacts.require('ERC20Mock2.sol');
 const ERC721Mock = artifacts.require('ERC721Mock.sol');
 const ERC1155Mock = artifacts.require('ERC1155Mock.sol');
 const config = require('config');
@@ -9,12 +19,19 @@ const walletTestAddress = config.userAddress || '0xfCb059A4dB5B961d3e48706fAC91a
 module.exports = function(deployer) {
 deployer.then(async () => {
 await deployer.deploy(ERC20Mock, 100000000000); // initialSupply
+await deployer.deploy(ERC20Mock1, 100000000000); // initialSupply
+await deployer.deploy(ERC20Mock2, 100000000000); // initialSupply
 await deployer.deploy(ERC721Mock);
 await deployer.deploy(ERC1155Mock);
 
 const ERC20deployed = await ERC20Mock.deployed();
+const ERC20deployed1 = await ERC20Mock1.deployed();
+const ERC20deployed2 = await ERC20Mock2.deployed();
 const ERC721deployed = await ERC721Mock.deployed();
 const ERC1155deployed = await ERC1155Mock.deployed();
+// For ping pong tests
+await ERC20deployed1.transfer(user1EthereumAddress, 100000000000);
+await ERC20deployed2.transfer(user2EthereumAddress, 100000000000);
 // For e2e tests
 await ERC721deployed.awardItem(recipientAddress, 'https://erc721mock/item-id-1.json');
 await ERC721deployed.awardItem(recipientAddress, 'https://erc721mock/item-id-2.json');

test/ping-pong/docker-compose.host.docker.internal.yml

@@ -46,10 +46,17 @@ services:
 # user-local:
 # environment:
 # BLOCKCHAIN_WS_HOST: host.docker.internal
+# BLOCKCHAIN_PORT: 8546
+# USER_ETHEREUM_SIGNING_KEY: abf4ed9f30bd1e4a290310d726c7bbdf39cd75a25eebd9a3a4874e10b4a0c4ce
 
 user-local1:
 environment:
 BLOCKCHAIN_WS_HOST: host.docker.internal
 BLOCKCHAIN_PORT: 8546
-USER_ETHEREUM_SIGNING_KEY: abf4ed9f30bd1e4a290310d726c7bbdf39cd75a25eebd9a3a4874e10b4a0c4ce
-USER_ADDRESS: '0xdb080dC48961bC1D67a0A4151572eCb824cC76E8'
+USER_ETHEREUM_SIGNING_KEY: b0fa8745bd6e77a67ec6a27e701971d659937140cc3159d9f85210da3444eb45
+
+user-local2:
+environment:
+BLOCKCHAIN_WS_HOST: host.docker.internal
+BLOCKCHAIN_PORT: 8546
+USER_ETHEREUM_SIGNING_KEY: d42905d0582c476c4b74757be6576ec323d715a0c7dcff231b6348b7ab0190eb

test/ping-pong/docker-compose.standalone.ganache.yml

@@ -11,3 +11,5 @@ services:
 ganache-cli --defaultBalanceEther=0 --gasLimit=0xbebc20 --deterministic -i 4378921 -p 8546
 --account="0xabf4ed9f30bd1e4a290310d726c7bbdf39cd75a25eebd9a3a4874e10b4a0c4ce,10000000000000000000000"
 --account="0x645ac79fa9fd87dd1cf30bdca51d326bd501cd328d6dbc9f5f517c7da0dafa6f,10000000000000000000000"
+--account="0xb0fa8745bd6e77a67ec6a27e701971d659937140cc3159d9f85210da3444eb45,10000000000000000000000"
+--account="0xd42905d0582c476c4b74757be6576ec323d715a0c7dcff231b6348b7ab0190eb,10000000000000000000000"

test/ping-pong/docker-compose.yml

@@ -67,6 +67,25 @@ services:
 TIMBER_PORT: 80
 command: ['npm', 'run', 'dev']
 
+# # Temporary container to deploy contracts and circuits and populate volumes
+# deployer:
+# image: ghcr.io/eyblockchain/nightfall3-deployer
+# volumes:
+# - type: volume
+# source: build
+# target: /app/build/
+# networks:
+# - nightfall_network
+# environment:
+# LOG_LEVEL: debug
+# # ETH_NETWORK sets the network selected by Truffle from truffle-config.js
+# # startup routines will wait for a blockchain client to be reachable on this network
+# ETH_NETWORK: blockchain1
+# BLOCKCHAIN_WS_HOST: blockchain1
+# BLOCKCHAIN_PORT: 8546
+# ZOKRATES_WORKER_HOST: worker
+# USE_STUBS: 'false'
+
 # Temporary container to deploy contracts and circuits and populate volumes
 deployer:
 image: ghcr.io/eyblockchain/nightfall3-deployer:latest
@@ -77,6 +96,30 @@ services:
 - type: volume
 source: build
 target: /app/build/
+- type: bind
+source: ../../nightfall-deployer/contracts
+target: /app/contracts/
+- type: bind
+source: ../../nightfall-deployer/circuits
+target: /app/circuits/
+- type: bind
+source: ../../nightfall-deployer/src
+target: /app/src/
+- type: bind
+source: ../../common-files
+target: /common-files
+- type: bind
+source: ../../config/default.js
+target: /app/config/default.js
+- type: bind
+source: ../../nightfall-deployer/migrations
+target: /app/migrations
+- type: bind
+source: ../../nightfall-deployer/truffle-config.js
+target: /app/truffle-config.js
+- type: bind
+source: ../../nightfall-deployer/entrypoint.sh
+target: /app/entrypoint.sh
 networks:
 - pong_network
 environment:
@@ -148,6 +191,7 @@ services:
 # CLIENT_PORT: 80
 # BLOCKCHAIN_WS_HOST: blockchain1
 # BLOCKCHAIN_PORT: 8546
+# ZKP_MNEMONIC: tiger victory velvet tank ritual column horse conduct athlete position soul shaft
 
 user-local1:
 build:
@@ -170,6 +214,34 @@ services:
 CLIENT_PORT: 80
 BLOCKCHAIN_WS_HOST: blockchain1
 BLOCKCHAIN_PORT: 8546
+RECIPIENT_PKD: 0x105651c0c5bb97582b3270e0f5a07ca81410ffd1920e86697efddaec03dccef8,0x1ac3b61ecba1448e697b23d37efe290fb86554b2f905aaca3a6df59805eca366
+ZKP_MNEMONIC: tone shadow woman critic glare utility brass scheme edge brisk enforce champion
+command: ['npm', 'run', 'dev']
+
+user-local2:
+build:
+dockerfile: user-local2.Dockerfile
+context: ../../
+networks:
+- nightfall_network
+volumes:
+- type: bind
+source: ../../common-files
+target: /app/common-files
+- type: bind
+source: ./user-local2/src
+target: /app/test/ping-pong/user-local2/src
+environment:
+OPTIMIST_HOST: optimist
+OPTIMIST_WS_PORT: 8080
+OPTIMIST_HTTP_PORT: 80
+CLIENT_HOST: client
+CLIENT_PORT: 80
+BLOCKCHAIN_WS_HOST: blockchain1
+BLOCKCHAIN_PORT: 8546
+RECIPIENT_PKD: 0x193a37cd7973373aceae05d133f3d69ab6e7ef2f4321461173871ec7611244e2,0x27234a8721e73c9aa160154ee63d2470101fc5fd841221eeb675a91ec2d66e78
+ZKP_MNEMONIC:
+tiger victory velvet tank ritual column horse conduct athlete position soul shaft
 command: ['npm', 'run', 'dev']
 
 volumes:

test/ping-pong/pong-apps

@@ -25,5 +25,5 @@ done
 # shut down cleanly in the event of a cntl-c etc. We don't want to leave containers running
 trap "exit 1" SIGHUP SIGINT SIGTERM
 
-docker-compose -f docker-compose.yml $FILE up -d --remove-orphans proposer user-local1
-docker-compose logs -f proposer user-local1
+docker-compose -f docker-compose.yml $FILE up -d --remove-orphans proposer user-local1 user-local2
+docker-compose logs -f proposer user-local1 user-local2

test/ping-pong/user-local1/src/index.mjs

@@ -5,48 +5,30 @@ Module that runs up as a user
 /* eslint-disable no-await-in-loop */
 /* eslint no-constant-condition: ["error", { "checkLoops": false } ] */
 
-import logger from 'common-files/utils/logger.mjs';
+// import logger from 'common-files/utils/logger.mjs';
 import config from 'config';
-import inquirer from 'inquirer';
 import Nf3 from '../../../../cli/lib/nf3.mjs';
-import waitForSufficientBalance from './utils.mjs';
+import { waitForSufficientBalance, retrieveL2Balance } from './utils.mjs';
 
 const {
 zkpMnemonic,
-userEthereumSigningKey,
+user1EthereumSigningKey,
 optimistWsUrl,
 web3WsUrl,
 clientBaseUrl,
 optimistBaseUrl,
 TRANSACTIONS_PER_BLOCK,
 } = config;
 
-/**
-Asks CLI questions
-*/
-async function promptUser() {
-return new Promise(resolve => {
-setTimeout(function () {
-resolve(true);
-}, 10000);
-resolve(
-inquirer.prompt([
-{
-name: 'isContinue',
-type: 'confirm',
-message: 'Continue the test',
-default: true,
-},
-]),
-);
-});
-}
+const TEST_LENGTH = 1;
+const recipientPkd = process.env.RECIPIENT_PKD.split(',');
 
 /**
 Does the preliminary setup and starts listening on the websocket
 */
 async function localTest() {
-logger.info('Starting local test...');
+// logger.info('Starting local test...');
+console.log('Starting local test...');
 
 const tokenType = 'ERC20';
 const value = 1;
@@ -56,46 +38,39 @@ async function localTest() {
 optimistBaseUrl,
 optimistWsUrl,
 web3WsUrl,
-userEthereumSigningKey,
+user1EthereumSigningKey,
 );
 
 await nf3.init(zkpMnemonic);
-if (await nf3.healthcheck('client')) logger.info('Healthcheck passed');
+if (await nf3.healthcheck('client')) console.log('Healthcheck passed');
 else throw new Error('Healthcheck failed');
 
-const ercAddress = await nf3.getContractAddress('ERC20Mock'); // TODO use proper mock contracts
-const startBalance = await nf3.getLayer2Balances();
-
+const ercAddress = await nf3.getContractAddress('ERC20Mock1');
+const startBalance = await retrieveL2Balance(nf3);
 console.log('HERE startBalance', startBalance);
 
 // To start with create a block of deposits such that, we do a transfer in the next block
 for (let i = 0; i < TRANSACTIONS_PER_BLOCK; i++) {
 await nf3.deposit(ercAddress, tokenType, value, tokenId);
 }
 
-while (true) {
-const { isContinue } = await promptUser();
-if (isContinue) {
-for (let j = 0; j < TRANSACTIONS_PER_BLOCK; j++) {
-// ensure there is sufficient balance for transfer.
-// this function relies on a prior deposit of
-// similar value being made
-await waitForSufficientBalance(nf3, value);
-await nf3.transfer(false, ercAddress, tokenType, value, tokenId, nf3.zkpKeys.pkd);
-await new Promise(resolve => setTimeout(resolve, 20000));
-}
-} else break;
+for (let i = 0; i < TEST_LENGTH; i++) {
+await waitForSufficientBalance(nf3, value);
+await nf3.transfer(false, ercAddress, tokenType, value, tokenId, recipientPkd);
+await nf3.deposit(ercAddress, tokenType, value, tokenId);
+await new Promise(resolve => setTimeout(resolve, 20000));
 }
 
-const endBalance = await nf3.getLayer2Balances();
+const endBalance = await retrieveL2Balance(nf3);
 console.log('HERE endBalance', endBalance);
 
-if (Object.keys(startBalance).length >= Object.keys(endBalance).length) {
-logger.warn('The test failed because the L2 balance has not increased');
+if (endBalance - startBalance === 2 * value) {
+console.log('Test passed');
+nf3.close();
+} else {
+console.log('The test failed because the L2 balance has not increased');
 process.exit(1);
 }
-logger.info('Test passed');
-nf3.close();
 }
 
 localTest();

test/ping-pong/user-local1/src/utils.mjs

@@ -1,8 +1,28 @@
+/**
+function to retrieve balance of user because getLayer2Balances returns
+balances of all users
+*/
+export const retrieveL2Balance = async client => {
+const balances = await client.getLayer2Balances();
+// if there are no balances
+if (Object.keys(balances).length === 0) {
+return 0;
+}
+const clientBalances = balances[client.zkpKeys.compressedPkd];
+// if this user has no balance
+if (clientBalances === undefined || Object.keys(clientBalances).length === 0) {
+return 0;
+}
+// TODO return address by contract address
+const balance = clientBalances[Object.keys(clientBalances)[0]];
+return balance;
+};
+
 /**
 function to wait until sufficient balance is achieved from
 transactions
 */
-const waitForSufficientBalance = (client, value) => {
+export const waitForSufficientBalance = (client, value) => {
 return new Promise(resolve => {
 async function isSufficientBalance() {
 const balances = await client.getLayer2Balances();
@@ -17,6 +37,7 @@ const waitForSufficientBalance = (client, value) => {
 await new Promise(resolving => setTimeout(resolving, 10000));
 isSufficientBalance();
 }
+console.log('HERE clientBalances', clientBalances);
 const balance = clientBalances[Object.keys(clientBalances)[0]];
 // if client has layer 2 balances and if it is equal to value required
 if (balance > value) {
@@ -31,5 +52,3 @@ const waitForSufficientBalance = (client, value) => {
 isSufficientBalance();
 });
 };
-
-export default waitForSufficientBalance;