feat: Adding packages via npm, instead of foundry;

configs/offline/baseline.toml

@@ -1,10 +1,10 @@
 chain-id = "31337" # Anvil local chain
 base-tokens = [
-    "0xb3af08c783c4d9c380893257980b5e26657f2317", # WETH (auto-generated from deployment)
-    "0xb12812c0cad46d18b669b31059d485fe90b1a839", # DAI (auto-generated from deployment)
-    "0xb04afbcd351a0a7e4ff658b3772ee5f3f5b6e4ae", # USDC (auto-generated from deployment)
-    "0x171a30524fd943df1a12cbb9da291bf4e34ac84b", # USDT (auto-generated from deployment)
-    "0x51a53858a4a8b81814da35c4604eb9003d56a895", # GNO (auto-generated from deployment)
+    "0x786cab982f69a055a9d08ac2e3e9a8c3c9ec184a", # WETH (auto-generated from deployment)
+    "0x470c43112b93f96980b3100034852b5187c81a4a", # DAI (auto-generated from deployment)
+    "0x2195f5c2dc29235c4f79c671f84a616f17eddd17", # USDC (auto-generated from deployment)
+    "0xf933c090bd235d2b54642c2ad78d36b168386d09", # USDT (auto-generated from deployment)
+    "0x7e347942bece146555998242624a27e0cfb12c8d", # GNO (auto-generated from deployment)
 ]
 max-hops = 2
 max-partial-attempts = 5

configs/offline/driver.toml

@@ -17,21 +17,21 @@ gas-price-cap = "1000000000000"
 mempool = "public"
 
 [contracts]
-gp-v2-settlement = "0x5113d53be0167ad02f9db0e415e210f11a6cb2ba"
-weth = "0xb3af08c783c4d9c380893257980b5e26657f2317"
-balances = "0x25106ea0c291520c2888cecf5154eec057602191"
-signatures = "0xca8afa27a121c57ec9c8317551a11bead55dbc19"
+gp-v2-settlement = "0x2a45e345a42ce34a0138386a6df25b9e6d922874"
+weth = "0x786cab982f69a055a9d08ac2e3e9a8c3c9ec184a"
+balances = "0xa31e8d1ec61607e6fd0ed8dff62f4dbd7928b434"
+signatures = "0xcd573d563d6c2618b997dd26eeec4a6d5bf1977b"
 
 [liquidity]
 base-tokens = [
-    "0xb3af08c783c4d9c380893257980b5e26657f2317", # WETH (auto-generated from deployment)
-    "0xb12812c0cad46d18b669b31059d485fe90b1a839", # DAI (auto-generated from deployment)
-    "0xb04afbcd351a0a7e4ff658b3772ee5f3f5b6e4ae", # USDC (auto-generated from deployment)
-    "0x171a30524fd943df1a12cbb9da291bf4e34ac84b", # USDT (auto-generated from deployment)
-    "0x51a53858a4a8b81814da35c4604eb9003d56a895", # GNO (auto-generated from deployment)
+    "0x786cab982f69a055a9d08ac2e3e9a8c3c9ec184a", # WETH (auto-generated from deployment)
+    "0x470c43112b93f96980b3100034852b5187c81a4a", # DAI (auto-generated from deployment)
+    "0x2195f5c2dc29235c4f79c671f84a616f17eddd17", # USDC (auto-generated from deployment)
+    "0xf933c090bd235d2b54642c2ad78d36b168386d09", # USDT (auto-generated from deployment)
+    "0x7e347942bece146555998242624a27e0cfb12c8d", # GNO (auto-generated from deployment)
 ]
 
 [[liquidity.uniswap-v2]] # Uniswap V2 configuration (auto-generated from deployment)
-router = "0x6c2014489c8479a8a36be65e3ccad07fa3cec029"
-pool-code = "0xb6912aa8f91da604bdd903b3484a9f6bb569baa993085fc590133487ff27f91e" # Uniswap V2 init code hash
+router = "0x6895c6e3ec54cc78d6ab8dc0a6f6d275f3dffc06"
+pool-code = "0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f" # Uniswap V2 init code hash
 missing-pool-cache-time = "1h"

playground/.env.offline

@@ -1,27 +1,28 @@
 # Auto-generated by deploy-all.sh
-# Generated at: 1763768150
+# Generated at: 1764168852
 
 # Network Configuration
 CHAIN_ID=31337
 NODE_URL=http://chain:8545
 SIMULATION_NODE_URL=http://chain:8545
 
 # Token Addresses (from deployment)
