Forge update

.env.example

@@ -1,36 +1,31 @@
-# Wallet Configuration
-
+# EOA Configuration
 PRIVATE_KEY="YOUR_PRIVATE_KEY"
 MNEMONIC="YOUR_MNEMONIC"
-EOA_INDEX=0 # optional (default to 0)
+EOA_INDEX=0 # Optional default to 0
 
 # Deployment Configuration
-
-CHAINS="ethereum,arbitrum,base,optimism,polygon"
-SALT="0x0000000000000000000000000000000000000000000000000000000000000000"
+SALT="" # Optional default to bytes32(0)
 
 # Etherscan Configuration
-
 ETHERSCAN_API_KEY="YOUR_ETHERSCAN_API_KEY"
 
 # RPC Provider Configuration (using Alchemy)
-
 RPC_API_KEY="YOUR_ALCHEMY_API_KEY"
 
-ETHEREUM_RPC_URL="https://eth-mainnet.g.alchemy.com/v2/${RPC_API_KEY}"
+MAINNET_RPC_URL="https://eth-mainnet.g.alchemy.com/v2/${RPC_API_KEY}"
 SEPOLIA_RPC_URL="https://eth-sepolia.g.alchemy.com/v2/${RPC_API_KEY}"
 
 OPTIMISM_RPC_URL="https://opt-mainnet.g.alchemy.com/v2/${RPC_API_KEY}"
 OPTIMISM_SEPOLIA_RPC_URL="https://opt-sepolia.g.alchemy.com/v2/${RPC_API_KEY}"
 
-BNB_RPC_URL="https://bnb-mainnet.g.alchemy.com/v2//${RPC_API_KEY}"
-BNB_TESTNET_RPC_URL="https://bnb-testnet.g.alchemy.com/v2/${RPC_API_KEY}"
+BSC_RPC_URL="https://bnb-mainnet.g.alchemy.com/v2//${RPC_API_KEY}"
+BSC_TESTNET_RPC_URL="https://bnb-testnet.g.alchemy.com/v2/${RPC_API_KEY}"
 
 UNICHAIN_RPC_URL="https://unichain-mainnet.g.alchemy.com/v2/${RPC_API_KEY}"
 UNICHAIN_SEPOLIA_RPC_URL="https://unichain-sepolia.g.alchemy.com/v2/${RPC_API_KEY}"
 
 POLYGON_RPC_URL="https://polygon-mainnet.g.alchemy.com/v2/${RPC_API_KEY}"
-POLYGON_AMOY_RPC_URL="https://polygon-amoy.g.alchemy.com/v2/${RPC_API_KEY}"
+AMOY_RPC_URL="https://polygon-amoy.g.alchemy.com/v2/${RPC_API_KEY}"
 
 BASE_RPC_URL="https://base-mainnet.g.alchemy.com/v2/${RPC_API_KEY}"
 BASE_SEPOLIA_RPC_URL="https://base-sepolia.g.alchemy.com/v2/${RPC_API_KEY}"
@@ -39,32 +34,31 @@ ARBITRUM_RPC_URL="https://arb-mainnet.g.alchemy.com/v2/${RPC_API_KEY}"
 ARBITRUM_SEPOLIA_RPC_URL="https://arb-sepolia.g.alchemy.com/v2/${RPC_API_KEY}"
 
 AVALANCHE_RPC_URL="https://avax-mainnet.g.alchemy.com/v2/${RPC_API_KEY}"
-AVALANCHE_FUJI_RPC_URL="https://avax-fuji.g.alchemy.com/v2/${RPC_API_KEY}"
-
-SCROLL_RPC_URL="https://scroll-mainnet.g.alchemy.com/v2/${RPC_API_KEY}"
-SCROLL_SEPOLIA_RPC_URL="https://scroll-sepolia.g.alchemy.com/v2/${RPC_API_KEY}"
+FUJI_RPC_URL="https://avax-fuji.g.alchemy.com/v2/${RPC_API_KEY}"
 
 LINEA_RPC_URL="https://linea-mainnet.g.alchemy.com/v2/${RPC_API_KEY}"
 LINEA_SEPOLIA_RPC_URL="https://linea-sepolia.g.alchemy.com/v2/${RPC_API_KEY}"
 
-# RPC Provider Configuration (using Infura)
+SCROLL_RPC_URL="https://scroll-mainnet.g.alchemy.com/v2/${RPC_API_KEY}"
+SCROLL_SEPOLIA_RPC_URL="https://scroll-sepolia.g.alchemy.com/v2/${RPC_API_KEY}"
 
+# RPC Provider Configuration (using Infura)
 RPC_API_KEY="YOUR_INFURA_API_KEY"
 
