♻️ Clean-up Network Configurations (#49)

Signed-off-by: Pascal Marco Caversaccio <[email protected]>
pcaversaccio · Dec 8, 2023 · daed11d · daed11d
1 parent 0883609
commit daed11d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 34 deletions.
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -174,11 +174,6 @@ const config: HardhatUserConfig = {
       url: vars.get("POLYGON_ZKEVM_MAINNET_URL", "https://zkevm-rpc.com"),
       accounts,
     },
-    hecoTestnet: {
-      chainId: 256,
-      url: vars.get("HECO_TESTNET_URL", "https://http-testnet.hecochain.com"),
-      accounts,
-    },
     hecoMain: {
       chainId: 128,
       url: vars.get("HECO_MAINNET_URL", "https://http-mainnet.hecochain.com"),
@@ -210,11 +205,6 @@ const config: HardhatUserConfig = {
       ),
       accounts,
     },
-    sokol: {
-      chainId: 77,
-      url: vars.get("SOKOL_TESTNET_URL", "https://sokol.poa.network"),
-      accounts,
-    },
     chiado: {
       chainId: 10200,
       url: vars.get("GNOSIS_TESTNET_URL", "https://rpc.chiadochain.net"),
@@ -304,12 +294,12 @@ const config: HardhatUserConfig = {
     },
     evmosTestnet: {
       chainId: 9000,
-      url: vars.get("EVMOS_TESTNET_URL", "https://eth.bd.evmos.dev:8545"),
+      url: vars.get("EVMOS_TESTNET_URL", "https://evmos-testnet.lava.build"),
       accounts,
     },
     evmosMain: {
       chainId: 9001,
-      url: vars.get("EVMOS_MAINNET_URL", "https://eth.bd.evmos.org:8545"),
+      url: vars.get("EVMOS_MAINNET_URL", "https://evmos.lava.build"),
       accounts,
     },
     bobaTestnet: {
@@ -479,9 +469,8 @@ const config: HardhatUserConfig = {
       // For BSC testnet & mainnet
       bsc: vars.get("BSC_API_KEY", ""),
       bscTestnet: vars.get("BSC_API_KEY", ""),
-      // For Heco testnet & mainnet
+      // For Heco mainnet
       heco: vars.get("HECO_API_KEY", ""),
-      hecoTestnet: vars.get("HECO_API_KEY", ""),
       // For Fantom testnet & mainnet
       opera: vars.get("FANTOM_API_KEY", ""),
       ftmTestnet: vars.get("FANTOM_API_KEY", ""),
@@ -515,10 +504,9 @@ const config: HardhatUserConfig = {
       // For Cronos testnet & mainnet
       cronos: vars.get("CRONOS_API_KEY", ""),
       cronosTestnet: vars.get("CRONOS_API_KEY", ""),
-      // For Gnosis/xDai testnets & mainnets
+      // For Gnosis/xDai testnet & mainnets
       gnosis: vars.get("GNOSIS_API_KEY", ""),
       xdai: vars.get("GNOSIS_API_KEY", ""),
-      sokol: vars.get("GNOSIS_API_KEY", ""),
       chiado: vars.get("GNOSIS_API_KEY", ""),
       // For Fuse testnet & mainnet
       fuse: vars.get("FUSE_API_KEY", ""),

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
@@ -55,13 +55,11 @@
     "deploy:polygonzkevmtestnet": "npx hardhat run --network polygonZkEVMTestnet scripts/deploy.ts",
     "deploy:polygon": "npx hardhat run --network polygon scripts/deploy.ts",
     "deploy:polygonzkevmmain": "npx hardhat run --network polygonZkEVMMain scripts/deploy.ts",
-    "deploy:hecotestnet": "npx hardhat run --network hecoTestnet scripts/deploy.ts",
     "deploy:hecomain": "npx hardhat run --network hecoMain scripts/deploy.ts",
     "deploy:fantomtestnet": "npx hardhat run --network fantomTestnet scripts/deploy.ts",
     "deploy:fantommain": "npx hardhat run --network fantomMain scripts/deploy.ts",
     "deploy:fuji": "npx hardhat run --network fuji scripts/deploy.ts",
     "deploy:avalanche": "npx hardhat run --network avalanche scripts/deploy.ts",
-    "deploy:sokol": "npx hardhat run --network sokol scripts/deploy.ts",
     "deploy:chiado": "npx hardhat run --network chiado scripts/deploy.ts",
     "deploy:gnosis": "npx hardhat run --network gnosis scripts/deploy.ts",
     "deploy:moonbasealpha": "npx hardhat run --network moonbaseAlpha scripts/deploy.ts",
@@ -127,7 +125,7 @@
     "prettier": "^3.1.0",
     "prettier-plugin-solidity": "^1.2.0",
     "solhint": "^4.0.0",
-    "ts-node": "^10.9.1",
+    "ts-node": "^10.9.2",
     "typechain": "^8.3.2",
     "typescript": "^5.3.3"
   }

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
+5 −0		.changeset/rude-weeks-beg.md
+5 −0		.changeset/strong-points-invent.md
+6 −0		CHANGELOG.md
+21 −10		contracts/metatx/ERC2771Context.sol
+6 −1		contracts/mocks/ERC2771ContextMock.sol
+1 −1		contracts/package.json
+1 −1		contracts/token/ERC1155/IERC1155.sol
+5 −1		contracts/utils/Context.sol
+17 −3		contracts/utils/Multicall.sol
+1 −1		lib/forge-std
+1 −1		package.json
+28 −2		test/metatx/ERC2771Context.test.js
+0 −12		.gas-snapshot
+0 −1		README.md
+1 −1		package.json
+0 −1		src/Milady.sol
+0 −66		src/utils/Multicallable.sol
+0 −119		test/Multicallable.t.sol
+0 −68		test/utils/mocks/MockMulticallable.sol