-WETH_ADDRESS=0xb3af08c783c4d9c380893257980b5e26657f2317
-DAI_ADDRESS=0xb12812c0cad46d18b669b31059d485fe90b1a839
-USDC_ADDRESS=0xb04afbcd351a0a7e4ff658b3772ee5f3f5b6e4ae
-USDT_ADDRESS=0x171a30524fd943df1a12cbb9da291bf4e34ac84b
-GNO_ADDRESS=0x51a53858a4a8b81814da35c4604eb9003d56a895
-NATIVE_TOKEN_ADDRESS=0xb3af08c783c4d9c380893257980b5e26657f2317
+WETH_ADDRESS=0x786cab982f69a055a9d08ac2e3e9a8c3c9ec184a
+DAI_ADDRESS=0x470c43112b93f96980b3100034852b5187c81a4a
+USDC_ADDRESS=0x2195f5c2dc29235c4f79c671f84a616f17eddd17
+USDT_ADDRESS=0xf933c090bd235d2b54642c2ad78d36b168386d09
+GNO_ADDRESS=0x7e347942bece146555998242624a27e0cfb12c8d
+NATIVE_TOKEN_ADDRESS=0x786cab982f69a055a9d08ac2e3e9a8c3c9ec184a
 
 # Uniswap V2 Addresses (from deployment)
-UNISWAP_V2_FACTORY_ADDRESS=0x7fb9dcdea3bec40d02e25ae230a64d7e8ddaa304
-UNISWAP_V2_ROUTER_ADDRESS=0x6c2014489c8479a8a36be65e3ccad07fa3cec029
+UNISWAP_V2_FACTORY_ADDRESS=0x51a5ea12b7e61c14bf3026e5b89be587af31f8a3
+UNISWAP_V2_ROUTER_ADDRESS=0x6895c6e3ec54cc78d6ab8dc0a6f6d275f3dffc06
 
 # CoW Protocol Addresses (from deployment)
-SETTLEMENT_CONTRACT_ADDRESS=0x5113d53be0167ad02f9db0e415e210f11a6cb2ba
-AUTHENTICATOR_ADDRESS=0x5fe5f7f937b63189bd0d33d78b264d4608973c8c
-VAULT_RELAYER_ADDRESS=1b683f6f3015913cff36b5d789080e0890a8ab94
-BALANCER_VAULT_ADDRESS=0xf30858ad95986bd3986529291e59d53a369e9700
-BALANCES_CONTRACT_ADDRESS=0x25106ea0c291520c2888cecf5154eec057602191
-SIGNATURES_CONTRACT_ADDRESS=0xca8afa27a121c57ec9c8317551a11bead55dbc19
+SETTLEMENT_CONTRACT_ADDRESS=0x2a45e345a42ce34a0138386a6df25b9e6d922874
+AUTHENTICATOR_ADDRESS=0x667e3f15f5bdf6634b6e454c2d8391bd25b94480
+VAULT_RELAYER_ADDRESS=3df7e9a903b96a556ef2bd0710dcf48c707601b7
+BALANCER_VAULT_ADDRESS=0xc488ceac619c76ee1fe3a7357884b0d5a8143256
+BALANCES_CONTRACT_ADDRESS=0xa31e8d1ec61607e6fd0ed8dff62f4dbd7928b434
+SIGNATURES_CONTRACT_ADDRESS=0xcd573d563d6c2618b997dd26eeec4a6d5bf1977b
+HOOKS_TRAMPOLINE_ADDRESS=0xc2fcb053b186405f9ef786f3c5c773e8d71183c0

playground/offline-mode/.gitignore

@@ -8,6 +8,7 @@ contracts/broadcast/
 contracts/lib/
 contracts/out-cow-protocol
 contracts/out-uniswap-v2
+contracts/out-uniswap-v2-periphery
 
 # State files (keep initial, ignore runtime)
 state/backups/
@@ -31,4 +32,7 @@ tmp/
 temp/
 
 cache/
-broadcast/
+broadcast/
+
+#Node modules
+node_modules/

playground/offline-mode/config/addresses.json

