From f1f0d8be2d3d1983eebb87a51c765e4341afbd57 Mon Sep 17 00:00:00 2001 From: Theo Date: Sun, 3 Sep 2023 07:23:08 -0700 Subject: [PATCH] Update tornado-oracles to calculate gas for bsc chain correctly --- build/contracts/OptimismL1GasPriceOracle.json | 151 ------------------ cli.js | 3 +- package-lock.json | 32 +--- package.json | 2 +- 4 files changed, 8 insertions(+), 180 deletions(-) delete mode 100644 build/contracts/OptimismL1GasPriceOracle.json diff --git a/build/contracts/OptimismL1GasPriceOracle.json b/build/contracts/OptimismL1GasPriceOracle.json deleted file mode 100644 index 8f239ad..0000000 --- a/build/contracts/OptimismL1GasPriceOracle.json +++ /dev/null @@ -1,151 +0,0 @@ -[ - { - "inputs": [{ "internalType": "address", "name": "_owner", "type": "address" }], - "stateMutability": "nonpayable", - "type": "constructor" - }, - { - "anonymous": false, - "inputs": [{ "indexed": false, "internalType": "uint256", "name": "", "type": "uint256" }], - "name": "DecimalsUpdated", - "type": "event" - }, - { - "anonymous": false, - "inputs": [{ "indexed": false, "internalType": "uint256", "name": "", "type": "uint256" }], - "name": "GasPriceUpdated", - "type": "event" - }, - { - "anonymous": false, - "inputs": [{ "indexed": false, "internalType": "uint256", "name": "", "type": "uint256" }], - "name": "L1BaseFeeUpdated", - "type": "event" - }, - { - "anonymous": false, - "inputs": [{ "indexed": false, "internalType": "uint256", "name": "", "type": "uint256" }], - "name": "OverheadUpdated", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { "indexed": true, "internalType": "address", "name": "previousOwner", "type": "address" }, - { "indexed": true, "internalType": "address", "name": "newOwner", "type": "address" } - ], - "name": "OwnershipTransferred", - "type": "event" - }, - { - "anonymous": false, - "inputs": [{ "indexed": false, "internalType": "uint256", "name": "", "type": "uint256" }], - "name": "ScalarUpdated", - "type": "event" - }, - { - "inputs": [], - "name": "decimals", - "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "gasPrice", - "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [{ "internalType": "bytes", "name": "_data", "type": "bytes" }], - "name": "getL1Fee", - "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [{ "internalType": "bytes", "name": "_data", "type": "bytes" }], - "name": "getL1GasUsed", - "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "l1BaseFee", - "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "overhead", - "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "owner", - "outputs": [{ "internalType": "address", "name": "", "type": "address" }], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "renounceOwnership", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "scalar", - "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [{ "internalType": "uint256", "name": "_decimals", "type": "uint256" }], - "name": "setDecimals", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [{ "internalType": "uint256", "name": "_gasPrice", "type": "uint256" }], - "name": "setGasPrice", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [{ "internalType": "uint256", "name": "_baseFee", "type": "uint256" }], - "name": "setL1BaseFee", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [{ "internalType": "uint256", "name": "_overhead", "type": "uint256" }], - "name": "setOverhead", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [{ "internalType": "uint256", "name": "_scalar", "type": "uint256" }], - "name": "setScalar", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [{ "internalType": "address", "name": "newOwner", "type": "address" }], - "name": "transferOwnership", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - } -] diff --git a/cli.js b/cli.js index c03c6ce..247ebba 100755 --- a/cli.js +++ b/cli.js @@ -41,7 +41,6 @@ let web3, netName, netSymbol, multiCall, - userAction, subgraph, feeOracle; let MERKLE_TREE_HEIGHT, ETH_AMOUNT, TOKEN_AMOUNT, PRIVATE_KEY; @@ -468,7 +467,7 @@ async function generateProof({ deposit, currency, amount, recipient, relayerAddr async function withdraw({ deposit, currency, amount, recipient, relayerURL, refund = '0' }) { let options = {}; if (currency === netSymbol.toLowerCase() && refund !== '0') { - throw new Error('The ETH purchase is supposted to be 0 for ETH withdrawals'); + throw new Error('The ETH purchase is supposed to be 0 for ETH withdrawals'); } if (!web3.utils.isAddress(recipient)) { diff --git a/package-lock.json b/package-lock.json index e8229d9..e6c53e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -540,26 +540,6 @@ "@tornado/snarkjs": "0.1.20-p2" } }, - "@tornado/gas-price-oracle": { - "version": "0.5.2-p1", - "resolved": "https://git.tornado.ws/api/packages/tornado-packages/npm/%40tornado%2Fgas-price-oracle/-/0.5.2-p1/gas-price-oracle-0.5.2-p1.tgz", - "integrity": "sha512-FbkhDQMD/aEBogdG6IdSXmlraG9LdEhaO+8aeNXZA0Tgp5P4PJ8pgZXxTK2rpVXBMpXrFiFg4IDkpRGrx67d4g==", - "requires": { - "axios": "^0.21.2", - "bignumber.js": "^9.0.0", - "node-cache": "^5.1.2" - }, - "dependencies": { - "axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", - "requires": { - "follow-redirects": "^1.14.0" - } - } - } - }, "@tornado/snarkjs": { "version": "0.1.20-p2", "resolved": "https://git.tornado.ws/api/packages/tornado-packages/npm/%40tornado%2Fsnarkjs/-/0.1.20-p2/snarkjs-0.1.20-p2.tgz", @@ -624,9 +604,9 @@ "integrity": "sha512-7EkpWNfEm34VEOrbLnPpvd/aUJYnA1L+6/qx2fZ/AfmuJFkjSZ18Z4jvVGNY7ktKIhTu3/Tbze+9l3eNueCNIA==" }, "@tornado/tornado-oracles": { - "version": "1.3.2", - "resolved": "https://git.tornado.ws/api/packages/tornado-packages/npm/%40tornado%2Ftornado-oracles/-/1.3.2/tornado-oracles-1.3.2.tgz", - "integrity": "sha512-z3NI35GKKznxVigF0OghqQ8S3sT/S4oD3AtXqyf+P2bfkriAsdrXnsSMW7Vxej529e5k3cA0dPtOs4eFqFE/7Q==", + "version": "2.1.0", + "resolved": "https://git.tornado.ws/api/packages/tornado-packages/npm/%40tornado%2Ftornado-oracles/-/2.1.0/tornado-oracles-2.1.0.tgz", + "integrity": "sha512-Y6FPAGnCvHLWzUnNYgGoOv+X7KY3CF02rRSawataYaLyl+v2ivh7RYZZZ3G/B5hXf+pD3IFeCdm4PDnTNyNe1g==", "requires": { "@tornado/gas-price-oracle": "^0.5.3", "@tornado/tornado-config": "^2.0.0", @@ -646,9 +626,9 @@ } }, "@types/node": { - "version": "20.5.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.6.tgz", - "integrity": "sha512-Gi5wRGPbbyOTX+4Y2iULQ27oUPrefaB0PxGQJnfyWN3kvEDGM3mIB5M/gQLmitZf7A9FmLeaqxD3L1CXpm3VKQ==" + "version": "20.5.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.8.tgz", + "integrity": "sha512-eajsR9aeljqNhK028VG0Wuw+OaY5LLxYmxeoXynIoE6jannr9/Ucd1LL0hSSoafk5LTYG+FfqsyGt81Q6Zkybw==" }, "axios": { "version": "0.21.4", diff --git a/package.json b/package.json index fea9de8..9598dc6 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "@tornado/circomlib": "0.0.20-p2", "@tornado/fixed-merkle-tree": "0.6.1-p1", "@tornado/snarkjs": "0.1.20-p2", - "@tornado/tornado-oracles": "^1.3.2", + "@tornado/tornado-oracles": "^2.1.0", "@tornado/web3-providers-http": "1.6.5-p1", "@tornado/websnark": "0.0.4-p1", "axios": "^0.19.2",