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)

oracle/docker-compose-helpers.yml

@@ -57,8 +57,5 @@ services:
       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)
-      FAKE_MEV_RELAY_TX_SENDING: 'true'
-      FAKE_MEV_RELAY_NO_EIP1559: 'true'
-      COMMON_FOREIGN_GAS_PRICE_FALLBACK: 100000000000 # will essentially replace block base fee
     restart: unless-stopped
     entrypoint: yarn mev:sender:foreign

oracle/src/mevSender.js

@@ -15,13 +15,9 @@ if (process.argv.length < 3) {
 }
 
 const config = require(path.join('../config/', process.argv[2]))
-const GasPrice = require('./services/gasPrice')
 
 const { web3, mevForeign, validatorAddress } = config
 
-const FAKE_MEV_RELAY_TX_SENDING = process.env.FAKE_MEV_RELAY_TX_SENDING === 'true'
-const FAKE_MEV_RELAY_NO_EIP1559 = process.env.FAKE_MEV_RELAY_NO_EIP1559 === 'true'
-
 let chainId = 0
 let flashbotsProvider
 
@@ -32,9 +28,7 @@ async function initialize() {
     web3.currentProvider.urls.forEach(checkHttps(config.id))
 
     chainId = await getChainId(web3)
-    if (!FAKE_MEV_RELAY_TX_SENDING) {
-      flashbotsProvider = await mevForeign.getFlashbotsProvider(chainId)
-    }
+    flashbotsProvider = await mevForeign.getFlashbotsProvider(chainId)
     return runMain()
   } catch (e) {
     logger.error(e.message)
@@ -71,13 +65,7 @@ async function main() {
       return
     }
 
-    const { baseFeePerGas, number: pendingBlockNumber } = await getBlock(web3, 'pending')
-    let pendingBaseFee = baseFeePerGas
-    if (FAKE_MEV_RELAY_TX_SENDING && FAKE_MEV_RELAY_NO_EIP1559) {
-      // emulate baseFee with the current gasPrice
-      await GasPrice.start('foreign', web3, true)
-      pendingBaseFee = GasPrice.gasPriceOptions().gasPrice
-    }
+    const { baseFeePerGas: pendingBaseFee, number: pendingBlockNumber } = await getBlock(web3, 'pending')
     const bestJob = pickBestJob(jobs, pendingBaseFee)
 
     if (!bestJob) {
@@ -127,7 +115,7 @@ async function main() {
       { nonce, fromBlock: pendingBlockNumber, toBlock: pendingBlockNumber + mevForeign.bundlesPerIteration - 1 },
       'Sending MEV bundles'
     )
-    const opts = {
+    const txHash = await sendTx({
       data: bestJob.data,
       nonce,
       value: bestJob.value,
@@ -146,14 +134,7 @@ async function main() {
         toBlock: pendingBlockNumber + mevForeign.bundlesPerIteration - 1,
         logger
       }
-    }
-    if (FAKE_MEV_RELAY_TX_SENDING) {
-      if (FAKE_MEV_RELAY_NO_EIP1559) {
-        opts.gasPriceOptions = { gasPrice: pendingBaseFee }
-      }
-      delete opts.mevOptions
-    }
-    const txHash = await sendTx(opts)
+    })
 
     jobLogger.info({ txHash }, `Tx generated ${txHash} for event Tx ${bestJob.transactionReference}`)