@safe-global/relay-kit 3.1.0-alpha.1 → 3.1.0-alpha.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/index.d.ts +1 -0
- package/dist/src/index.js +6 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/packs/gelato/GelatoRelayPack.test.js +1 -1
- package/dist/src/packs/gelato/GelatoRelayPack.test.js.map +1 -1
- package/dist/src/packs/safe-4337/Safe4337Pack.d.ts +1 -1
- package/dist/src/packs/safe-4337/Safe4337Pack.js +45 -29
- package/dist/src/packs/safe-4337/Safe4337Pack.js.map +1 -1
- package/dist/src/packs/safe-4337/Safe4337Pack.test.js +145 -138
- package/dist/src/packs/safe-4337/Safe4337Pack.test.js.map +1 -1
- package/dist/src/packs/safe-4337/SafeOperation.d.ts +4 -1
- package/dist/src/packs/safe-4337/SafeOperation.js +6 -1
- package/dist/src/packs/safe-4337/SafeOperation.js.map +1 -1
- package/dist/src/packs/safe-4337/SafeOperation.test.js +5 -0
- package/dist/src/packs/safe-4337/SafeOperation.test.js.map +1 -1
- package/dist/src/packs/safe-4337/estimators/PimlicoFeeEstimator.js +2 -1
- package/dist/src/packs/safe-4337/estimators/PimlicoFeeEstimator.js.map +1 -1
- package/dist/src/packs/safe-4337/testing-utils/fixtures.d.ts +1 -1
- package/dist/src/packs/safe-4337/testing-utils/fixtures.js +1 -1
- package/dist/src/packs/safe-4337/types.d.ts +9 -4
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +4 -4
|
@@ -273,134 +273,6 @@ describe('Safe4337Pack', () => {
|
|
|
273
273
|
}
|
|
274
274
|
});
|
|
275
275
|
});
|
|
276
|
-
describe('When using a passkey signer', () => {
|
|
277
|
-
const SAFE_WEBAUTHN_SHARED_SIGNER_ADDRESS = '0x608Cf2e3412c6BDA14E6D8A0a7D27c4240FeD6F1';
|
|
278
|
-
const P256_VERIFIER_ADDRESS = '0xcA89CBa4813D5B40AeC6E57A30d0Eeb500d6531b';
|
|
279
|
-
const PASSKEY_PRIVATE_KEY = BigInt(process.env.PASSKEY_PRIVATE_KEY);
|
|
280
|
-
let passkey;
|
|
281
|
-
beforeAll(async () => {
|
|
282
|
-
if (!global.crypto) {
|
|
283
|
-
global.crypto = crypto_1.default;
|
|
284
|
-
}
|
|
285
|
-
const webAuthnCredentials = new webauthnShim_1.WebAuthnCredentials(PASSKEY_PRIVATE_KEY);
|
|
286
|
-
passkey = await (0, passkeys_1.createMockPasskey)('chucknorris', webAuthnCredentials);
|
|
287
|
-
global.navigator = {
|
|
288
|
-
credentials: {
|
|
289
|
-
create: jest
|
|
290
|
-
.fn()
|
|
291
|
-
.mockImplementation(webAuthnCredentials.create.bind(webAuthnCredentials)),
|
|
292
|
-
get: jest.fn().mockImplementation(webAuthnCredentials.get.bind(webAuthnCredentials))
|
|
293
|
-
}
|
|
294
|
-
};
|
|
295
|
-
});
|
|
296
|
-
it('should include a passkey configuration transaction to SafeWebAuthnSharedSigner contract in a multiSend call', async () => {
|
|
297
|
-
const encodeFunctionDataSpy = jest.spyOn(constants.INTERFACES, 'encodeFunctionData');
|
|
298
|
-
const safeCreateSpy = jest.spyOn(protocol_kit_1.default, 'init');
|
|
299
|
-
const safe4337Pack = await (0, helpers_1.createSafe4337Pack)({
|
|
300
|
-
signer: passkey,
|
|
301
|
-
options: {
|
|
302
|
-
owners: [fixtures.OWNER_1],
|
|
303
|
-
threshold: 1
|
|
304
|
-
}
|
|
305
|
-
});
|
|
306
|
-
const provider = safe4337Pack.protocolKit.getSafeProvider().provider;
|
|
307
|
-
const safeProvider = await protocolKit.SafeProvider.init(provider, passkey);
|
|
308
|
-
const passkeySigner = (await safeProvider.getExternalSigner());
|
|
309
|
-
const passkeyOwnerConfiguration = {
|
|
310
|
-
...passkeySigner.coordinates,
|
|
311
|
-
verifiers: P256_VERIFIER_ADDRESS
|
|
312
|
-
};
|
|
313
|
-
const enableModulesData = constants.INTERFACES.encodeFunctionData('enableModules', [
|
|
314
|
-
[safe4337ModuleAddress]
|
|
315
|
-
]);
|
|
316
|
-
const passkeyConfigureData = constants.INTERFACES.encodeFunctionData('configure', [
|
|
317
|
-
passkeyOwnerConfiguration
|
|
318
|
-
]);
|
|
319
|
-
const enable4337ModuleTransaction = {
|
|
320
|
-
to: addModulesLibAddress,
|
|
321
|
-
value: '0',
|
|
322
|
-
data: enableModulesData,
|
|
323
|
-
operation: safe_core_sdk_types_1.OperationType.DelegateCall
|
|
324
|
-
};
|
|
325
|
-
const sharedSignerTransaction = {
|
|
326
|
-
to: SAFE_WEBAUTHN_SHARED_SIGNER_ADDRESS,
|
|
327
|
-
value: '0',
|
|
328
|
-
data: passkeyConfigureData,
|
|
329
|
-
operation: safe_core_sdk_types_1.OperationType.DelegateCall
|
|
330
|
-
};
|
|
331
|
-
const multiSendData = protocolKit.encodeMultiSendData([
|
|
332
|
-
enable4337ModuleTransaction,
|
|
333
|
-
sharedSignerTransaction
|
|
334
|
-
]);
|
|
335
|
-
expect(encodeFunctionDataSpy).toHaveBeenNthCalledWith(2, 'configure', [
|
|
336
|
-
passkeyOwnerConfiguration
|
|
337
|
-
]);
|
|
338
|
-
expect(encodeFunctionDataSpy).toHaveBeenNthCalledWith(3, 'multiSend', [multiSendData]);
|
|
339
|
-
expect(safeCreateSpy).toHaveBeenCalledWith({
|
|
340
|
-
provider: safe4337Pack.protocolKit.getSafeProvider().provider,
|
|
341
|
-
signer: passkey,
|
|
342
|
-
predictedSafe: {
|
|
343
|
-
safeDeploymentConfig: {
|
|
344
|
-
safeVersion: constants.DEFAULT_SAFE_VERSION,
|
|
345
|
-
saltNonce: undefined
|
|
346
|
-
},
|
|
347
|
-
safeAccountConfig: {
|
|
348
|
-
owners: [fixtures.OWNER_1, SAFE_WEBAUTHN_SHARED_SIGNER_ADDRESS],
|
|
349
|
-
threshold: 1,
|
|
350
|
-
to: await safe4337Pack.protocolKit.getMultiSendAddress(),
|
|
351
|
-
data: constants.INTERFACES.encodeFunctionData('multiSend', [multiSendData]),
|
|
352
|
-
fallbackHandler: safe4337ModuleAddress,
|
|
353
|
-
paymentToken: ethers_1.ethers.ZeroAddress,
|
|
354
|
-
payment: 0,
|
|
355
|
-
paymentReceiver: ethers_1.ethers.ZeroAddress
|
|
356
|
-
}
|
|
357
|
-
}
|
|
358
|
-
});
|
|
359
|
-
});
|
|
360
|
-
it('should allow to sign a SafeOperation', async () => {
|
|
361
|
-
const transferUSDC = {
|
|
362
|
-
to: fixtures.PAYMASTER_TOKEN_ADDRESS,
|
|
363
|
-
data: (0, helpers_1.generateTransferCallData)(fixtures.SAFE_ADDRESS_4337_PASSKEY, 100000n),
|
|
364
|
-
value: '0',
|
|
365
|
-
operation: 0
|
|
366
|
-
};
|
|
367
|
-
const safe4337Pack = await (0, helpers_1.createSafe4337Pack)({
|
|
368
|
-
signer: passkey,
|
|
369
|
-
options: {
|
|
370
|
-
safeAddress: fixtures.SAFE_ADDRESS_4337_PASSKEY
|
|
371
|
-
}
|
|
372
|
-
});
|
|
373
|
-
const safeOperation = await safe4337Pack.createTransaction({
|
|
374
|
-
transactions: [transferUSDC]
|
|
375
|
-
});
|
|
376
|
-
expect(await safe4337Pack.signSafeOperation(safeOperation)).toMatchObject({
|
|
377
|
-
signatures: new Map().set(SAFE_WEBAUTHN_SHARED_SIGNER_ADDRESS.toLowerCase(), new protocolKit.EthSafeSignature(SAFE_WEBAUTHN_SHARED_SIGNER_ADDRESS, '0x000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000e0c79e723c4ad6557198f00ab3e8cc1cd3de64b30f6ff44664fc131f37fa1e97fe4dce48568eb0582d34c6adb97a5902b6de0488c10ab3c9f3589b44b98027ac840000000000000000000000000000000000000000000000000000000000000025a24f744b28d73f066bf3203d145765a7bc735e6328168c8b03e476da3ad0d8fe0400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001e226f726967696e223a2268747470733a2f2f736166652e676c6f62616c22001f', true))
|
|
378
|
-
});
|
|
379
|
-
});
|
|
380
|
-
it('should allow to send an UserOperation to a bundler', async () => {
|
|
381
|
-
const transferUSDC = {
|
|
382
|
-
to: fixtures.PAYMASTER_TOKEN_ADDRESS,
|
|
383
|
-
data: (0, helpers_1.generateTransferCallData)(fixtures.SAFE_ADDRESS_4337_PASSKEY, 100000n),
|
|
384
|
-
value: '0',
|
|
385
|
-
operation: 0
|
|
386
|
-
};
|
|
387
|
-
const safe4337Pack = await (0, helpers_1.createSafe4337Pack)({
|
|
388
|
-
signer: passkey,
|
|
389
|
-
options: {
|
|
390
|
-
safeAddress: fixtures.SAFE_ADDRESS_4337_PASSKEY
|
|
391
|
-
}
|
|
392
|
-
});
|
|
393
|
-
let safeOperation = await safe4337Pack.createTransaction({
|
|
394
|
-
transactions: [transferUSDC]
|
|
395
|
-
});
|
|
396
|
-
safeOperation = await safe4337Pack.signSafeOperation(safeOperation);
|
|
397
|
-
await safe4337Pack.executeTransaction({ executable: safeOperation });
|
|
398
|
-
expect(sendMock).toHaveBeenCalledWith(constants.RPC_4337_CALLS.SEND_USER_OPERATION, [
|
|
399
|
-
utils.userOperationToHexValues(safeOperation.toUserOperation()),
|
|
400
|
-
fixtures.ENTRYPOINTS[0]
|
|
401
|
-
]);
|
|
402
|
-
});
|
|
403
|
-
});
|
|
404
276
|
});
|
|
405
277
|
describe('When creating a new SafeOperation', () => {
|
|
406
278
|
let safe4337Pack;
|
|
@@ -444,7 +316,7 @@ describe('Safe4337Pack', () => {
|
|
|
444
316
|
maxFeePerGas: 100000n,
|
|
445
317
|
maxPriorityFeePerGas: 200000n,
|
|
446
318
|
verificationGasLimit: 400000n,
|
|
447
|
-
preVerificationGas:
|
|
319
|
+
preVerificationGas: 105000n
|
|
448
320
|
});
|
|
449
321
|
});
|
|
450
322
|
it('should allow to use a single transaction', async () => {
|
|
@@ -470,7 +342,7 @@ describe('Safe4337Pack', () => {
|
|
|
470
342
|
maxFeePerGas: 100000n,
|
|
471
343
|
maxPriorityFeePerGas: 200000n,
|
|
472
344
|
verificationGasLimit: 400000n,
|
|
473
|
-
preVerificationGas:
|
|
345
|
+
preVerificationGas: 105000n
|
|
474
346
|
});
|
|
475
347
|
});
|
|
476
348
|
it('should fill the initCode property when the Safe does not exist', async () => {
|
|
@@ -494,8 +366,7 @@ describe('Safe4337Pack', () => {
|
|
|
494
366
|
},
|
|
495
367
|
paymasterOptions: {
|
|
496
368
|
isSponsored: true,
|
|
497
|
-
paymasterUrl: fixtures.PAYMASTER_URL
|
|
498
|
-
paymasterAddress: fixtures.PAYMASTER_ADDRESS
|
|
369
|
+
paymasterUrl: fixtures.PAYMASTER_URL
|
|
499
370
|
}
|
|
500
371
|
});
|
|
501
372
|
const sponsoredSafeOperation = await safe4337Pack.createTransaction({
|
|
@@ -506,7 +377,7 @@ describe('Safe4337Pack', () => {
|
|
|
506
377
|
safe: fixtures.SAFE_ADDRESS_v1_4_1,
|
|
507
378
|
entryPoint: '0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789',
|
|
508
379
|
initCode: '0x',
|
|
509
|
-
paymasterAndData: '
|
|
380
|
+
paymasterAndData: '0x',
|
|
510
381
|
callData: constants.INTERFACES.encodeFunctionData('executeUserOp', [
|
|
511
382
|
transferUSDC.to,
|
|
512
383
|
transferUSDC.value,
|
|
@@ -520,7 +391,7 @@ describe('Safe4337Pack', () => {
|
|
|
520
391
|
maxFeePerGas: 100000n,
|
|
521
392
|
maxPriorityFeePerGas: 200000n,
|
|
522
393
|
verificationGasLimit: 400000n,
|
|
523
|
-
preVerificationGas:
|
|
394
|
+
preVerificationGas: 105000n
|
|
524
395
|
});
|
|
525
396
|
});
|
|
526
397
|
it('createTransaction should throw an error if paymasterUrl is not present in sponsored transactions', async () => {
|
|
@@ -528,9 +399,9 @@ describe('Safe4337Pack', () => {
|
|
|
528
399
|
options: {
|
|
529
400
|
safeAddress: fixtures.SAFE_ADDRESS_v1_4_1
|
|
530
401
|
},
|
|
402
|
+
// @ts-expect-error - An error will be thrown
|
|
531
403
|
paymasterOptions: {
|
|
532
|
-
isSponsored: true
|
|
533
|
-
paymasterAddress: fixtures.PAYMASTER_ADDRESS
|
|
404
|
+
isSponsored: true
|
|
534
405
|
}
|
|
535
406
|
});
|
|
536
407
|
await expect(safe4337Pack.createTransaction({
|
|
@@ -585,9 +456,145 @@ describe('Safe4337Pack', () => {
|
|
|
585
456
|
maxFeePerGas: 100000n,
|
|
586
457
|
maxPriorityFeePerGas: 200000n,
|
|
587
458
|
verificationGasLimit: 400000n,
|
|
588
|
-
preVerificationGas:
|
|
459
|
+
preVerificationGas: 105000n
|
|
460
|
+
});
|
|
461
|
+
});
|
|
462
|
+
});
|
|
463
|
+
describe('When using a passkey signer', () => {
|
|
464
|
+
const SAFE_WEBAUTHN_SHARED_SIGNER_ADDRESS = '0x608Cf2e3412c6BDA14E6D8A0a7D27c4240FeD6F1';
|
|
465
|
+
const CUSTOM_P256_VERIFIER_ADDRESS = '0xcA89CBa4813D5B40AeC6E57A30d0Eeb500d6531b';
|
|
466
|
+
const PASSKEY_PRIVATE_KEY = BigInt(process.env.PASSKEY_PRIVATE_KEY);
|
|
467
|
+
jest.setTimeout(120000);
|
|
468
|
+
let passkey;
|
|
469
|
+
beforeAll(async () => {
|
|
470
|
+
if (!global.crypto) {
|
|
471
|
+
global.crypto = crypto_1.default;
|
|
472
|
+
}
|
|
473
|
+
const webAuthnCredentials = new webauthnShim_1.WebAuthnCredentials(PASSKEY_PRIVATE_KEY);
|
|
474
|
+
passkey = await (0, passkeys_1.createMockPasskey)('chucknorris', webAuthnCredentials);
|
|
475
|
+
passkey.customVerifierAddress = CUSTOM_P256_VERIFIER_ADDRESS;
|
|
476
|
+
Object.defineProperty(global, 'navigator', {
|
|
477
|
+
value: {
|
|
478
|
+
credentials: {
|
|
479
|
+
create: jest
|
|
480
|
+
.fn()
|
|
481
|
+
.mockImplementation(webAuthnCredentials.create.bind(webAuthnCredentials)),
|
|
482
|
+
get: jest.fn().mockImplementation(webAuthnCredentials.get.bind(webAuthnCredentials))
|
|
483
|
+
}
|
|
484
|
+
},
|
|
485
|
+
writable: true
|
|
589
486
|
});
|
|
590
487
|
});
|
|
488
|
+
it('should include a passkey configuration transaction to SafeWebAuthnSharedSigner contract in a multiSend call', async () => {
|
|
489
|
+
const encodeFunctionDataSpy = jest.spyOn(constants.INTERFACES, 'encodeFunctionData');
|
|
490
|
+
const safeCreateSpy = jest.spyOn(protocol_kit_1.default, 'init');
|
|
491
|
+
const safe4337Pack = await (0, helpers_1.createSafe4337Pack)({
|
|
492
|
+
signer: passkey,
|
|
493
|
+
options: {
|
|
494
|
+
owners: [fixtures.OWNER_1],
|
|
495
|
+
threshold: 1
|
|
496
|
+
}
|
|
497
|
+
});
|
|
498
|
+
const provider = safe4337Pack.protocolKit.getSafeProvider().provider;
|
|
499
|
+
const safeProvider = await protocolKit.SafeProvider.init(provider, passkey);
|
|
500
|
+
const passkeySigner = (await safeProvider.getExternalSigner());
|
|
501
|
+
const passkeyOwnerConfiguration = {
|
|
502
|
+
...passkeySigner.coordinates,
|
|
503
|
+
verifiers: CUSTOM_P256_VERIFIER_ADDRESS
|
|
504
|
+
};
|
|
505
|
+
const enableModulesData = constants.INTERFACES.encodeFunctionData('enableModules', [
|
|
506
|
+
[safe4337ModuleAddress]
|
|
507
|
+
]);
|
|
508
|
+
const passkeyConfigureData = constants.INTERFACES.encodeFunctionData('configure', [
|
|
509
|
+
passkeyOwnerConfiguration
|
|
510
|
+
]);
|
|
511
|
+
const enable4337ModuleTransaction = {
|
|
512
|
+
to: addModulesLibAddress,
|
|
513
|
+
value: '0',
|
|
514
|
+
data: enableModulesData,
|
|
515
|
+
operation: safe_core_sdk_types_1.OperationType.DelegateCall
|
|
516
|
+
};
|
|
517
|
+
const sharedSignerTransaction = {
|
|
518
|
+
to: SAFE_WEBAUTHN_SHARED_SIGNER_ADDRESS,
|
|
519
|
+
value: '0',
|
|
520
|
+
data: passkeyConfigureData,
|
|
521
|
+
operation: safe_core_sdk_types_1.OperationType.DelegateCall
|
|
522
|
+
};
|
|
523
|
+
const multiSendData = protocolKit.encodeMultiSendData([
|
|
524
|
+
enable4337ModuleTransaction,
|
|
525
|
+
sharedSignerTransaction
|
|
526
|
+
]);
|
|
527
|
+
expect(encodeFunctionDataSpy).toHaveBeenNthCalledWith(2, 'configure', [
|
|
528
|
+
passkeyOwnerConfiguration
|
|
529
|
+
]);
|
|
530
|
+
expect(encodeFunctionDataSpy).toHaveBeenNthCalledWith(3, 'multiSend', [multiSendData]);
|
|
531
|
+
expect(safeCreateSpy).toHaveBeenCalledWith({
|
|
532
|
+
provider: safe4337Pack.protocolKit.getSafeProvider().provider,
|
|
533
|
+
signer: passkey,
|
|
534
|
+
predictedSafe: {
|
|
535
|
+
safeDeploymentConfig: {
|
|
536
|
+
safeVersion: constants.DEFAULT_SAFE_VERSION,
|
|
537
|
+
saltNonce: undefined
|
|
538
|
+
},
|
|
539
|
+
safeAccountConfig: {
|
|
540
|
+
owners: [fixtures.OWNER_1, SAFE_WEBAUTHN_SHARED_SIGNER_ADDRESS],
|
|
541
|
+
threshold: 1,
|
|
542
|
+
to: await safe4337Pack.protocolKit.getMultiSendAddress(),
|
|
543
|
+
data: constants.INTERFACES.encodeFunctionData('multiSend', [multiSendData]),
|
|
544
|
+
fallbackHandler: safe4337ModuleAddress,
|
|
545
|
+
paymentToken: ethers_1.ethers.ZeroAddress,
|
|
546
|
+
payment: 0,
|
|
547
|
+
paymentReceiver: ethers_1.ethers.ZeroAddress
|
|
548
|
+
}
|
|
549
|
+
}
|
|
550
|
+
});
|
|
551
|
+
});
|
|
552
|
+
it('should allow to sign a SafeOperation', async () => {
|
|
553
|
+
const transferUSDC = {
|
|
554
|
+
to: fixtures.PAYMASTER_TOKEN_ADDRESS,
|
|
555
|
+
data: (0, helpers_1.generateTransferCallData)(fixtures.SAFE_ADDRESS_4337_PASSKEY, 100000n),
|
|
556
|
+
value: '0',
|
|
557
|
+
operation: 0
|
|
558
|
+
};
|
|
559
|
+
const safe4337Pack = await (0, helpers_1.createSafe4337Pack)({
|
|
560
|
+
signer: passkey,
|
|
561
|
+
options: {
|
|
562
|
+
owners: [],
|
|
563
|
+
threshold: 1
|
|
564
|
+
}
|
|
565
|
+
});
|
|
566
|
+
const safeOperation = await safe4337Pack.createTransaction({
|
|
567
|
+
transactions: [transferUSDC]
|
|
568
|
+
});
|
|
569
|
+
const safeOpHash = utils.calculateSafeUserOperationHash(safeOperation.data, BigInt(fixtures.CHAIN_ID), fixtures.MODULE_ADDRESS);
|
|
570
|
+
const passkeySignature = await safe4337Pack.protocolKit.signHash(safeOpHash);
|
|
571
|
+
expect(await safe4337Pack.signSafeOperation(safeOperation)).toMatchObject({
|
|
572
|
+
signatures: new Map().set(SAFE_WEBAUTHN_SHARED_SIGNER_ADDRESS.toLowerCase(), new protocolKit.EthSafeSignature(SAFE_WEBAUTHN_SHARED_SIGNER_ADDRESS, passkeySignature.data, true))
|
|
573
|
+
});
|
|
574
|
+
});
|
|
575
|
+
it('should allow to send an UserOperation to a bundler', async () => {
|
|
576
|
+
const transferUSDC = {
|
|
577
|
+
to: fixtures.PAYMASTER_TOKEN_ADDRESS,
|
|
578
|
+
data: (0, helpers_1.generateTransferCallData)(fixtures.SAFE_ADDRESS_4337_PASSKEY, 100000n),
|
|
579
|
+
value: '0',
|
|
580
|
+
operation: 0
|
|
581
|
+
};
|
|
582
|
+
const safe4337Pack = await (0, helpers_1.createSafe4337Pack)({
|
|
583
|
+
signer: passkey,
|
|
584
|
+
options: {
|
|
585
|
+
safeAddress: fixtures.SAFE_ADDRESS_4337_PASSKEY
|
|
586
|
+
}
|
|
587
|
+
});
|
|
588
|
+
let safeOperation = await safe4337Pack.createTransaction({
|
|
589
|
+
transactions: [transferUSDC]
|
|
590
|
+
});
|
|
591
|
+
safeOperation = await safe4337Pack.signSafeOperation(safeOperation);
|
|
592
|
+
await safe4337Pack.executeTransaction({ executable: safeOperation });
|
|
593
|
+
expect(sendMock).toHaveBeenCalledWith(constants.RPC_4337_CALLS.SEND_USER_OPERATION, [
|
|
594
|
+
utils.userOperationToHexValues(safeOperation.toUserOperation()),
|
|
595
|
+
fixtures.ENTRYPOINTS[0]
|
|
596
|
+
]);
|
|
597
|
+
});
|
|
591
598
|
});
|
|
592
599
|
it('should allow to sign a SafeOperation', async () => {
|
|
593
600
|
const transferUSDC = {
|
|
@@ -605,7 +612,7 @@ describe('Safe4337Pack', () => {
|
|
|
605
612
|
transactions: [transferUSDC]
|
|
606
613
|
});
|
|
607
614
|
expect(await safe4337Pack.signSafeOperation(safeOperation)).toMatchObject({
|
|
608
|
-
signatures: new Map().set(fixtures.OWNER_1.toLowerCase(), new protocolKit.EthSafeSignature(fixtures.OWNER_1, '
|
|
615
|
+
signatures: new Map().set(fixtures.OWNER_1.toLowerCase(), new protocolKit.EthSafeSignature(fixtures.OWNER_1, '0xda808d1e84e6aac5eb50fda331469a108bfdce442fd41501fefaa5b5d648ade406d08a1ca2ca9a5f0ba1a079da001dbee6990189a2cdb054e6c388d5afbd2d9b20', false))
|
|
609
616
|
});
|
|
610
617
|
});
|
|
611
618
|
it('should allow to sign a SafeOperation using a SafeOperationResponse object from the api to add a signature', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Safe4337Pack.test.js","sourceRoot":"","sources":["../../../../src/packs/safe-4337/Safe4337Pack.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Safe4337Pack.test.js","sourceRoot":"","sources":["../../../../src/packs/safe-4337/Safe4337Pack.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { EstimateGasData, SafeOperation, SafeSignature, SafeUserOperation, UserO
|
|
|
2
2
|
type SafeOperationOptions = {
|
|
3
3
|
moduleAddress: string;
|
|
4
4
|
entryPoint: string;
|
|
5
|
+
chainId: bigint;
|
|
5
6
|
validAfter?: number;
|
|
6
7
|
validUntil?: number;
|
|
7
8
|
};
|
|
@@ -9,11 +10,13 @@ declare class EthSafeOperation implements SafeOperation {
|
|
|
9
10
|
data: SafeUserOperation;
|
|
10
11
|
signatures: Map<string, SafeSignature>;
|
|
11
12
|
moduleAddress: string;
|
|
12
|
-
|
|
13
|
+
chainId: bigint;
|
|
14
|
+
constructor(userOperation: UserOperation, { chainId, entryPoint, validAfter, validUntil, moduleAddress }: SafeOperationOptions);
|
|
13
15
|
getSignature(signer: string): SafeSignature | undefined;
|
|
14
16
|
addSignature(signature: SafeSignature): void;
|
|
15
17
|
encodedSignatures(): string;
|
|
16
18
|
addEstimations(estimations: EstimateGasData): void;
|
|
17
19
|
toUserOperation(): UserOperation;
|
|
20
|
+
getHash(): string;
|
|
18
21
|
}
|
|
19
22
|
export default EthSafeOperation;
|
|
@@ -2,9 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const ethers_1 = require("ethers");
|
|
4
4
|
const protocol_kit_1 = require("@safe-global/protocol-kit");
|
|
5
|
+
const utils_1 = require("./utils");
|
|
5
6
|
class EthSafeOperation {
|
|
6
|
-
constructor(userOperation, { entryPoint, validAfter, validUntil, moduleAddress }) {
|
|
7
|
+
constructor(userOperation, { chainId, entryPoint, validAfter, validUntil, moduleAddress }) {
|
|
7
8
|
this.signatures = new Map();
|
|
9
|
+
this.chainId = chainId;
|
|
8
10
|
this.moduleAddress = moduleAddress;
|
|
9
11
|
this.data = {
|
|
10
12
|
safe: userOperation.sender,
|
|
@@ -58,6 +60,9 @@ class EthSafeOperation {
|
|
|
58
60
|
signature: ethers_1.ethers.solidityPacked(['uint48', 'uint48', 'bytes'], [this.data.validAfter, this.data.validUntil, this.encodedSignatures()])
|
|
59
61
|
};
|
|
60
62
|
}
|
|
63
|
+
getHash() {
|
|
64
|
+
return (0, utils_1.calculateSafeUserOperationHash)(this.data, this.chainId, this.moduleAddress);
|
|
65
|
+
}
|
|
61
66
|
}
|
|
62
67
|
exports.default = EthSafeOperation;
|
|
63
68
|
//# sourceMappingURL=SafeOperation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SafeOperation.js","sourceRoot":"","sources":["../../../../src/packs/safe-4337/SafeOperation.ts"],"names":[],"mappings":";;AAAA,mCAA+B;AAQ/B,4DAA+D;
|
|
1
|
+
{"version":3,"file":"SafeOperation.js","sourceRoot":"","sources":["../../../../src/packs/safe-4337/SafeOperation.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,7 @@ const fixtures = __importStar(require("./testing-utils/fixtures"));
|
|
|
33
33
|
describe('SafeOperation', () => {
|
|
34
34
|
it('should create a SafeOperation from an UserOperation', () => {
|
|
35
35
|
const safeOperation = new SafeOperation_1.default(fixtures.USER_OPERATION, {
|
|
36
|
+
chainId: BigInt(fixtures.CHAIN_ID),
|
|
36
37
|
moduleAddress: fixtures.MODULE_ADDRESS,
|
|
37
38
|
entryPoint: fixtures.ENTRYPOINTS[0]
|
|
38
39
|
});
|
|
@@ -55,6 +56,7 @@ describe('SafeOperation', () => {
|
|
|
55
56
|
});
|
|
56
57
|
it('should add and retrieve signatures', () => {
|
|
57
58
|
const safeOperation = new SafeOperation_1.default(fixtures.USER_OPERATION, {
|
|
59
|
+
chainId: BigInt(fixtures.CHAIN_ID),
|
|
58
60
|
moduleAddress: fixtures.MODULE_ADDRESS,
|
|
59
61
|
entryPoint: fixtures.ENTRYPOINTS[0]
|
|
60
62
|
});
|
|
@@ -68,6 +70,7 @@ describe('SafeOperation', () => {
|
|
|
68
70
|
});
|
|
69
71
|
it('should encode the signatures', () => {
|
|
70
72
|
const safeOperation = new SafeOperation_1.default(fixtures.USER_OPERATION, {
|
|
73
|
+
chainId: BigInt(fixtures.CHAIN_ID),
|
|
71
74
|
moduleAddress: fixtures.MODULE_ADDRESS,
|
|
72
75
|
entryPoint: fixtures.ENTRYPOINTS[0]
|
|
73
76
|
});
|
|
@@ -77,6 +80,7 @@ describe('SafeOperation', () => {
|
|
|
77
80
|
});
|
|
78
81
|
it('should add estimations', () => {
|
|
79
82
|
const safeOperation = new SafeOperation_1.default(fixtures.USER_OPERATION, {
|
|
83
|
+
chainId: BigInt(fixtures.CHAIN_ID),
|
|
80
84
|
moduleAddress: fixtures.MODULE_ADDRESS,
|
|
81
85
|
entryPoint: fixtures.ENTRYPOINTS[0]
|
|
82
86
|
});
|
|
@@ -103,6 +107,7 @@ describe('SafeOperation', () => {
|
|
|
103
107
|
});
|
|
104
108
|
it('should convert to UserOperation', () => {
|
|
105
109
|
const safeOperation = new SafeOperation_1.default(fixtures.USER_OPERATION, {
|
|
110
|
+
chainId: BigInt(fixtures.CHAIN_ID),
|
|
106
111
|
moduleAddress: fixtures.MODULE_ADDRESS,
|
|
107
112
|
entryPoint: fixtures.ENTRYPOINTS[0]
|
|
108
113
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SafeOperation.test.js","sourceRoot":"","sources":["../../../../src/packs/safe-4337/SafeOperation.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"SafeOperation.test.js","sourceRoot":"","sources":["../../../../src/packs/safe-4337/SafeOperation.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,8 @@ class PimlicoFeeEstimator {
|
|
|
21
21
|
async adjustEstimation({ userOperation }) {
|
|
22
22
|
return {
|
|
23
23
|
callGasLimit: userOperation.callGasLimit + userOperation.callGasLimit / 2n, // +50%
|
|
24
|
-
verificationGasLimit: userOperation.verificationGasLimit * 4n // +300%
|
|
24
|
+
verificationGasLimit: userOperation.verificationGasLimit * 4n, // +300%
|
|
25
|
+
preVerificationGas: userOperation.preVerificationGas + userOperation.preVerificationGas / 20n // +5%
|
|
25
26
|
};
|
|
26
27
|
}
|
|
27
28
|
async getPaymasterEstimation({ userOperation, paymasterUrl, entryPoint, sponsorshipPolicyId }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PimlicoFeeEstimator.js","sourceRoot":"","sources":["../../../../../src/packs/safe-4337/estimators/PimlicoFeeEstimator.ts"],"names":[],"mappings":";;;;;;;;;AAQA,oCAA8E;AAC9E,4CAA6C;AAE7C,MAAa,mBAAmB;IAAhC;;
|
|
1
|
+
{"version":3,"file":"PimlicoFeeEstimator.js","sourceRoot":"","sources":["../../../../../src/packs/safe-4337/estimators/PimlicoFeeEstimator.ts"],"names":[],"mappings":";;;;;;;;;AAQA,oCAA8E;AAC9E,4CAA6C;AAE7C,MAAa,mBAAmB;IAAhC;;IAyCA,CAAC;IAxCC,KAAK,CAAC,eAAe,CAAC,EAAE,UAAU,EAA4B;QAC5D,MAAM,aAAa,GAAG,IAAA,iCAAyB,EAAC,UAAU,CAAC,CAAA;QAE3D,MAAM,OAAO,GAAG,MAAM,uBAAA,IAAI,uEAAY,MAAhB,IAAI,EAAa,aAAa,CAAC,CAAA;QAErD,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,EAAE,aAAa,EAA4B;QAChE,OAAO;YACL,YAAY,EAAE,aAAa,CAAC,YAAY,GAAG,aAAa,CAAC,YAAY,GAAG,EAAE,EAAE,OAAO;YACnF,oBAAoB,EAAE,aAAa,CAAC,oBAAoB,GAAG,EAAE,EAAE,QAAQ;YACvE,kBAAkB,EAAE,aAAa,CAAC,kBAAkB,GAAG,aAAa,CAAC,kBAAkB,GAAG,GAAG,CAAC,MAAM;SACrG,CAAA;IACH,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,EAC3B,aAAa,EACb,YAAY,EACZ,UAAU,EACV,mBAAmB,EACe;QAClC,MAAM,eAAe,GAAG,IAAA,iCAAyB,EAAC,YAAY,CAAC,CAAA;QAE/D,MAAM,MAAM,GAAG,mBAAmB;YAChC,CAAC,CAAC,CAAC,IAAA,gCAAwB,EAAC,aAAa,CAAC,EAAE,UAAU,EAAE,EAAE,mBAAmB,EAAE,CAAC;YAChF,CAAC,CAAC,CAAC,IAAA,gCAAwB,EAAC,aAAa,CAAC,EAAE,UAAU,CAAC,CAAA;QAEzD,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,0BAAc,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAA;QAE7F,OAAO,WAAW,CAAA;IACpB,CAAC;CASF;AAzCD,kDAyCC;kFAPC,KAAK,0CACH,aAAqC;IAErC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,kCAAkC,EAAE,EAAE,CAAC,CAAA;IAEjF,OAAO,IAAI,CAAA;AACb,CAAC"}
|
|
@@ -5,7 +5,7 @@ export declare const SAFE_ADDRESS_v1_4_1 = "0x717f4BB83D8DF2e5a3Cc603Ee27263ac9E
|
|
|
5
5
|
export declare const SAFE_ADDRESS_v1_3_0 = "0x8C35a08Af278518B59D04ddDe3F1b370aD766D22";
|
|
6
6
|
export declare const SAFE_ADDRESS_4337_MODULE_NOT_ENABLED = "0xfC82a1e4A045a44527e8b45FC70332C8F66fc32B";
|
|
7
7
|
export declare const SAFE_ADDRESS_4337_FALLBACKHANDLER_NOT_ENABLED = "0xA6FDc4e18404E1715D1bC51B07266c91393C6622";
|
|
8
|
-
export declare const SAFE_ADDRESS_4337_PASSKEY = "
|
|
8
|
+
export declare const SAFE_ADDRESS_4337_PASSKEY = "0x6FC89F63A59776BE6679c5b09554D919eeDa41a7";
|
|
9
9
|
export declare const SAFE_MODULES_V0_3_0 = "0.3.0";
|
|
10
10
|
export declare const PAYMASTER_ADDRESS = "0x0000000000325602a77416A16136FDafd04b299f";
|
|
11
11
|
export declare const PAYMASTER_TOKEN_ADDRESS = "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238";
|
|
@@ -9,7 +9,7 @@ exports.SAFE_ADDRESS_v1_4_1 = '0x717f4BB83D8DF2e5a3Cc603Ee27263ac9EFB6c12';
|
|
|
9
9
|
exports.SAFE_ADDRESS_v1_3_0 = '0x8C35a08Af278518B59D04ddDe3F1b370aD766D22';
|
|
10
10
|
exports.SAFE_ADDRESS_4337_MODULE_NOT_ENABLED = '0xfC82a1e4A045a44527e8b45FC70332C8F66fc32B';
|
|
11
11
|
exports.SAFE_ADDRESS_4337_FALLBACKHANDLER_NOT_ENABLED = '0xA6FDc4e18404E1715D1bC51B07266c91393C6622';
|
|
12
|
-
exports.SAFE_ADDRESS_4337_PASSKEY = '
|
|
12
|
+
exports.SAFE_ADDRESS_4337_PASSKEY = '0x6FC89F63A59776BE6679c5b09554D919eeDa41a7'; // Safe owned by passkey signer + 4337 module + fallback handler enabled
|
|
13
13
|
exports.SAFE_MODULES_V0_3_0 = '0.3.0';
|
|
14
14
|
exports.PAYMASTER_ADDRESS = '0x0000000000325602a77416A16136FDafd04b299f';
|
|
15
15
|
exports.PAYMASTER_TOKEN_ADDRESS = '0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238';
|