➕ Add EVM on Flow Test and Main Network Deployments

Signed-off-by: Pascal Marco Caversaccio <[email protected]>
pcaversaccio · Dec 20, 2024 · ea2045d · ea2045d
1 parent 11517d5
commit ea2045d
Show file tree

Hide file tree

Showing 9 changed files with 231 additions and 176 deletions.
diff --git a/README.md b/README.md
@@ -2232,6 +2232,7 @@ To verify a deployed [`CreateX`](./src/CreateX.sol) contract on a block explorer
 - [Metal L2](https://explorer.metall2.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Superseed](https://explorer.superseed.xyz/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Sonic](https://sonicscan.org/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
+- [EVM on Flow](https://evm.flowscan.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 
 #### Ethereum Test Networks
 
@@ -2292,6 +2293,7 @@ To verify a deployed [`CreateX`](./src/CreateX.sol) contract on a block explorer
 - [Superseed Sepolia Testnet](https://sepolia-explorer.superseed.xyz/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Story Testnet (Odyssey)](https://odyssey.storyscan.xyz/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Sonic Testnet (Blaze)](https://testnet.sonicscan.org/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
+- [EVM on Flow Testnet](https://evm-testnet.flowscan.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 
 ## Integration With External Tooling
 

diff --git a/deployments/deployments.json b/deployments/deployments.json
@@ -417,6 +417,13 @@
       "https://sonicscan.org/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed"
     ]
   },
+  {
+    "name": "EVM on Flow",
+    "chainId": 747,
+    "urls": [
+      "https://evm.flowscan.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed"
+    ]
+  },
   {
     "name": "Sepolia",
     "chainId": 11155111,
@@ -818,5 +825,12 @@
     "urls": [
       "https://testnet.sonicscan.org/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed"
     ]
+  },
+  {
+    "name": "EVM on Flow Testnet",
+    "chainId": 545,
+    "urls": [
+      "https://evm-testnet.flowscan.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed"
+    ]
   }
 ]
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -763,6 +763,16 @@ const config: HardhatUserConfig = {
       url: vars.get("SONIC_MAINNET_URL", "https://rpc.soniclabs.com"),
       accounts,
     },
+    flowTestnet: {
+      chainId: 545,
+      url: vars.get("FLOW_TESTNET_URL", "https://testnet.evm.nodes.onflow.org"),
+      accounts,
+    },
+    flowMain: {
+      chainId: 747,
+      url: vars.get("FLOW_MAINNET_URL", "https://mainnet.evm.nodes.onflow.org"),
+      accounts,
+    },
   },
   contractSizer: {
     alphaSort: true,
@@ -967,6 +977,9 @@ const config: HardhatUserConfig = {
       // For Sonic testnet & mainnet
       sonic: vars.get("SONIC_API_KEY", ""),
       sonicTestnet: vars.get("SONIC_API_KEY", ""),
+      // For EVM on Flow testnet & mainnet
+      flow: vars.get("FLOW_API_KEY", ""),
+      flowTestnet: vars.get("FLOW_API_KEY", ""),
     },
     customChains: [
       {
@@ -1751,6 +1764,22 @@ const config: HardhatUserConfig = {
           browserURL: "https://testnet.sonicscan.org",
         },
       },
+      {
+        network: "flow",
+        chainId: 747,
+        urls: {
+          apiURL: "https://evm.flowscan.io/api",
+          browserURL: "https://evm.flowscan.io",
+        },
+      },
+      {
+        network: "flowTestnet",
+        chainId: 545,
+        urls: {
+          apiURL: "https://evm-testnet.flowscan.io/api",
+          browserURL: "https://evm-testnet.flowscan.io",
+        },
+      },
     ],
   },
 };

diff --git a/interface/package.json b/interface/package.json
@@ -32,7 +32,7 @@
   "dependencies": {
     "@headlessui/react": "^2.2.0",
     "@heroicons/react": "^2.2.0",
-    "next": "^15.1.1",
+    "next": "^15.1.2",
     "next-themes": "^0.4.4",
     "prismjs": "^1.29.0",
     "react": "^19.0.0",
@@ -41,14 +41,14 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.17.0",
-    "@next/eslint-plugin-next": "^15.1.1",
+    "@next/eslint-plugin-next": "^15.1.2",
     "@trivago/prettier-plugin-sort-imports": "^5.2.0",
     "@types/node": "^22.10.2",
-    "@types/react": "^19.0.1",
+    "@types/react": "^19.0.2",
     "@types/react-dom": "^19.0.2",
     "autoprefixer": "^10.4.20",
     "eslint": "^9.17.0",
-    "eslint-config-next": "^15.1.1",
+    "eslint-config-next": "^15.1.2",
     "eslint-plugin-react": "^7.37.2",
     "eslint-plugin-react-hooks": "^5.1.0",
     "next-seo": "^6.6.0",

diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/solady b/lib/solady
diff --git a/package.json b/package.json
@@ -161,6 +161,8 @@
     "deploy:storytestnet": "npx hardhat run --no-compile --network storyTestnet scripts/deploy.ts",
     "deploy:sonictestnet": "npx hardhat run --no-compile --network sonicTestnet scripts/deploy.ts",
     "deploy:sonicmain": "npx hardhat run --no-compile --network sonicMain scripts/deploy.ts",
+    "deploy:flowtestnet": "npx hardhat run --no-compile --network flowTestnet scripts/deploy.ts",
+    "deploy:flowmain": "npx hardhat run --no-compile --network flowMain scripts/deploy.ts",
     "prettier:check": "npx prettier -c \"**/*.{js,ts,md,sol,json,yml,yaml}\"",
     "prettier:check:interface": "pnpm -C interface prettier:check",
     "prettier:fix": "npx prettier -w \"**/*.{js,ts,md,sol,json,yml,yaml}\"",
+5 −0		.changeset/brave-islands-sparkle.md
+5 −0		.changeset/ten-fishes-fold.md
+5 −0		.changeset/thin-eels-cross.md
+0 −4		.github/workflows/checks.yml
+19 −6		contracts/governance/Governor.sol
+14 −1		contracts/governance/IGovernor.sol
+76 −0		contracts/governance/extensions/GovernorSequentialProposalId.sol
+39 −0		contracts/mocks/governance/GovernorSequentialProposalIdMock.sol
+5 −5		contracts/token/ERC20/extensions/ERC4626.sol
+1 −1		fv-requirements.txt
+31 −0		hardhat/common-contracts.js
+1 −1		package.json
+2 −0		scripts/checks/coverage.sh
+10 −0		scripts/set-max-old-space-size.sh
+1 −2		slither.config.json
+8 −9		test/account/utils/draft-ERC4337Utils.test.js
+1 −1		test/governance/Governor.test.js
+202 −0		test/governance/extensions/GovernorSequentialProposalId.test.js
+0 −31		test/helpers/erc4337-entrypoint.js
+14 −12		test/helpers/governance.js
+30 −28		test/utils/introspection/SupportsInterface.behavior.js