Merge pull request #1374 from ethereum-optimism/develop

Merge Develop into Master

.changeset/hot-dryers-joke.md

+---
+'@eth-optimism/integration-tests': patch
+'@eth-optimism/batch-submitter': patch
+'@eth-optimism/contracts': patch
+'@eth-optimism/core-utils': patch
+'@eth-optimism/data-transport-layer': patch
+'@eth-optimism/hardhat-ovm': patch
+'@eth-optimism/message-relayer': patch
+---
+
+Bump ethers dependency to 5.4.x to support eip1559

integration-tests/package.json

@@ -22,7 +22,7 @@
     "@eth-optimism/core-utils": "^0.5.1",
     "@eth-optimism/hardhat-ovm": "^0.2.2",
     "@eth-optimism/message-relayer": "^0.1.8",
-    "@ethersproject/providers": "^5.0.24",
+    "@ethersproject/providers": "^5.4.4",
     "@nomiclabs/hardhat-ethers": "^2.0.2",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
     "@types/chai": "^4.2.17",
@@ -48,7 +48,7 @@
     "eslint-plugin-react": "^7.24.0",
     "eslint-plugin-unicorn": "^32.0.1",
     "ethereum-waffle": "^3.3.0",
-    "ethers": "^5.0.32",
+    "ethers": "^5.4.5",
     "hardhat": "^2.2.1",
     "hardhat-gas-reporter": "^1.0.4",
     "mocha": "^8.3.1",

integration-tests/test/rpc.spec.ts

@@ -328,10 +328,21 @@ describe('Basic RPC tests', () => {
 
       // Get latest block once to start.
       const prev = await provider.getBlockWithTransactions('latest')
+      // set wait to null to allow a deep object comparison
+      prev.transactions[0].wait = null
 
       // Over ten seconds, repeatedly check the latest block to make sure nothing has changed.
       for (let i = 0; i < 5; i++) {
         const latest = await provider.getBlockWithTransactions('latest')
+        latest.transactions[0].wait = null
+        // Check each key of the transaction individually
+        // for easy debugging if one field changes
+        for (const [key, value] of Object.entries(latest.transactions[0])) {
+          expect(value).to.deep.equal(
+            prev.transactions[0][key],
+            `mismatch ${key}`
+          )
+        }
         expect(latest).to.deep.equal(prev)
         await sleep(2000)
       }

ops/docker/hardhat/hardhat.config.js

+module.exports = {
+  networks: {
+    hardhat: {
+      gasPrice: 0,
+      initialBaseFeePerGas: 0
+    },
+  },
+  analytics: { enabled: false },
+}

ops/docker/hardhat/package.json

@@ -2,10 +2,10 @@
   "name": "@eth-optimism/hardhat-node",
   "version": "1.0.0",
   "scripts": {
-    "start": "hardhat node"
+    "start": "hardhat node --network hardhat"
   },
   "license": "MIT",
   "dependencies": {
-    "hardhat": "^2.1.2"
+    "hardhat": "^2.6.1"
   }
 }

packages/batch-submitter/package.json

@@ -36,13 +36,13 @@
     "@eth-optimism/contracts": "^0.4.9",
     "@eth-optimism/core-utils": "^0.5.1",
     "@eth-optimism/ynatm": "^0.2.2",
-    "@ethersproject/abstract-provider": "^5.0.5",
-    "@ethersproject/providers": "^5.0.14",
+    "@ethersproject/abstract-provider": "^5.4.1",
+    "@ethersproject/providers": "^5.4.4",
     "@sentry/node": "^6.2.5",
     "bcfg": "^0.1.6",
     "bluebird": "^3.7.2",
     "dotenv": "^8.2.0",
-    "ethers": "5.0.0",
+    "ethers": "^5.4.5",
     "old-contracts": "npm:@eth-optimism/contracts@^0.0.2-alpha.7",
     "prom-client": "^13.1.0"
   },

packages/contracts/package.json

@@ -51,9 +51,9 @@
   },
   "dependencies": {
     "@eth-optimism/core-utils": "^0.5.1",
-    "@ethersproject/abstract-provider": "^5.0.8",
-    "@ethersproject/abstract-signer": "^5.1.0",
-    "@ethersproject/contracts": "^5.0.5",
+    "@ethersproject/abstract-provider": "^5.4.1",
+    "@ethersproject/abstract-signer": "^5.4.1",
+    "@ethersproject/contracts": "^5.4.1",
     "@ethersproject/hardware-wallets": "^5.4.0",
     "glob": "^7.1.6"
   },