-ETHEREUM_RPC_URL="https://mainnet.infura.io/v3/${RPC_API_KEY}"
+MAINNET_RPC_URL="https://mainnet.infura.io/v3/${RPC_API_KEY}"
 SEPOLIA_RPC_URL="https://sepolia.infura.io/v3/${RPC_API_KEY}"
 
 OPTIMISM_RPC_URL="https://optimism-mainnet.infura.io/v3/${RPC_API_KEY}"
 OPTIMISM_SEPOLIA_RPC_URL="https://optimism-sepolia.infura.io/v3/${RPC_API_KEY}"
 
-BNB_RPC_URL="https://bsc-mainnet.infura.io/v3/${RPC_API_KEY}"
-BNB_TESTNET_RPC_URL="https://bsc-testnet.infura.io/v3/${RPC_API_KEY}"
+BSC_RPC_URL="https://bsc-mainnet.infura.io/v3/${RPC_API_KEY}"
+BSC_TESTNET_RPC_URL="https://bsc-testnet.infura.io/v3/${RPC_API_KEY}"
 
 UNICHAIN_RPC_URL="https://unichain-mainnet.infura.io/v3/${RPC_API_KEY}"
 UNICHAIN_SEPOLIA_RPC_URL="https://unichain-sepolia.infura.io/v3/${RPC_API_KEY}"
 
 POLYGON_RPC_URL="https://polygon-mainnet.infura.io/v3/${RPC_API_KEY}"
-POLYGON_AMOY_RPC_URL="https://polygon-amoy.infura.io/v3/${RPC_API_KEY}"
+AMOY_RPC_URL="https://polygon-amoy.infura.io/v3/${RPC_API_KEY}"
 
 BASE_RPC_URL="https://base-mainnet.infura.io/v3/${RPC_API_KEY}"
 BASE_SEPOLIA_RPC_URL="https://base-sepolia.infura.io/v3/${RPC_API_KEY}"
@@ -73,10 +67,10 @@ ARBITRUM_RPC_URL="https://arbitrum-mainnet.infura.io/v3/${RPC_API_KEY}"
 ARBITRUM_SEPOLIA_RPC_URL="https://arbitrum-sepolia.infura.io/v3/${RPC_API_KEY}"
 
 AVALANCHE_RPC_URL="https://avalanche-mainnet.infura.io/v3/${RPC_API_KEY}"
-AVALANCHE_FUJI_RPC_URL="https://avalanche-fuji.infura.io/v3/${RPC_API_KEY}"
-
-SCROLL_RPC_URL="https://scroll-mainnet.infura.io/v3/${RPC_API_KEY}"
-SCROLL_SEPOLIA_RPC_URL="https://scroll-sepolia.infura.io/v3/${RPC_API_KEY}"
+FUJI_RPC_URL="https://avalanche-fuji.infura.io/v3/${RPC_API_KEY}"
 
 LINEA_RPC_URL="https://linea-mainnet.infura.io/v3/${RPC_API_KEY}"
 LINEA_SEPOLIA_RPC_URL="https://linea-sepolia.infura.io/v3/${RPC_API_KEY}"
+
+SCROLL_RPC_URL="https://scroll-mainnet.infura.io/v3/${RPC_API_KEY}"
+SCROLL_SEPOLIA_RPC_URL="https://scroll-sepolia.infura.io/v3/${RPC_API_KEY}"

.github/workflows/test.yml

@@ -36,17 +36,17 @@ jobs:
 
       - name: Run Forge tests
         env:
-          ETHEREUM_RPC_URL: ${{ secrets.ETHEREUM_RPC_URL }}
+          MAINNET_RPC_URL: ${{ secrets.MAINNET_RPC_URL }}
           OPTIMISM_RPC_URL: ${{ secrets.OPTIMISM_RPC_URL }}
-          BNB_RPC_URL: ${{ secrets.BNB_RPC_URL }}
+          BSC_RPC_URL: ${{ secrets.BSC_RPC_URL }}
           UNICHAIN_RPC_URL: ${{ secrets.UNICHAIN_RPC_URL }}
           POLYGON_RPC_URL: ${{ secrets.POLYGON_RPC_URL }}
           FANTOM_RPC_URL: ${{ secrets.FANTOM_RPC_URL }}
           BASE_RPC_URL: ${{ secrets.BASE_RPC_URL }}
           ARBITRUM_RPC_URL: ${{ secrets.ARBITRUM_RPC_URL }}
           AVALANCHE_RPC_URL: ${{ secrets.AVALANCHE_RPC_URL }}
-          SCROLL_RPC_URL: ${{ secrets.SCROLL_RPC_URL }}
           LINEA_RPC_URL: ${{ secrets.LINEA_RPC_URL }}
+          SCROLL_RPC_URL: ${{ secrets.SCROLL_RPC_URL }}
         run: |
           forge test -vvv
         id: test

.prettierignore

@@ -1,5 +1,4 @@
 .github/
-foundry.toml
-out/
+cache/
 lib/
-cache/
+out/