@@ -1,32 +1,33 @@
 {
   "chainId": "31337",
   "tokens": {
-    "WETH": "0xB3AF08c783C4D9c380893257980b5E26657F2317",
-    "USDC": "0xb04AfbCD351A0a7e4fF658b3772eE5f3F5b6e4AE",
-    "DAI": "0xB12812C0CAD46D18b669B31059D485fE90B1A839",
-    "USDT": "0x171a30524Fd943Df1a12CbB9da291bf4E34Ac84b",
-    "GNO": "0x51A53858A4a8b81814Da35C4604eB9003D56a895"
+    "WETH": "0x786CAb982f69A055A9d08AC2e3E9A8C3C9Ec184a",
+    "USDC": "0x2195f5C2dc29235C4F79c671F84A616F17EDdd17",
+    "DAI": "0x470c43112b93f96980b3100034852b5187C81A4A",
+    "USDT": "0xF933C090bd235d2B54642c2aD78d36B168386d09",
+    "GNO": "0x7e347942BecE146555998242624A27e0Cfb12C8D"
   },
   "uniswapV2": {
-    "factory": "0x7fB9DCDea3BEc40d02e25AE230A64d7e8DdaA304",
-    "router": "0x6c2014489C8479a8A36bE65e3ccAd07Fa3Cec029",
+    "factory": "0x51a5ea12B7E61c14BF3026e5B89Be587af31F8a3",
+    "router": "0x6895C6E3EC54cc78D6ab8dc0A6F6D275f3dFfc06",
     "pairs": {
-      "WETH-USDC": "0x4a77eB944F3dDC5669D2BbE7dbF9dcbDA45Ab05e",
-      "WETH-DAI": "0x8558Fc228Bb9Fa5f24A8fbEE76b7044DeA8b92B9",
-      "WETH-USDT": "0xbf88a9B221dC5f93545FbaFa9b21199943380dd7",
-      "WETH-GNO": "0xFB7b2868Afa489Bcba909678AaD0A39386C7b4c9",
-      "USDC-DAI": "0x945a1afA368781DF3BDa23D13e88ff0904981049",
-      "USDC-USDT": "0x59c536486C96b046547e2D76c45f4867Ba0f6659",
-      "USDC-GNO": "0x12D1eBB852912a2C1715dA1dB4d21A7e867F6A34",
-      "DAI-USDT": "0xf2e737f8328faede847E2Ccf9A5E3Dc4E54fC5EB",
-      "DAI-GNO": "0xE60D514D0aE6E40f2D8366E81e7838b96aee2B6d",
-      "USDT-GNO": "0x4a8c7645a1423a6553969fcCdB0377F848D016aF"
+      "WETH-USDC": "0x29DFde24Da69D50030E4d70bfF2DA81F8944d228",
+      "WETH-DAI": "0x8799b65Cd81a69Aa5C83FE595aD062a2b5B98f7c",
+      "WETH-USDT": "0xAc973837d6B3D3b00eF7A794526aF343f7AadC43",
+      "WETH-GNO": "0x8592C488f6F886fa61297134F07d3B71B0DD88b6",
+      "USDC-DAI": "0xe92a0E180F7AA705966c54A90Bd2e75b4D9097Ae",
+      "USDC-USDT": "0x5Ff051d3c09a0DeEe31d13e9BAEAf94755F97EB0",
+      "USDC-GNO": "0x69D619eD34C90D3b69F21bEFE23f2652E17DeDDf",
+      "DAI-USDT": "0x47B1c32809d8CAdDa443D35880E3189201B71957",
+      "DAI-GNO": "0x8f33B62Ef3286837A0c95e8566018b311984c374",
+      "USDT-GNO": "0x2Fc25e5Bc404d553b377dE6a2a691349dEdBA791"
     }
   },
   "cowProtocol": {
-    "settlement": "0x5113d53be0167ad02f9db0E415e210F11a6cB2bA",
-    "authenticator": "0x5fe5f7F937b63189BD0D33D78B264d4608973C8C",
-    "vaultRelayer": "0x1B683f6F3015913CFf36b5d789080e0890A8ab94",
-    "balancerVault": "0xf30858AD95986bD3986529291E59D53a369E9700"
+    "settlement": "0x2a45e345A42CE34A0138386a6df25b9E6d922874",
+    "authenticator": "0x667e3f15f5bDf6634b6E454c2d8391Bd25B94480",
+    "vaultRelayer": "0x3df7E9a903B96a556ef2BD0710DcF48c707601B7",
+    "balancerVault": "0xC488CeAc619c76Ee1FE3A7357884b0D5A8143256",
+    "hooksTrampoline": "0xC2fcB053B186405F9ef786F3c5c773e8D71183C0"
   }
 }

playground/offline-mode/foundry.toml

@@ -1,7 +1,7 @@
 [profile.default]
 src = "contracts/src"
 out = "contracts/out"
-libs = ["contracts/lib"]
+libs = ["node_modules", "contracts/lib"]
 test = "contracts/test"
 script = "contracts/script"
 
