Merge the develop branch to the master branch, preparation to v3.4.0

This merge contains the following set of changes:
  * [Oracle, Improvement] Refetch old logs ranges to see if there are missed events (#627)
  * [Oracle, Improvement] Add support for EIP1559 gas price oracle (#631)
  * [Oracle, Improvement] CollectedSignatures AMB watcher for MEV bundling (#634)
  * [Oracle, Fix] Fix eip1559 transaction sending problems (#632)

CONFIGURATION.md

@@ -8,11 +8,11 @@ COMMON_HOME_RPC_URL | The HTTPS URL(s) used to communicate to the RPC nodes in t
 COMMON_FOREIGN_RPC_URL | The HTTPS URL(s) used to communicate to the RPC nodes in the Foreign network. Several URLs can be specified, delimited by spaces. If the connection to one of these nodes is lost the next URL is used for connection. | URL(s)
 COMMON_HOME_BRIDGE_ADDRESS | The address of the bridge contract address in the Home network. It is used to listen to events from and send validators' transactions to the Home network. | hexidecimal beginning with "0x"
 COMMON_FOREIGN_BRIDGE_ADDRESS | The  address of the bridge contract address in the Foreign network. It is used to listen to events from and send validators' transactions to the Foreign network. | hexidecimal beginning with "0x"
-COMMON_HOME_GAS_PRICE_SUPPLIER_URL | The URL used to get a JSON response from the gas price prediction oracle for the Home network. The gas price provided by the oracle is used to send the validator's transactions to the RPC node. Since it is assumed that the Home network has a predefined gas price (e.g. the gas price in the Core of POA.Network is `1 GWei`), the gas price oracle parameter can be omitted for such networks. | URL
+COMMON_HOME_GAS_PRICE_SUPPLIER_URL | The URL used to get a JSON response from the gas price prediction oracle for the Home network. The gas price provided by the oracle is used to send the validator's transactions to the RPC node. Since it is assumed that the Home network has a predefined gas price (e.g. the gas price in the Core of POA.Network is `1 GWei`), the gas price oracle parameter can be omitted for such networks. Set to `eip1559-gas-estimation` if you want to use EIP1559 RPC-based gas estimation. | URL
 COMMON_HOME_GAS_PRICE_SPEED_TYPE | Assuming the gas price oracle responds with the following JSON structure: `{"fast": 20.0, "block_time": 12.834, "health": true, "standard": 6.0, "block_number": 6470469, "instant": 71.0, "slow": 1.889}`, this parameter specifies the desirable transaction speed. The speed type can be omitted when `COMMON_HOME_GAS_PRICE_SUPPLIER_URL` is not used. | `instant` / `fast` / `standard` / `slow`
 COMMON_HOME_GAS_PRICE_FALLBACK | The gas price (in Wei) that is used if both the oracle and the fall back gas price specified in the Home Bridge contract are not available. | integer
 COMMON_HOME_GAS_PRICE_FACTOR | A value that will multiply the gas price of the oracle to convert it to gwei. If the oracle API returns gas prices in gwei then this can be set to `1`. Also, it could be used to intentionally pay more gas than suggested by the oracle to guarantee the transaction verification. E.g. `1.25` or `1.5`. | integer
-COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL | The URL used to get a JSON response from the gas price prediction oracle for the Foreign network. The provided gas price is used to send the validator's transactions to the RPC node. If the Foreign network is Ethereum Foundation mainnet, the oracle URL can be: https://gasprice.poa.network. Otherwise this parameter can be omitted. Set to `gas-price-oracle` if you want to use npm `gas-price-oracle` package for retrieving gas price from multiple sources. | URL
+COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL | The URL used to get a JSON response from the gas price prediction oracle for the Foreign network. The provided gas price is used to send the validator's transactions to the RPC node. If the Foreign network is Ethereum Foundation mainnet, the oracle URL can be: https://gasprice.poa.network. Otherwise this parameter can be omitted. Set to `gas-price-oracle` if you want to use npm `gas-price-oracle` package for retrieving gas price from multiple sources. Set to `eip1559-gas-estimation` if you want to use EIP1559 RPC-based gas estimation. | URL
 COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE | Assuming the gas price oracle responds with the following JSON structure: `{"fast": 20.0, "block_time": 12.834, "health": true, "standard": 6.0, "block_number": 6470469, "instant": 71.0, "slow": 1.889}`, this parameter specifies the desirable transaction speed. The speed type can be omitted when `COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL`is not used. | `instant` / `fast` / `standard` / `slow`
 COMMON_FOREIGN_GAS_PRICE_FALLBACK | The gas price (in Wei) used if both the oracle and fall back gas price specified in the Foreign Bridge contract are not available. | integer
 COMMON_FOREIGN_GAS_PRICE_FACTOR | A value that will multiply the gas price of the oracle to convert it to gwei. If the oracle API returns gas prices in gwei then this can be set to `1`. Also, it could be used to intentionally pay more gas than suggested by the oracle to guarantee the transaction verification. E.g. `1.25` or `1.5`. | integer
@@ -53,6 +53,12 @@ ORACLE_SHUTDOWN_CONTRACT_METHOD | Method signature to be used in the side chain
 ORACLE_FOREIGN_RPC_BLOCK_POLLING_LIMIT | Max length for the block range used in `eth_getLogs` requests for polling contract events for the Foreign chain. Infinite, if not provided. | `integer`
 ORACLE_HOME_RPC_BLOCK_POLLING_LIMIT | Max length for the block range used in `eth_getLogs` requests for polling contract events for the Home chain. Infinite, if not provided. | `integer`
 ORACLE_JSONRPC_ERROR_CODES | Override default JSON rpc error codes that can trigger RPC fallback to the next URL from the list (or a retry in case of a single RPC URL). Default is `-32603,-32002,-32005`. Should be a comma-separated list of negative integers. | `string`
+ORACLE_HOME_EVENTS_REPROCESSING | If set to `true`, home events happened in the past will be refetched and processed once again, to ensure that nothing was missed on the first pass. | `bool`
+ORACLE_HOME_EVENTS_REPROCESSING_BATCH_SIZE | Batch size for one `eth_getLogs` request when reprocessing old logs in the home chain. Defaults to `1000` | `integer`
+ORACLE_HOME_EVENTS_REPROCESSING_BLOCK_DELAY | Block confirmations number, after which old logs are being reprocessed in the home chain. Defaults to `500` | `integer`
+ORACLE_FOREIGN_EVENTS_REPROCESSING  | If set to `true`, foreign events happened in the past will be refetched and processed once again, to ensure that nothing was missed on the first pass. | `bool`
+ORACLE_FOREIGN_EVENTS_REPROCESSING_BATCH_SIZE | Batch size for one `eth_getLogs` request when reprocessing old logs in the foreign chain. Defaults to `500` | `integer`
+ORACLE_FOREIGN_EVENTS_REPROCESSING_BLOCK_DELAY | Block confirmations number, after which old logs are being reprocessed in the foreign chain. Defaults to `250` | `integer`
 
 
 ## Monitor configuration

commons/package.json

@@ -8,6 +8,7 @@
     "test": "NODE_ENV=test mocha"
   },
   "dependencies": {
+    "@mycrypto/gas-estimation": "^1.1.0",
     "gas-price-oracle": "^0.1.5",
     "web3-utils": "^1.3.0",
     "node-fetch": "^2.1.2"

commons/utils.js

@@ -1,5 +1,6 @@
 const { toWei, toBN, BN } = require('web3-utils')
 const { GasPriceOracle } = require('gas-price-oracle')
+const { estimateFees } = require('@mycrypto/gas-estimation')
 const fetch = require('node-fetch')
 const { BRIDGE_MODES } = require('./constants')
 const { REWARDABLE_VALIDATORS_ABI } = require('./abis')
@@ -176,12 +177,20 @@ const gasPriceWithinLimits = (gasPrice, limits) => {
 const normalizeGasPrice = (oracleGasPrice, factor, limits = null) => {
   let gasPrice = oracleGasPrice * factor
   gasPrice = gasPriceWithinLimits(gasPrice, limits)
-  return toBN(toWei(gasPrice.toFixed(2).toString(), 'gwei'))
+  return toWei(gasPrice.toFixed(2).toString(), 'gwei')
 }
 
-const gasPriceFromSupplier = async (url, options = {}) => {
+const gasPriceFromSupplier = async (web3, url, options = {}) => {
   try {
     let json
+    if (url === 'eip1559-gas-estimation') {
+      const { maxFeePerGas, maxPriorityFeePerGas } = await estimateFees(web3)
+      const res = { maxFeePerGas: maxFeePerGas.toString(10), maxPriorityFeePerGas: maxPriorityFeePerGas.toString(10) }
+      options.logger &&
+        options.logger.debug &&
+        options.logger.debug(res, 'Gas price updated using eip1559-gas-estimation')
+      return res
+    }
     if (url === 'gas-price-oracle') {
       json = await gasPriceOracle.fetchGasPricesOffChain()
     } else if (url) {
@@ -205,7 +214,7 @@ const gasPriceFromSupplier = async (url, options = {}) => {
       options.logger.debug &&
       options.logger.debug({ oracleGasPrice, normalizedGasPrice }, 'Gas price updated using the API')
 
-    return normalizedGasPrice
+    return { gasPrice: normalizedGasPrice }
   } catch (e) {
     options.logger && options.logger.error && options.logger.error(`Gas Price API is not available. ${e.message}`)
   }
@@ -214,11 +223,11 @@ const gasPriceFromSupplier = async (url, options = {}) => {
 
 const gasPriceFromContract = async (bridgeContract, options = {}) => {
   try {
-    const gasPrice = await bridgeContract.methods.gasPrice().call()
+    const gasPrice = (await bridgeContract.methods.gasPrice().call()).toString()
     options.logger &&
       options.logger.debug &&
       options.logger.debug({ gasPrice }, 'Gas price updated using the contracts')
-    return gasPrice
+    return { gasPrice }
   } catch (e) {
     options.logger &&
       options.logger.error &&

e2e-commons/components-envs/oracle-amb.env

@@ -23,3 +23,9 @@ ORACLE_HOME_START_BLOCK=1
 ORACLE_FOREIGN_START_BLOCK=1
 ORACLE_HOME_TO_FOREIGN_BLOCK_LIST=/mono/oracle/access-lists/block_list.txt
 ORACLE_FOREIGN_ARCHIVE_RPC_URL=http://parity2:8545
+ORACLE_HOME_EVENTS_REPROCESSING=false
+ORACLE_HOME_EVENTS_REPROCESSING_BATCH_SIZE=10
+ORACLE_HOME_EVENTS_REPROCESSING_BLOCK_DELAY=10
+ORACLE_FOREIGN_EVENTS_REPROCESSING=true
+ORACLE_FOREIGN_EVENTS_REPROCESSING_BATCH_SIZE=10
+ORACLE_FOREIGN_EVENTS_REPROCESSING_BLOCK_DELAY=10

e2e-commons/components-envs/oracle-erc20-native.env

@@ -22,3 +22,9 @@ ORACLE_ALLOW_HTTP_FOR_RPC=yes
 ORACLE_HOME_START_BLOCK=1
 ORACLE_FOREIGN_START_BLOCK=1
 ORACLE_HOME_TO_FOREIGN_BLOCK_LIST=/mono/oracle/access-lists/block_list.txt
+ORACLE_HOME_EVENTS_REPROCESSING=true
+ORACLE_HOME_EVENTS_REPROCESSING_BATCH_SIZE=10
+ORACLE_HOME_EVENTS_REPROCESSING_BLOCK_DELAY=10
+ORACLE_FOREIGN_EVENTS_REPROCESSING=true
+ORACLE_FOREIGN_EVENTS_REPROCESSING_BATCH_SIZE=10
+ORACLE_FOREIGN_EVENTS_REPROCESSING_BLOCK_DELAY=10

oracle/config/base.config.js

@@ -23,7 +23,13 @@ const {
   ORACLE_HOME_START_BLOCK,
   ORACLE_FOREIGN_START_BLOCK,
   ORACLE_HOME_RPC_BLOCK_POLLING_LIMIT,
-  ORACLE_FOREIGN_RPC_BLOCK_POLLING_LIMIT
+  ORACLE_FOREIGN_RPC_BLOCK_POLLING_LIMIT,
+  ORACLE_HOME_EVENTS_REPROCESSING,
+  ORACLE_HOME_EVENTS_REPROCESSING_BATCH_SIZE,
+  ORACLE_HOME_EVENTS_REPROCESSING_BLOCK_DELAY,
+  ORACLE_FOREIGN_EVENTS_REPROCESSING,
+  ORACLE_FOREIGN_EVENTS_REPROCESSING_BATCH_SIZE,
+  ORACLE_FOREIGN_EVENTS_REPROCESSING_BLOCK_DELAY
 } = process.env
 
 let homeAbi
@@ -61,7 +67,12 @@ const homeConfig = {
   blockPollingLimit: parseInt(ORACLE_HOME_RPC_BLOCK_POLLING_LIMIT, 10),
   web3: web3Home,
   bridgeContract: homeContract,
-  eventContract: homeContract
+  eventContract: homeContract,
+  reprocessingOptions: {
+    enabled: ORACLE_HOME_EVENTS_REPROCESSING === 'true',
+    batchSize: parseInt(ORACLE_HOME_EVENTS_REPROCESSING_BATCH_SIZE, 10) || 1000,
+    blockDelay: parseInt(ORACLE_HOME_EVENTS_REPROCESSING_BLOCK_DELAY, 10) || 500
+  }
 }
 
 const foreignContract = new web3Foreign.eth.Contract(foreignAbi, COMMON_FOREIGN_BRIDGE_ADDRESS)
@@ -74,7 +85,12 @@ const foreignConfig = {
   blockPollingLimit: parseInt(ORACLE_FOREIGN_RPC_BLOCK_POLLING_LIMIT, 10),
   web3: web3Foreign,
   bridgeContract: foreignContract,
-  eventContract: foreignContract
+  eventContract: foreignContract,
+  reprocessingOptions: {
+    enabled: ORACLE_FOREIGN_EVENTS_REPROCESSING === 'true',
+    batchSize: parseInt(ORACLE_FOREIGN_EVENTS_REPROCESSING_BATCH_SIZE, 10) || 500,
+    blockDelay: parseInt(ORACLE_FOREIGN_EVENTS_REPROCESSING_BLOCK_DELAY, 10) || 250
+  }
 }
 
 const maxProcessingTime =

oracle/config/foreign-mev-sender.config.js

@@ -0,0 +1,37 @@
+const baseConfig = require('./base.config')
+
+const { DEFAULT_TRANSACTION_RESEND_INTERVAL } = require('../src/utils/constants')
+const { MEV_HELPER_ABI } = require('../src/utils/mev')
+const { web3Foreign, getFlashbotsProvider } = require('../src/services/web3')
+
+const {
+  ORACLE_FOREIGN_TX_RESEND_INTERVAL,
+  ORACLE_MEV_FOREIGN_HELPER_CONTRACT_ADDRESS,
+  ORACLE_MEV_FOREIGN_MIN_GAS_PRICE,
+  ORACLE_MEV_FOREIGN_FLAT_MINER_FEE,
+  ORACLE_MEV_FOREIGN_MAX_PRIORITY_FEE_PER_GAS,
+  ORACLE_MEV_FOREIGN_MAX_FEE_PER_GAS,
+  ORACLE_MEV_FOREIGN_BUNDLES_BLOCK_RANGE
+} = process.env
+
+const contract = new baseConfig.foreign.web3.eth.Contract(MEV_HELPER_ABI, ORACLE_MEV_FOREIGN_HELPER_CONTRACT_ADDRESS)
+
+module.exports = {
+  ...baseConfig,
+  pollingInterval: baseConfig.foreign.pollingInterval,
+  mevForeign: {
+    contractAddress: ORACLE_MEV_FOREIGN_HELPER_CONTRACT_ADDRESS,
+    contract,
+    minGasPrice: ORACLE_MEV_FOREIGN_MIN_GAS_PRICE,
+    flatMinerFee: ORACLE_MEV_FOREIGN_FLAT_MINER_FEE,
+    maxPriorityFeePerGas: ORACLE_MEV_FOREIGN_MAX_PRIORITY_FEE_PER_GAS,
+    maxFeePerGas: ORACLE_MEV_FOREIGN_MAX_FEE_PER_GAS,
+    bundlesPerIteration: Math.max(parseInt(ORACLE_MEV_FOREIGN_BUNDLES_BLOCK_RANGE, 10) || 5, 1),
+    getFlashbotsProvider
+  },
+  mevJobsRedisKey: `${baseConfig.id}-collected-signatures-mev:mevJobs`,
+  id: 'mev-sender-foreign',
+  name: 'mev-sender-foreign',
+  web3: web3Foreign,
+  resendInterval: parseInt(ORACLE_FOREIGN_TX_RESEND_INTERVAL, 10) || DEFAULT_TRANSACTION_RESEND_INTERVAL
+}

oracle/config/foreign-sender.config.js

@@ -8,7 +8,6 @@ const { ORACLE_FOREIGN_TX_RESEND_INTERVAL } = process.env
 module.exports = {
   ...baseConfig,
   queue: 'foreign-prioritized',
-  oldQueue: 'foreign',
   id: 'foreign',
   name: 'sender-foreign',
   web3: web3Foreign,

oracle/config/home-sender.config.js

@@ -8,7 +8,6 @@ const { ORACLE_HOME_TX_RESEND_INTERVAL } = process.env
 module.exports = {
   ...baseConfig,
   queue: 'home-prioritized',
-  oldQueue: 'home',
   id: 'home',
   name: 'sender-home',
   web3: web3Home,

oracle/config/mev-collected-signatures-watcher.config.js

@@ -0,0 +1,30 @@
+const baseConfig = require('./base.config')
+const { MEV_HELPER_ABI } = require('../src/utils/mev')
+
+const {
+  ORACLE_MEV_FOREIGN_HELPER_CONTRACT_ADDRESS,
+  ORACLE_MEV_FOREIGN_MIN_GAS_PRICE,
+  ORACLE_MEV_FOREIGN_FLAT_MINER_FEE,
+  ORACLE_MEV_FOREIGN_MAX_PRIORITY_FEE_PER_GAS,
+  ORACLE_MEV_FOREIGN_MAX_FEE_PER_GAS
+} = process.env
+
+const id = `${baseConfig.id}-collected-signatures-mev`
+
+const contract = new baseConfig.foreign.web3.eth.Contract(MEV_HELPER_ABI, ORACLE_MEV_FOREIGN_HELPER_CONTRACT_ADDRESS)
+
+module.exports = {
+  ...baseConfig,
+  mevForeign: {
+    contractAddress: ORACLE_MEV_FOREIGN_HELPER_CONTRACT_ADDRESS,
+    contract,
+    minGasPrice: ORACLE_MEV_FOREIGN_MIN_GAS_PRICE,
+    flatMinerFee: ORACLE_MEV_FOREIGN_FLAT_MINER_FEE,
+    maxPriorityFeePerGas: ORACLE_MEV_FOREIGN_MAX_PRIORITY_FEE_PER_GAS,
+    maxFeePerGas: ORACLE_MEV_FOREIGN_MAX_FEE_PER_GAS
+  },
+  main: baseConfig.home,
+  event: 'CollectedSignatures',
+  name: `watcher-${id}`,
+  id
+}

oracle/docker-compose-helpers.yml

@@ -1,6 +1,14 @@
 ---
 version: '2.4'
 services:
+  redis:
+    cpus: 0.1
+    mem_limit: 500m
+    command: [ redis-server, --appendonly, 'yes' ]
+    hostname: redis
+    image: redis:4
+    restart: unless-stopped
+    volumes: [ '~/bridge_data/helpers/redis:/data' ]
   interestFetcher:
     cpus: 0.1
     mem_limit: 500m
@@ -13,3 +21,41 @@ services:
       INTERVAL: 300000
     restart: unless-stopped
     entrypoint: yarn helper:interestFether
+  mevWatcher:
+    cpus: 0.1
+    mem_limit: 500m
+    image: poanetwork/tokenbridge-oracle:latest
+    env_file: ./.env
+    environment:
+      NODE_ENV: production
+      ORACLE_VALIDATOR_ADDRESS: ${ORACLE_VALIDATOR_ADDRESS}
+      ORACLE_MEV_FOREIGN_HELPER_CONTRACT_ADDRESS: 'TBD'
+      ORACLE_MEV_FOREIGN_MIN_GAS_PRICE: '50000000000' # 50 gwei
+      ORACLE_MEV_FOREIGN_FLAT_MINER_FEE: '1500000000000000' # 0.0015 eth = 300k gas * 5 gwei
+      ORACLE_MEV_FOREIGN_MAX_PRIORITY_FEE_PER_GAS: '0' # 0 gwei
+      ORACLE_MEV_FOREIGN_MAX_FEE_PER_GAS: '1000000000000' # 1000 gwei
+      ORACLE_FOREIGN_RPC_POLLING_INTERVAL: '15000' # CollectedSignatures event polling interval
+      ORACLE_HOME_START_BLOCK: 'TBD'
+      ORACLE_HOME_SKIP_MANUAL_LANE: 'true'
+    restart: unless-stopped
+    entrypoint: yarn mev:watcher:collected-signatures
+  mevSender:
+    cpus: 0.1
+    mem_limit: 500m
+    image: poanetwork/tokenbridge-oracle:latest
+    env_file: ./.env
+    environment:
+      NODE_ENV: production
+      ORACLE_VALIDATOR_ADDRESS: ${ORACLE_VALIDATOR_ADDRESS}
+      ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: ${ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY}
+      ORACLE_MEV_FOREIGN_HELPER_CONTRACT_ADDRESS: 'TBD'
+      ORACLE_MEV_FOREIGN_MIN_GAS_PRICE: '50000000000' # 50 gwei
+      ORACLE_MEV_FOREIGN_FLAT_MINER_FEE: '1500000000000000' # 0.0015 eth = 300k gas * 5 gwei
+      ORACLE_MEV_FOREIGN_MAX_PRIORITY_FEE_PER_GAS: '0' # 0 gwei
+      ORACLE_MEV_FOREIGN_MAX_FEE_PER_GAS: '1000000000000' # 1000 gwei
+      ORACLE_MEV_FOREIGN_FLASHBOTS_RPC_URL: 'https://relay-goerli.flashbots.net'
+      ORACLE_MEV_FOREIGN_FLASHBOTS_AUTH_SIGNING_KEY: 82db7175932f4e6c8e45283b78b54fd5f195149378ec90d95b8fd0ec8bdadf1d
+      ORACLE_MEV_FOREIGN_BUNDLES_BLOCK_RANGE: '5'
+      ORACLE_FOREIGN_RPC_POLLING_INTERVAL: '70000' # time between sending different batches of MEV bundles (~= 5 blocks * 14 seconds)
+    restart: unless-stopped
+    entrypoint: yarn mev:sender:foreign

oracle/package.json

@@ -19,6 +19,8 @@
     "confirm:information-request": "./scripts/start-worker.sh confirmRelay information-request-watcher",
     "manager:shutdown": "./scripts/start-worker.sh shutdownManager shutdown-manager",
     "helper:interestFether": "node ./scripts/interestFetcher.js",
+    "mev:watcher:collected-signatures": "./scripts/start-worker.sh mevWatcher mev-collected-signatures-watcher",
+    "mev:sender:foreign": "./scripts/start-worker.sh mevSender foreign-mev-sender",
     "dev": "concurrently -n 'watcher:signature-request,watcher:collected-signatures,watcher:affirmation-request,watcher:transfer, sender:home,sender:foreign' -c 'red,green,yellow,blue,magenta,cyan' 'yarn watcher:signature-request' 'yarn watcher:collected-signatures' 'yarn watcher:affirmation-request' 'yarn watcher:transfer' 'yarn sender:home' 'yarn sender:foreign'",
     "test": "NODE_ENV=test mocha",
     "test:watch": "NODE_ENV=test mocha --watch --reporter=min",
@@ -28,17 +30,19 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@flashbots/ethers-provider-bundle": "^0.4.3",
     "amqp-connection-manager": "^2.0.0",
     "amqplib": "^0.5.2",
     "bignumber.js": "^7.2.1",
     "dotenv": "^5.0.1",
+    "ethers": "^5.5.3",
     "ioredis": "^3.2.2",
     "node-fetch": "^2.1.2",
     "pino": "^4.17.3",
     "pino-pretty": "^2.0.1",
     "promise-limit": "^2.7.0",
     "promise-retry": "^1.1.1",
-    "web3": "^1.3.0"
+    "web3": "^1.6.0"
   },
   "devDependencies": {
     "bn-chai": "^1.0.1",

oracle/scripts/erc20_to_native/sendForeign.js

@@ -36,7 +36,7 @@ async function main() {
         data,
         nonce,
         gasPrice: FOREIGN_TEST_TX_GAS_PRICE,
-        amount: '0',
+        value: '0',
         gasLimit,
         to: bridgeableTokenAddress,
         web3: web3Foreign,

oracle/scripts/erc20_to_native/sendHome.js

@@ -29,7 +29,7 @@ async function main() {
         data: '0x',
         nonce,
         gasPrice: HOME_TEST_TX_GAS_PRICE,
-        amount: HOME_MIN_AMOUNT_PER_TX,
+        value: web3Home.utils.toWei(HOME_MIN_AMOUNT_PER_TX),
         gasLimit: 100000,
         to: COMMON_HOME_BRIDGE_ADDRESS,
         web3: web3Home,

oracle/scripts/interestFetcher.js

@@ -54,7 +54,7 @@ async function main() {
       nonce,
       gasPrice,
       gasLimit: Math.round(gasLimit * 1.5),
-      amount: '0',
+      value: '0',
       chainId,
       web3: web3Home
     })