@@ -61,13 +61,13 @@
     "@codechecks/client": "0.1.10-beta",
     "@eth-optimism/hardhat-ovm": "^0.2.2",
     "@eth-optimism/smock": "^1.1.10",
-    "@ethersproject/transactions": "^5.0.31",
+    "@ethersproject/transactions": "^5.4.0",
     "@nomiclabs/hardhat-ethers": "^2.0.1",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
     "@openzeppelin/contracts": "^3.3.0",
     "@openzeppelin/contracts-upgradeable": "^3.3.0",
-    "@typechain/ethers-v5": "1.0.0",
-    "@typechain/hardhat": "^1.0.1",
+    "@typechain/ethers-v5": "^7.0.1",
+    "@typechain/hardhat": "^2.3.0",
     "@types/buffer-xor": "^2.0.0",
     "@types/chai": "^4.2.17",
     "@types/copyfiles": "^2.4.0",
@@ -94,7 +94,7 @@
     "eslint-plugin-react": "^7.24.0",
     "eslint-plugin-unicorn": "^32.0.1",
     "ethereum-waffle": "^3.3.0",
-    "ethers": "^5.0.31",
+    "ethers": "^5.4.5",
     "ganache-core": "^2.13.2",
     "hardhat": "^2.2.1",
     "hardhat-deploy": "^0.7.4",
@@ -112,7 +112,7 @@
     "solidity-coverage": "^0.7.16",
     "ts-generator": "0.0.8",
     "ts-node": "^9.1.1",
-    "typechain": "2.0.0",
+    "typechain": "^5.1.0",
     "typescript": "^4.2.3",
     "yargs": "^16.2.0"
   },

packages/core-utils/package.json

@@ -44,8 +44,8 @@
     "typescript": "^4.2.3"
   },
   "dependencies": {
-    "@ethersproject/abstract-provider": "^5.0.9",
-    "ethers": "^5.0.31",
+    "@ethersproject/abstract-provider": "^5.4.1",
+    "ethers": "^5.4.5",
     "lodash": "^4.17.21"
   }
 }

packages/data-transport-layer/package.json

@@ -25,7 +25,7 @@
     "@eth-optimism/common-ts": "^0.1.5",
     "@eth-optimism/contracts": "^0.4.9",
     "@eth-optimism/core-utils": "^0.5.1",
-    "@ethersproject/providers": "^5.0.21",
+    "@ethersproject/providers": "^5.4.4",
     "@ethersproject/transactions": "^5.0.21",
     "@sentry/node": "^6.3.1",
     "@sentry/tracing": "^6.3.1",
@@ -36,7 +36,7 @@
     "browser-or-node": "^1.3.0",
     "cors": "^2.8.5",
     "dotenv": "^8.2.0",
-    "ethers": "^5.0.26",
+    "ethers": "^5.4.0",
     "express": "^4.17.1",
     "express-prom-bundle": "^6.3.6",
     "level": "^6.0.1",
@@ -44,7 +44,7 @@
     "node-fetch": "^2.6.1"
   },
   "devDependencies": {
-    "@ethersproject/abstract-provider": "^5.1.0",
+    "@ethersproject/abstract-provider": "^5.4.1",
     "@types/browser-or-node": "^1.3.0",
     "@types/chai": "^4.2.17",
     "@types/chai-as-promised": "^7.1.3",

packages/hardhat-ovm/package.json

@@ -20,7 +20,7 @@
     "node-fetch": "^2.6.1"
   },
   "peerDependencies": {
-    "ethers": "^5.1.4",
+    "ethers": "^5.4.0",
     "hardhat": "^2.2.1"
   },
   "devDependencies": {

packages/message-relayer/package.json

@@ -39,7 +39,7 @@
     "@sentry/node": "6.2.5",
     "bcfg": "^0.1.6",
     "dotenv": "^8.2.0",
-    "ethers": "^5.1.0",
+    "ethers": "^5.4.5",
     "merkletreejs": "^0.2.18",
     "rlp": "^2.2.6"
   },

packages/replica-healthcheck/package.json

@@ -31,7 +31,7 @@
   "dependencies": {
     "@eth-optimism/common-ts": "0.1.5",
     "@eth-optimism/core-utils": "^0.5.1",
-    "ethers": "^5.3.0",
+    "ethers": "^5.4.5",
     "express": "^4.17.1",
     "express-prom-bundle": "^6.3.6",
     "prom-client": "^13.1.0"