@safe-global/relay-kit 3.0.1 → 3.0.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.
Files changed (27) hide show
  1. package/dist/src/packs/safe-4337/Safe4337Pack.d.ts +11 -5
  2. package/dist/src/packs/safe-4337/Safe4337Pack.js +104 -85
  3. package/dist/src/packs/safe-4337/Safe4337Pack.js.map +1 -1
  4. package/dist/src/packs/safe-4337/Safe4337Pack.test.js +81 -23
  5. package/dist/src/packs/safe-4337/Safe4337Pack.test.js.map +1 -1
  6. package/dist/src/packs/safe-4337/SafeOperation.d.ts +3 -1
  7. package/dist/src/packs/safe-4337/SafeOperation.js +2 -1
  8. package/dist/src/packs/safe-4337/SafeOperation.js.map +1 -1
  9. package/dist/src/packs/safe-4337/SafeOperation.test.js +5 -0
  10. package/dist/src/packs/safe-4337/SafeOperation.test.js.map +1 -1
  11. package/dist/src/packs/safe-4337/constants.d.ts +2 -0
  12. package/dist/src/packs/safe-4337/constants.js +3 -1
  13. package/dist/src/packs/safe-4337/constants.js.map +1 -1
  14. package/dist/src/packs/safe-4337/testing-utils/fixtures.d.ts +35 -0
  15. package/dist/src/packs/safe-4337/testing-utils/fixtures.js +40 -5
  16. package/dist/src/packs/safe-4337/testing-utils/fixtures.js.map +1 -1
  17. package/dist/src/packs/safe-4337/testing-utils/helpers.js +0 -1
  18. package/dist/src/packs/safe-4337/testing-utils/helpers.js.map +1 -1
  19. package/dist/src/packs/safe-4337/types.d.ts +2 -4
  20. package/dist/src/packs/safe-4337/utils/entrypoint.d.ts +4 -0
  21. package/dist/src/packs/safe-4337/utils/entrypoint.js +23 -0
  22. package/dist/src/packs/safe-4337/utils/entrypoint.js.map +1 -0
  23. package/dist/src/packs/safe-4337/utils.d.ts +32 -5
  24. package/dist/src/packs/safe-4337/utils.js +71 -9
  25. package/dist/src/packs/safe-4337/utils.js.map +1 -1
  26. package/dist/tsconfig.build.tsbuildinfo +1 -1
  27. package/package.json +5 -5
@@ -26,6 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
26
26
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
+ const dotenv_1 = __importDefault(require("dotenv"));
29
30
  const ethers_1 = require("ethers");
30
31
  const protocol_kit_1 = __importStar(require("@safe-global/protocol-kit")), protocolKit = protocol_kit_1;
31
32
  const safe_modules_deployments_1 = require("@safe-global/safe-modules-deployments");
@@ -35,34 +36,23 @@ const SafeOperation_1 = __importDefault(require("./SafeOperation"));
35
36
  const constants = __importStar(require("./constants"));
36
37
  const fixtures = __importStar(require("./testing-utils/fixtures"));
37
38
  const helpers_1 = require("./testing-utils/helpers");
38
- const dotenv_1 = __importDefault(require("dotenv"));
39
39
  const utils = __importStar(require("./utils"));
40
40
  dotenv_1.default.config();
41
+ const requestResponseMap = {
42
+ [constants.RPC_4337_CALLS.SUPPORTED_ENTRY_POINTS]: fixtures.ENTRYPOINTS,
43
+ [constants.RPC_4337_CALLS.CHAIN_ID]: fixtures.CHAIN_ID,
44
+ [constants.RPC_4337_CALLS.SEND_USER_OPERATION]: fixtures.USER_OPERATION_HASH,
45
+ [constants.RPC_4337_CALLS.ESTIMATE_USER_OPERATION_GAS]: fixtures.GAS_ESTIMATION,
46
+ [constants.RPC_4337_CALLS.GET_USER_OPERATION_BY_HASH]: fixtures.USER_OPERATION_BY_HASH,
47
+ [constants.RPC_4337_CALLS.GET_USER_OPERATION_RECEIPT]: fixtures.USER_OPERATION_RECEIPT,
48
+ ['pimlico_getUserOperationGasPrice']: fixtures.USER_OPERATION_GAS_PRICE
49
+ };
41
50
  const sendMock = jest.fn(async (method) => {
42
- switch (method) {
43
- case constants.RPC_4337_CALLS.SUPPORTED_ENTRY_POINTS:
44
- return fixtures.ENTRYPOINTS;
45
- case constants.RPC_4337_CALLS.CHAIN_ID:
46
- return fixtures.CHAIN_ID;
47
- case constants.RPC_4337_CALLS.SEND_USER_OPERATION:
48
- return fixtures.USER_OPERATION_HASH;
49
- case constants.RPC_4337_CALLS.ESTIMATE_USER_OPERATION_GAS:
50
- return fixtures.GAS_ESTIMATION;
51
- case constants.RPC_4337_CALLS.GET_USER_OPERATION_BY_HASH:
52
- return fixtures.USER_OPERATION_BY_HASH;
53
- case constants.RPC_4337_CALLS.GET_USER_OPERATION_RECEIPT:
54
- return fixtures.USER_OPERATION_RECEIPT;
55
- case 'pimlico_getUserOperationGasPrice':
56
- return fixtures.USER_OPERATION_GAS_PRICE;
57
- default:
58
- return undefined;
59
- }
51
+ return requestResponseMap[method];
60
52
  });
61
53
  jest.mock('./utils', () => ({
62
54
  ...jest.requireActual('./utils'),
63
- getEip4337BundlerProvider: () => ({
64
- send: sendMock
65
- })
55
+ getEip4337BundlerProvider: jest.fn(() => ({ send: sendMock }))
66
56
  }));
67
57
  let safe4337ModuleAddress;
68
58
  let addModulesLibAddress;
@@ -97,8 +87,31 @@ describe('Safe4337Pack', () => {
97
87
  options: { safeAddress: fixtures.SAFE_ADDRESS_4337_FALLBACKHANDLER_NOT_ENABLED }
98
88
  })).rejects.toThrow('Incompatibility detected: The EIP-4337 fallbackhandler is not attached to the Safe Account. Attach this fallbackhandler (address: 0xa581c4A4DB7175302464fF3C06380BC3270b4037) to ensure compatibility.');
99
89
  });
90
+ it('should throw an error if the Safe Modules do not match the supported version', async () => {
91
+ await expect((0, helpers_1.createSafe4337Pack)({
92
+ safeModulesVersion: fixtures.SAFE_MODULES_V0_3_0
93
+ })).rejects.toThrow('Incompatibility detected: Safe modules version 0.3.0 is not supported. The SDK can use 0.2.0 only.');
94
+ });
100
95
  });