.prettierrc.json

@@ -12,7 +12,7 @@
 			}
 		},
 		{
-			"files": "*.json",
+			"files": ["*.json", "*.js", "*.ts"],
 			"options": {
 				"useTabs": true,
 				"bracketSpacing": true

README.md

@@ -59,7 +59,7 @@ forge test --gas-report
 ### Deploy
 
 ```bash
-forge script script/Deploy.s.sol \
+forge script script/Deploy.s.sol:DeployScript \
     --broadcast \
     --multi \
     --slow \

config/deployments.toml

@@ -0,0 +1,119 @@
+[mainnet]
+endpoint_url = "${MAINNET_RPC_URL}"
+
+[mainnet.bool]
+is_testnet = false
+
+[sepolia]
+endpoint_url = "${SEPOLIA_RPC_URL}"
+
+[sepolia.bool]
+is_testnet = true
+
+[optimism]
+endpoint_url = "${OPTIMISM_RPC_URL}"
+
+[optimism.bool]
+is_testnet = false
+
+[optimism-sepolia]
+endpoint_url = "${OPTIMISM_SEPOLIA_RPC_URL}"
+
+[optimism-sepolia.bool]
+is_testnet = true
+
+[bsc]
+endpoint_url = "${BSC_RPC_URL}"
+
+[bsc.bool]
+is_testnet = false
+
+[bsc-testnet]
+endpoint_url = "${BSC_TESTNET_RPC_URL}"
+
+[bsc-testnet.bool]
+is_testnet = true
+
+[unichain]
+endpoint_url = "${UNICHAIN_RPC_URL}"
+
+[unichain.bool]
+is_testnet = false
+
+[unichain-sepolia]
+endpoint_url = "${UNICHAIN_SEPOLIA_RPC_URL}"
+
+[unichain-sepolia.bool]
+is_testnet = true
+
+[polygon]
+endpoint_url = "${POLYGON_RPC_URL}"
+
+[polygon.bool]
+is_testnet = false
+
+[amoy]
+endpoint_url = "${AMOY_RPC_URL}"
+
+[amoy.bool]
+is_testnet = true
+
+[base]
+endpoint_url = "${BASE_RPC_URL}"
+
+[base.bool]
+is_testnet = false
+
+[base-sepolia]
+endpoint_url = "${BASE_SEPOLIA_RPC_URL}"
+
+[base-sepolia.bool]
+is_testnet = true
+
+[arbitrum]
+endpoint_url = "${ARBITRUM_RPC_URL}"
+
+[arbitrum.bool]
+is_testnet = false
+
+[arbitrum-sepolia]
+endpoint_url = "${ARBITRUM_SEPOLIA_RPC_URL}"
+
+[arbitrum-sepolia.bool]
+is_testnet = true
+
+[avalanche]
+endpoint_url = "${AVALANCHE_RPC_URL}"
+
+[avalanche.bool]
+is_testnet = false
+
+[fuji]
+endpoint_url = "${FUJI_RPC_URL}"
+
+[fuji.bool]
+is_testnet = true
+
+[linea]
+endpoint_url = "${LINEA_RPC_URL}"
+
+[linea.bool]
+is_testnet = false
+
+[linea-sepolia]
+endpoint_url = "${LINEA_SEPOLIA_RPC_URL}"
+
+[linea-sepolia.bool]
+is_testnet = true
+
+[scroll]
+endpoint_url = "${SCROLL_RPC_URL}"
+
+[scroll.bool]
+is_testnet = false
+
+[scroll-sepolia]
+endpoint_url = "${SCROLL_SEPOLIA_RPC_URL}"
+
+[scroll-sepolia.bool]
+is_testnet = true

config/test.toml

@@ -0,0 +1,29 @@
+[mainnet]
+endpoint_url = "${MAINNET_RPC_URL}"
+
+[optimism]
+endpoint_url = "${OPTIMISM_RPC_URL}"
+
+[bsc]
+endpoint_url = "${BSC_RPC_URL}"
+
+[unichain]
+endpoint_url = "${UNICHAIN_RPC_URL}"
+
+[polygon]
+endpoint_url = "${POLYGON_RPC_URL}"
+
+[base]
+endpoint_url = "${BASE_RPC_URL}"
+
+[arbitrum]
+endpoint_url = "${ARBITRUM_RPC_URL}"
+
+[avalanche]
+endpoint_url = "${AVALANCHE_RPC_URL}"
+
+[linea]
+endpoint_url = "${LINEA_RPC_URL}"
+
+[scroll]
+endpoint_url = "${SCROLL_RPC_URL}"

foundry.lock

@@ -0,0 +1,8 @@
+{
+  "lib/forge-std": {
+    "tag": {
+      "name": "v1.11.0",
+      "rev": "8e40513d678f392f398620b3ef2b418648b33e89"
+    }
+  }
+}