➕ Add Shape/Etherlink Test and Main Network Deployments

Signed-off-by: Pascal Marco Caversaccio <[email protected]>
pcaversaccio · Jan 13, 2025 · 375ed5f · 375ed5f
1 parent a0abca4
commit 375ed5f
Show file tree

Hide file tree

Showing 7 changed files with 117 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -2235,6 +2235,8 @@ To verify a deployed [`CreateX`](./src/CreateX.sol) contract on a block explorer
 - [EVM on Flow](https://evm.flowscan.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Ink](https://explorer.inkonchain.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Morph](https://explorer.morphl2.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
+- [Shape](https://shapescan.xyz/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
+- [Etherlink](https://explorer.etherlink.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 
 #### Ethereum Test Networks
 
@@ -2298,6 +2300,8 @@ To verify a deployed [`CreateX`](./src/CreateX.sol) contract on a block explorer
 - [EVM on Flow Testnet](https://evm-testnet.flowscan.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Ink Sepolia Testnet](https://explorer-sepolia.inkonchain.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 - [Morph Holešky Testnet](https://explorer-holesky.morphl2.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
+- [Shape Sepolia Testnet](https://explorer-sepolia.shape.network/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
+- [Etherlink Testnet (Ghostnet)](https://testnet.explorer.etherlink.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed)
 
 ## Integration With External Tooling
 

diff --git a/deployments/deployments.json b/deployments/deployments.json
@@ -438,6 +438,20 @@
       "https://explorer.morphl2.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed"
     ]
   },
+  {
+    "name": "Shape",
+    "chainId": 360,
+    "urls": [
+      "https://shapescan.xyz/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed"
+    ]
+  },
+  {
+    "name": "Etherlink",
+    "chainId": 42793,
+    "urls": [
+      "https://explorer.etherlink.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed"
+    ]
+  },
   {
     "name": "Sepolia",
     "chainId": 11155111,
@@ -860,5 +874,19 @@
     "urls": [
       "https://explorer-holesky.morphl2.io/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed"
     ]
+  },
+  {
+    "name": "Shape Sepolia Testnet",
+    "chainId": 11011,
+    "urls": [
+      "https://explorer-sepolia.shape.network/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed"
+    ]
+  },
+  {
+    "name": "Etherlink Testnet (Ghostnet)",
+    "chainId": 128123,
+    "urls": [
+      "https://testnet.explorer.etherlink.com/address/0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed"
+    ]
   }
 ]
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -799,6 +799,32 @@ const config: HardhatUserConfig = {
       url: vars.get("MORPH_MAINNET_URL", "https://rpc-quicknode.morphl2.io"),
       accounts,
     },
+    shapeTestnet: {
+      chainId: 11011,
+      url: vars.get("SHAPE_TESTNET_URL", "https://sepolia.shape.network"),
+      accounts,
+    },
+    shapeMain: {
+      chainId: 360,
+      url: vars.get("SHAPE_MAINNET_URL", "https://mainnet.shape.network"),
+      accounts,
+    },
+    etherlinkTestnet: {
+      chainId: 128123,
+      url: vars.get(
+        "ETHERLINK_TESTNET_URL",
+        "https://node.ghostnet.etherlink.com",
+      ),
+      accounts,
+    },
+    etherlinkMain: {
+      chainId: 42793,
+      url: vars.get(
+        "ETHERLINK_MAINNET_URL",
+        "https://node.mainnet.etherlink.com",
+      ),
+      accounts,
+    },
   },
   contractSizer: {
     alphaSort: true,
@@ -1012,6 +1038,12 @@ const config: HardhatUserConfig = {
       // For Morph testnet & mainnet
       morph: vars.get("MORPH_API_KEY", ""),
       morphTestnet: vars.get("MORPH_API_KEY", ""),
+      // For Shape testnet & mainnet
+      shape: vars.get("SHAPE_API_KEY", ""),
+      shapeTestnet: vars.get("SHAPE_API_KEY", ""),
+      // For Etherlink testnet & mainnet
+      etherlink: vars.get("ETHERLINK_API_KEY", ""),
+      etherlinkTestnet: vars.get("ETHERLINK_API_KEY", ""),
     },
     customChains: [
       {
@@ -1844,6 +1876,38 @@ const config: HardhatUserConfig = {
           browserURL: "https://explorer-holesky.morphl2.io",
         },
       },
+      {
+        network: "shape",
+        chainId: 360,
+        urls: {
+          apiURL: "https://shapescan.xyz/api",
+          browserURL: "https://shapescan.xyz",
+        },
+      },
+      {
+        network: "shapeTestnet",
+        chainId: 11011,
+        urls: {
+          apiURL: "https://explorer-sepolia.shape.network/api",
+          browserURL: "https://explorer-sepolia.shape.network",
+        },
+      },
+      {
+        network: "etherlink",
+        chainId: 42793,
+        urls: {
+          apiURL: "https://explorer.etherlink.com/api",
+          browserURL: "https://explorer.etherlink.com",
+        },
+      },
+      {
+        network: "etherlinkTestnet",
+        chainId: 128123,
+        urls: {
+          apiURL: "https://testnet.explorer.etherlink.com/api",
+          browserURL: "https://testnet.explorer.etherlink.com",
+        },
+      },
     ],
   },
 };

diff --git a/interface/package.json b/interface/package.json
@@ -44,12 +44,12 @@
     "@next/eslint-plugin-next": "^15.1.4",
     "@trivago/prettier-plugin-sort-imports": "^5.2.1",
     "@types/node": "^22.10.5",
-    "@types/react": "^19.0.5",
+    "@types/react": "^19.0.6",
     "@types/react-dom": "^19.0.3",
     "autoprefixer": "^10.4.20",
     "eslint": "^9.18.0",
     "eslint-config-next": "^15.1.4",
-    "eslint-plugin-react": "^7.37.3",
+    "eslint-plugin-react": "^7.37.4",
     "eslint-plugin-react-hooks": "^5.1.0",
     "next-seo": "^6.6.0",
     "postcss": "^8.4.49",

diff --git a/lib/solady b/lib/solady
diff --git a/package.json b/package.json
@@ -167,6 +167,10 @@
     "deploy:inkmain": "npx hardhat run --no-compile --network inkMain scripts/deploy.ts",
     "deploy:morphtestnet": "npx hardhat run --no-compile --network morphTestnet scripts/deploy.ts",
     "deploy:morphmain": "npx hardhat run --no-compile --network morphMain scripts/deploy.ts",
+    "deploy:shapetestnet": "npx hardhat run --no-compile --network shapeTestnet scripts/deploy.ts",
+    "deploy:shapemain": "npx hardhat run --no-compile --network shapeMain scripts/deploy.ts",
+    "deploy:etherlinktestnet": "npx hardhat run --no-compile --network etherlinkTestnet scripts/deploy.ts",
+    "deploy:etherlinkmain": "npx hardhat run --no-compile --network etherlinkMain 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}\"",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
+9 −10		src/accounts/ERC4337Factory.sol
+3 −2		src/accounts/ERC7821.sol
+3 −0		src/accounts/LibERC7579.sol
+1 −0		src/accounts/Receiver.sol
+2 −0		src/accounts/Timelock.sol
+1 −1		src/tokens/ERC20Votes.sol
+3 −2		src/utils/EnumerableSetLib.sol
+11 −1		src/utils/Initializable.sol
+5 −5		src/utils/LibClone.sol
+32 −23		src/utils/MinHeapLib.sol
+1 −1		src/utils/Multicallable.sol
+6 −5		src/utils/RedBlackTreeLib.sol
+6 −6		src/utils/SignatureCheckerLib.sol
+2 −1		src/utils/UUPSUpgradeable.sol
+3 −2		src/utils/g/EnumerableSetLib.sol
+32 −23		src/utils/g/MinHeapLib.sol
+6 −5		src/utils/g/RedBlackTreeLib.sol
+14 −24		test/ERC4337Factory.t.sol
+2 −0		test/Timelock.t.sol