101
96
  describe('When using existing Safe Accounts with version 1.4.1 or greater', () => {
97
+ it('should throw an error if the version of the entrypoint used is incompatible', async () => {
98
+ await expect((0, helpers_1.createSafe4337Pack)({
99
+ options: { safeAddress: fixtures.SAFE_ADDRESS_v1_4_1 },
100
+ customContracts: { entryPointAddress: fixtures.ENTRYPOINTS[1] }
101
+ })).rejects.toThrow(`The selected entrypoint ${fixtures.ENTRYPOINTS[1]} is not compatible with version 0.2.0 of Safe modules`);
102
+ });
103
+ it('should throw an error if no supported entrypoints are available', async () => {
104
+ const overridenMap = Object.assign({}, requestResponseMap, {
105
+ [constants.RPC_4337_CALLS.SUPPORTED_ENTRY_POINTS]: [fixtures.ENTRYPOINTS[1]]
106
+ });
107
+ const mockedUtils = jest.requireMock('./utils');
108
+ mockedUtils.getEip4337BundlerProvider.mockImplementationOnce(() => ({
109
+ send: jest.fn(async (method) => overridenMap[method])
110
+ }));
111
+ await expect((0, helpers_1.createSafe4337Pack)({
112
+ options: { safeAddress: fixtures.SAFE_ADDRESS_v1_4_1 }
113
+ })).rejects.toThrow(`Incompatibility detected: None of the entrypoints provided by the bundler is compatible with the Safe modules version 0.2.0`);
114
+ });
102
115
  it('should be able to instantiate the pack using a existing Safe', async () => {
103
116
  const safe4337Pack = await (0, helpers_1.createSafe4337Pack)({
104
117
  options: { safeAddress: fixtures.SAFE_ADDRESS_v1_4_1 }
@@ -143,6 +156,15 @@ describe('Safe4337Pack', () => {
143
156
  });
144
157
  expect(await safe4337Pack.protocolKit.getAddress()).toBe(fixtures.PREDICTED_SAFE_ADDRESS);
145
158
  });
159
+ it('should throw an error if the entrypoint is not compatible with the safe modules version', async () => {
160
+ await expect((0, helpers_1.createSafe4337Pack)({
161
+ options: {
162
+ owners: [fixtures.OWNER_1],
163
+ threshold: 1
164
+ },
165
+ customContracts: { entryPointAddress: fixtures.ENTRYPOINTS[1] }
166
+ })).rejects.toThrow(`The selected entrypoint ${fixtures.ENTRYPOINTS[1]} is not compatible with version 0.2.0 of Safe modules`);
167
+ });
146
168
  it('should throw an error if the owners or threshold are not specified', async () => {
147
169
  await expect((0, helpers_1.createSafe4337Pack)({
148
170
  // @ts-expect-error - An error will be thrown
@@ -436,7 +458,7 @@ describe('Safe4337Pack', () => {
436
458
  });
437
459
  });
438
460
  });
439
- it('should all to sign a SafeOperation', async () => {
461
+ it('should allow to sign a SafeOperation', async () => {
440
462
  const transferUSDC = {
441
463
  to: fixtures.PAYMASTER_TOKEN_ADDRESS,
442
464
  data: (0, helpers_1.generateTransferCallData)(fixtures.SAFE_ADDRESS_v1_4_1, 100000n),
@@ -455,6 +477,18 @@ describe('Safe4337Pack', () => {
455
477
  signatures: new Map().set(fixtures.OWNER_1.toLowerCase(), new protocolKit.EthSafeSignature(fixtures.OWNER_1, '0x63de7fdf99bcf20a1981ae74c3960604139d8bf025da894abc11604b30f438e82ceb0d37e73bf16b0b8b896f8be82a49750433733c0414fe4a3b8182a3875e1f1c', false))
456
478
  });
457
479
  });
480
+ it('should allow to sign a SafeOperation using a SafeOperationResponse object from the api to add a signature', async () => {
481
+ const safe4337Pack = await (0, helpers_1.createSafe4337Pack)({
482
+ options: {
483
+ safeAddress: fixtures.SAFE_ADDRESS_v1_4_1
484
+ }
485
+ });
486
+ expect(await safe4337Pack.signSafeOperation(fixtures.SAFE_OPERATION_RESPONSE)).toMatchObject({
487
+ signatures: new Map()
488
+ .set(fixtures.OWNER_1.toLowerCase(), new protocolKit.EthSafeSignature(fixtures.OWNER_1, '0xcb28e74375889e400a4d8aca46b8c59e1cf8825e373c26fa99c2fd7c078080e64fe30eaf1125257bdfe0b358b5caef68aa0420478145f52decc8e74c979d43ab1c', false))
489
+ .set(fixtures.OWNER_2.toLowerCase(), new protocolKit.EthSafeSignature(fixtures.OWNER_2, '0xcb28e74375889e400a4d8aca46b8c59e1cf8825e373c26fa99c2fd7c078080e64fe30eaf1125257bdfe0b358b5caef68aa0420478145f52decc8e74c979d43ab1d', false))
490
+ });
491
+ });
458
492
  it('should allow to send an UserOperation to a bundler', async () => {
459
493
  const transferUSDC = {
460
494
  to: fixtures.PAYMASTER_TOKEN_ADDRESS,
@@ -477,6 +511,30 @@ describe('Safe4337Pack', () => {
477
511
  fixtures.ENTRYPOINTS[0]
478
512
  ]);
479
513
  });
514
+ it('should allow to send a UserOperation to the bundler using a SafeOperationResponse object from the api', async () => {
515
+ const safe4337Pack = await (0, helpers_1.createSafe4337Pack)({
516
+ options: {
517
+ safeAddress: fixtures.SAFE_ADDRESS_v1_4_1
518
+ }
519
+ });
520
+ await safe4337Pack.executeTransaction({ executable: fixtures.SAFE_OPERATION_RESPONSE });
521
+ expect(sendMock).toHaveBeenCalledWith(constants.RPC_4337_CALLS.SEND_USER_OPERATION, [
522
+ utils.userOperationToHexValues({
523
+ sender: '0xE322e721bCe76cE7FCf3A475f139A9314571ad3D',
524
+ nonce: '3',
525
+ initCode: '0x',
526
+ callData: '0x7bb37428000000000000000000000000e322e721bce76ce7fcf3a475f139a9314571ad3d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
527
+ callGasLimit: 122497n,
528
+ verificationGasLimit: 123498n,
529
+ preVerificationGas: 50705n,
530
+ maxFeePerGas: 105183831060n,
531
+ maxPriorityFeePerGas: 1380000000n,
532
+ paymasterAndData: '0x',
533
+ signature: '0x000000000000000000000000cb28e74375889e400a4d8aca46b8c59e1cf8825e373c26fa99c2fd7c078080e64fe30eaf1125257bdfe0b358b5caef68aa0420478145f52decc8e74c979d43ab1d'
534
+ }),
535
+ fixtures.ENTRYPOINTS[0]
536
+ ]);
537
+ });
480
538
  it('should return a UserOperation based on a userOpHash', async () => {
481
539
  const safe4337Pack = await (0, helpers_1.createSafe4337Pack)({
482
540
  options: {
@@ -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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"}
@@ -1,5 +1,6 @@
1
1
  import { EstimateGasData, SafeOperation, SafeSignature, SafeUserOperation, UserOperation } from '@safe-global/safe-core-sdk-types';
2
2
  type SafeOperationOptions = {
3
+ moduleAddress: string;
3
4
  entryPoint: string;
4
5
  validAfter?: number;
5
6
  validUntil?: number;
@@ -7,7 +8,8 @@ type SafeOperationOptions = {
7
8
  declare class EthSafeOperation implements SafeOperation {
8
9
  data: SafeUserOperation;
9
10
  signatures: Map<string, SafeSignature>;
10
- constructor(userOperation: UserOperation, { entryPoint, validAfter, validUntil }: SafeOperationOptions);
11
+ moduleAddress: string;
12
+ constructor(userOperation: UserOperation, { entryPoint, validAfter, validUntil, moduleAddress }: SafeOperationOptions);
11
13
  getSignature(signer: string): SafeSignature | undefined;
12
14
  addSignature(signature: SafeSignature): void;
13
15
  encodedSignatures(): string;
@@ -3,8 +3,9 @@ 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
5
  class EthSafeOperation {
6
- constructor(userOperation, { entryPoint, validAfter, validUntil }) {
6
+ constructor(userOperation, { entryPoint, validAfter, validUntil, moduleAddress }) {
7
7
  this.signatures = new Map();
8
+ this.moduleAddress = moduleAddress;
8
9
  this.data = {
9
10
  safe: userOperation.sender,
10
11
  nonce: BigInt(userOperation.nonce),
@@ -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;AAI/D,MAAM,gBAAgB;IAIpB,YACE,aAA4B,EAC5B,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAwB;QAJ9D,eAAU,GAA+B,IAAI,GAAG,EAAE,CAAA;QAMhD,IAAI,CAAC,IAAI,GAAG;YACV,IAAI,EAAE,aAAa,CAAC,MAAM;YAC1B,KAAK,EAAE,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC;YAClC,QAAQ,EAAE,aAAa,CAAC,QAAQ;YAChC,QAAQ,EAAE,aAAa,CAAC,QAAQ;YAChC,YAAY,EAAE,aAAa,CAAC,YAAY;YACxC,oBAAoB,EAAE,aAAa,CAAC,oBAAoB;YACxD,kBAAkB,EAAE,aAAa,CAAC,kBAAkB;YACpD,YAAY,EAAE,aAAa,CAAC,YAAY;YACxC,oBAAoB,EAAE,aAAa,CAAC,oBAAoB;YACxD,gBAAgB,EAAE,aAAa,CAAC,gBAAgB;YAChD,UAAU,EAAE,UAAU,IAAI,CAAC;YAC3B,UAAU,EAAE,UAAU,IAAI,CAAC;YAC3B,UAAU;SACX,CAAA;IACH,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;IAClD,CAAC;IAED,YAAY,CAAC,SAAwB;QACnC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,SAAS,CAAC,CAAA;IAChE,CAAC;IAED,iBAAiB;QACf,OAAO,IAAA,kCAAmB,EAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;IAClE,CAAC;IAED,cAAc,CAAC,WAA4B;QACzC,MAAM,IAAI,GAA8B;YACtC,cAAc;YACd,sBAAsB;YACtB,sBAAsB;YACtB,oBAAoB;YACpB,cAAc;SACf,CAAA;QAED,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QAC7D,CAAC;IACH,CAAC;IAED,eAAe;QACb,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;YACtB,KAAK,EAAE,eAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;YACtC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAC5B,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAC5B,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY;YACpC,oBAAoB,EAAE,IAAI,CAAC,IAAI,CAAC,oBAAoB;YACpD,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB;YAChD,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY;YACpC,oBAAoB,EAAE,IAAI,CAAC,IAAI,CAAC,oBAAoB;YACpD,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB;YAC5C,SAAS,EAAE,eAAM,CAAC,cAAc,CAC9B,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,EAC7B,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CACvE;SACF,CAAA;IACH,CAAC;CACF;AAED,kBAAe,gBAAgB,CAAA"}
1
+ {"version":3,"file":"SafeOperation.js","sourceRoot":"","sources":["../../../../src/packs/safe-4337/SafeOperation.ts"],"names":[],"mappings":";;AAAA,mCAA+B;AAQ/B,4DAA+D;AAS/D,MAAM,gBAAgB;IAKpB,YACE,aAA4B,EAC5B,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAwB;QAL7E,eAAU,GAA+B,IAAI,GAAG,EAAE,CAAA;QAOhD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,IAAI,CAAC,IAAI,GAAG;YACV,IAAI,EAAE,aAAa,CAAC,MAAM;YAC1B,KAAK,EAAE,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC;YAClC,QAAQ,EAAE,aAAa,CAAC,QAAQ;YAChC,QAAQ,EAAE,aAAa,CAAC,QAAQ;YAChC,YAAY,EAAE,aAAa,CAAC,YAAY;YACxC,oBAAoB,EAAE,aAAa,CAAC,oBAAoB;YACxD,kBAAkB,EAAE,aAAa,CAAC,kBAAkB;YACpD,YAAY,EAAE,aAAa,CAAC,YAAY;YACxC,oBAAoB,EAAE,aAAa,CAAC,oBAAoB;YACxD,gBAAgB,EAAE,aAAa,CAAC,gBAAgB;YAChD,UAAU,EAAE,UAAU,IAAI,CAAC;YAC3B,UAAU,EAAE,UAAU,IAAI,CAAC;YAC3B,UAAU;SACX,CAAA;IACH,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;IAClD,CAAC;IAED,YAAY,CAAC,SAAwB;QACnC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,SAAS,CAAC,CAAA;IAChE,CAAC;IAED,iBAAiB;QACf,OAAO,IAAA,kCAAmB,EAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;IAClE,CAAC;IAED,cAAc,CAAC,WAA4B;QACzC,MAAM,IAAI,GAA8B;YACtC,cAAc;YACd,sBAAsB;YACtB,sBAAsB;YACtB,oBAAoB;YACpB,cAAc;SACf,CAAA;QAED,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QAC7D,CAAC;IACH,CAAC;IAED,eAAe;QACb,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;YACtB,KAAK,EAAE,eAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;YACtC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAC5B,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAC5B,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY;YACpC,oBAAoB,EAAE,IAAI,CAAC,IAAI,CAAC,oBAAoB;YACpD,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB;YAChD,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY;YACpC,oBAAoB,EAAE,IAAI,CAAC,IAAI,CAAC,oBAAoB;YACpD,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB;YAC5C,SAAS,EAAE,eAAM,CAAC,cAAc,CAC9B,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,EAC7B,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CACvE;SACF,CAAA;IACH,CAAC;CACF;AAED,kBAAe,gBAAgB,CAAA"}
@@ -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
+ moduleAddress: fixtures.MODULE_ADDRESS,
36
37
  entryPoint: fixtures.ENTRYPOINTS[0]
37
38
  });
38
39
  expect(safeOperation.data).toMatchObject({
@@ -54,6 +55,7 @@ describe('SafeOperation', () => {
54
55
  });
55
56
  it('should add and retrieve signatures', () => {
56
57
  const safeOperation = new SafeOperation_1.default(fixtures.USER_OPERATION, {
58
+ moduleAddress: fixtures.MODULE_ADDRESS,
57
59
  entryPoint: fixtures.ENTRYPOINTS[0]
58
60
  });
59
61
  safeOperation.addSignature(new protocol_kit_1.EthSafeSignature('0xSigner', '0xSignature'));
@@ -66,6 +68,7 @@ describe('SafeOperation', () => {
66
68
  });
67
69
  it('should encode the signatures', () => {
68
70
  const safeOperation = new SafeOperation_1.default(fixtures.USER_OPERATION, {
71
+ moduleAddress: fixtures.MODULE_ADDRESS,
69
72
  entryPoint: fixtures.ENTRYPOINTS[0]
70
73
  });
71
74
  safeOperation.addSignature(new protocol_kit_1.EthSafeSignature('0xSigner1', '0xSignature1'));
@@ -74,6 +77,7 @@ describe('SafeOperation', () => {
74
77
  });
75
78
  it('should add estimations', () => {
76
79
  const safeOperation = new SafeOperation_1.default(fixtures.USER_OPERATION, {
80
+ moduleAddress: fixtures.MODULE_ADDRESS,
77
81
  entryPoint: fixtures.ENTRYPOINTS[0]
78
82
  });
79
83
  safeOperation.addEstimations({
@@ -99,6 +103,7 @@ describe('SafeOperation', () => {
99
103
  });
100
104
  it('should convert to UserOperation', () => {
101
105
  const safeOperation = new SafeOperation_1.default(fixtures.USER_OPERATION, {
106
+ moduleAddress: fixtures.MODULE_ADDRESS,
102
107
  entryPoint: fixtures.ENTRYPOINTS[0]
103
108
  });
104
109
  safeOperation.addSignature(new protocol_kit_1.EthSafeSignature('0xSigner', '0x000000000000000000000000a397ca32ee7fb5282256ee3465da0843485930b803d747516aac76e152f834051ac18fd2b3c0565590f9d65085538993c85c9bb189c940d15c15402c7c2885821b'));
@@ -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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"}
@@ -8,6 +8,8 @@ export declare const EIP712_SAFE_OPERATION_TYPE: {
8
8
  }[];
9
9
  };
10
10
  export declare const INTERFACES: ethers.Interface;
11
+ export declare const ENTRYPOINT_ADDRESS_V06 = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789";
12
+ export declare const ENTRYPOINT_ADDRESS_V07 = "0x0000000071727De22E5E9d8BAf0edAc6f37da032";
11
13
  export declare const RPC_4337_CALLS: {
12
14
  ESTIMATE_USER_OPERATION_GAS: string;
13
15
  SEND_USER_OPERATION: string;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.RPC_4337_CALLS = exports.INTERFACES = exports.EIP712_SAFE_OPERATION_TYPE = exports.DEFAULT_SAFE_MODULES_VERSION = exports.DEFAULT_SAFE_VERSION = void 0;
3
+ exports.RPC_4337_CALLS = exports.ENTRYPOINT_ADDRESS_V07 = exports.ENTRYPOINT_ADDRESS_V06 = exports.INTERFACES = exports.EIP712_SAFE_OPERATION_TYPE = exports.DEFAULT_SAFE_MODULES_VERSION = exports.DEFAULT_SAFE_VERSION = void 0;
4
4
  const ethers_1 = require("ethers");
5
5
  exports.DEFAULT_SAFE_VERSION = '1.4.1';
6
6
  exports.DEFAULT_SAFE_MODULES_VERSION = '0.2.0';
@@ -27,6 +27,8 @@ exports.INTERFACES = new ethers_1.ethers.Interface([
27
27
  'function executeUserOp(address to, uint256 value, bytes data, uint8 operation)',
28
28
  'function approve(address _spender, uint256 _value)'
29
29
  ]);
30
+ exports.ENTRYPOINT_ADDRESS_V06 = '0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789';
31
+ exports.ENTRYPOINT_ADDRESS_V07 = '0x0000000071727De22E5E9d8BAf0edAc6f37da032';
30
32
  exports.RPC_4337_CALLS = {
31
33
  ESTIMATE_USER_OPERATION_GAS: 'eth_estimateUserOperationGas',
32
34
  SEND_USER_OPERATION: 'eth_sendUserOperation',
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/packs/safe-4337/constants.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAElB,QAAA,oBAAoB,GAAG,OAAO,CAAA;AAC9B,QAAA,4BAA4B,GAAG,OAAO,CAAA;AAEtC,QAAA,0BAA0B,GAAG;IACxC,MAAM,EAAE;QACN,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE;QACjC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE;QAClC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE;QACnC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE;QACnC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE;QACzC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,sBAAsB,EAAE;QACjD,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,oBAAoB,EAAE;QAC/C,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE;QACzC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,sBAAsB,EAAE;QACjD,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE;QAC3C,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE;QACtC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE;QACtC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE;KACxC;CACF,CAAA;AAEY,QAAA,UAAU,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC;IAC7C,mCAAmC;IACnC,8DAA8D;IAC9D,gFAAgF;IAChF,oDAAoD;CACrD,CAAC,CAAA;AAEW,QAAA,cAAc,GAAG;IAC5B,2BAA2B,EAAE,8BAA8B;IAC3D,mBAAmB,EAAE,uBAAuB;IAC5C,0BAA0B,EAAE,4BAA4B;IACxD,0BAA0B,EAAE,6BAA6B;IACzD,sBAAsB,EAAE,0BAA0B;IAClD,QAAQ,EAAE,aAAa;IACvB,sBAAsB,EAAE,yBAAyB;CAClD,CAAA"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/packs/safe-4337/constants.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAElB,QAAA,oBAAoB,GAAG,OAAO,CAAA;AAC9B,QAAA,4BAA4B,GAAG,OAAO,CAAA;AAEtC,QAAA,0BAA0B,GAAG;IACxC,MAAM,EAAE;QACN,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE;QACjC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE;QAClC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE;QACnC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE;QACnC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE;QACzC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,sBAAsB,EAAE;QACjD,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,oBAAoB,EAAE;QAC/C,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE;QACzC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,sBAAsB,EAAE;QACjD,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE;QAC3C,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE;QACtC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE;QACtC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE;KACxC;CACF,CAAA;AAEY,QAAA,UAAU,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC;IAC7C,mCAAmC;IACnC,8DAA8D;IAC9D,gFAAgF;IAChF,oDAAoD;CACrD,CAAC,CAAA;AAEW,QAAA,sBAAsB,GAAG,4CAA4C,CAAA;AACrE,QAAA,sBAAsB,GAAG,4CAA4C,CAAA;AAErE,QAAA,cAAc,GAAG;IAC5B,2BAA2B,EAAE,8BAA8B;IAC3D,mBAAmB,EAAE,uBAAuB;IAC5C,0BAA0B,EAAE,4BAA4B;IACxD,0BAA0B,EAAE,6BAA6B;IACzD,sBAAsB,EAAE,0BAA0B;IAClD,QAAQ,EAAE,aAAa;IACvB,sBAAsB,EAAE,yBAAyB;CAClD,CAAA"}
@@ -5,9 +5,11 @@ 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_MODULES_V0_3_0 = "0.3.0";
8
9
  export declare const PAYMASTER_ADDRESS = "0x0000000000325602a77416A16136FDafd04b299f";
9
10
  export declare const PAYMASTER_TOKEN_ADDRESS = "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238";
10
11
  export declare const CHAIN_ID = "0xaa36a7";
12
+ export declare const MODULE_ADDRESS = "0xa581c4A4DB7175302464fF3C06380BC3270b4037";
11
13
  export declare const RPC_URL = "https://sepolia.gateway.tenderly.co";
12
14
  export declare const BUNDLER_URL = "https://bundler.url";
13
15
  export declare const PAYMASTER_URL = "https://paymaster.url";
@@ -87,6 +89,39 @@ export declare const GAS_ESTIMATION: {
87
89
  preVerificationGas: string;
88
90
  callGasLimit: string;
89
91
  };
92
+ export declare const SAFE_OPERATION_RESPONSE: {
93
+ created: string;
94
+ modified: string;
95
+ safeOperationHash: string;
96
+ validAfter: null;
97
+ validUntil: null;
98
+ moduleAddress: string;
99
+ confirmations: {
100
+ created: string;
101
+ modified: string;
102
+ owner: string;
103
+ signature: string;
104
+ signatureType: string;
105
+ }[];
106
+ preparedSignature: string;
107
+ userOperation: {
108
+ ethereumTxHash: null;
109
+ sender: string;
110
+ userOperationHash: string;
111
+ nonce: number;
112
+ initCode: string;
113
+ callData: string;
114
+ callGasLimit: number;
115
+ verificationGasLimit: number;
116
+ preVerificationGas: number;
117
+ maxFeePerGas: number;
118
+ maxPriorityFeePerGas: number;
119
+ paymaster: null;
120
+ paymasterData: null;
121
+ signature: string;
122
+ entryPoint: string;
123
+ };
124
+ };
90
125
  export declare const SPONSORED_GAS_ESTIMATION: {
91
126
  verificationGasLimit: string;
92
127
  preVerificationGas: string;
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.USER_OPERATION_GAS_PRICE = exports.SPONSORED_GAS_ESTIMATION = exports.GAS_ESTIMATION = exports.USER_OPERATION_BY_HASH = exports.USER_OPERATION_HEX_VALUES = exports.USER_OPERATION = exports.USER_OPERATION_RECEIPT = exports.ENTRYPOINTS = exports.USER_OPERATION_HASH = exports.PAYMASTER_URL = exports.BUNDLER_URL = exports.RPC_URL = exports.CHAIN_ID = exports.PAYMASTER_TOKEN_ADDRESS = exports.PAYMASTER_ADDRESS = exports.SAFE_ADDRESS_4337_FALLBACKHANDLER_NOT_ENABLED = exports.SAFE_ADDRESS_4337_MODULE_NOT_ENABLED = exports.SAFE_ADDRESS_v1_3_0 = exports.SAFE_ADDRESS_v1_4_1 = exports.PREDICTED_SAFE_ADDRESS = exports.OWNER_2 = exports.OWNER_1 = void 0;
3
+ exports.USER_OPERATION_GAS_PRICE = exports.SPONSORED_GAS_ESTIMATION = exports.SAFE_OPERATION_RESPONSE = exports.GAS_ESTIMATION = exports.USER_OPERATION_BY_HASH = exports.USER_OPERATION_HEX_VALUES = exports.USER_OPERATION = exports.USER_OPERATION_RECEIPT = exports.ENTRYPOINTS = exports.USER_OPERATION_HASH = exports.PAYMASTER_URL = exports.BUNDLER_URL = exports.RPC_URL = exports.MODULE_ADDRESS = exports.CHAIN_ID = exports.PAYMASTER_TOKEN_ADDRESS = exports.PAYMASTER_ADDRESS = exports.SAFE_MODULES_V0_3_0 = exports.SAFE_ADDRESS_4337_FALLBACKHANDLER_NOT_ENABLED = exports.SAFE_ADDRESS_4337_MODULE_NOT_ENABLED = exports.SAFE_ADDRESS_v1_3_0 = exports.SAFE_ADDRESS_v1_4_1 = exports.PREDICTED_SAFE_ADDRESS = exports.OWNER_2 = exports.OWNER_1 = void 0;
4
+ const constants_1 = require("../constants");
4
5
  exports.OWNER_1 = '0xFfAC5578BE8AC1B2B9D13b34cAf4A074B96B8A1b';
5
6
  exports.OWNER_2 = '0x3059EfD1BCe33be41eeEfd5fb6D520d7fEd54E43';
6
7
  exports.PREDICTED_SAFE_ADDRESS = '0x65e0d294F2d17CB9fB0f65111E9Ac8a00C4049dA';
@@ -8,17 +9,16 @@ exports.SAFE_ADDRESS_v1_4_1 = '0x717f4BB83D8DF2e5a3Cc603Ee27263ac9EFB6c12';
8
9
  exports.SAFE_ADDRESS_v1_3_0 = '0x8C35a08Af278518B59D04ddDe3F1b370aD766D22';
9
10
  exports.SAFE_ADDRESS_4337_MODULE_NOT_ENABLED = '0xfC82a1e4A045a44527e8b45FC70332C8F66fc32B';
10
11
  exports.SAFE_ADDRESS_4337_FALLBACKHANDLER_NOT_ENABLED = '0xA6FDc4e18404E1715D1bC51B07266c91393C6622';
12
+ exports.SAFE_MODULES_V0_3_0 = '0.3.0';
11
13
  exports.PAYMASTER_ADDRESS = '0x0000000000325602a77416A16136FDafd04b299f';
12
14
  exports.PAYMASTER_TOKEN_ADDRESS = '0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238';
13
15
  exports.CHAIN_ID = '0xaa36a7';
16
+ exports.MODULE_ADDRESS = '0xa581c4A4DB7175302464fF3C06380BC3270b4037';
14
17
  exports.RPC_URL = 'https://sepolia.gateway.tenderly.co';
15
18
  exports.BUNDLER_URL = 'https://bundler.url';
16
19
  exports.PAYMASTER_URL = 'https://paymaster.url';
17
20
  exports.USER_OPERATION_HASH = '0x3cb881d1969036174f38d636d22108d1d032145518b53104fc0b1e1296d2cc9c';
18
- exports.ENTRYPOINTS = [
19
- '0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789',
20
- '0x0000000071727De22E5E9d8BAf0edAc6f37da032'
21
- ];
21
+ exports.ENTRYPOINTS = [constants_1.ENTRYPOINT_ADDRESS_V06, constants_1.ENTRYPOINT_ADDRESS_V07];
22
22
  exports.USER_OPERATION_RECEIPT = {
23
23
  userOpHash: '0x3cb881d1969036174f38d636d22108d1d032145518b53104fc0b1e1296d2cc9c',
24
24
  sender: '0x1405B3659a11a16459fc27Fa1925b60388C38Ce1',
@@ -81,6 +81,41 @@ exports.GAS_ESTIMATION = {
81
81
  preVerificationGas: '0x186A0',
82
82
  callGasLimit: '0x186A0'
83
83
  };
84
+ exports.SAFE_OPERATION_RESPONSE = {
85
+ created: '2024-05-31T10:12:21.169031Z',
86
+ modified: '2024-05-31T10:12:21.169031Z',
87
+ safeOperationHash: '0x5a62b1d61f8fca5f766e9456523bb42765d318058b5f235f967ffe3c2af8b1d7',
88
+ validAfter: null,
89
+ validUntil: null,
90
+ moduleAddress: '0xa581c4A4DB7175302464fF3C06380BC3270b4037',
91
+ confirmations: [
92
+ {
93
+ created: '2024-05-31T10:12:21.184585Z',
94
+ modified: '2024-05-31T10:12:21.184585Z',
95
+ owner: '0x3059EfD1BCe33be41eeEfd5fb6D520d7fEd54E43',
96
+ signature: '0xcb28e74375889e400a4d8aca46b8c59e1cf8825e373c26fa99c2fd7c078080e64fe30eaf1125257bdfe0b358b5caef68aa0420478145f52decc8e74c979d43ab1d',
97
+ signatureType: 'EOA'
98
+ }
99
+ ],
100
+ preparedSignature: '0xcb28e74375889e400a4d8aca46b8c59e1cf8825e373c26fa99c2fd7c078080e64fe30eaf1125257bdfe0b358b5caef68aa0420478145f52decc8e74c979d43ab1c',
101
+ userOperation: {
102
+ ethereumTxHash: null,
103
+ sender: '0xE322e721bCe76cE7FCf3A475f139A9314571ad3D',
104
+ userOperationHash: '0x5d23b7d96a718582601183b1849a4c76b2a13d3787f15074d62a0b6e4a3f76a1',
105
+ nonce: 3,
106
+ initCode: '0x',
107
+ callData: '0x7bb37428000000000000000000000000e322e721bce76ce7fcf3a475f139a9314571ad3d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
108
+ callGasLimit: 122497,
109
+ verificationGasLimit: 123498,
110
+ preVerificationGas: 50705,
111
+ maxFeePerGas: 105183831060,
112
+ maxPriorityFeePerGas: 1380000000,
113
+ paymaster: null,
114
+ paymasterData: null,
115
+ signature: '0x54158da2d357241ee1c5c8fca9c4e1bfa6b92a60bd0ed1bea56f4092b008435153d6264a8a8c00925383ecaeaf9d839a2dc1ff006703c65b7f05d0ce8cdd57ab1b',
116
+ entryPoint: '0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789'
117
+ }
118
+ };
84
119
  exports.SPONSORED_GAS_ESTIMATION = {
85
120
  paymasterAndData: '0x1405B3659a11a16459fc27Fa1925b60388C38Ce1',
86
121
  ...exports.GAS_ESTIMATION
@@ -1 +1 @@
1
- {"version":3,"file":"fixtures.js","sourceRoot":"","sources":["../../../../../src/packs/safe-4337/testing-utils/fixtures.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,4CAA4C,CAAA;AACtD,QAAA,OAAO,GAAG,4CAA4C,CAAA;AACtD,QAAA,sBAAsB,GAAG,4CAA4C,CAAA;AACrE,QAAA,mBAAmB,GAAG,4CAA4C,CAAA;AAClE,QAAA,mBAAmB,GAAG,4CAA4C,CAAA;AAClE,QAAA,oCAAoC,GAAG,4CAA4C,CAAA;AACnF,QAAA,6CAA6C,GACxD,4CAA4C,CAAA;AACjC,QAAA,iBAAiB,GAAG,4CAA4C,CAAA;AAChE,QAAA,uBAAuB,GAAG,4CAA4C,CAAA;AACtE,QAAA,QAAQ,GAAG,UAAU,CAAA;AAErB,QAAA,OAAO,GAAG,qCAAqC,CAAA;AAC/C,QAAA,WAAW,GAAG,qBAAqB,CAAA;AACnC,QAAA,aAAa,GAAG,uBAAuB,CAAA;AAEvC,QAAA,mBAAmB,GAC9B,oEAAoE,CAAA;AAEzD,QAAA,WAAW,GAAG;IACzB,4CAA4C;IAC5C,4CAA4C;CAC7C,CAAA;AAEY,QAAA,sBAAsB,GAAG;IACpC,UAAU,EAAE,oEAAoE;IAChF,MAAM,EAAE,4CAA4C;IACpD,KAAK,EAAE,KAAK;IACZ,aAAa,EAAE,SAAS;IACxB,aAAa,EAAE,kBAAkB;IACjC,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,EAAE;IACR,OAAO,EAAE;QACP,eAAe,EAAE,oEAAoE;QACrF,gBAAgB,EAAE,MAAM;QACxB,SAAS,EAAE,oEAAoE;QAC/E,WAAW,EAAE,UAAU;QACvB,IAAI,EAAE,4CAA4C;QAClD,EAAE,EAAE,4CAA4C;QAChD,iBAAiB,EAAE,UAAU;QAC7B,OAAO,EAAE,SAAS;QAClB,eAAe,EAAE,IAAI;QACrB,IAAI,EAAE,EAAE;QACR,SAAS,EACP,ogBAAogB;QACtgB,MAAM,EAAE,KAAK;QACb,iBAAiB,EAAE,cAAc;KAClC;CACF,CAAA;AAEY,QAAA,cAAc,GAAG;IAC5B,MAAM,EAAE,4CAA4C;IACpD,KAAK,EAAE,KAAK;IACZ,QAAQ,EAAE,IAAI;IACd,QAAQ,EACN,4oCAA4oC;IAC9oC,YAAY,EAAE,OAAQ;IACtB,oBAAoB,EAAE,MAAO;IAC7B,kBAAkB,EAAE,MAAO;IAC3B,YAAY,EAAE,aAAgB;IAC9B,oBAAoB,EAAE,WAAc;IACpC,gBAAgB,EAAE,IAAI;IACtB,SAAS,EACP,8JAA8J;CACjK,CAAA;AAEY,QAAA,yBAAyB,GAAG;IACvC,MAAM,EAAE,4CAA4C;IACpD,KAAK,EAAE,KAAK;IACZ,QAAQ,EAAE,IAAI;IACd,QAAQ,EACN,4oCAA4oC;IAC9oC,YAAY,EAAE,SAAS;IACvB,oBAAoB,EAAE,SAAS;IAC/B,kBAAkB,EAAE,QAAQ;IAC5B,YAAY,EAAE,cAAc;IAC5B,oBAAoB,EAAE,YAAY;IAClC,gBAAgB,EAAE,IAAI;IACtB,SAAS,EACP,8JAA8J;CACjK,CAAA;AAEY,QAAA,sBAAsB,GAAG;IACpC,aAAa,EAAE,iCAAyB;IACxC,UAAU,EAAE,4CAA4C;IACxD,eAAe,EAAE,oEAAoE;IACrF,SAAS,EAAE,oEAAoE;IAC/E,WAAW,EAAE,UAAU;CACxB,CAAA;AAEY,QAAA,cAAc,GAAG;IAC5B,oBAAoB,EAAE,SAAS;IAC/B,kBAAkB,EAAE,SAAS;IAC7B,YAAY,EAAE,SAAS;CACxB,CAAA;AAEY,QAAA,wBAAwB,GAAG;IACtC,gBAAgB,EAAE,4CAA4C;IAC9D,GAAG,sBAAc;CAClB,CAAA;AAEY,QAAA,wBAAwB,GAAG;IACtC,IAAI,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,oBAAoB,EAAE,SAAS,EAAE;CACnE,CAAA"}
1
+ {"version":3,"file":"fixtures.js","sourceRoot":"","sources":["../../../../../src/packs/safe-4337/testing-utils/fixtures.ts"],"names":[],"mappings":";;;AAAA,4CAA6E;AAEhE,QAAA,OAAO,GAAG,4CAA4C,CAAA;AACtD,QAAA,OAAO,GAAG,4CAA4C,CAAA;AACtD,QAAA,sBAAsB,GAAG,4CAA4C,CAAA;AACrE,QAAA,mBAAmB,GAAG,4CAA4C,CAAA;AAClE,QAAA,mBAAmB,GAAG,4CAA4C,CAAA;AAClE,QAAA,oCAAoC,GAAG,4CAA4C,CAAA;AACnF,QAAA,6CAA6C,GACxD,4CAA4C,CAAA;AACjC,QAAA,mBAAmB,GAAG,OAAO,CAAA;AAC7B,QAAA,iBAAiB,GAAG,4CAA4C,CAAA;AAChE,QAAA,uBAAuB,GAAG,4CAA4C,CAAA;AACtE,QAAA,QAAQ,GAAG,UAAU,CAAA;AACrB,QAAA,cAAc,GAAG,4CAA4C,CAAA;AAC7D,QAAA,OAAO,GAAG,qCAAqC,CAAA;AAC/C,QAAA,WAAW,GAAG,qBAAqB,CAAA;AACnC,QAAA,aAAa,GAAG,uBAAuB,CAAA;AAEvC,QAAA,mBAAmB,GAC9B,oEAAoE,CAAA;AAEzD,QAAA,WAAW,GAAG,CAAC,kCAAsB,EAAE,kCAAsB,CAAC,CAAA;AAE9D,QAAA,sBAAsB,GAAG;IACpC,UAAU,EAAE,oEAAoE;IAChF,MAAM,EAAE,4CAA4C;IACpD,KAAK,EAAE,KAAK;IACZ,aAAa,EAAE,SAAS;IACxB,aAAa,EAAE,kBAAkB;IACjC,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,EAAE;IACR,OAAO,EAAE;QACP,eAAe,EAAE,oEAAoE;QACrF,gBAAgB,EAAE,MAAM;QACxB,SAAS,EAAE,oEAAoE;QAC/E,WAAW,EAAE,UAAU;QACvB,IAAI,EAAE,4CAA4C;QAClD,EAAE,EAAE,4CAA4C;QAChD,iBAAiB,EAAE,UAAU;QAC7B,OAAO,EAAE,SAAS;QAClB,eAAe,EAAE,IAAI;QACrB,IAAI,EAAE,EAAE;QACR,SAAS,EACP,ogBAAogB;QACtgB,MAAM,EAAE,KAAK;QACb,iBAAiB,EAAE,cAAc;KAClC;CACF,CAAA;AAEY,QAAA,cAAc,GAAG;IAC5B,MAAM,EAAE,4CAA4C;IACpD,KAAK,EAAE,KAAK;IACZ,QAAQ,EAAE,IAAI;IACd,QAAQ,EACN,4oCAA4oC;IAC9oC,YAAY,EAAE,OAAQ;IACtB,oBAAoB,EAAE,MAAO;IAC7B,kBAAkB,EAAE,MAAO;IAC3B,YAAY,EAAE,aAAgB;IAC9B,oBAAoB,EAAE,WAAc;IACpC,gBAAgB,EAAE,IAAI;IACtB,SAAS,EACP,8JAA8J;CACjK,CAAA;AAEY,QAAA,yBAAyB,GAAG;IACvC,MAAM,EAAE,4CAA4C;IACpD,KAAK,EAAE,KAAK;IACZ,QAAQ,EAAE,IAAI;IACd,QAAQ,EACN,4oCAA4oC;IAC9oC,YAAY,EAAE,SAAS;IACvB,oBAAoB,EAAE,SAAS;IAC/B,kBAAkB,EAAE,QAAQ;IAC5B,YAAY,EAAE,cAAc;IAC5B,oBAAoB,EAAE,YAAY;IAClC,gBAAgB,EAAE,IAAI;IACtB,SAAS,EACP,8JAA8J;CACjK,CAAA;AAEY,QAAA,sBAAsB,GAAG;IACpC,aAAa,EAAE,iCAAyB;IACxC,UAAU,EAAE,4CAA4C;IACxD,eAAe,EAAE,oEAAoE;IACrF,SAAS,EAAE,oEAAoE;IAC/E,WAAW,EAAE,UAAU;CACxB,CAAA;AAEY,QAAA,cAAc,GAAG;IAC5B,oBAAoB,EAAE,SAAS;IAC/B,kBAAkB,EAAE,SAAS;IAC7B,YAAY,EAAE,SAAS;CACxB,CAAA;AAEY,QAAA,uBAAuB,GAAG;IACrC,OAAO,EAAE,6BAA6B;IACtC,QAAQ,EAAE,6BAA6B;IACvC,iBAAiB,EAAE,oEAAoE;IACvF,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,IAAI;IAChB,aAAa,EAAE,4CAA4C;IAC3D,aAAa,EAAE;QACb;YACE,OAAO,EAAE,6BAA6B;YACtC,QAAQ,EAAE,6BAA6B;YACvC,KAAK,EAAE,4CAA4C;YACnD,SAAS,EACP,sIAAsI;YACxI,aAAa,EAAE,KAAK;SACrB;KACF;IACD,iBAAiB,EACf,sIAAsI;IACxI,aAAa,EAAE;QACb,cAAc,EAAE,IAAI;QACpB,MAAM,EAAE,4CAA4C;QACpD,iBAAiB,EAAE,oEAAoE;QACvF,KAAK,EAAE,CAAC;QACR,QAAQ,EAAE,IAAI;QACd,QAAQ,EACN,4UAA4U;QAC9U,YAAY,EAAE,MAAM;QACpB,oBAAoB,EAAE,MAAM;QAC5B,kBAAkB,EAAE,KAAK;QACzB,YAAY,EAAE,YAAY;QAC1B,oBAAoB,EAAE,UAAU;QAChC,SAAS,EAAE,IAAI;QACf,aAAa,EAAE,IAAI;QACnB,SAAS,EACP,sIAAsI;QACxI,UAAU,EAAE,4CAA4C;KACzD;CACF,CAAA;AAEY,QAAA,wBAAwB,GAAG;IACtC,gBAAgB,EAAE,4CAA4C;IAC9D,GAAG,sBAAc;CAClB,CAAA;AAEY,QAAA,wBAAwB,GAAG;IACtC,IAAI,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,oBAAoB,EAAE,SAAS,EAAE;CACnE,CAAA"}
@@ -46,7 +46,6 @@ const createSafe4337Pack = async (initOptions) => {
46
46
  safeAddress: ''
47
47
  },
48
48
  ...initOptions,
49
- rpcUrl: fixtures.RPC_URL,
50
49
  bundlerUrl: fixtures.BUNDLER_URL
51
50
  });
52
51
  safe4337PackCache.set(key, safe4337Pack);
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../src/packs/safe-4337/testing-utils/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA+B;AAE/B,kDAA8C;AAC9C,qDAAsC;AAE/B,MAAM,wBAAwB,GAAG,CAAC,EAAU,EAAE,KAAa,EAAE,EAAE;IACpE,MAAM,WAAW,GAAG,+DAA+D,CAAA;IACnF,MAAM,KAAK,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,CAAC,CAAA;IAEjD,OAAO,KAAK,CAAC,kBAAkB,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAA;AAC1D,CAAC,CAAA;AALY,QAAA,wBAAwB,4BAKpC;AAED,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAE,CAAA;AAE5B,MAAM,kBAAkB,GAAG,KAAK,EACrC,WAAyC,EAClB,EAAE;IACzB,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;IAEvC,IAAI,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/B,OAAO,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACnC,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,2BAAY,CAAC,IAAI,CAAC;QAC3C,QAAQ,EAAE,QAAQ,CAAC,OAAO;QAC1B,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;QAC/B,OAAO,EAAE;YACP,WAAW,EAAE,EAAE;SAChB;QACD,GAAG,WAAW;QACd,MAAM,EAAE,QAAQ,CAAC,OAAO;QACxB,UAAU,EAAE,QAAQ,CAAC,WAAW;KACjC,CAAC,CAAA;IAEF,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAA;IAExC,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA;AAvBY,QAAA,kBAAkB,sBAuB9B"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../src/packs/safe-4337/testing-utils/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA+B;AAE/B,kDAA8C;AAC9C,qDAAsC;AAE/B,MAAM,wBAAwB,GAAG,CAAC,EAAU,EAAE,KAAa,EAAE,EAAE;IACpE,MAAM,WAAW,GAAG,+DAA+D,CAAA;IACnF,MAAM,KAAK,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,CAAC,CAAA;IAEjD,OAAO,KAAK,CAAC,kBAAkB,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAA;AAC1D,CAAC,CAAA;AALY,QAAA,wBAAwB,4BAKpC;AAED,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAE,CAAA;AAE5B,MAAM,kBAAkB,GAAG,KAAK,EACrC,WAAyC,EAClB,EAAE;IACzB,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;IAEvC,IAAI,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/B,OAAO,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACnC,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,2BAAY,CAAC,IAAI,CAAC;QAC3C,QAAQ,EAAE,QAAQ,CAAC,OAAO;QAC1B,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;QAC/B,OAAO,EAAE;YACP,WAAW,EAAE,EAAE;SAChB;QACD,GAAG,WAAW;QACd,UAAU,EAAE,QAAQ,CAAC,WAAW;KACjC,CAAC,CAAA;IAEF,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAA;IAExC,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA;AAtBY,QAAA,kBAAkB,sBAsB9B"}
@@ -1,5 +1,5 @@
1
1
  import Safe, { SafeProviderConfig } from '@safe-global/protocol-kit';
2
- import { EstimateGasData, MetaTransactionData, SafeVersion, UserOperation } from '@safe-global/safe-core-sdk-types';
2
+ import { EstimateGasData, MetaTransactionData, SafeOperationResponse, SafeVersion, UserOperation } from '@safe-global/safe-core-sdk-types';
3
3
  import { ethers } from 'ethers';
4
4
  import EthSafeOperation from './SafeOperation';
5
5
  type ExistingSafeOptions = {
@@ -23,7 +23,6 @@ export type Safe4337InitOptions = {
23
23
  provider: SafeProviderConfig['provider'];
24
24
  signer?: SafeProviderConfig['signer'];
25
25
  bundlerUrl: string;
26
- rpcUrl: string;
27
26
  safeModulesVersion?: string;
28
27
  customContracts?: {
29
28
  entryPointAddress?: string;
@@ -38,7 +37,6 @@ export type Safe4337Options = {
38
37
  bundlerUrl: string;
39
38
  paymasterOptions?: PaymasterOptions;
40
39
  bundlerClient: ethers.JsonRpcProvider;
41
- publicClient: ethers.JsonRpcProvider;
42
40
  entryPointAddress: string;
43
41
  safe4337ModuleAddress: string;
44
42
  };
@@ -52,7 +50,7 @@ export type Safe4337CreateTransactionProps = {
52
50
  };
53
51
  };
54
52
  export type Safe4337ExecutableProps = {
55
- executable: EthSafeOperation;
53
+ executable: EthSafeOperation | SafeOperationResponse;
56
54
  };
57
55
  export type EstimateSponsoredGasData = {
58
56
  paymasterAndData: string;
@@ -0,0 +1,4 @@
1
+ export declare const EQ_OR_GT_0_3_0 = ">=0.3.0";
2
+ export declare function sameString(str1: string, str2: string): boolean;
3
+ export declare function entryPointToSafeModules(entryPoint: string): string;
4
+ export declare function isEntryPointV6(address: string): boolean;
@@ -0,0 +1,23 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.isEntryPointV6 = exports.entryPointToSafeModules = exports.sameString = exports.EQ_OR_GT_0_3_0 = void 0;
4
+ const constants_1 = require("../constants");
5
+ const EQ_0_2_0 = '0.2.0';
6
+ exports.EQ_OR_GT_0_3_0 = '>=0.3.0';
7
+ function sameString(str1, str2) {
8
+ return str1.toLowerCase() === str2.toLowerCase();
9
+ }
10
+ exports.sameString = sameString;
11
+ function entryPointToSafeModules(entryPoint) {
12
+ const moduleVersionToEntryPoint = {
13
+ [constants_1.ENTRYPOINT_ADDRESS_V06]: EQ_0_2_0,
14
+ [constants_1.ENTRYPOINT_ADDRESS_V07]: exports.EQ_OR_GT_0_3_0
15
+ };
16
+ return moduleVersionToEntryPoint[entryPoint];
17
+ }
18
+ exports.entryPointToSafeModules = entryPointToSafeModules;
19
+ function isEntryPointV6(address) {
20
+ return sameString(address, constants_1.ENTRYPOINT_ADDRESS_V06);
21
+ }
22
+ exports.isEntryPointV6 = isEntryPointV6;
23
+ //# sourceMappingURL=entrypoint.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"entrypoint.js","sourceRoot":"","sources":["../../../../../src/packs/safe-4337/utils/entrypoint.ts"],"names":[],"mappings":";;;AAAA,4CAA6E;AAE7E,MAAM,QAAQ,GAAG,OAAO,CAAA;AAEX,QAAA,cAAc,GAAG,SAAS,CAAA;AAEvC,SAAgB,UAAU,CAAC,IAAY,EAAE,IAAY;IACnD,OAAO,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,WAAW,EAAE,CAAA;AAClD,CAAC;AAFD,gCAEC;AAED,SAAgB,uBAAuB,CAAC,UAAkB;IACxD,MAAM,yBAAyB,GAA2B;QACxD,CAAC,kCAAsB,CAAC,EAAE,QAAQ;QAClC,CAAC,kCAAsB,CAAC,EAAE,sBAAc;KACzC,CAAA;IAED,OAAO,yBAAyB,CAAC,UAAU,CAAC,CAAA;AAC9C,CAAC;AAPD,0DAOC;AAED,SAAgB,cAAc,CAAC,OAAe;IAC5C,OAAO,UAAU,CAAC,OAAO,EAAE,kCAAsB,CAAC,CAAA;AACpD,CAAC;AAFD,wCAEC"}