upload deposits and withdrawal separately; disable gas price bump

.env.example

@@ -12,5 +12,5 @@ INSERT_BATCH_SIZE=60
 CRON_EXPRESSION="0 */3 * * * *"
 CONFIRMATION_BLOCKS=3
 
-# one of "low", "standard", "fast", "instant" or a number in Gwei
-GAS_PRICE=fast
+# a number in Gwei
+GAS_PRICE=20

package.json

@@ -1,6 +1,6 @@
 {
   "name": "root-updater",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -16,7 +16,6 @@
     "dotenv": "^8.2.0",
     "eth-ens-namehash": "^2.0.8",
     "fixed-merkle-tree": "^0.3.4",
-    "gas-price-oracle": "^0.2.2",
     "ioredis": "^4.17.3",
     "snarkjs": "git+https://github.com/tornadocash/snarkjs.git#869181cfaf7526fe8972073d31655493a04326d5",
     "torn-token": "^1.0.0",

src/index.js

@@ -1,10 +1,10 @@
 require('dotenv').config()
 const cron = require('cron')
-const { web3, redis, getTornadoTrees, txManager, gasOracle } = require('./singletons')
+const { web3, redis, getTornadoTrees, txManager } = require('./singletons')
 const config = require('torn-token')
 const { getTornadoEvents, getRegisteredEvents } = require('./events')
-const GAS_PRICE_VALUES = ['low', 'standard', 'fast', 'instant']
 const { toWei, toHex } = require('web3-utils')
+const { action } = require('./utils')
 
 const STARTING_BLOCK = process.env.STARTING_BLOCK || 0
 const prefix = {
@@ -13,6 +13,8 @@ const prefix = {
   5: 'goerli.',
 }
 
+let previousUpload = action.DEPOSIT
+
 async function main(isRetry = false) {
   const tornadoTrees = await getTornadoTrees()
   const newEvents = {}
@@ -22,7 +24,7 @@ async function main(isRetry = false) {
   const explorer = `https://${prefix[netId]}etherscan.io`
   const instances = Object.values(config.instances[`netId${netId}`].eth.instanceAddress)
   console.log(`Getting events for blocks ${startBlock} to ${currentBlock}`)
-  for (const type of ['deposit', 'withdrawal']) {
+  for (const type of Object.values(action)) {
     const newRegisteredEvents = await getRegisteredEvents({ type })
     const tornadoEvents = await getTornadoEvents({ instances, startBlock, endBlock: currentBlock, type })
 
@@ -41,27 +43,26 @@ async function main(isRetry = false) {
     }
   }
 
-  while (newEvents['deposit'].length || newEvents['withdrawal'].length) {
-    const chunks = {}
-    for (const type of ['deposit', 'withdrawal']) {
-      chunks[type] = newEvents[type].splice(0, process.env.INSERT_BATCH_SIZE)
-    }
   console.log(
-      `Submitting tree update with ${chunks['deposit'].length} deposits and ${chunks['withdrawal'].length} withdrawals`,
+    `There are ${newEvents[action.DEPOSIT].length} unprocessed deposits and ${
+      newEvents[action.WITHDRAWAL].length
+    } withdrawals`,
   )
-    let gasPrice
-    if (GAS_PRICE_VALUES.includes(process.env.GAS_PRICE)) {
-      const gasPrices = await gasOracle.gasPrices()
-      gasPrice = gasPrices[process.env.GAS_PRICE]
-    } else {
-      gasPrice = Number(process.env.GAS_PRICE)
-    }
 
-    const data = tornadoTrees.methods.updateRoots(chunks['deposit'], chunks['withdrawal']).encodeABI()
+  while (newEvents[action.DEPOSIT].length || newEvents[action.WITHDRAWAL].length) {
+    const chunks = {}
+    const type = previousUpload === action.DEPOSIT ? action.WITHDRAWAL : action.DEPOSIT
+    chunks[type] = newEvents[type].splice(0, process.env.INSERT_BATCH_SIZE)
+
+    console.log(`Submitting tree update with ${chunks[type].length} ${type}s`)
+
+    const args =
+      previousUpload === action.DEPOSIT ? [[], chunks[action.WITHDRAWAL]] : [chunks[action.DEPOSIT], []]
+    const data = tornadoTrees.methods.updateRoots(...args).encodeABI()
     const tx = txManager.createTx({
       to: tornadoTrees._address,
       data,
-      gasPrice: toHex(toWei(gasPrice.toString(), 'Gwei')),
+      gasPrice: toHex(toWei(process.env.GAS_PRICE, 'Gwei')),
     })
 
     try {
@@ -81,6 +82,7 @@ async function main(isRetry = false) {
       }
       return
     }
+    previousUpload = type
   }
 
   await redis.set('lastBlock', currentBlock)

src/singletons.js

@@ -5,8 +5,6 @@ const tornadoTreesAbi = require('../abi/tornadoTrees.json')
 const Redis = require('ioredis')
 const ENSResolver = require('./resolver')
 const resolver = new ENSResolver()
-const { GasPriceOracle } = require('gas-price-oracle')
-const gasOracle = new GasPriceOracle({ defaultRpc: process.env.RPC_URL })
 const redis = new Redis(process.env.REDIS_URL)
 const config = require('torn-token')
 let tornadoTrees
@@ -20,6 +18,7 @@ const txManager = new TxManager({
   rpcUrl: process.env.RPC_URL,
   config: {
     CONFIRMATIONS: process.env.CONFIRMATION_BLOCKS,
+    MAX_GAS_PRICE: process.env.GAS_PRICE,
   },
 })
 
@@ -36,5 +35,4 @@ module.exports = {
   redis,
   getTornadoTrees,
   txManager,
-  gasOracle,
 }

src/utils.js

@@ -9,8 +9,10 @@ const toFixedHex = (number, length = 32) =>
 const poseidonHash = (items) => toFixedHex(poseidon(items))
 const poseidonHash2 = (a, b) => poseidonHash([a, b])
 
+const action = Object.freeze({ DEPOSIT: 'deposit', WITHDRAWAL: 'withdrawal' })
 module.exports = {
   toFixedHex,
   poseidonHash,
   poseidonHash2,
+  action,
 }

yarn.lock

@@ -2133,14 +2133,6 @@ gas-price-oracle@^0.2.0:
     axios "^0.19.2"
     bignumber.js "^9.0.0"
 
-gas-price-oracle@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/gas-price-oracle/-/gas-price-oracle-0.2.2.tgz#32c57a9aa6bc69152be96812880232efebfecbc6"
-  integrity sha512-I4+rLbc7C1vgYXV+cYY0MKeqdZVna2hXpNfD2fcIvf/wIgvtIYmG9gsmhiaYGSgOE2RSPUs2xf/W4K2nJOoNuQ==
-  dependencies:
-    axios "^0.19.2"
-    bignumber.js "^9.0.0"
-
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"