@@ -20,12 +20,15 @@ evm_version = "cancun"
 
 # Remappings
 remappings = [
-    "@openzeppelin/=contracts/lib/openzeppelin-contracts/",
-    "@cowprotocol/=contracts/lib/cow-protocol/src/contracts/",
-    "@uniswap/v2-core/=contracts/lib/v2-core/",
-    "@uniswap/v2-periphery/=contracts/lib/v2-periphery/",
-    "solmate/=contracts/lib/solmate/src/",
-    "forge-std/=contracts/lib/forge-std/src/"
+    "@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/",
+    "@openzeppelin/contracts-old/=node_modules/@openzeppelin/contracts-old/",
+    "@cowprotocol/contracts/=node_modules/@cowprotocol/contracts/src/contracts/",
+    "@cowprotocol/hooks-trampoline/=node_modules/@cowprotocol/hooks-trampoline/src/",
+    "@uniswap/v2-core/=node_modules/@uniswap/v2-core/",
+    "@uniswap/v2-periphery/=node_modules/@uniswap/v2-periphery/",
+    "@uniswap/lib/=node_modules/@uniswap/lib/",
+    "solmate/=node_modules/solmate/src/",
+    "forge-std/=node_modules/forge-std/src/"
 ]
 
 # Test settings
@@ -40,9 +43,7 @@ fs_permissions = [
     { access = "read", path = "./contracts/out-uniswap-v2" },
     { access = "read", path = "./contracts/out-uniswap-v2-periphery" },
     { access = "read", path = "./contracts/out-cow-protocol" },
-    { access = "read", path = "./out-uniswap-v2" },
-    { access = "read", path = "./out-uniswap-v2-periphery" },
-    { access = "read", path = "./out-cow-protocol" }
+    { access = "read", path = "./node_modules" }
 ]
 
 # RPC
@@ -54,11 +55,11 @@ localhost = "http://localhost:8545"
 
 # Profile for Uniswap V2 contracts (Solidity 0.5.16)
 [profile.uniswap-v2]
-src = "contracts/lib/v2-core/contracts"
+src = "node_modules/@uniswap/v2-core/contracts"
 out = "contracts/out-uniswap-v2"
-libs = ["contracts/lib/v2-core", "contracts/lib/v2-periphery"]
-script = "contracts/lib/v2-core/contracts"
-test = "contracts/lib/v2-core/test"
+libs = ["node_modules"]
+script = "node_modules/@uniswap/v2-core/contracts"
+test = "node_modules/@uniswap/v2-core/test"
 solc_version = "0.5.16"
 optimizer = true
 optimizer_runs = 999999
@@ -67,27 +68,27 @@ ignored_error_codes = [5159]
 
 # Profile for Uniswap V2 Periphery (Solidity 0.6.6)
 [profile.uniswap-v2-periphery]
-src = "contracts/lib/v2-periphery/contracts"
+src = "node_modules/@uniswap/v2-periphery/contracts"
 out = "contracts/out-uniswap-v2-periphery"
-libs = ["contracts/lib/v2-core", "contracts/lib/v2-periphery", "contracts/lib/solidity-lib"]
-script = "contracts/lib/v2-periphery/contracts"
-test = "contracts/lib/v2-periphery/test"
+libs = ["node_modules"]
+script = "node_modules/@uniswap/v2-periphery/contracts"
+test = "node_modules/@uniswap/v2-periphery/test"
 solc_version = "0.6.6"
 optimizer = true
 optimizer_runs = 999999
 evm_version = "istanbul"
 ignored_error_codes = [5159]
 remappings = [
-    "@uniswap/lib/=contracts/lib/solidity-lib/",
-    "@uniswap/v2-core/=contracts/lib/v2-core/"
+    "@uniswap/lib/=node_modules/@uniswap/lib/",
+    "@uniswap/v2-core/=node_modules/@uniswap/v2-core/"
 ]
 
 # Profile for CoW Protocol (Solidity 0.7.6)
 [profile.cow-protocol]
-src = "contracts/lib/cow-protocol/src/contracts"
+src = "node_modules/@cowprotocol/contracts/src/contracts"
 out = "contracts/out-cow-protocol"
-libs = []
-script = "contracts/lib/cow-protocol/src/contracts"
+libs = ["node_modules"]
+script = "node_modules/@cowprotocol/contracts/src/contracts"
 # Don't compile tests, only production contracts
 test = "contracts/test"
 solc_version = "0.7.6"
@@ -96,3 +97,6 @@ optimizer_runs = 1000000
 via_ir = false
 evm_version = "istanbul"
 ignored_error_codes = [5159]
+remappings = [
+    "@openzeppelin/contracts/=node_modules/@openzeppelin/contracts-old/"
+]