@pimlico/alto 0.0.0-main.20251205T161640 → 0.0.0-main.20260101T134812

package/esm/cli/deploySimulationsContract.js

@@ -5,6 +5,9 @@ import entrypointSimulationsJsonV7 from "../contracts/EntryPointSimulations.sol/
 import entrypointSimulationsJsonV8 from "../contracts/EntryPointSimulations.sol/EntryPointSimulations08.json" with {
     type: "json"
 };
+import entrypointSimulationsJsonV9 from "../contracts/EntryPointSimulations.sol/EntryPointSimulations09.json" with {
+    type: "json"
+};
 import pimlicoSimulationsJson from "../contracts/PimlicoSimulations.sol/PimlicoSimulations.json" with {
     type: "json"
 };
@@ -39,10 +42,17 @@ export const deploySimulationsContract = async ({ logger, args, publicClient })
         salt,
         from: args.deterministicDeployerAddress
     });
-    const [isPimlicoDeployed, isDeployedV7, isDeployedV8, isDeterministicDeployerDeployed] = await Promise.all([
+    const epSimulationsV9 = getContractAddress({
+        opcode: "CREATE2",
+        bytecode: entrypointSimulationsJsonV9.bytecode.object,
+        salt,
+        from: args.deterministicDeployerAddress
+    });
+    const [isPimlicoDeployed, isDeployedV7, isDeployedV8, isDeployedV9, isDeterministicDeployerDeployed] = await Promise.all([
         isContractDeployed({ publicClient, address: pimlicoSimulations }),
         isContractDeployed({ publicClient, address: epSimulationsV7 }),
         isContractDeployed({ publicClient, address: epSimulationsV8 }),
+        isContractDeployed({ publicClient, address: epSimulationsV9 }),
         isContractDeployed({
             publicClient,
             address: args.deterministicDeployerAddress
@@ -50,12 +60,14 @@ export const deploySimulationsContract = async ({ logger, args, publicClient })
     ]);
     if (isDeployedV7 &&
         isDeployedV8 &&
+        isDeployedV9 &&
         isPimlicoDeployed &&
         isDeterministicDeployerDeployed) {
         return {
             pimlicoSimulationContract: pimlicoSimulations,
             entrypointSimulationContractV7: epSimulationsV7,
-            entrypointSimulationContractV8: epSimulationsV8
+            entrypointSimulationContractV8: epSimulationsV8,
+            entrypointSimulationContractV9: epSimulationsV9
         };
     }
     const walletClient = createWalletClient({
@@ -119,19 +131,43 @@ export const deploySimulationsContract = async ({ logger, args, publicClient })
             logger.error("Failed to deploy simulationsContract V8");
         }
     }
+    if (!isDeployedV9) {
+        try {
+            const deployHash = await walletClient.sendTransaction({
+                chain: publicClient.chain,
+                to: args.deterministicDeployerAddress,
+                data: concat([
+                    salt,
+                    entrypointSimulationsJsonV9.bytecode.object
+                ])
+            });
+            await publicClient.waitForTransactionReceipt({
+                hash: deployHash
+            });
+        }
+        catch {
+            logger.error("Failed to deploy simulationsContract V9");
+        }
+    }
     const deployStatus = await Promise.all([
         isContractDeployed({ publicClient, address: pimlicoSimulations }),
         isContractDeployed({ publicClient, address: epSimulationsV7 }),
-        isContractDeployed({ publicClient, address: epSimulationsV8 })
+        isContractDeployed({ publicClient, address: epSimulationsV8 }),
+        isContractDeployed({ publicClient, address: epSimulationsV9 })
     ]);
     // EntryPointSimulationsV8 is optional as not all chains support cancun.
-    if (!deployStatus[1]) {
-        logger.error("Failed to deploy simulationsContract V8");
+    if (!deployStatus[2]) {
+        logger.error("Failed to deploy simulationsContract 0.7");
+    }
+    // EntryPointSimulationsV8 is optional as not all chains support cancun.
+    if (!deployStatus[3]) {
+        logger.error("Failed to deploy simulationsContract 0.9");
     }
     if (deployStatus[0]) {
         return {
             entrypointSimulationContractV7: epSimulationsV7,
             entrypointSimulationContractV8: epSimulationsV8,
+            entrypointSimulationContractV9: epSimulationsV9,
             pimlicoSimulationContract: pimlicoSimulations
         };
     }

package/esm/cli/deploySimulationsContract.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploySimulationsContract.js","sourceRoot":"","sources":["../../cli/deploySimulationsContract.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deploySimulationsContract.js","sourceRoot":"","sources":["../../cli/deploySimulationsContract.ts"],"names":[],"mappings":"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"}

package/esm/cli/handler.js

@@ -56,6 +56,17 @@ const preFlightChecks = async (config) => {
     //         )
     //     }
     // }
+    // if (config.entrypointSimulationContractV9) {
+    //     const simulations = config.entrypointSimulationContractV9
+    //     const simulationsCode = await config.publicClient.getCode({
+    //         address: simulations
+    //     })
+    //     if (simulationsCode === undefined || simulationsCode === "0x") {
+    //         throw new Error(
+    //             `EntryPointSimulationsV9 contract ${simulations} does not exist`
+    //         )
+    //     }
+    // }
     if (config.refillHelperContract) {
         const refillHelper = config.refillHelperContract;
         const refillHelperCode = await config.publicClient.getCode({
@@ -166,11 +177,14 @@ export async function bundlerHandler(args_) {
             deployedContracts.entrypointSimulationContractV7;
         args.entrypointSimulationContractV8 =
             deployedContracts.entrypointSimulationContractV8;
+        args.entrypointSimulationContractV9 =
+            deployedContracts.entrypointSimulationContractV9;
         args.pimlicoSimulationContract =
             deployedContracts.pimlicoSimulationContract;
         logger.info({
             entrypointSimulationContractV7: deployedContracts.entrypointSimulationContractV7,
             entrypointSimulationContractV8: deployedContracts.entrypointSimulationContractV8,
+            entrypointSimulationContractV9: deployedContracts.entrypointSimulationContractV9,
             pimlicoSimulationContract: deployedContracts.pimlicoSimulationContract
         }, "Contracts used for simulation");
     }

package/esm/cli/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../cli/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EACH,aAAa,EACb,eAAe,EACf,oBAAoB,EACvB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAGH,kBAAkB,EAClB,kBAAkB,EAClB,QAAQ,EACR,WAAW,EACX,aAAa,EAChB,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,EAAmB,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAA;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAA;AAEvE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,MAAM,eAAe,GAAG,KAAK,EAAE,MAAkB,EAAiB,EAAE;IAChE,yCAAyC;IACzC,IAAI,MAAM,CAAC,uBAAuB,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CACX,qEAAqE,CACxE,CAAA;IACL,CAAC;IAED,0CAA0C;IAC1C,IAAI,MAAM,CAAC,uBAAuB,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CACX,sEAAsE,CACzE,CAAA;IACL,CAAC;IAED,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QAC1C,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC;YACrD,OAAO,EAAE,UAAU;SACtB,CAAC,CAAA;QACF,IAAI,cAAc,KAAK,SAAS,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;YAC1D,MAAM,IAAI,KAAK,CAAC,eAAe,UAAU,iBAAiB,CAAC,CAAA;QAC/D,CAAC;IACL,CAAC;IAED,IAAI,MAAM,CAAC,yBAAyB,EAAE,CAAC;QACnC,MAAM,OAAO,GAAG,MAAM,CAAC,yBAAyB,CAAA;QAChD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC;YAC3C,OAAO,EAAE,OAAO;SACnB,CAAC,CAAA;QACF,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CACX,+BAA+B,OAAO,iBAAiB,CAC1D,CAAA;QACL,CAAC;IACL,CAAC;IAED,IAAI,MAAM,CAAC,8BAA8B,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,MAAM,CAAC,8BAA8B,CAAA;QACrD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC;YAC3C,OAAO;SACV,CAAC,CAAA;QACF,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CACX,oCAAoC,OAAO,iBAAiB,CAC/D,CAAA;QACL,CAAC;IACL,CAAC;IAED,+CAA+C;IAC/C,gEAAgE;IAChE,kEAAkE;IAClE,+BAA+B;IAC/B,SAAS;IACT,uEAAuE;IACvE,2BAA2B;IAC3B,+EAA+E;IAC/E,YAAY;IACZ,QAAQ;IACR,IAAI;IAEJ,IAAI,MAAM,CAAC,oBAAoB,EAAE,CAAC;QAC9B,MAAM,YAAY,GAAG,MAAM,CAAC,oBAAoB,CAAA;QAChD,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC;YACvD,OAAO,EAAE,YAAY;SACxB,CAAC,CAAA;QACF,IAAI,gBAAgB,KAAK,SAAS,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;YAC9D,MAAM,IAAI,KAAK,CACX,yBAAyB,YAAY,iBAAiB,CACzD,CAAA;QACL,CAAC;IACL,CAAC;AACL,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CAAC,EAClB,OAAO,EACP,IAAI,EACkD,EAAE,EAAE;IAC1D,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACxC,IAAI,KAAK,CAAC,EAAE,KAAK,OAAO,EAAE,CAAC;YACvB,OAAO;gBACH,GAAG,KAAK;gBACR,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS;gBAC5C,OAAO,EAAE;oBACL,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;oBAChC,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;iBAClC;aACJ,CAAA;QACL,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAA;AACf,CAAC,CAAA;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,KAAoB;IACrD,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA;IAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAA;IAClC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI;QACpB,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC;QACrC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAEpC,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE;QAC1B,MAAM,MAAM,GAAG,kBAAkB,CAAC;YAC9B,SAAS,EAAE,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE;gBACpC,MAAM,EAAE,MAAM,CAAC,KAAK,CAChB,EAAE,MAAM,EAAE,eAAe,EAAE,EAC3B;oBACI,KAAK,EAAE,IAAI,CAAC,oBAAoB,IAAI,IAAI,CAAC,QAAQ;iBACpD,CACJ;aACJ,CAAC;SACL,CAAC,CAAA;QACF,OAAO,MAAM,MAAM,CAAC,UAAU,EAAE,CAAA;IACpC,CAAC,CAAA;IAED,MAAM,OAAO,GAAG,MAAM,UAAU,EAAE,CAAA;IAElC,wEAAwE;IACxE,MAAM,SAAS,GAAG,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;IAEjD,MAAM,KAAK,GAAU,SAAS,IAAI;QAC9B,EAAE,EAAE,OAAO;QACX,IAAI,EAAE,YAAY,EAAE,8BAA8B;QAClD,cAAc,EAAE;YACZ,IAAI,EAAE,KAAK;YACX,MAAM,EAAE,KAAK;YACb,QAAQ,EAAE,EAAE;SACf;QACD,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,OAAO,EAAE;YACL,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAChC,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;SAClC;QACD,gCAAgC,EAAE,IAAI,CAAC,8BAA8B;KACxE,CAAA;IAED,IAAI,YAAY,GAAG,kBAAkB,CAAC;QAClC,SAAS,EAAE,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE;YACpC,MAAM,EAAE,MAAM,CAAC,KAAK,CAChB,EAAE,MAAM,EAAE,eAAe,EAAE,EAC3B;gBACI,KAAK,EAAE,IAAI,CAAC,oBAAoB,IAAI,IAAI,CAAC,QAAQ;aACpD,CACJ;SACJ,CAAC;QACF,eAAe,EAAE,IAAI,CAAC,SAAS,GAAG,CAAC;QACnC,KAAK;KACR,CAAC,CAAA;IAEF,8EAA8E;IAC9E,+FAA+F;IAC/F,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAA;QACnD,YAAY,GAAG,YAAY;aACtB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACjB,KAAK,CAAC,IAAI,CAAC,IAAoB;gBAC3B,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAA;gBAChC,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAClC,CAAC;SACJ,CAAC,CAAC;aACF,MAAM,CAAC,aAAa,CAAC,CAAA;IAC9B,CAAC;IAED,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAE,EAAE,CAC1C,eAAe,CAAC,GAAG,EAAE;QACjB,MAAM,EAAE,MAAM,CAAC,KAAK,CAChB,EAAE,MAAM,EAAE,eAAe,EAAE,EAC3B,EAAE,KAAK,EAAE,IAAI,CAAC,oBAAoB,IAAI,IAAI,CAAC,QAAQ,EAAE,CACxD;KACJ,CAAC,CAAA;IAEN,MAAM,aAAa,GAAG;QAClB,OAAO,EAAE,IAAI,CAAC,qBAAqB;YAC/B,CAAC,CAAC,kBAAkB,CAAC;gBACf,SAAS,EAAE,QAAQ,CACf;oBACI,qBAAqB,CAAC,IAAI,CAAC,qBAAqB,CAAC;oBACjD,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC;iBACrC,EACD,EAAE,IAAI,EAAE,KAAK,EAAE,CAClB;gBACD,KAAK;aACR,CAAC;YACJ,CAAC,CAAC,SAAS;QACf,MAAM,EAAE,kBAAkB,CAAC;YACvB,SAAS,EAAE,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC;YAC7C,KAAK;SACR,CAAC;KACL,CAAA;IAED,wEAAwE;IACxE,IAAI,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACjC,MAAM,iBAAiB,GAAG,MAAM,yBAAyB,CAAC;YACtD,MAAM;YACN,IAAI;YACJ,YAAY;SACf,CAAC,CAAA;QACF,IAAI,CAAC,8BAA8B;YAC/B,iBAAiB,CAAC,8BAA8B,CAAA;QACpD,IAAI,CAAC,8BAA8B;YAC/B,iBAAiB,CAAC,8BAA8B,CAAA;QACpD,IAAI,CAAC,yBAAyB;YAC1B,iBAAiB,CAAC,yBAAyB,CAAA;QAC/C,MAAM,CAAC,IAAI,CACP;YACI,8BAA8B,EAC1B,iBAAiB,CAAC,8BAA8B;YACpD,8BAA8B,EAC1B,iBAAiB,CAAC,8BAA8B;YACpD,yBAAyB,EACrB,iBAAiB,CAAC,yBAAyB;SAClD,EACD,+BAA+B,CAClC,CAAA;IACL,CAAC;IAED,MAAM,MAAM,GAAG,YAAY,CAAC;QACxB,GAAG,IAAI;QACP,MAAM;QACN,YAAY;QACZ,aAAa;QACb,UAAU;KACb,CAAC,CAAA;IAEF,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,CAAA;IAEnD,MAAM,eAAe,CAAC,IAAI,EAAE,CAAA;IAE5B,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAA;IAC/B,MAAM,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAA;IAEvC,MAAM,eAAe,CAAC,MAAM,CAAC,CAAA;IAE7B,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC;QACzC,MAAM;QACN,OAAO;KACV,CAAC,CAAA;IAEF,MAAM,oBAAoB,GAAG,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAA;IAE9D,IAAI,oBAAoB,IAAI,MAAM,CAAC,oBAAoB,EAAE,CAAC;QACtD,MAAM,oBAAoB,GAAG,IAAI,oBAAoB,CAAC;YAClD,MAAM;YACN,OAAO;YACP,oBAAoB;SACvB,CAAC,CAAA;QAEF,MAAM,oBAAoB,CAAC,KAAK,EAAE,CAAA;IACtC,CAAC;IAED,OAAO,CAAC,yBAAyB,CAAC,GAAG,CACjC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,CAClE,CAAA;IAED,MAAM,WAAW,CAAC;QACd,MAAM;QACN,QAAQ;QACR,OAAO;QACP,aAAa;QACb,eAAe;KAClB,CAAC,CAAA;AACN,CAAC"}
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../cli/handler.ts"],"names":[],"mappings":"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"}