➕ Add Kava Mainnet and Polygon, Mantle, and Linea Sepolia Deployments (…

…#102) Signed-off-by: Pascal Marco Caversaccio <pascal.caversaccio@hotmail.ch>
pcaversaccio · Apr 13, 2024 · b6184f5 · b6184f5
1 parent 4a92221
commit b6184f5
Show file tree

Hide file tree

Showing 8 changed files with 303 additions and 246 deletions.
diff --git a/README.md b/README.md
@@ -2205,6 +2205,7 @@ To verify a deployed [`CreateX`](./src/CreateX.sol) contract on a block explorer
 - [Blast](https://blastscan.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [DOS Chain](https://doscan.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Endurance](https://explorer-endurance.fusionist.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
+- [Kava](https://kavascan.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 
 #### Ethereum Test Networks
 
@@ -2216,7 +2217,7 @@ To verify a deployed [`CreateX`](./src/CreateX.sol) contract on a block explorer
 - [Binance Smart Chain Testnet](https://testnet.bscscan.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Optimism Sepolia Testnet](https://sepolia-optimism.etherscan.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Arbitrum Sepolia Testnet](https://sepolia.arbiscan.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
-- [Polygon Testnet (Mumbai)](https://mumbai.polygonscan.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
+- [Polygon Sepolia Testnet (Amoy)](https://www.oklink.com/amoy/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Polygon Testnet (zkEVM)](https://cardona-zkevm.polygonscan.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Fantom Testnet](https://testnet.ftmscan.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Avalanche Testnet (Fuji)](https://testnet.snowtrace.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
@@ -2231,17 +2232,17 @@ To verify a deployed [`CreateX`](./src/CreateX.sol) contract on a block explorer
 - [Boba Network Testnet](https://testnet.bobascan.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Canto Testnet](https://testnet.tuber.build/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Base Sepolia Testnet](https://sepolia.basescan.org/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
-- [Mantle Testnet (Ringwood)](https://explorer.testnet.mantle.xyz/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
+- [Mantle Sepolia Testnet](https://explorer.sepolia.mantle.xyz/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Filecoin Testnet (Calibration)](https://calibration.filfox.info/en/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Scroll Sepolia Testnet](https://sepolia.scrollscan.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
-- [Linea Testnet](https://goerli.lineascan.build/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
+- [Linea Sepolia Testnet](https://sepolia.lineascan.build/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Zora Sepolia Testnet](https://sepolia.explorer.zora.energy/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [LUKSO Testnet](https://explorer.execution.testnet.lukso.network/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Manta Pacific Testnet](https://pacific-explorer.testnet.manta.network/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Frame Testnet](https://explorer.testnet.frame.xyz/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
-- [Blast Testnet](https://sepolia.blastscan.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
+- [Blast Sepolia Testnet](https://sepolia.blastscan.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [DOS Chain Testnet](https://test.doscan.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
-- [Fraxtal Testnet](https://holesky.fraxscan.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
+- [Fraxtal Holešky Testnet](https://holesky.fraxscan.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 
 ## Integration With External Tooling
 

diff --git a/deployments/deployments.json b/deployments/deployments.json
@@ -239,6 +239,14 @@
       "https://repo.sourcify.dev/contracts/partial_match/648/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed/"
     ]
   },
+  {
+    "name": "Kava",
+    "chainId": 2222,
+    "urls": [
+      "https://kavascan.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed",
+      "https://repo.sourcify.dev/contracts/partial_match/2222/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed/"
+    ]
+  },
   {
     "name": "Sepolia",
     "chainId": 11155111,
@@ -280,11 +288,10 @@
     ]
   },
   {
-    "name": "Polygon Testnet (Mumbai)",
-    "chainId": 80001,
+    "name": "Polygon Sepolia Testnet (Amoy)",
+    "chainId": 80002,
     "urls": [
-      "https://mumbai.polygonscan.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed",
-      "https://repo.sourcify.dev/contracts/partial_match/80001/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed/"
+      "https://www.oklink.com/amoy/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed"
     ]
   },
   {
@@ -393,10 +400,10 @@
     ]
   },
   {
-    "name": "Mantle Testnet (Ringwood)",
-    "chainId": 5001,
+    "name": "Mantle Sepolia Testnet",
+    "chainId": 5003,
     "urls": [
-      "https://explorer.testnet.mantle.xyz/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed"
+      "https://explorer.sepolia.mantle.xyz/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed"
     ]
   },
   {
@@ -415,10 +422,10 @@
     ]
   },
   {
-    "name": "Linea Testnet",
+    "name": "Linea Sepolia Testnet",
     "chainId": 59140,
     "urls": [
-      "https://goerli.lineascan.build/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed"
+      "https://sepolia.lineascan.build/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed"
     ]
   },
   {
@@ -451,7 +458,7 @@
     ]
   },
   {
-    "name": "Blast Testnet",
+    "name": "Blast Sepolia Testnet",
     "chainId": 168587773,
     "urls": [
       "https://sepolia.blastscan.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed"
@@ -465,7 +472,7 @@
     ]
   },
   {
-    "name": "Fraxtal Testnet",
+    "name": "Fraxtal Holešky Testnet",
     "chainId": 2522,
     "urls": [
       "https://holesky.fraxscan.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed"

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -144,9 +144,12 @@ const config: HardhatUserConfig = {
       url: vars.get("ARBITRUM_NOVA_URL", "https://nova.arbitrum.io/rpc"),
       accounts,
     },
-    mumbai: {
-      chainId: 80001,
-      url: vars.get("POLYGON_TESTNET_URL", "https://rpc-mumbai.maticvigil.com"),
+    amoy: {
+      chainId: 80002,
+      url: vars.get(
+        "POLYGON_TESTNET_URL",
+        "https://rpc-amoy.polygon.technology",
+      ),
       accounts,
     },
     polygonZkEVMTestnet: {
@@ -331,8 +334,8 @@ const config: HardhatUserConfig = {
       accounts,
     },
     mantleTestnet: {
-      chainId: 5001,
-      url: vars.get("MANTLE_TESTNET_URL", "https://rpc.testnet.mantle.xyz"),
+      chainId: 5003,
+      url: vars.get("MANTLE_TESTNET_URL", "https://rpc.sepolia.mantle.xyz"),
       accounts,
     },
     mantleMain: {
@@ -364,8 +367,8 @@ const config: HardhatUserConfig = {
       accounts,
     },
     lineaTestnet: {
-      chainId: 59140,
-      url: vars.get("LINEA_TESTNET_URL", "https://rpc.goerli.linea.build"),
+      chainId: 59141,
+      url: vars.get("LINEA_TESTNET_URL", "https://rpc.sepolia.linea.build"),
       accounts,
     },
     lineaMain: {
@@ -491,6 +494,11 @@ const config: HardhatUserConfig = {
       url: vars.get("FRAXTAL_TESTNET_URL", "https://rpc.testnet.frax.com"),
       accounts,
     },
+    kavaMain: {
+      chainId: 2222,
+      url: vars.get("KAVA_MAINNET_URL", "https://evm.kava-rpc.com"),
+      accounts,
+    },
   },
   contractSizer: {
     alphaSort: true,
@@ -540,7 +548,7 @@ const config: HardhatUserConfig = {
       // For Polygon testnets & mainnets
       polygon: vars.get("POLYGON_API_KEY", ""),
       polygonZkEVM: vars.get("POLYGON_ZKEVM_API_KEY", ""),
-      polygonMumbai: vars.get("POLYGON_API_KEY", ""),
+      polygonAmoy: vars.get("POLYGON_AMOY_API_KEY", ""),
       polygonZkEVMTestnet: vars.get("POLYGON_ZKEVM_API_KEY", ""),
       // For Arbitrum testnet & mainnets
       arbitrumOne: vars.get("ARBITRUM_API_KEY", ""),
@@ -625,6 +633,8 @@ const config: HardhatUserConfig = {
       dosTestnet: vars.get("DOS_API_KEY", ""),
       // For Fraxtal testnet
       fraxtalTestnet: vars.get("FRAXTAL_API_KEY", ""),
+      // For Kava mainnet
+      kava: vars.get("KAVA_API_KEY", ""),
     },
     customChains: [
       {
@@ -799,10 +809,10 @@ const config: HardhatUserConfig = {
       },
       {
         network: "mantleTestnet",
-        chainId: 5001,
+        chainId: 5003,
         urls: {
-          apiURL: "https://explorer.testnet.mantle.xyz/api",
-          browserURL: "https://explorer.testnet.mantle.xyz",
+          apiURL: "https://explorer.sepolia.mantle.xyz/api",
+          browserURL: "https://explorer.sepolia.mantle.xyz",
         },
       },
       {
@@ -845,6 +855,15 @@ const config: HardhatUserConfig = {
           browserURL: "https://zkevm.polygonscan.com",
         },
       },
+      {
+        network: "polygonAmoy",
+        chainId: 80002,
+        urls: {
+          apiURL:
+            "https://www.oklink.com/api/explorer/v1/contract/verify/async/api/polygonAmoy",
+          browserURL: "https://www.oklink.com/amoy",
+        },
+      },
       {
         network: "polygonZkEVMTestnet",
         chainId: 2442,
@@ -863,10 +882,10 @@ const config: HardhatUserConfig = {
       },
       {
         network: "lineaTestnet",
-        chainId: 59140,
+        chainId: 59141,
         urls: {
-          apiURL: "https://api-testnet.lineascan.build/api",
-          browserURL: "https://goerli.lineascan.build",
+          apiURL: "https://api-sepolia.lineascan.build/api",
+          browserURL: "https://sepolia.lineascan.build",
         },
       },
       {
@@ -1013,6 +1032,14 @@ const config: HardhatUserConfig = {
           browserURL: "https://holesky.fraxscan.com",
         },
       },
+      {
+        network: "kava",
+        chainId: 2222,
+        urls: {
+          apiURL: "https://kavascan.com/api",
+          browserURL: "https://kavascan.com",
+        },
+      },
     ],
   },
 };

diff --git a/interface/package.json b/interface/package.json
@@ -32,7 +32,7 @@
   "dependencies": {
     "@headlessui/react": "^1.7.18",
     "@heroicons/react": "^2.1.3",
-    "next": "^14.1.4",
+    "next": "^14.2.1",
     "next-themes": "^0.3.0",
     "prismjs": "^1.29.0",
     "react": "^18.2.0",
@@ -41,22 +41,22 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.0.0",
-    "@next/eslint-plugin-next": "^14.1.4",
+    "@next/eslint-plugin-next": "^14.2.1",
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
-    "@types/node": "^20.12.5",
-    "@types/react": "^18.2.74",
-    "@types/react-dom": "^18.2.24",
+    "@types/node": "^20.12.7",
+    "@types/react": "^18.2.77",
+    "@types/react-dom": "^18.2.25",
     "autoprefixer": "^10.4.19",
     "eslint": "^8.57.0",
-    "eslint-config-next": "^14.1.4",
+    "eslint-config-next": "^14.2.1",
     "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "next-seo": "^6.5.0",
     "postcss": "^8.4.38",
     "prettier": "^3.2.5",
     "prettier-plugin-tailwindcss": "^0.5.13",
     "tailwindcss": "^3.4.3",
-    "typescript": "^5.4.4",
+    "typescript": "^5.4.5",
     "typescript-eslint": "^7.6.0"
   }
 }
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
@@ -51,7 +51,7 @@
     "deploy:arbitrumsepolia": "npx hardhat run --no-compile --network arbitrumSepolia scripts/deploy.ts",
     "deploy:arbitrummain": "npx hardhat run --no-compile --network arbitrumMain scripts/deploy.ts",
     "deploy:arbitrumnova": "npx hardhat run --no-compile --network arbitrumNova scripts/deploy.ts",
-    "deploy:mumbai": "npx hardhat run --no-compile --network mumbai scripts/deploy.ts",
+    "deploy:amoy": "npx hardhat run --no-compile --network amoy scripts/deploy.ts",
     "deploy:polygonzkevmtestnet": "npx hardhat run --no-compile --network polygonZkEVMTestnet scripts/deploy.ts",
     "deploy:polygon": "npx hardhat run --no-compile --network polygon scripts/deploy.ts",
     "deploy:polygonzkevmmain": "npx hardhat run --no-compile --network polygonZkEVMMain scripts/deploy.ts",
@@ -112,6 +112,7 @@
     "deploy:dostestnet": "npx hardhat run --no-compile --network dosTestnet scripts/deploy.ts",
     "deploy:dosmain": "npx hardhat run --no-compile --network dosMain scripts/deploy.ts",
     "deploy:fraxtaltestnet": "npx hardhat run --no-compile --network fraxtalTestnet scripts/deploy.ts",
+    "deploy:kavamain": "npx hardhat run --no-compile --network kavaMain scripts/deploy.ts",
     "prettier:check": "npx prettier -c \"**/*.{js,ts,md,sol,json,yml,yaml}\"",
     "prettier:check:interface": "cd interface && pnpm prettier:check",
     "prettier:fix": "npx prettier -w \"**/*.{js,ts,md,sol,json,yml,yaml}\"",
@@ -141,10 +142,10 @@
     "hardhat-gas-reporter": "^2.1.1",
     "prettier": "^3.2.5",
     "prettier-plugin-solidity": "^1.3.1",
-    "solhint": "^4.5.2",
+    "solhint": "^4.5.4",
     "ts-node": "^10.9.2",
     "typechain": "^8.3.2",
-    "typescript": "^5.4.4",
+    "typescript": "^5.4.5",
     "typescript-eslint": "^7.6.0"
   }
 }
+5 −0		.changeset/lucky-crews-eat.md
+5 −0		.changeset/thin-walls-drop.md
+6 −5		contracts/access/manager/AccessManager.sol
+1 −1		contracts/access/manager/IAccessManager.sol
+1 −1		contracts/governance/utils/Votes.sol
+1 −1		contracts/token/ERC20/extensions/ERC20FlashMint.sol
+4 −4		contracts/token/ERC20/extensions/ERC20Votes.sol
+17 −8		package-lock.json
+1 −1		package.json
+4 −1		scripts/upgradeable/transpile.sh
+545 −542		.gas-snapshot
+1 −1		package.json
+42 −26		src/accounts/ERC1271.sol
+24 −13		src/accounts/ERC6551.sol
+46 −0		src/utils/LibClone.sol
+2 −3		src/utils/LibString.sol
+60 −14		test/ERC6551.t.sol
+32 −0		test/LibClone.t.sol