diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c3eae8dd62..a981b0c7cd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -53,7 +53,7 @@ importers: version: 20.16.12 '@vitest/coverage-v8': specifier: ^1.0.4 - version: 1.0.4(vitest@1.0.4(@types/node@20.16.12)(@vitest/ui@1.0.4)(terser@5.36.0)) + version: 1.0.4(vitest@1.0.4) '@vitest/ui': specifier: ^1.0.4 version: 1.0.4(vitest@1.0.4) @@ -2631,7 +2631,6 @@ packages: bun@1.1.30: resolution: {integrity: sha512-ysRL1pq10Xba0jqVLPrKU3YIv0ohfp3cTajCPtpjCyppbn3lfiAVNpGoHfyaxS17OlPmWmR67UZRPw/EueQuug==} - cpu: [arm64, x64] os: [darwin, linux, win32] hasBin: true @@ -5436,6 +5435,14 @@ packages: typescript: optional: true + viem@2.21.48: + resolution: {integrity: sha512-/hBHyG1gdIIuiQv0z9YmzXl5eWJa0UCZGwkeuQzH2Bmg6FIEwZeEcxgiytXZydip+p2wMBFa1jdr7o5O1+mrIg==} + peerDependencies: + typescript: '>=5.0.4' + peerDependenciesMeta: + typescript: + optional: true + viem@file:src: resolution: {directory: src, type: directory} peerDependencies: @@ -6695,7 +6702,7 @@ snapshots: pino-http: 8.6.1 pino-pretty: 10.3.1 prom-client: 14.2.0 - viem: 2.21.47(typescript@5.6.2)(zod@3.23.8) + viem: 2.21.48(typescript@5.6.2)(zod@3.23.8) yargs: 17.7.2 zod: 3.23.8 zod-validation-error: 1.5.0(zod@3.23.8) @@ -7578,7 +7585,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@vitest/coverage-v8@1.0.4(vitest@1.0.4(@types/node@20.16.12)(@vitest/ui@1.0.4)(terser@5.36.0))': + '@vitest/coverage-v8@1.0.4(vitest@1.0.4)': dependencies: '@ampproject/remapping': 2.3.0 '@bcoe/v8-coverage': 0.2.3 @@ -11313,6 +11320,24 @@ snapshots: - utf-8-validate - zod + viem@2.21.48(typescript@5.6.2)(zod@3.23.8): + dependencies: + '@noble/curves': 1.6.0 + '@noble/hashes': 1.5.0 + '@scure/bip32': 1.5.0 + '@scure/bip39': 1.4.0 + abitype: 1.0.6(typescript@5.6.2)(zod@3.23.8) + isows: 1.0.6(ws@8.18.0) + ox: 0.1.2(typescript@5.6.2)(zod@3.23.8) + webauthn-p256: 0.0.10 + ws: 8.18.0 + optionalDependencies: + typescript: 5.6.2 + transitivePeerDependencies: + - bufferutil + - utf-8-validate + - zod + viem@file:src(typescript@5.6.2)(zod@3.23.8): dependencies: '@noble/curves': 1.6.0 diff --git a/src/account-abstraction/actions/bundler/estimateUserOperationGas.test.ts b/src/account-abstraction/actions/bundler/estimateUserOperationGas.test.ts index 586c202a0e..3269935024 100644 --- a/src/account-abstraction/actions/bundler/estimateUserOperationGas.test.ts +++ b/src/account-abstraction/actions/bundler/estimateUserOperationGas.test.ts @@ -57,11 +57,11 @@ describe('entryPointVersion: 0.7', async () => { }), ).toMatchInlineSnapshot(` { - "callGasLimit": 141653n, + "callGasLimit": 141623n, "paymasterPostOpGasLimit": 0n, "paymasterVerificationGasLimit": 0n, "preVerificationGas": 53438n, - "verificationGasLimit": 259350n, + "verificationGasLimit": 259311n, } `) }) @@ -93,11 +93,11 @@ describe('entryPointVersion: 0.7', async () => { }), ).toMatchInlineSnapshot(` { - "callGasLimit": 141653n, + "callGasLimit": 141623n, "paymasterPostOpGasLimit": 1n, - "paymasterVerificationGasLimit": 20150n, + "paymasterVerificationGasLimit": 20098n, "preVerificationGas": 59826n, - "verificationGasLimit": 237672n, + "verificationGasLimit": 237573n, } `) }) @@ -132,11 +132,11 @@ describe('entryPointVersion: 0.7', async () => { }), ).toMatchInlineSnapshot(` { - "callGasLimit": 141653n, + "callGasLimit": 141623n, "paymasterPostOpGasLimit": 1n, - "paymasterVerificationGasLimit": 20150n, + "paymasterVerificationGasLimit": 20098n, "preVerificationGas": 59826n, - "verificationGasLimit": 237672n, + "verificationGasLimit": 237573n, } `) }) @@ -169,7 +169,7 @@ describe('entryPointVersion: 0.7', async () => { "paymasterPostOpGasLimit": 0n, "paymasterVerificationGasLimit": 0n, "preVerificationGas": 51722n, - "verificationGasLimit": 259060n, + "verificationGasLimit": 259021n, } `) }) @@ -753,7 +753,7 @@ describe('entryPointVersion: 0.6', async () => { { "callGasLimit": 80000n, "preVerificationGas": 55233n, - "verificationGasLimit": 258801n, + "verificationGasLimit": 258762n, } `) }) @@ -784,7 +784,7 @@ describe('entryPointVersion: 0.6', async () => { { "callGasLimit": 80000n, "preVerificationGas": 55233n, - "verificationGasLimit": 258801n, + "verificationGasLimit": 258762n, } `) }) diff --git a/src/account-abstraction/actions/bundler/prepareUserOperation.test.ts b/src/account-abstraction/actions/bundler/prepareUserOperation.test.ts index 1a6792ff1b..eda3838429 100644 --- a/src/account-abstraction/actions/bundler/prepareUserOperation.test.ts +++ b/src/account-abstraction/actions/bundler/prepareUserOperation.test.ts @@ -62,7 +62,7 @@ describe('entryPointVersion: 0.7', async () => { { "account": undefined, "callData": "0x34fcd5be00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fba3912ca04dd458c843e2ee08967fc04f3579c20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000041249c58b00000000000000000000000000000000000000000000000000000000", - "callGasLimit": 141653n, + "callGasLimit": 141623n, "factory": "0xfb6dab6200b8958c2655c3747708f82243d3f32e", "factoryData": "0xf14ddffc000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb922660000000000000000000000000000000000000000000000000000000000000000", "maxFeePerGas": undefined, @@ -73,7 +73,7 @@ describe('entryPointVersion: 0.7', async () => { "preVerificationGas": 53438n, "sender": "0xE911628bF8428C23f179a07b081325cAe376DE1f", "signature": "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c", - "verificationGasLimit": 259350n, + "verificationGasLimit": 259311n, } `) }) @@ -105,7 +105,7 @@ describe('entryPointVersion: 0.7', async () => { "preVerificationGas": 51642n, "sender": "0xE911628bF8428C23f179a07b081325cAe376DE1f", "signature": "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c", - "verificationGasLimit": 259060n, + "verificationGasLimit": 259021n, } `) }) @@ -130,7 +130,7 @@ describe('entryPointVersion: 0.7', async () => { "paymasterVerificationGasLimit": 0n, "preVerificationGas": 51642n, "sender": "0xE911628bF8428C23f179a07b081325cAe376DE1f", - "verificationGasLimit": 259060n, + "verificationGasLimit": 259021n, } `) }) @@ -156,7 +156,7 @@ describe('entryPointVersion: 0.7', async () => { "paymasterVerificationGasLimit": 0n, "preVerificationGas": 51642n, "sender": "0xE911628bF8428C23f179a07b081325cAe376DE1f", - "verificationGasLimit": 259060n, + "verificationGasLimit": 259021n, } `) }) @@ -188,7 +188,7 @@ describe('entryPointVersion: 0.7', async () => { "preVerificationGas": 51642n, "sender": "0xE911628bF8428C23f179a07b081325cAe376DE1f", "signature": "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c", - "verificationGasLimit": 259060n, + "verificationGasLimit": 259021n, } `) }) @@ -216,7 +216,7 @@ describe('entryPointVersion: 0.7', async () => { "preVerificationGas": 51642n, "sender": "0xE911628bF8428C23f179a07b081325cAe376DE1f", "signature": "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c", - "verificationGasLimit": 259060n, + "verificationGasLimit": 259021n, } `) @@ -241,7 +241,7 @@ describe('entryPointVersion: 0.7', async () => { "preVerificationGas": 51642n, "sender": "0xE911628bF8428C23f179a07b081325cAe376DE1f", "signature": "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c", - "verificationGasLimit": 259060n, + "verificationGasLimit": 259021n, } `) @@ -270,7 +270,7 @@ describe('entryPointVersion: 0.7', async () => { "preVerificationGas": 51642n, "sender": "0xE911628bF8428C23f179a07b081325cAe376DE1f", "signature": "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c", - "verificationGasLimit": 259060n, + "verificationGasLimit": 259021n, } `) }) @@ -353,20 +353,20 @@ describe('entryPointVersion: 0.7', async () => { { "account": undefined, "callData": "0x34fcd5be00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fba3912ca04dd458c843e2ee08967fc04f3579c20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000041249c58b00000000000000000000000000000000000000000000000000000000", - "callGasLimit": 141653n, + "callGasLimit": 141623n, "factory": "0xfb6dab6200b8958c2655c3747708f82243d3f32e", "factoryData": "0xf14ddffc000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb922660000000000000000000000000000000000000000000000000000000000000000", "maxFeePerGas": 15000000000n, "maxPriorityFeePerGas": 2000000000n, "nonce": 30902162761187369175482099564544n, "paymaster": "0xf42ec71a4440f5e9871c643696dd6dc9a38911f8", - "paymasterData": "0x00000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000000001234c6b3c2eae05243d400394621384296c3877c11cc3b46217e8b3f94a80422fc1c283bd78df37c33f5631f9b3731201a4937b1bbb3eed63a2012293d5034ab5c311c", + "paymasterData": "0x00000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000000001234031925c2c924ef50b273904db6376983272e78469ff17e2aa79156a89eb96e6d612b2ab4522b0a716e2421d5e0e3d7469cd07992bb61f8a192f0225da7c5fe6a1c", "paymasterPostOpGasLimit": 1000000n, "paymasterVerificationGasLimit": 1000000n, "preVerificationGas": 59826n, "sender": "0xE911628bF8428C23f179a07b081325cAe376DE1f", "signature": "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c", - "verificationGasLimit": 237672n, + "verificationGasLimit": 237573n, } `) }) @@ -446,7 +446,7 @@ describe('entryPointVersion: 0.7', async () => { { "account": undefined, "callData": "0x34fcd5be00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fba3912ca04dd458c843e2ee08967fc04f3579c20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000041249c58b00000000000000000000000000000000000000000000000000000000", - "callGasLimit": 141653n, + "callGasLimit": 141623n, "factory": "0xfb6dab6200b8958c2655c3747708f82243d3f32e", "factoryData": "0xf14ddffc000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb922660000000000000000000000000000000000000000000000000000000000000000", "maxFeePerGas": 15000000000n, @@ -459,7 +459,7 @@ describe('entryPointVersion: 0.7', async () => { "preVerificationGas": 59826n, "sender": "0xE911628bF8428C23f179a07b081325cAe376DE1f", "signature": "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c", - "verificationGasLimit": 237672n, + "verificationGasLimit": 237573n, } `) }) @@ -507,20 +507,20 @@ describe('entryPointVersion: 0.7', async () => { { "account": undefined, "callData": "0x34fcd5be00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fba3912ca04dd458c843e2ee08967fc04f3579c20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000041249c58b00000000000000000000000000000000000000000000000000000000", - "callGasLimit": 141653n, + "callGasLimit": 141623n, "factory": "0xfb6dab6200b8958c2655c3747708f82243d3f32e", "factoryData": "0xf14ddffc000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb922660000000000000000000000000000000000000000000000000000000000000000", "maxFeePerGas": 15000000000n, "maxPriorityFeePerGas": 2000000000n, "nonce": 30902162761242709407703228219392n, "paymaster": "0x28227b230d3945e580ed3b1c6c8ea1df658a7aa9", - "paymasterData": "0x00000000000000000000000000000000000000000000000000000000deadbeef00000000000000000000000000000000000000000000000000000000000012344ed861882e796d9e2b6c83120defdf4d5a328f1efd0905d9a099ed68fe7b78f743627e3222882dacbf3d5120addf3f4a36160c6a1a8cb4ec4dcffee3a65d1f631b", + "paymasterData": "0x00000000000000000000000000000000000000000000000000000000deadbeef000000000000000000000000000000000000000000000000000000000000123451dc23333a0e42f392b537b739ace15057a72f08125f9014553ef132420baae643d54d895953e2fe55a50d72cda604ed7fb87c786af04dfd9a9dc1ba6fdb1ab81c", "paymasterPostOpGasLimit": 1000000n, "paymasterVerificationGasLimit": 1000000n, "preVerificationGas": 59826n, "sender": "0xE911628bF8428C23f179a07b081325cAe376DE1f", "signature": "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c", - "verificationGasLimit": 237672n, + "verificationGasLimit": 237573n, } `) }) @@ -562,20 +562,20 @@ describe('entryPointVersion: 0.7', async () => { { "account": undefined, "callData": "0x34fcd5be00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fba3912ca04dd458c843e2ee08967fc04f3579c20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000041249c58b00000000000000000000000000000000000000000000000000000000", - "callGasLimit": 141653n, + "callGasLimit": 141623n, "factory": "0xfb6dab6200b8958c2655c3747708f82243d3f32e", "factoryData": "0xf14ddffc000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb922660000000000000000000000000000000000000000000000000000000000000000", "maxFeePerGas": 15000000000n, "maxPriorityFeePerGas": 2000000000n, "nonce": 30902162761261156151776937771008n, "paymaster": "0x82a9286db983093ff234cefcea1d8fa66382876b", - "paymasterData": "0x00000000000000000000000000000000000000000000000000000000deadbf1800000000000000000000000000000000000000000000000000000000000012341c201216c41d0f4f25d9fa5f59bd67de22382a97c372ee9e89f1a884f627b8240f251c72d3442d2e24c0f5dc231ec633134fd071daaafe922b13b33a3429fbea1c", + "paymasterData": "0x00000000000000000000000000000000000000000000000000000000deadbf1800000000000000000000000000000000000000000000000000000000000012342bb7a0b275c7e13b76778ecca17ab62a87db6852419a6b3a54149740c2515c61053c6dd63fe656cee48915fb5ebc09276b546ef5205738994fbde73c5fa4f0691b", "paymasterPostOpGasLimit": 1000000n, "paymasterVerificationGasLimit": 1000000n, "preVerificationGas": 59826n, "sender": "0xE911628bF8428C23f179a07b081325cAe376DE1f", "signature": "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c", - "verificationGasLimit": 237672n, + "verificationGasLimit": 237573n, } `) }) @@ -606,7 +606,7 @@ describe('entryPointVersion: 0.7', async () => { { "account": undefined, "callData": "0x34fcd5be00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fba3912ca04dd458c843e2ee08967fc04f3579c20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000041249c58b00000000000000000000000000000000000000000000000000000000", - "callGasLimit": 141653n, + "callGasLimit": 141623n, "factory": "0xfb6dab6200b8958c2655c3747708f82243d3f32e", "factoryData": "0xf14ddffc000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb922660000000000000000000000000000000000000000000000000000000000000000", "maxFeePerGas": undefined, @@ -617,7 +617,7 @@ describe('entryPointVersion: 0.7', async () => { "preVerificationGas": 51246n, "sender": "0xE911628bF8428C23f179a07b081325cAe376DE1f", "signature": "0xdeadbeef", - "verificationGasLimit": 254502n, + "verificationGasLimit": 254466n, } `) }) @@ -653,7 +653,7 @@ describe('entryPointVersion: 0.7', async () => { { "account": undefined, "callData": "0x34fcd5be00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fba3912ca04dd458c843e2ee08967fc04f3579c20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000041249c58b00000000000000000000000000000000000000000000000000000000", - "callGasLimit": 141653n, + "callGasLimit": 141623n, "factory": "0xfb6dab6200b8958c2655c3747708f82243d3f32e", "factoryData": "0xf14ddffc000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb922660000000000000000000000000000000000000000000000000000000000000000", "maxFeePerGas": 15000000000n, @@ -782,7 +782,7 @@ describe('entryPointVersion: 0.7', async () => { { "account": undefined, "callData": "0x34fcd5be00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fba3912ca04dd458c843e2ee08967fc04f3579c20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000041249c58b00000000000000000000000000000000000000000000000000000000", - "callGasLimit": 141653n, + "callGasLimit": 141623n, "factory": "0xfb6dab6200b8958c2655c3747708f82243d3f32e", "factoryData": "0xf14ddffc000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb922660000000000000000000000000000000000000000000000000000000000000000", "maxFeePerGas": 3000000n, @@ -793,7 +793,7 @@ describe('entryPointVersion: 0.7', async () => { "preVerificationGas": 53438n, "sender": "0xE911628bF8428C23f179a07b081325cAe376DE1f", "signature": "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c", - "verificationGasLimit": 259350n, + "verificationGasLimit": 259311n, } `) }) @@ -859,20 +859,20 @@ describe('entryPointVersion: 0.7', async () => { { "account": undefined, "callData": "0x34fcd5be00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fba3912ca04dd458c843e2ee08967fc04f3579c20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000041249c58b00000000000000000000000000000000000000000000000000000000", - "callGasLimit": 141653n, + "callGasLimit": 141623n, "factory": "0xfb6dab6200b8958c2655c3747708f82243d3f32e", "factoryData": "0xf14ddffc000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb922660000000000000000000000000000000000000000000000000000000000000000", "maxFeePerGas": 15000000000n, "maxPriorityFeePerGas": 2000000000n, "nonce": 30902162761390283360292904632320n, "paymaster": "0x41219a0a9c0b86ed81933c788a6b63dfef8f17ee", - "paymasterData": "0x00000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000000001234fc6dca78f243df7d59c299a92b566ac102011e79a5a72c21921be882d1d42bd10b8bd6cb743fe39c2bca82fac658a474fb273f1eeb2e4dbf056e62877b87fe7b1b", + "paymasterData": "0x00000000000000000000000000000000000000000000000000000000deadbeef00000000000000000000000000000000000000000000000000000000000012344e12823f3d2769c48dab19241ecf3a385e66c0cd140fdeacc15e97414ad2af934f92e0bce76892c983e81c01a0e60f36cd32ca507a98a730d8543ecf4b2059381c", "paymasterPostOpGasLimit": 1000000n, "paymasterVerificationGasLimit": 1000000n, "preVerificationGas": 59826n, "sender": "0xE911628bF8428C23f179a07b081325cAe376DE1f", "signature": "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c", - "verificationGasLimit": 237672n, + "verificationGasLimit": 237573n, } `) }) @@ -917,7 +917,7 @@ describe('entryPointVersion: 0.7', async () => { { "account": undefined, "callData": "0x34fcd5be00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fba3912ca04dd458c843e2ee08967fc04f3579c20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000041249c58b00000000000000000000000000000000000000000000000000000000", - "callGasLimit": 141653n, + "callGasLimit": 141623n, "factory": "0xfb6dab6200b8958c2655c3747708f82243d3f32e", "factoryData": "0xf14ddffc000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb922660000000000000000000000000000000000000000000000000000000000000000", "maxFeePerGas": 15000000000n, @@ -930,7 +930,7 @@ describe('entryPointVersion: 0.7', async () => { "preVerificationGas": 59826n, "sender": "0xE911628bF8428C23f179a07b081325cAe376DE1f", "signature": "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c", - "verificationGasLimit": 237672n, + "verificationGasLimit": 237573n, } `) }) @@ -978,20 +978,20 @@ describe('entryPointVersion: 0.7', async () => { { "account": undefined, "callData": "0x34fcd5be00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fba3912ca04dd458c843e2ee08967fc04f3579c20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000041249c58b00000000000000000000000000000000000000000000000000000000", - "callGasLimit": 141653n, + "callGasLimit": 141623n, "factory": "0xfb6dab6200b8958c2655c3747708f82243d3f32e", "factoryData": "0xf14ddffc000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb922660000000000000000000000000000000000000000000000000000000000000000", "maxFeePerGas": 15000000000n, "maxPriorityFeePerGas": 2000000000n, "nonce": 30902162761427176848440323735552n, "paymaster": "0xf67e26649037695ddfab19f4e22d5c9fd1564592", - "paymasterData": "0x00000000000000000000000000000000000000000000000000000000deadbeef000000000000000000000000000000000000000000000000000000000000123481cad233167ea1d8ed383d4a460c9f9ea3853d8de80f3bbae3f7532c0bc3cd707ebf52eefb227b068f3c14dbf113cbbba5b3ff893d9bbeef622557f52fe2496e1b", + "paymasterData": "0x00000000000000000000000000000000000000000000000000000000deadbeef00000000000000000000000000000000000000000000000000000000000012341c4e6f65bc0aeaafeee2d5cc597f449c535185df34aeb595e028cbb5f0b4b4c201bd6be767729f168634469f48dd8a59ac498ec281772a87bbbf2801ae05490f1c", "paymasterPostOpGasLimit": 1000000n, "paymasterVerificationGasLimit": 1000000n, "preVerificationGas": 59826n, "sender": "0xE911628bF8428C23f179a07b081325cAe376DE1f", "signature": "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c", - "verificationGasLimit": 237672n, + "verificationGasLimit": 237573n, } `) }) @@ -1033,20 +1033,20 @@ describe('entryPointVersion: 0.7', async () => { { "account": undefined, "callData": "0x34fcd5be00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fba3912ca04dd458c843e2ee08967fc04f3579c20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000041249c58b00000000000000000000000000000000000000000000000000000000", - "callGasLimit": 141653n, + "callGasLimit": 141623n, "factory": "0xfb6dab6200b8958c2655c3747708f82243d3f32e", "factoryData": "0xf14ddffc000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb922660000000000000000000000000000000000000000000000000000000000000000", "maxFeePerGas": 15000000000n, "maxPriorityFeePerGas": 2000000000n, "nonce": 30902162761445623592514033287168n, "paymaster": "0xea8ae08513f8230caa8d031d28cb4ac8ce720c68", - "paymasterData": "0x00000000000000000000000000000000000000000000000000000000deadbf18000000000000000000000000000000000000000000000000000000000000123473e52a4667dd3ef6df23825f569d0902f5961bf96056008fd91d41513ef8eee467fffc20a829c697d364c1063c2b249fa87ea14430c89638052ce217a3ae34841b", + "paymasterData": "0x00000000000000000000000000000000000000000000000000000000deadbf18000000000000000000000000000000000000000000000000000000000000123407c7d21300510f104aa22a2830fd75e9fe00b412da54c06a612459b0b215c39322aaffea809c6c466f93b29521cbf9e4bdecbd14e37b266e5540711f950495631b", "paymasterPostOpGasLimit": 1000000n, "paymasterVerificationGasLimit": 1000000n, "preVerificationGas": 59826n, "sender": "0xE911628bF8428C23f179a07b081325cAe376DE1f", "signature": "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c", - "verificationGasLimit": 237672n, + "verificationGasLimit": 237573n, } `) }) @@ -1095,7 +1095,7 @@ describe('entryPointVersion: 0.6', async () => { "preVerificationGas": 55154n, "sender": "0x6edf7db791fC4D438D4A683E857B2fE1a84947Ce", "signature": "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c", - "verificationGasLimit": 258801n, + "verificationGasLimit": 258762n, } `) }) @@ -1129,7 +1129,7 @@ describe('entryPointVersion: 0.6', async () => { "paymasterVerificationGasLimit": undefined, "preVerificationGas": 54124n, "sender": "0x6edf7db791fC4D438D4A683E857B2fE1a84947Ce", - "verificationGasLimit": 113517n, + "verificationGasLimit": 113496n, } `) }) diff --git a/src/account-abstraction/actions/bundler/sendUserOperation.test.ts b/src/account-abstraction/actions/bundler/sendUserOperation.test.ts index 179fee125d..1994ad5e23 100644 --- a/src/account-abstraction/actions/bundler/sendUserOperation.test.ts +++ b/src/account-abstraction/actions/bundler/sendUserOperation.test.ts @@ -344,7 +344,7 @@ describe('entryPointVersion: 0.7', async () => { preVerificationGas: 48501 sender: 0xE911628bF8428C23f179a07b081325cAe376DE1f signature: 0xdeadbeef - verificationGasLimit: 79159 + verificationGasLimit: 79141 Details: UserOperation reverted with reason: AA24 signature error Version: viem@x.y.z] diff --git a/src/account-abstraction/actions/paymaster/getPaymasterData.test.ts b/src/account-abstraction/actions/paymaster/getPaymasterData.test.ts index 4c73016dab..4e0d8d16af 100644 --- a/src/account-abstraction/actions/paymaster/getPaymasterData.test.ts +++ b/src/account-abstraction/actions/paymaster/getPaymasterData.test.ts @@ -71,7 +71,7 @@ describe('entryPointVersion: 0.7', async () => { "paymasterPostOpGasLimit": 0n, "paymasterVerificationGasLimit": 0n, "preVerificationGas": 100000n, - "verificationGasLimit": 259060n, + "verificationGasLimit": 259021n, } `) diff --git a/src/account-abstraction/actions/paymaster/getPaymasterStubData.test.ts b/src/account-abstraction/actions/paymaster/getPaymasterStubData.test.ts index 53b65f4591..084b90ec4b 100644 --- a/src/account-abstraction/actions/paymaster/getPaymasterStubData.test.ts +++ b/src/account-abstraction/actions/paymaster/getPaymasterStubData.test.ts @@ -67,7 +67,7 @@ describe('entryPointVersion: 0.7', async () => { "callGasLimit": 80000n, "paymasterPostOpGasLimit": 0n, "paymasterVerificationGasLimit": 0n, - "verificationGasLimit": 259060n, + "verificationGasLimit": 259021n, } `) }) diff --git a/test/setup.ts b/test/setup.ts index ab33cf025a..68648b37ab 100644 --- a/test/setup.ts +++ b/test/setup.ts @@ -11,6 +11,8 @@ import * as instances from './src/anvil.js' const client = instances.anvilMainnet.getClient() +setSignEntropy(false) + beforeAll(() => { setErrorConfig({ getDocsUrl({ docsBaseUrl, docsPath }) { @@ -20,7 +22,6 @@ beforeAll(() => { }, version: 'viem@x.y.z', }) - setSignEntropy(false) vi.mock('../src/errors/utils.ts', () => ({ getContractAddress: vi .fn()