fix: rebase to master and fix wallet incompatibilities

Author: Westlad

cli/lib/nf3.mjs

@@ -3,7 +3,6 @@ import Web3 from 'web3';
 import WebSocket from 'ws';
 import EventEmitter from 'events';
 import { Mutex } from 'async-mutex';
-import config from 'config';
 import { approve } from './tokens.mjs';
 import erc20 from './abis/ERC20.mjs';
 import erc721 from './abis/ERC721.mjs';
@@ -164,13 +163,19 @@ class Nf3 {
 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);
+
+let gasPrice = 10000000000;
+const gas = (await this.web3.eth.getBlock('latest')).gasLimit;
+const blockGasPrice = Number(await this.web3.eth.getGasPrice());
+if (blockGasPrice > gasPrice) gasPrice = blockGasPrice;
+
 tx = {
 from: this.ethereumAddress,
 to: contractAddress,
 data: unsignedTransaction,
 value: fee,
-gas: config.WEB3_OPTIONS.gas,
-gasPrice: config.WEB3_OPTIONS.gasPrice,
+gas,
+gasPrice,
 nonce: this.nonce,
 };
 this.nonce++;

cli/package-lock.json

@@ -15,7 +15,6 @@
 "clear": "^0.1.0",
 "cli-table": "^0.3.6",
 "commander": "^8.2.0",
-"config": "^3.3.6",
 "figlet": "^1.5.2",
 "inquirer": "^8.1.4",
 "web3": "^1.5.2",

cli/package.json

@@ -1,7 +1,3 @@
-const Web3 = require('web3');
-
-const web3 = new Web3();
-
 module.exports = {
 COMMITMENTS_DB: 'nightfall_commitments',
 OPTIMIST_DB: 'optimist_data',
@@ -34,9 +30,7 @@ module.exports = {
 `ws://${process.env.BLOCKCHAIN_WS_HOST}:${process.env.BLOCKCHAIN_PORT}`,
 USE_INFURA: process.env.USE_INFURA === 'true',
 ETH_PRIVATE_KEY: process.env.ETH_PRIVATE_KEY, // owner's/deployer's private key
-ETH_ADDRESS: process.env.ETH_PRIVATE_KEY
-? web3.eth.accounts.privateKeyToAccount(process.env.ETH_PRIVATE_KEY, false).address
-: undefined, // owner's address
+ETH_ADDRESS: process.env.ETH_ADDRESS,
 OPTIMIST_HOST: process.env.OPTIMIST_HOST || 'optimist',
 OPTIMIST_PORT: process.env.OPTIMIST_PORT || 80,
 clientBaseUrl: `http://${process.env.CLIENT_HOST}:${process.env.CLIENT_PORT}`,
@@ -46,9 +40,7 @@ module.exports = {
 userEthereumSigningKey:
 process.env.USER_ETHEREUM_SIGNING_KEY ||
 '0x4775af73d6dc84a0ae76f8726bda4b9ecf187c377229cb39e1afa7a18236a69e',
-userAddress: process.env.USER_ETHEREUM_SIGNING_KEY
-? web3.eth.accounts.privateKeyToAccount(process.env.USER_ETHEREUM_SIGNING_KEY, false).address
-: undefined, // user's address
+userAddress: process.env.USER_ADDRESS,
 zkpMnemonic:
 process.env.ZKP_MNEMONIC ||
 'hurt labor ketchup seven scan swap dirt brown brush path goat together',
@@ -58,10 +50,7 @@ module.exports = {
 WEB3_OPTIONS: {
 gas: process.env.GAS || 8000000,
 gasPrice: process.env.GAS_PRICE || '20000000000',
-from:
-process.env.FROM_ADDRESS || process.env.ETH_PRIVATE_KEY
-? web3.eth.accounts.privateKeyToAccount(process.env.ETH_PRIVATE_KEY, false).address
-: undefined,
+from: process.env.FROM_ADDRESS || process.env.ETH_ADDRESS,
 },
 WEB3_PROVIDER_OPTIONS: {
 clientConfig: {

config/default.js

@@ -17,10 +17,13 @@ services:
 BLOCKCHAIN_WS_HOST: ropsten1-ws.testnet.nightfall3.com
 BLOCKCHAIN_PORT: 80
 ETH_PRIVATE_KEY: abf4ed9f30bd1e4a290310d726c7bbdf39cd75a25eebd9a3a4874e10b4a0c4ce
+# this should be the address corresponding to the above provate key
+ETH_ADDRESS: db080dC48961bC1D67a0A4151572eCb824cC76E8
 USE_ROPSTEN: enable
 GAS_PRICE: 20000000000
 # This is only needed for test purposes - it gives tokens to the user at startup
 USER_ETHEREUM_SIGNING_KEY: abf4ed9f30bd1e4a290310d726c7bbdf39cd75a25eebd9a3a4874e10b4a0c4ce
+USER_ADDRESS: db080dC48961bC1D67a0A4151572eCb824cC76E8
 
 optimist:
 environment:
@@ -39,3 +42,4 @@ services:
 BLOCKCHAIN_WS_HOST: ropsten1-ws.testnet.nightfall3.com
 BLOCKCHAIN_PORT: 80
 USER_ETHEREUM_SIGNING_KEY: abf4ed9f30bd1e4a290310d726c7bbdf39cd75a25eebd9a3a4874e10b4a0c4ce
+USER_ADDRESS: db080dC48961bC1D67a0A4151572eCb824cC76E8