Remove simulations hardcode (#313)

* remove simulations contract hardcode * update configs * add changeset
pimlicolabs · Oct 7, 2024 · 8588fbd · 8588fbd
1 parent 50b1d9e
commit 8588fbd
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 21 deletions.
diff --git a/.changeset/tricky-news-retire.md b/.changeset/tricky-news-retire.md
@@ -0,0 +1,5 @@
+---
+"@pimlico/alto": patch
+---
+
+Improved calldata gas estimations for v0.7 userOperations
diff --git a/config.localhost.json b/config.localhost.json
@@ -11,7 +11,7 @@
     "executor-private-keys": "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80,0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d,0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a,0x7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6",
     "utility-private-key": "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
     "entrypoints": "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789,0x0000000071727De22E5E9d8BAf0edAc6f37da032",
-    "entrypoint-simulation-contract": "0x74cb5e4ee81b86e70f9045036a1c5477de69ee87",
+    "deploy-simulations-contract": true,
     "enable-debug-endpoints": true,
     "safe-mode": false,
     "mempool-max-parallel-ops": 5,

diff --git a/scripts/config.local.json b/scripts/config.local.json
@@ -10,7 +10,7 @@
     "executor-private-keys": "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
     "utility-private-key": "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
     "entrypoints": "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789,0x0000000071727De22E5E9d8BAf0edAc6f37da032",
-    "entrypoint-simulation-contract": "0xAE6035bEE0802C969265C8A3193CE8878c99A66A",
+    "entrypoint-simulation-contract": "0xf0763f1faa2cc2539ca3e5f55795cb58987c8021",
     "enable-debug-endpoints": true,
     "expiration-check": false,
     "safe-mode": false,

diff --git a/scripts/localDeployer/constants.ts b/scripts/localDeployer/constants.ts
diff --git a/scripts/localDeployer/index.ts b/scripts/localDeployer/index.ts
@@ -301,7 +301,7 @@ const main = async () => {
         "0x988C135a1049Ce61730724afD342fb7C56CD2776",
         "0x0000000071727De22E5E9d8BAf0edAc6f37da032",
         "0x91E60e0613810449d098b0b5Ec8b51A0FE8c8985",
-        "0xAE6035bEE0802C969265C8A3193CE8878c99A66A",
+        "0xf0763f1faa2cc2539ca3e5f55795cb58987c8021",
         "0x2dd68b007B46fBe91B9A7c3EDa5A7a1063cB5b47",
         "0x75cf11467937ce3F2f357CE24ffc3DBF8fD5c226",
         "0x8EcD4ec46D4D2a6B64fE960B3D64e8B94B2234eb",

diff --git a/src/cli/handler.ts b/src/cli/handler.ts
@@ -157,16 +157,6 @@ export async function bundlerHandler(args: IOptionsInput): Promise<void> {
         parsedArgs["entrypoint-simulation-contract"] = simulationsContract
     }
 
-    // TODO: THIS IS TEMPORARY, REMOVE AFTER THIS PR IS DEPLOYED + ENV VARS ARE SET
-    parsedArgs["entrypoint-simulation-contract"] =
-        "0xAE6035bEE0802C969265C8A3193CE8878c99A66A"
-
-    if (chainId === 19411) {
-        // geo-testnet
-        parsedArgs["entrypoint-simulation-contract"] =
-            "0x98F36cDFCE8cF2AB75d8E164b99060f9e41775Dd"
-    }
-
     const gasPriceManager = new GasPriceManager(
         chain,
         client,

diff --git a/src/types/contracts/PimlicoEntryPointSimulations.ts b/src/types/contracts/PimlicoEntryPointSimulations.ts
diff --git a/test/e2e/alto-config.json b/test/e2e/alto-config.json
@@ -4,7 +4,7 @@
     "enable-debug-endpoints": true,
     "entrypoints": "0x5ff137d4b0fdcd49dca30c7cf57e578a026d2789,0x0000000071727De22E5E9d8BAf0edAc6f37da032",
     "balance-override-enabled": "true",
-    "entrypoint-simulation-contract": "0xAE6035bEE0802C969265C8A3193CE8878c99A66A",
+    "entrypoint-simulation-contract": "0xf0763f1faa2cc2539ca3e5f55795cb58987c8021",
     "api-version": "v1,v2",
     "rpc-url": "http://anvil:8545",
     "min-balance": "0",
@@ -19,7 +19,6 @@
     "public-client-log-level": "error",
     "wallet-client-log-level": "error",
     "polling-interval": 100,
-    "network-name": "0.0.0.0",
     "mempool-max-parallel-ops": 10,
     "mempool-max-queued-ops": 10,
     "enforce-unique-senders-per-bundle": false,

diff --git a/test/e2e/deploy-contracts/constants.ts b/test/e2e/deploy-contracts/constants.ts
diff --git a/test/e2e/deploy-contracts/index.ts b/test/e2e/deploy-contracts/index.ts
@@ -223,7 +223,7 @@ const main = async () => {
         "0x4e59b44847b379578588920ca78fbf26c0b4956c",
         "0x0000000071727De22E5E9d8BAf0edAc6f37da032",
         "0x91E60e0613810449d098b0b5Ec8b51A0FE8c8985",
-        "0xAE6035bEE0802C969265C8A3193CE8878c99A66A", // 0.7 Simulations Contract
+        "0xf0763f1faa2cc2539ca3e5f55795cb58987c8021", // 0.7 Simulations Contract
         BUNDLE_BULKER_ADDRESS,
         PER_OP_INFLATOR_ADDRESS,
         SIMPLE_INFLATOR_ADDRESS