feat(Foundry): Updated constants usage

README.md

@@ -84,9 +84,7 @@ To enable ZKSync support, the zksync fork of foundry must be installed (see [her
 Also, the `FOUNDRY_PROFILE` environment variable must be set to `zksync`.
 
 ```shell
-export FOUNDRY_PROFILE=zksync
-
-forge script script/016DeployZkSyncSpokePool.s.sol:DeployZkSyncSpokePool --rpc-url zksync --broadcast --verify -vvvv
+FOUNDRY_PROFILE=zksync forge script script/016DeployZkSyncSpokePool.s.sol:DeployZkSyncSpokePool --rpc-url zksync --broadcast --verify -vvvv
 ```
 
 Alternatively, the `yarn forge-script-zksync` command can be used to deploy the contract.

script/utils/constants.json → generated/constants.json

@@ -478,6 +478,10 @@
     "ZK_SYNC_SEPOLIA": 300,
     "SOLANA_DEVNET": 133268194659241
   },
+  "TESTNET_CHAIN_IDs": [
+    421614, 84532, 168587773, 808813, 998, 763373, 129399, 37111, 4202, 919, 11155420, 9746, 80002, 534351, 11155111,
+    1301, 300, 133268194659241
+  ],
   "WETH": {
     "1": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
     "10": "0x4200000000000000000000000000000000000006",
@@ -870,6 +874,18 @@
     "1": "0x1ff1dC3cB9eeDbC6Eb2d99C03b30A05cA625fB5a",
     "232": "0x6bDc36E20D267Ff0dd6097799f82e78907105e2F"
   },
+  "CHAIN_FAMILIES": {
+    "0": "NONE",
+    "1": "OP_STACK",
+    "2": "ORBIT",
+    "3": "ZK_STACK",
+    "4": "SVM",
+    "NONE": 0,
+    "OP_STACK": 1,
+    "ORBIT": 2,
+    "ZK_STACK": 3,
+    "SVM": 4
+  },
   "OTHER_CONSTANTS": {
     "ZERO_ADDRESS": "0x0000000000000000000000000000000000000000",
     "ARBITRUM_MAX_SUBMISSION_COST": "10000000000000000",

script/001DeployHubPool.s.sol

@@ -26,7 +26,7 @@ contract DeployHubPool is Script, Test, Constants {
         uint256 chainId = block.chainid;
 
         // Get the appropriate addresses for this chain
-        WETH9Interface weth = getWrappedNativeToken(chainId);
+        address weth = getWrappedNativeToken(chainId);
         FinderInterface finder = FinderInterface(getL1Addresses(chainId).finder);
 
         vm.startBroadcast(deployerPrivateKey);
@@ -35,7 +35,7 @@ contract DeployHubPool is Script, Test, Constants {
         LpTokenFactory lpTokenFactory = new LpTokenFactory();
 
         // Deploy HubPool with the LpTokenFactory address
-        HubPool hubPool = new HubPool(lpTokenFactory, finder, weth, address(0));
+        HubPool hubPool = new HubPool(lpTokenFactory, finder, WETH9Interface(weth), address(0));
 
         // Log the deployed addresses
         console.log("Chain ID:", chainId);

script/002DeployOptimismAdapter.s.sol

@@ -9,6 +9,7 @@ import { Constants } from "./utils/Constants.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { ITokenMessenger } from "../contracts/external/interfaces/CCTPInterfaces.sol";
 import { IL1StandardBridge } from "@eth-optimism/contracts/L1/messaging/IL1StandardBridge.sol";
+import { WETH9Interface } from "../contracts/external/interfaces/WETH9Interface.sol";
 
 // How to run:
 // 1. `source .env` where `.env` has MNEMONIC="x x x ... x" and ETHERSCAN_API_KEY="x" entries
@@ -31,6 +32,8 @@ contract DeployOptimismAdapter is Script, Test, Constants {
             "Optimism_Adapter should only be deployed on Ethereum mainnet or Sepolia"
         );
 
+        address weth = getWrappedNativeToken(chainId);
+
         // Get OP Stack addresses for this chain and Optimism
         uint256 optimismChainId = getChainId("OPTIMISM");
         Constants.OpStackAddresses memory opStack = getOpStackAddresses(chainId, optimismChainId);
@@ -39,7 +42,7 @@ contract DeployOptimismAdapter is Script, Test, Constants {
 
         // Deploy Optimism_Adapter with constructor parameters
         Optimism_Adapter optimismAdapter = new Optimism_Adapter(
-            getWrappedNativeToken(chainId), // L1 WETH
+            WETH9Interface(weth), // L1 WETH
             opStack.L1CrossDomainMessenger, // L1 Cross Domain Messenger
             IL1StandardBridge(opStack.L1StandardBridge), // L1 Standard Bridge
             IERC20(getUSDCAddress(chainId)), // L1 USDC
@@ -49,7 +52,7 @@ contract DeployOptimismAdapter is Script, Test, Constants {
         // Log the deployed addresses
         console.log("Chain ID:", chainId);
         console.log("Optimism_Adapter deployed to:", address(optimismAdapter));
-        console.log("L1 WETH:", address(getWrappedNativeToken(chainId)));
+        console.log("L1 WETH:", weth);
         console.log("L1 Cross Domain Messenger:", opStack.L1CrossDomainMessenger);
         console.log("L1 Standard Bridge:", opStack.L1StandardBridge);
         console.log("L1 USDC:", getUSDCAddress(chainId));

script/003DeployOptimismSpokePool.s.sol

@@ -5,7 +5,6 @@ import { Script } from "forge-std/Script.sol";
 import { Test } from "forge-std/Test.sol";
 import { console } from "forge-std/console.sol";
 import { Optimism_SpokePool } from "../contracts/Optimism_SpokePool.sol";
-import { WETH9Interface } from "../contracts/external/interfaces/WETH9Interface.sol";
 import { DeploymentUtils } from "./utils/DeploymentUtils.sol";
 
 // How to run:
@@ -25,7 +24,7 @@ contract DeployOptimismSpokePool is Script, Test, DeploymentUtils {
         console.log("HubPool address:", info.hubPool);
 
         // Get the appropriate addresses for this chain
-        WETH9Interface weth = getWrappedNativeToken(info.spokeChainId);
+        address weth = getWrappedNativeToken(info.spokeChainId);
 
         // Get L2 addresses for Optimism
         address cctpTokenMessenger = getL2Address(info.spokeChainId, "cctpTokenMessenger");
@@ -34,7 +33,7 @@ contract DeployOptimismSpokePool is Script, Test, DeploymentUtils {
 
         // Prepare constructor arguments for Optimism_SpokePool
         bytes memory constructorArgs = abi.encode(
-            address(weth), // _wrappedNativeTokenAddress
+            weth, // _wrappedNativeTokenAddress
             QUOTE_TIME_BUFFER(), // _depositQuoteTimeBuffer
             FILL_DEADLINE_BUFFER(), // _fillDeadlineBuffer
             getUSDCAddress(info.spokeChainId), // _l2Usdc
@@ -62,7 +61,7 @@ contract DeployOptimismSpokePool is Script, Test, DeploymentUtils {
         console.log("Chain ID:", info.spokeChainId);
         console.log("Hub Chain ID:", info.hubChainId);
         console.log("HubPool address:", info.hubPool);
-        console.log("WETH address:", address(weth));
+        console.log("WETH address:", weth);
         console.log("CCTP Token Messenger:", cctpTokenMessenger);
         console.log("USDC address:", getUSDCAddress(info.spokeChainId));
         console.log("Optimism_SpokePool proxy deployed to:", result.proxy);

script/005DeployArbitrumSpokePool.s.sol

@@ -5,7 +5,6 @@ import { Script } from "forge-std/Script.sol";
 import { Test } from "forge-std/Test.sol";
 import { console } from "forge-std/console.sol";
 import { Arbitrum_SpokePool } from "../contracts/Arbitrum_SpokePool.sol";
-import { WETH9Interface } from "../contracts/external/interfaces/WETH9Interface.sol";
 import { DeploymentUtils } from "./utils/DeploymentUtils.sol";
 
 // How to run:
@@ -25,7 +24,7 @@ contract DeployArbitrumSpokePool is Script, Test, DeploymentUtils {
         console.log("HubPool address:", info.hubPool);
 
         // Get the appropriate addresses for this chain
-        WETH9Interface weth = getWrappedNativeToken(info.spokeChainId);
+        address weth = getWrappedNativeToken(info.spokeChainId);
 
         // Get L2 addresses for Arbitrum
         address l2GatewayRouter = getL2Address(info.spokeChainId, "l2GatewayRouter");
@@ -35,7 +34,7 @@ contract DeployArbitrumSpokePool is Script, Test, DeploymentUtils {
 
         // Prepare constructor arguments for Arbitrum_SpokePool
         bytes memory constructorArgs = abi.encode(
-            address(weth), // _weth
+            weth, // _weth
             QUOTE_TIME_BUFFER(), // _quoteTimeBuffer
             FILL_DEADLINE_BUFFER(), // _fillDeadlineBuffer
             getUSDCAddress(info.spokeChainId), // _usdc
@@ -66,7 +65,7 @@ contract DeployArbitrumSpokePool is Script, Test, DeploymentUtils {
         console.log("Chain ID:", info.spokeChainId);
         console.log("Hub Chain ID:", info.hubChainId);
         console.log("HubPool address:", info.hubPool);
-        console.log("WETH address:", address(weth));
+        console.log("WETH address:", weth);
         console.log("L2 Gateway Router:", l2GatewayRouter);
         console.log("CCTP Token Messenger:", cctpTokenMessenger);
         console.log("USDC address:", getUSDCAddress(info.spokeChainId));

script/007DeployEthereumSpokePool.s.sol

@@ -5,7 +5,6 @@ import { Script } from "forge-std/Script.sol";
 import { Test } from "forge-std/Test.sol";
 import { console } from "forge-std/console.sol";
 import { Ethereum_SpokePool } from "../contracts/Ethereum_SpokePool.sol";
-import { WETH9Interface } from "../contracts/external/interfaces/WETH9Interface.sol";
 import { DeploymentUtils } from "./utils/DeploymentUtils.sol";
 
 // How to run:
@@ -25,13 +24,13 @@ contract DeployEthereumSpokePool is Script, Test, DeploymentUtils {
         console.log("HubPool address:", info.hubPool);
 
         // Get the appropriate addresses for this chain
-        WETH9Interface weth = getWrappedNativeToken(info.spokeChainId);
+        address weth = getWrappedNativeToken(info.spokeChainId);
 
         vm.startBroadcast(deployerPrivateKey);
 
         // Prepare constructor arguments for Ethereum_SpokePool
         bytes memory constructorArgs = abi.encode(
-            address(weth), // _weth
+            weth, // _weth
             QUOTE_TIME_BUFFER(), // _quoteTimeBuffer
             FILL_DEADLINE_BUFFER() // _fillDeadlineBuffer
         );
@@ -56,7 +55,7 @@ contract DeployEthereumSpokePool is Script, Test, DeploymentUtils {
         console.log("Chain ID:", info.spokeChainId);
         console.log("Hub Chain ID:", info.hubChainId);
         console.log("HubPool address:", info.hubPool);
-        console.log("WETH address:", address(weth));
+        console.log("WETH address:", weth);
         console.log("Ethereum_SpokePool proxy deployed to:", result.proxy);
         console.log("Ethereum_SpokePool implementation deployed to:", result.implementation);
 

script/027DeployScrollSpokePool.s.sol

@@ -5,7 +5,6 @@ import { Script } from "forge-std/Script.sol";
 import { Test } from "forge-std/Test.sol";
 import { console } from "forge-std/console.sol";
 import { Scroll_SpokePool } from "../contracts/Scroll_SpokePool.sol";
-import { WETH9Interface } from "../contracts/external/interfaces/WETH9Interface.sol";
 import { DeploymentUtils } from "./utils/DeploymentUtils.sol";
 
 // How to run:
@@ -25,7 +24,7 @@ contract DeployScrollSpokePool is Script, Test, DeploymentUtils {
         console.log("HubPool address:", info.hubPool);
 
         // Get the appropriate addresses for this chain
-        WETH9Interface weth = getWrappedNativeToken(info.spokeChainId);
+        address weth = getWrappedNativeToken(info.spokeChainId);
 
         // Get L2 addresses for Scroll
         address l2GatewayRouter = getL2Address(info.spokeChainId, "scrollERC20GatewayRouter");
@@ -35,7 +34,7 @@ contract DeployScrollSpokePool is Script, Test, DeploymentUtils {
 
         // Prepare constructor arguments for Scroll_SpokePool
         bytes memory constructorArgs = abi.encode(
-            address(weth), // _wrappedNativeTokenAddress
+            weth, // _wrappedNativeTokenAddress
             QUOTE_TIME_BUFFER(), // _depositQuoteTimeBuffer
             FILL_DEADLINE_BUFFER() // _fillDeadlineBuffer
         );
@@ -64,7 +63,7 @@ contract DeployScrollSpokePool is Script, Test, DeploymentUtils {
         console.log("Chain ID:", info.spokeChainId);
         console.log("Hub Chain ID:", info.hubChainId);
         console.log("HubPool address:", info.hubPool);
-        console.log("WETH address:", address(weth));
+        console.log("WETH address:", weth);
         console.log("L2 Gateway Router:", l2GatewayRouter);
         console.log("L2 Scroll Messenger:", l2ScrollMessenger);
         console.log("Scroll_SpokePool proxy deployed to:", result.proxy);

script/036DeployBlastSpokePool.s.sol

@@ -5,7 +5,6 @@ import { Script } from "forge-std/Script.sol";
 import { Test } from "forge-std/Test.sol";
 import { console } from "forge-std/console.sol";
 import { Blast_SpokePool } from "../contracts/Blast_SpokePool.sol";
-import { WETH9Interface } from "../contracts/external/interfaces/WETH9Interface.sol";
 import { DeploymentUtils } from "./utils/DeploymentUtils.sol";
 
 // How to run:
@@ -35,7 +34,7 @@ contract DeployBlastSpokePool is Script, Test, DeploymentUtils {
         console.log("HubPool address:", info.hubPool);
 
         // Get the appropriate addresses for this chain
-        WETH9Interface weth = getWrappedNativeToken(info.spokeChainId);
+        address weth = getWrappedNativeToken(info.spokeChainId);
 
         // Get USDB and DAI addresses based on chain
         address usdb = getUSDBAddress(info.spokeChainId);
@@ -46,7 +45,7 @@ contract DeployBlastSpokePool is Script, Test, DeploymentUtils {
 
         // Prepare constructor arguments for Blast_SpokePool
         bytes memory constructorArgs = abi.encode(
-            address(weth), // _wrappedNativeTokenAddress
+            weth, // _wrappedNativeTokenAddress
             QUOTE_TIME_BUFFER(), // _depositQuoteTimeBuffer
             FILL_DEADLINE_BUFFER(), // _fillDeadlineBuffer
             address(0), // _l2Usdc
@@ -79,7 +78,7 @@ contract DeployBlastSpokePool is Script, Test, DeploymentUtils {
         console.log("Chain ID:", info.spokeChainId);
         console.log("Hub Chain ID:", info.hubChainId);
         console.log("HubPool address:", info.hubPool);
-        console.log("WETH address:", address(weth));
+        console.log("WETH address:", weth);
         console.log("USDB address:", usdb);
         console.log("DAI address:", dai);
         console.log("Yield Recipient:", YIELD_RECIPIENT);

script/039DeployModeSpokePool.s.sol

@@ -5,7 +5,6 @@ import { Script } from "forge-std/Script.sol";
 import { Test } from "forge-std/Test.sol";
 import { console } from "forge-std/console.sol";
 import { Mode_SpokePool } from "../contracts/Mode_SpokePool.sol";
-import { WETH9Interface } from "../contracts/external/interfaces/WETH9Interface.sol";
 import { DeploymentUtils } from "./utils/DeploymentUtils.sol";
 
 // How to run:
@@ -27,13 +26,13 @@ contract DeployModeSpokePool is Script, Test, DeploymentUtils {
         console.log("HubPool address:", info.hubPool);
 
         // Get the appropriate addresses for this chain
-        WETH9Interface weth = getWrappedNativeToken(info.spokeChainId);
+        address weth = getWrappedNativeToken(info.spokeChainId);
 
         vm.startBroadcast(deployerPrivateKey);
 
         // Prepare constructor arguments for Mode_SpokePool
         bytes memory constructorArgs = abi.encode(
-            address(weth), // _wrappedNativeTokenAddress
+            weth, // _wrappedNativeTokenAddress
             QUOTE_TIME_BUFFER(), // _depositQuoteTimeBuffer
             FILL_DEADLINE_BUFFER(), // _fillDeadlineBuffer
             address(0), // _l2Usdc
@@ -61,7 +60,7 @@ contract DeployModeSpokePool is Script, Test, DeploymentUtils {
         console.log("Chain ID:", info.spokeChainId);
         console.log("Hub Chain ID:", info.hubChainId);
         console.log("HubPool address:", info.hubPool);
-        console.log("WETH address:", address(weth));
+        console.log("WETH address:", weth);
         console.log("Mode_SpokePool proxy deployed to:", result.proxy);
         console.log("Mode_SpokePool implementation deployed to:", result.implementation);
 

script/047DeployRedstoneSpokePool.s.sol

@@ -5,7 +5,6 @@ import { Script } from "forge-std/Script.sol";
 import { Test } from "forge-std/Test.sol";
 import { console } from "forge-std/console.sol";
 import { Redstone_SpokePool } from "../contracts/Redstone_SpokePool.sol";
-import { WETH9Interface } from "../contracts/external/interfaces/WETH9Interface.sol";
 import { DeploymentUtils } from "./utils/DeploymentUtils.sol";
 
 // How to run:
@@ -25,13 +24,13 @@ contract DeployRedstoneSpokePool is Script, Test, DeploymentUtils {
         console.log("HubPool address:", info.hubPool);
 
         // Get the appropriate addresses for this chain
-        WETH9Interface weth = getWrappedNativeToken(info.spokeChainId);
+        address weth = getWrappedNativeToken(info.spokeChainId);
 
         vm.startBroadcast(deployerPrivateKey);
 
         // Prepare constructor arguments for Redstone_SpokePool
         bytes memory constructorArgs = abi.encode(
-            address(weth), // _wrappedNativeTokenAddress
+            weth, // _wrappedNativeTokenAddress
             QUOTE_TIME_BUFFER(), // _depositQuoteTimeBuffer
             FILL_DEADLINE_BUFFER(), // _fillDeadlineBuffer
             address(0), // _l2Usdc
@@ -59,7 +58,7 @@ contract DeployRedstoneSpokePool is Script, Test, DeploymentUtils {
         console.log("Chain ID:", info.spokeChainId);
         console.log("Hub Chain ID:", info.hubChainId);
         console.log("HubPool address:", info.hubPool);
-        console.log("WETH address:", address(weth));
+        console.log("WETH address:", weth);
         console.log("Redstone_SpokePool proxy deployed to:", result.proxy);
         console.log("Redstone_SpokePool implementation deployed to:", result.implementation);
 

script/049DeployZoraSpokePool.s.sol

@@ -5,7 +5,6 @@ import { Script } from "forge-std/Script.sol";
 import { Test } from "forge-std/Test.sol";
 import { console } from "forge-std/console.sol";
 import { Zora_SpokePool } from "../contracts/Zora_SpokePool.sol";
-import { WETH9Interface } from "../contracts/external/interfaces/WETH9Interface.sol";
 import { DeploymentUtils } from "./utils/DeploymentUtils.sol";
 
 // How to run:
@@ -25,13 +24,13 @@ contract DeployZoraSpokePool is Script, Test, DeploymentUtils {
         console.log("HubPool address:", info.hubPool);
 
         // Get the appropriate addresses for this chain
-        WETH9Interface weth = getWrappedNativeToken(info.spokeChainId);
+        address weth = getWrappedNativeToken(info.spokeChainId);
 
         vm.startBroadcast(deployerPrivateKey);
 
         // Prepare constructor arguments for Zora_SpokePool
         bytes memory constructorArgs = abi.encode(
-            address(weth), // _wrappedNativeTokenAddress
+            weth, // _wrappedNativeTokenAddress
             QUOTE_TIME_BUFFER(), // _depositQuoteTimeBuffer
             FILL_DEADLINE_BUFFER(), // _fillDeadlineBuffer
             address(0), // _l2Usdc
@@ -59,7 +58,7 @@ contract DeployZoraSpokePool is Script, Test, DeploymentUtils {
         console.log("Chain ID:", info.spokeChainId);
         console.log("Hub Chain ID:", info.hubChainId);
         console.log("HubPool address:", info.hubPool);
-        console.log("WETH address:", address(weth));
+        console.log("WETH address:", weth);
         console.log("Zora_SpokePool proxy deployed to:", result.proxy);
         console.log("Zora_SpokePool implementation deployed to:", result.implementation);
 

script/057DeployInkSpokePool.s.sol

@@ -5,7 +5,6 @@ import { Script } from "forge-std/Script.sol";
 import { Test } from "forge-std/Test.sol";
 import { console } from "forge-std/console.sol";
 import { Ink_SpokePool } from "../contracts/Ink_SpokePool.sol";
-import { WETH9Interface } from "../contracts/external/interfaces/WETH9Interface.sol";
 import { DeploymentUtils } from "./utils/DeploymentUtils.sol";
 
 // How to run:
@@ -25,13 +24,13 @@ contract DeployInkSpokePool is Script, Test, DeploymentUtils {
         console.log("HubPool address:", info.hubPool);
 
         // Get the appropriate addresses for this chain
-        WETH9Interface weth = getWrappedNativeToken(info.spokeChainId);
+        address weth = getWrappedNativeToken(info.spokeChainId);
 
         vm.startBroadcast(deployerPrivateKey);
 
         // Prepare constructor arguments for Ink_SpokePool
         bytes memory constructorArgs = abi.encode(
-            address(weth), // _wrappedNativeTokenAddress
+            weth, // _wrappedNativeTokenAddress
             QUOTE_TIME_BUFFER(), // _depositQuoteTimeBuffer
             FILL_DEADLINE_BUFFER(), // _fillDeadlineBuffer
             address(0), // _l2Usdc
@@ -59,7 +58,7 @@ contract DeployInkSpokePool is Script, Test, DeploymentUtils {
         console.log("Chain ID:", info.spokeChainId);
         console.log("Hub Chain ID:", info.hubChainId);
         console.log("HubPool address:", info.hubPool);
-        console.log("WETH address:", address(weth));
+        console.log("WETH address:", weth);
         console.log("Ink_SpokePool proxy deployed to:", result.proxy);
         console.log("Ink_SpokePool implementation deployed to:", result.implementation);