@safe-global/relay-kit 3.0.1 → 3.0.3

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 (31) hide show
  1. package/dist/src/packs/gelato/GelatoRelayPack.test.js +1 -1
  2. package/dist/src/packs/gelato/GelatoRelayPack.test.js.map +1 -1
  3. package/dist/src/packs/safe-4337/Safe4337Pack.d.ts +11 -5
  4. package/dist/src/packs/safe-4337/Safe4337Pack.js +126 -95
  5. package/dist/src/packs/safe-4337/Safe4337Pack.js.map +1 -1
  6. package/dist/src/packs/safe-4337/Safe4337Pack.test.js +90 -33
  7. package/dist/src/packs/safe-4337/Safe4337Pack.test.js.map +1 -1
  8. package/dist/src/packs/safe-4337/SafeOperation.d.ts +6 -1
  9. package/dist/src/packs/safe-4337/SafeOperation.js +7 -1
  10. package/dist/src/packs/safe-4337/SafeOperation.js.map +1 -1
  11. package/dist/src/packs/safe-4337/SafeOperation.test.js +10 -0
  12. package/dist/src/packs/safe-4337/SafeOperation.test.js.map +1 -1
  13. package/dist/src/packs/safe-4337/constants.d.ts +2 -0
  14. package/dist/src/packs/safe-4337/constants.js +3 -1
  15. package/dist/src/packs/safe-4337/constants.js.map +1 -1
  16. package/dist/src/packs/safe-4337/estimators/PimlicoFeeEstimator.js +2 -1
  17. package/dist/src/packs/safe-4337/estimators/PimlicoFeeEstimator.js.map +1 -1
  18. package/dist/src/packs/safe-4337/testing-utils/fixtures.d.ts +35 -0
  19. package/dist/src/packs/safe-4337/testing-utils/fixtures.js +40 -5
  20. package/dist/src/packs/safe-4337/testing-utils/fixtures.js.map +1 -1
  21. package/dist/src/packs/safe-4337/testing-utils/helpers.js +0 -1
  22. package/dist/src/packs/safe-4337/testing-utils/helpers.js.map +1 -1
  23. package/dist/src/packs/safe-4337/types.d.ts +11 -8
  24. package/dist/src/packs/safe-4337/utils/entrypoint.d.ts +4 -0
  25. package/dist/src/packs/safe-4337/utils/entrypoint.js +23 -0
  26. package/dist/src/packs/safe-4337/utils/entrypoint.js.map +1 -0
  27. package/dist/src/packs/safe-4337/utils.d.ts +32 -5
  28. package/dist/src/packs/safe-4337/utils.js +71 -9
  29. package/dist/src/packs/safe-4337/utils.js.map +1 -1
  30. package/dist/tsconfig.build.tsbuildinfo +1 -1
  31. package/package.json +5 -5
package/dist/src/packs/gelato/GelatoRelayPack.test.js CHANGED
@@ -130,7 +130,7 @@ describe('GelatoRelayPack', () => {
130
130
  });
131
131
  it('should throw an error when trying to do a sponsored transaction without an api key', async () => {
132
132
  const relayPack = new GelatoRelayPack_1.GelatoRelayPack({ protocolKit: safe });
133
- await expect(relayPack.sendSponsorTransaction(SAFE_ADDRESS, '0x', CHAIN_ID)).rejects.toThrowError('API key not defined');
133
+ await expect(relayPack.sendSponsorTransaction(SAFE_ADDRESS, '0x', CHAIN_ID)).rejects.toThrow('API key not defined');
134
134
  });
135
135
  describe('when creating a relayed transaction', () => {
136
136
  describe('When gas limit is manually defined', () => {
package/dist/src/packs/gelato/GelatoRelayPack.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"GelatoRelayPack.test.js","sourceRoot":"","sources":["../../../../src/packs/gelato/GelatoRelayPack.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GelatoRelayPack.test.js","sourceRoot":"","sources":["../../../../src/packs/gelato/GelatoRelayPack.test.ts"],"names":[],"mappings":"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"}
package/dist/src/packs/safe-4337/Safe4337Pack.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { SigningMethod } from '@safe-global/protocol-kit';
2
2
  import { RelayKitBasePack } from '../../RelayKitBasePack';
3
+ import { SafeOperationResponse } from '@safe-global/safe-core-sdk-types';
3
4
  import EthSafeOperation from './SafeOperation';
4
5
  import { EstimateFeeProps, Safe4337CreateTransactionProps, Safe4337ExecutableProps, Safe4337InitOptions, Safe4337Options, UserOperationReceipt, UserOperationWithPayload } from './types';
5
6
  /**
@@ -25,7 +26,7 @@ export declare class Safe4337Pack extends RelayKitBasePack<{
25
26
  *
26
27
  * @param {Safe4337Options} options - The initialization parameters.
27
28
  */
28
- constructor({ protocolKit, bundlerClient, publicClient, bundlerUrl, paymasterOptions, entryPointAddress, safe4337ModuleAddress }: Safe4337Options);
29
+ constructor({ protocolKit, bundlerClient, bundlerUrl, chainId, paymasterOptions, entryPointAddress, safe4337ModuleAddress }: Safe4337Options);
29
30
  /**
30
31
  * Initializes a Safe4337Pack class.
31
32
  * This method creates the protocolKit instance based on the input parameters.
@@ -57,18 +58,23 @@ export declare class Safe4337Pack extends RelayKitBasePack<{
57
58
  /**
58
59
  * Signs a safe operation.
59
60
  *
60
- * @param {EthSafeOperation} safeOperation - The SafeOperation to sign.
61
+ * @param {EthSafeOperation | SafeOperationResponse} safeOperation - The SafeOperation to sign. It can be:
62
+ * - A response from the API (Tx Service)
63
+ * - An instance of EthSafeOperation
61
64
  * @param {SigningMethod} signingMethod - The signing method to use.
62
65
  * @return {Promise<EthSafeOperation>} The Promise object will resolve to the signed SafeOperation.
63
66
  */
64
- signSafeOperation(safeOperation: EthSafeOperation, signingMethod?: SigningMethod): Promise<EthSafeOperation>;
67
+ signSafeOperation(safeOperation: EthSafeOperation | SafeOperationResponse, signingMethod?: SigningMethod): Promise<EthSafeOperation>;
65
68
  /**
66
69
  * Executes the relay transaction.
67
70
  *
68
- * @param {EthSafeOperation} safeOperation - The SafeOperation to execute.
71
+ * @param {Safe4337ExecutableProps} props - The parameters for the transaction execution.
72
+ * @param {EthSafeOperation | SafeOperationResponse} props.executable - The SafeOperation to execute. It can be:
73
+ * - A response from the API (Tx Service)
74
+ * - An instance of EthSafeOperation
69
75
  * @return {Promise<string>} The user operation hash.
70
76
  */
71
- executeTransaction({ executable: safeOperation }: Safe4337ExecutableProps): Promise<string>;
77
+ executeTransaction({ executable }: Safe4337ExecutableProps): Promise<string>;
72
78
  /**
73
79
  * Return a UserOperation based on a hash (userOpHash) returned by eth_sendUserOperation
74
80
  *
package/dist/src/packs/safe-4337/Safe4337Pack.js CHANGED
@@ -36,7 +36,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
36
36
  var __importDefault = (this && this.__importDefault) || function (mod) {
37
37
  return (mod && mod.__esModule) ? mod : { "default": mod };
38
38
  };
39
- var _Safe4337Pack_instances, _Safe4337Pack_BUNDLER_URL, _Safe4337Pack_ENTRYPOINT_ADDRESS, _Safe4337Pack_SAFE_4337_MODULE_ADDRESS, _Safe4337Pack_bundlerClient, _Safe4337Pack_publicClient, _Safe4337Pack_paymasterOptions, _Safe4337Pack_getSafeUserOperationHash, _Safe4337Pack_sendUserOperation, _Safe4337Pack_signTypedData, _Safe4337Pack_getAccountNonce, _Safe4337Pack_encodeExecuteUserOpCallData, _Safe4337Pack_encodeMultiSendCallData;
39
+ var _Safe4337Pack_instances, _Safe4337Pack_BUNDLER_URL, _Safe4337Pack_ENTRYPOINT_ADDRESS, _Safe4337Pack_SAFE_4337_MODULE_ADDRESS, _Safe4337Pack_bundlerClient, _Safe4337Pack_chainId, _Safe4337Pack_paymasterOptions, _Safe4337Pack_toSafeOperation, _Safe4337Pack_timestamp, _Safe4337Pack_getSafeNonceFromEntrypoint, _Safe4337Pack_encodeExecuteUserOpCallData;
40
40
  Object.defineProperty(exports, "__esModule", { value: true });
41
41
  exports.Safe4337Pack = void 0;
42
42
  const ethers_1 = require("ethers");
@@ -48,8 +48,10 @@ const safe_modules_deployments_1 = require("@safe-global/safe-modules-deployment
48
48
  const SafeOperation_1 = __importDefault(require("./SafeOperation"));
49
49
  const constants_1 = require("./constants");
50
50
  const utils_1 = require("./utils");
51
+ const entrypoint_1 = require("./utils/entrypoint");
51
52
  const PimlicoFeeEstimator_1 = require("./estimators/PimlicoFeeEstimator");
52
53
  const MAX_ERC20_AMOUNT_TO_APPROVE = 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffn;
54
+ const EQ_OR_GT_1_4_1 = '>=1.4.1';
53
55
  /**
54
56
  * Safe4337Pack class that extends RelayKitBasePack.
55
57
  * This class provides an implementation of the ERC-4337 that enables Safe accounts to wrk with UserOperations.
@@ -65,18 +67,18 @@ class Safe4337Pack extends RelayKitBasePack_1.RelayKitBasePack {
65
67
  *
66
68
  * @param {Safe4337Options} options - The initialization parameters.
67
69
  */
68
- constructor({ protocolKit, bundlerClient, publicClient, bundlerUrl, paymasterOptions, entryPointAddress, safe4337ModuleAddress }) {
70
+ constructor({ protocolKit, bundlerClient, bundlerUrl, chainId, paymasterOptions, entryPointAddress, safe4337ModuleAddress }) {
69
71
  super(protocolKit);
70
72
  _Safe4337Pack_instances.add(this);
71
73
  _Safe4337Pack_BUNDLER_URL.set(this, void 0);
72
74
  _Safe4337Pack_ENTRYPOINT_ADDRESS.set(this, void 0);
73
75
  _Safe4337Pack_SAFE_4337_MODULE_ADDRESS.set(this, '0x');
74
76
  _Safe4337Pack_bundlerClient.set(this, void 0);
75
- _Safe4337Pack_publicClient.set(this, void 0);
77
+ _Safe4337Pack_chainId.set(this, void 0);
76
78
  _Safe4337Pack_paymasterOptions.set(this, void 0);
77
79
  __classPrivateFieldSet(this, _Safe4337Pack_BUNDLER_URL, bundlerUrl, "f");
78
80
  __classPrivateFieldSet(this, _Safe4337Pack_bundlerClient, bundlerClient, "f");
79
- __classPrivateFieldSet(this, _Safe4337Pack_publicClient, publicClient, "f");
81
+ __classPrivateFieldSet(this, _Safe4337Pack_chainId, chainId, "f");
80
82
  __classPrivateFieldSet(this, _Safe4337Pack_paymasterOptions, paymasterOptions, "f");
81
83
  __classPrivateFieldSet(this, _Safe4337Pack_ENTRYPOINT_ADDRESS, entryPointAddress, "f");
82
84
  __classPrivateFieldSet(this, _Safe4337Pack_SAFE_4337_MODULE_ADDRESS, safe4337ModuleAddress, "f");
@@ -92,17 +94,20 @@ class Safe4337Pack extends RelayKitBasePack_1.RelayKitBasePack {
92
94
  * @return {Promise<Safe4337Pack>} The Promise object that will be resolved into an instance of Safe4337Pack.
93
95
  */
94
96
  static async init(initOptions) {
95
- const { provider, signer, options, bundlerUrl, rpcUrl, customContracts, paymasterOptions } = initOptions;
97
+ const { provider, signer, options, bundlerUrl, customContracts, paymasterOptions } = initOptions;
96
98
  let protocolKit;
97
99
  const bundlerClient = (0, utils_1.getEip4337BundlerProvider)(bundlerUrl);
98
- const publicClient = (0, utils_1.getEip1193Provider)(rpcUrl);
99
100
  const chainId = await bundlerClient.send(constants_1.RPC_4337_CALLS.CHAIN_ID, []);
100
101
  let addModulesLibAddress = customContracts?.addModulesLibAddress;
101
102
  const network = parseInt(chainId, 16).toString();
103
+ const safeModulesVersion = initOptions.safeModulesVersion || constants_1.DEFAULT_SAFE_MODULES_VERSION;
104
+ if ((0, satisfies_1.default)(safeModulesVersion, entrypoint_1.EQ_OR_GT_0_3_0)) {
105
+ throw new Error(`Incompatibility detected: Safe modules version ${safeModulesVersion} is not supported. The SDK can use 0.2.0 only.`);
106
+ }
102
107
  if (!addModulesLibAddress) {
103
108
  const addModulesDeployment = (0, safe_modules_deployments_1.getAddModulesLibDeployment)({
104
109
  released: true,
105
- version: initOptions.safeModulesVersion || constants_1.DEFAULT_SAFE_MODULES_VERSION,
110
+ version: safeModulesVersion,
106
111
  network
107
112
  });
108
113
  addModulesLibAddress = addModulesDeployment?.networkAddresses[network];
@@ -111,13 +116,13 @@ class Safe4337Pack extends RelayKitBasePack_1.RelayKitBasePack {
111
116
  if (!safe4337ModuleAddress) {
112
117
  const safe4337ModuleDeployment = (0, safe_modules_deployments_1.getSafe4337ModuleDeployment)({
113
118
  released: true,
114
- version: initOptions.safeModulesVersion || constants_1.DEFAULT_SAFE_MODULES_VERSION,
119
+ version: safeModulesVersion,
115
120
  network
116
121
  });
117
122
  safe4337ModuleAddress = safe4337ModuleDeployment?.networkAddresses[network];
118
123
  }
119
124
  if (!addModulesLibAddress || !safe4337ModuleAddress) {
120
- throw new Error(`Safe4337Module and/or AddModulesLib not available for chain ${network} and modules version ${constants_1.DEFAULT_SAFE_MODULES_VERSION}`);
125
+ throw new Error(`Safe4337Module and/or AddModulesLib not available for chain ${network} and modules version ${safeModulesVersion}`);
121
126
  }
122
127
  // Existing Safe
123
128
  if ('safeAddress' in options) {
@@ -127,7 +132,7 @@ class Safe4337Pack extends RelayKitBasePack_1.RelayKitBasePack {
127
132
  safeAddress: options.safeAddress
128
133
  });
129
134
  const safeVersion = await protocolKit.getContractVersion();
130
- const isSafeVersion4337Compatible = (0, satisfies_1.default)(safeVersion, '>=1.4.1');
135
+ const isSafeVersion4337Compatible = (0, satisfies_1.default)(safeVersion, EQ_OR_GT_1_4_1);
131
136
  if (!isSafeVersion4337Compatible) {
132
137
  throw new Error(`Incompatibility detected: The current Safe Account version (${safeVersion}) is not supported. EIP-4337 requires the Safe to use at least v1.4.1.`);
133
138
  }
@@ -149,8 +154,9 @@ class Safe4337Pack extends RelayKitBasePack_1.RelayKitBasePack {
149
154
  }
150
155
  let deploymentTo = addModulesLibAddress;
151
156
  let deploymentData = constants_1.INTERFACES.encodeFunctionData('enableModules', [[safe4337ModuleAddress]]);
152
- const { isSponsored, paymasterTokenAddress } = paymasterOptions || {};
153
- const isApproveTransactionRequired = !!paymasterOptions && !isSponsored && !!paymasterTokenAddress;
157
+ const isApproveTransactionRequired = !!paymasterOptions &&
158
+ !paymasterOptions.isSponsored &&
159
+ !!paymasterOptions.paymasterTokenAddress;
154
160
  if (isApproveTransactionRequired) {
155
161
  const { paymasterAddress, amountToApprove = MAX_ERC20_AMOUNT_TO_APPROVE } = paymasterOptions;
156
162
  const enable4337ModulesTransaction = {
@@ -160,7 +166,7 @@ class Safe4337Pack extends RelayKitBasePack_1.RelayKitBasePack {
160
166
  operation: safe_core_sdk_types_1.OperationType.DelegateCall // DelegateCall required for enabling the 4337 module
161
167
  };
162
168
  const approveToPaymasterTransaction = {
163
- to: paymasterTokenAddress,
169
+ to: paymasterOptions.paymasterTokenAddress,
164
170
  data: constants_1.INTERFACES.encodeFunctionData('approve', [paymasterAddress, amountToApprove]),
165
171
  value: '0',
166
172
  operation: safe_core_sdk_types_1.OperationType.Call // Call for approve
@@ -197,20 +203,33 @@ class Safe4337Pack extends RelayKitBasePack_1.RelayKitBasePack {
197
203
  }
198
204
  });
199
205
  }
200
- let supportedEntryPoints;
201
- if (!customContracts?.entryPointAddress) {
202
- supportedEntryPoints = await bundlerClient.send(constants_1.RPC_4337_CALLS.SUPPORTED_ENTRY_POINTS, []);
206
+ let selectedEntryPoint;
207
+ if (customContracts?.entryPointAddress) {
208
+ const requiredSafeModulesVersion = (0, entrypoint_1.entryPointToSafeModules)(customContracts?.entryPointAddress);
209
+ if (!(0, satisfies_1.default)(safeModulesVersion, requiredSafeModulesVersion))
210
+ throw new Error(`The selected entrypoint ${customContracts?.entryPointAddress} is not compatible with version ${safeModulesVersion} of Safe modules`);
211
+ selectedEntryPoint = customContracts?.entryPointAddress;
212
+ }
213
+ else {
214
+ const supportedEntryPoints = await bundlerClient.send(constants_1.RPC_4337_CALLS.SUPPORTED_ENTRY_POINTS, []);
203
215
  if (!supportedEntryPoints.length) {
204
216
  throw new Error('No entrypoint provided or available through the bundler');
205
217
  }
218
+ selectedEntryPoint = supportedEntryPoints.find((entryPoint) => {
219
+ const requiredSafeModulesVersion = (0, entrypoint_1.entryPointToSafeModules)(entryPoint);
220
+ return (0, satisfies_1.default)(safeModulesVersion, requiredSafeModulesVersion);
221
+ });
222
+ if (!selectedEntryPoint) {
223
+ throw new Error(`Incompatibility detected: None of the entrypoints provided by the bundler is compatible with the Safe modules version ${safeModulesVersion}`);
224
+ }
206
225
  }
207
226
  return new Safe4337Pack({
227
+ chainId: BigInt(chainId),
208
228
  protocolKit,
209
229
  bundlerClient,
210
- publicClient,
211
230
  paymasterOptions,
212
231
  bundlerUrl,
213
- entryPointAddress: customContracts?.entryPointAddress || supportedEntryPoints[0],
232
+ entryPointAddress: selectedEntryPoint,
214
233
  safe4337ModuleAddress
215
234
  });
216
235
  }
@@ -231,7 +250,10 @@ class Safe4337Pack extends RelayKitBasePack_1.RelayKitBasePack {
231
250
  if (setupEstimationData) {
232
251
  safeOperation.addEstimations(setupEstimationData);
233
252
  }
234
- const estimateUserOperationGas = await __classPrivateFieldGet(this, _Safe4337Pack_bundlerClient, "f").send(constants_1.RPC_4337_CALLS.ESTIMATE_USER_OPERATION_GAS, [(0, utils_1.userOperationToHexValues)(safeOperation.toUserOperation()), __classPrivateFieldGet(this, _Safe4337Pack_ENTRYPOINT_ADDRESS, "f")]);
253
+ const estimateUserOperationGas = await __classPrivateFieldGet(this, _Safe4337Pack_bundlerClient, "f").send(constants_1.RPC_4337_CALLS.ESTIMATE_USER_OPERATION_GAS, [
254
+ (0, utils_1.userOperationToHexValues)((0, utils_1.addDummySignature)(safeOperation.toUserOperation(), await this.protocolKit.getOwners())),
255
+ __classPrivateFieldGet(this, _Safe4337Pack_ENTRYPOINT_ADDRESS, "f")
256
+ ]);
235
257
  if (estimateUserOperationGas) {
236
258
  safeOperation.addEstimations({
237
259
  preVerificationGas: BigInt(estimateUserOperationGas.preVerificationGas),
@@ -274,17 +296,19 @@ class Safe4337Pack extends RelayKitBasePack_1.RelayKitBasePack {
274
296
  */
275
297
  async createTransaction({ transactions, options = {} }) {
276
298
  const safeAddress = await this.protocolKit.getAddress();
277
- const nonce = await __classPrivateFieldGet(this, _Safe4337Pack_instances, "m", _Safe4337Pack_getAccountNonce).call(this, safeAddress);
299
+ const nonce = await __classPrivateFieldGet(this, _Safe4337Pack_instances, "m", _Safe4337Pack_getSafeNonceFromEntrypoint).call(this, safeAddress);
278
300
  const { amountToApprove, validUntil, validAfter, feeEstimator } = options;
279
301
  if (amountToApprove) {
280
- if (!__classPrivateFieldGet(this, _Safe4337Pack_paymasterOptions, "f") || !__classPrivateFieldGet(this, _Safe4337Pack_paymasterOptions, "f").paymasterTokenAddress) {
302
+ const paymasterOptions = __classPrivateFieldGet(this, _Safe4337Pack_paymasterOptions, "f");
303
+ if (!paymasterOptions.paymasterTokenAddress) {
281
304
  throw new Error('Paymaster must be initialized');
282
305
  }
283
- const paymasterAddress = __classPrivateFieldGet(this, _Safe4337Pack_paymasterOptions, "f").paymasterAddress;
284
- const paymasterTokenAddress = __classPrivateFieldGet(this, _Safe4337Pack_paymasterOptions, "f").paymasterTokenAddress;
285
306
  const approveToPaymasterTransaction = {
286
- to: paymasterTokenAddress,
287
- data: constants_1.INTERFACES.encodeFunctionData('approve', [paymasterAddress, amountToApprove]),
307
+ to: paymasterOptions.paymasterTokenAddress,
308
+ data: constants_1.INTERFACES.encodeFunctionData('approve', [
309
+ paymasterOptions.paymasterAddress,
310
+ amountToApprove
311
+ ]),
288
312
  value: '0',
289
313
  operation: safe_core_sdk_types_1.OperationType.Call // Call for approve
290
314
  };
@@ -296,11 +320,13 @@ class Safe4337Pack extends RelayKitBasePack_1.RelayKitBasePack {
296
320
  ? __classPrivateFieldGet(this, _Safe4337Pack_instances, "m", _Safe4337Pack_encodeExecuteUserOpCallData).call(this, {
297
321
  to: multiSendAddress,
298
322
  value: '0',
299
- data: __classPrivateFieldGet(this, _Safe4337Pack_instances, "m", _Safe4337Pack_encodeMultiSendCallData).call(this, transactions),
323
+ data: (0, utils_1.encodeMultiSendCallData)(transactions),
300
324
  operation: safe_core_sdk_types_1.OperationType.DelegateCall
301
325
  })
302
326
  : __classPrivateFieldGet(this, _Safe4337Pack_instances, "m", _Safe4337Pack_encodeExecuteUserOpCallData).call(this, transactions[0]);
303
- const paymasterAndData = __classPrivateFieldGet(this, _Safe4337Pack_paymasterOptions, "f")?.paymasterAddress || '0x';
327
+ const paymasterAndData = __classPrivateFieldGet(this, _Safe4337Pack_paymasterOptions, "f") && 'paymasterAddress' in __classPrivateFieldGet(this, _Safe4337Pack_paymasterOptions, "f")
328
+ ? __classPrivateFieldGet(this, _Safe4337Pack_paymasterOptions, "f").paymasterAddress
329
+ : '0x';
304
330
  const userOperation = {
305
331
  sender: safeAddress,
306
332
  nonce: nonce,
@@ -319,6 +345,8 @@ class Safe4337Pack extends RelayKitBasePack_1.RelayKitBasePack {
319
345
  userOperation.initCode = await this.protocolKit.getInitCode();
320
346
  }
321
347
  const safeOperation = new SafeOperation_1.default(userOperation, {
348
+ chainId: __classPrivateFieldGet(this, _Safe4337Pack_chainId, "f"),
349
+ moduleAddress: __classPrivateFieldGet(this, _Safe4337Pack_SAFE_4337_MODULE_ADDRESS, "f"),
322
350
  entryPoint: __classPrivateFieldGet(this, _Safe4337Pack_ENTRYPOINT_ADDRESS, "f"),
323
351
  validUntil,
324
352
  validAfter
@@ -331,11 +359,20 @@ class Safe4337Pack extends RelayKitBasePack_1.RelayKitBasePack {
331
359
  /**
332
360
  * Signs a safe operation.
333
361
  *
334
- * @param {EthSafeOperation} safeOperation - The SafeOperation to sign.
362
+ * @param {EthSafeOperation | SafeOperationResponse} safeOperation - The SafeOperation to sign. It can be:
363
+ * - A response from the API (Tx Service)
364
+ * - An instance of EthSafeOperation
335
365
  * @param {SigningMethod} signingMethod - The signing method to use.
336
366
  * @return {Promise<EthSafeOperation>} The Promise object will resolve to the signed SafeOperation.
337
367
  */
338
368
  async signSafeOperation(safeOperation, signingMethod = protocol_kit_1.SigningMethod.ETH_SIGN_TYPED_DATA_V4) {
369
+ let safeOp;
370
+ if ((0, safe_core_sdk_types_1.isSafeOperationResponse)(safeOperation)) {
371
+ safeOp = __classPrivateFieldGet(this, _Safe4337Pack_instances, "m", _Safe4337Pack_toSafeOperation).call(this, safeOperation);
372
+ }
373
+ else {
374
+ safeOp = safeOperation;
375
+ }
339
376
  const owners = await this.protocolKit.getOwners();
340
377
  const signerAddress = await this.protocolKit.getSafeProvider().getSignerAddress();
341
378
  if (!signerAddress) {
@@ -349,19 +386,20 @@ class Safe4337Pack extends RelayKitBasePack_1.RelayKitBasePack {
349
386
  if (signingMethod === protocol_kit_1.SigningMethod.ETH_SIGN_TYPED_DATA_V4 ||
350
387
  signingMethod === protocol_kit_1.SigningMethod.ETH_SIGN_TYPED_DATA_V3 ||
351
388
  signingMethod === protocol_kit_1.SigningMethod.ETH_SIGN_TYPED_DATA) {
352
- signature = await __classPrivateFieldGet(this, _Safe4337Pack_instances, "m", _Safe4337Pack_signTypedData).call(this, safeOperation.data);
389
+ signature = await (0, utils_1.signSafeOp)(safeOp.data, this.protocolKit.getSafeProvider(), __classPrivateFieldGet(this, _Safe4337Pack_SAFE_4337_MODULE_ADDRESS, "f"));
353
390
  }
354
391
  else {
355
- const chainId = await this.protocolKit.getSafeProvider().getChainId();
356
- const safeOpHash = __classPrivateFieldGet(this, _Safe4337Pack_instances, "m", _Safe4337Pack_getSafeUserOperationHash).call(this, safeOperation.data, chainId);
392
+ const safeOpHash = safeOp.getHash();
357
393
  signature = await this.protocolKit.signHash(safeOpHash);
358
394
  }
359
- const signedSafeOperation = new SafeOperation_1.default(safeOperation.toUserOperation(), {
395
+ const signedSafeOperation = new SafeOperation_1.default(safeOp.toUserOperation(), {
396
+ chainId: __classPrivateFieldGet(this, _Safe4337Pack_chainId, "f"),
397
+ moduleAddress: __classPrivateFieldGet(this, _Safe4337Pack_SAFE_4337_MODULE_ADDRESS, "f"),
360
398
  entryPoint: __classPrivateFieldGet(this, _Safe4337Pack_ENTRYPOINT_ADDRESS, "f"),
361
- validUntil: safeOperation.data.validUntil,
362
- validAfter: safeOperation.data.validAfter
399
+ validUntil: safeOp.data.validUntil,
400
+ validAfter: safeOp.data.validAfter
363
401
  });
364
- signedSafeOperation.signatures.forEach((signature) => {
402
+ safeOp.signatures.forEach((signature) => {
365
403
  signedSafeOperation.addSignature(signature);
366
404
  });
367
405
  signedSafeOperation.addSignature(signature);
@@ -370,12 +408,25 @@ class Safe4337Pack extends RelayKitBasePack_1.RelayKitBasePack {
370
408
  /**
371
409
  * Executes the relay transaction.
372
410
  *
373
- * @param {EthSafeOperation} safeOperation - The SafeOperation to execute.
411
+ * @param {Safe4337ExecutableProps} props - The parameters for the transaction execution.
412
+ * @param {EthSafeOperation | SafeOperationResponse} props.executable - The SafeOperation to execute. It can be:
413
+ * - A response from the API (Tx Service)
414
+ * - An instance of EthSafeOperation
374
415
  * @return {Promise<string>} The user operation hash.
375
416
  */
376
- async executeTransaction({ executable: safeOperation }) {
417
+ async executeTransaction({ executable }) {
418
+ let safeOperation;
419
+ if ((0, safe_core_sdk_types_1.isSafeOperationResponse)(executable)) {
420
+ safeOperation = __classPrivateFieldGet(this, _Safe4337Pack_instances, "m", _Safe4337Pack_toSafeOperation).call(this, executable);
421
+ }
422
+ else {
423
+ safeOperation = executable;
424
+ }
377
425
  const userOperation = safeOperation.toUserOperation();
378
- return __classPrivateFieldGet(this, _Safe4337Pack_instances, "m", _Safe4337Pack_sendUserOperation).call(this, userOperation);
426
+ return __classPrivateFieldGet(this, _Safe4337Pack_bundlerClient, "f").send(constants_1.RPC_4337_CALLS.SEND_USER_OPERATION, [
427
+ (0, utils_1.userOperationToHexValues)(userOperation),
428
+ __classPrivateFieldGet(this, _Safe4337Pack_ENTRYPOINT_ADDRESS, "f")
429
+ ]);
379
430
  }
380
431
  /**
381
432
  * Return a UserOperation based on a hash (userOpHash) returned by eth_sendUserOperation
@@ -384,8 +435,7 @@ class Safe4337Pack extends RelayKitBasePack_1.RelayKitBasePack {
384
435
  * @returns {UserOperation} - null in case the UserOperation is not yet included in a block, or a full UserOperation, with the addition of entryPoint, blockNumber, blockHash and transactionHash
385
436
  */
386
437
  async getUserOperationByHash(userOpHash) {
387
- const userOperation = await __classPrivateFieldGet(this, _Safe4337Pack_bundlerClient, "f").send(constants_1.RPC_4337_CALLS.GET_USER_OPERATION_BY_HASH, [userOpHash]);
388
- return userOperation;
438
+ return __classPrivateFieldGet(this, _Safe4337Pack_bundlerClient, "f").send(constants_1.RPC_4337_CALLS.GET_USER_OPERATION_BY_HASH, [userOpHash]);
389
439
  }
390
440
  /**
391
441
  * Return a UserOperation receipt based on a hash (userOpHash) returned by eth_sendUserOperation
@@ -394,8 +444,7 @@ class Safe4337Pack extends RelayKitBasePack_1.RelayKitBasePack {
394
444
  * @returns {UserOperationReceipt} - null in case the UserOperation is not yet included in a block, or UserOperationReceipt object
395
445
  */
396
446
  async getUserOperationReceipt(userOpHash) {
397
- const userOperationReceipt = await __classPrivateFieldGet(this, _Safe4337Pack_bundlerClient, "f").send(constants_1.RPC_4337_CALLS.GET_USER_OPERATION_RECEIPT, [userOpHash]);
398
- return userOperationReceipt;
447
+ return __classPrivateFieldGet(this, _Safe4337Pack_bundlerClient, "f").send(constants_1.RPC_4337_CALLS.GET_USER_OPERATION_RECEIPT, [userOpHash]);
399
448
  }
400
449
  /**
401
450
  * Returns an array of the entryPoint addresses supported by the client.
@@ -404,8 +453,7 @@ class Safe4337Pack extends RelayKitBasePack_1.RelayKitBasePack {
404
453
  * @returns {string[]} - The supported entry points.
405
454
  */
406
455
  async getSupportedEntryPoints() {
407
- const supportedEntryPoints = await __classPrivateFieldGet(this, _Safe4337Pack_bundlerClient, "f").send(constants_1.RPC_4337_CALLS.SUPPORTED_ENTRY_POINTS, []);
408
- return supportedEntryPoints;
456
+ return __classPrivateFieldGet(this, _Safe4337Pack_bundlerClient, "f").send(constants_1.RPC_4337_CALLS.SUPPORTED_ENTRY_POINTS, []);
409
457
  }
410
458
  /**
411
459
  * Returns EIP-155 Chain ID.
@@ -413,60 +461,47 @@ class Safe4337Pack extends RelayKitBasePack_1.RelayKitBasePack {
413
461
  * @returns {string} - The chain id.
414
462
  */
415
463
  async getChainId() {
416
- const chainId = await __classPrivateFieldGet(this, _Safe4337Pack_bundlerClient, "f").send(constants_1.RPC_4337_CALLS.CHAIN_ID, []);
417
- return chainId;
464
+ return __classPrivateFieldGet(this, _Safe4337Pack_bundlerClient, "f").send(constants_1.RPC_4337_CALLS.CHAIN_ID, []);
418
465
  }
419
466
  }
420
467
  exports.Safe4337Pack = Safe4337Pack;
421
- _Safe4337Pack_BUNDLER_URL = new WeakMap(), _Safe4337Pack_ENTRYPOINT_ADDRESS = new WeakMap(), _Safe4337Pack_SAFE_4337_MODULE_ADDRESS = new WeakMap(), _Safe4337Pack_bundlerClient = new WeakMap(), _Safe4337Pack_publicClient = new WeakMap(), _Safe4337Pack_paymasterOptions = new WeakMap(), _Safe4337Pack_instances = new WeakSet(), _Safe4337Pack_getSafeUserOperationHash = function _Safe4337Pack_getSafeUserOperationHash(safeUserOperation, chainId) {
422
- return ethers_1.ethers.TypedDataEncoder.hash({
423
- chainId,
424
- verifyingContract: __classPrivateFieldGet(this, _Safe4337Pack_SAFE_4337_MODULE_ADDRESS, "f")
425
- }, constants_1.EIP712_SAFE_OPERATION_TYPE, safeUserOperation);
426
- }, _Safe4337Pack_sendUserOperation =
427
- /**
428
- * Send the UserOperation to the bundler.
429
- *
430
- * @param {UserOperation} userOpWithSignature - The signed UserOperation to send to the bundler.
431
- * @return {Promise<string>} The hash.
432
- */
433
- async function _Safe4337Pack_sendUserOperation(userOpWithSignature) {
434
- return await __classPrivateFieldGet(this, _Safe4337Pack_bundlerClient, "f").send(constants_1.RPC_4337_CALLS.SEND_USER_OPERATION, [
435
- (0, utils_1.userOperationToHexValues)(userOpWithSignature),
436
- __classPrivateFieldGet(this, _Safe4337Pack_ENTRYPOINT_ADDRESS, "f")
437
- ]);
438
- }, _Safe4337Pack_signTypedData =
439
- /**
440
- * Signs typed data.
441
- *
442
- * @param {SafeUserOperation} safeUserOperation - Safe user operation to sign.
443
- * @return {Promise<SafeSignature>} The SafeSignature object containing the data and the signatures.
444
- */
445
- async function _Safe4337Pack_signTypedData(safeUserOperation) {
446
- const safeProvider = this.protocolKit.getSafeProvider();
447
- const signer = (await safeProvider.getExternalSigner());
448
- const chainId = await safeProvider.getChainId();
449
- const signerAddress = await signer.getAddress();
450
- const signature = await signer.signTypedData({
451
- chainId,
452
- verifyingContract: __classPrivateFieldGet(this, _Safe4337Pack_SAFE_4337_MODULE_ADDRESS, "f")
453
- }, constants_1.EIP712_SAFE_OPERATION_TYPE, {
454
- ...safeUserOperation,
455
- nonce: ethers_1.ethers.toBeHex(safeUserOperation.nonce),
456
- validAfter: ethers_1.ethers.toBeHex(safeUserOperation.validAfter),
457
- validUntil: ethers_1.ethers.toBeHex(safeUserOperation.validUntil),
458
- maxFeePerGas: ethers_1.ethers.toBeHex(safeUserOperation.maxFeePerGas),
459
- maxPriorityFeePerGas: ethers_1.ethers.toBeHex(safeUserOperation.maxPriorityFeePerGas)
468
+ _Safe4337Pack_BUNDLER_URL = new WeakMap(), _Safe4337Pack_ENTRYPOINT_ADDRESS = new WeakMap(), _Safe4337Pack_SAFE_4337_MODULE_ADDRESS = new WeakMap(), _Safe4337Pack_bundlerClient = new WeakMap(), _Safe4337Pack_chainId = new WeakMap(), _Safe4337Pack_paymasterOptions = new WeakMap(), _Safe4337Pack_instances = new WeakSet(), _Safe4337Pack_toSafeOperation = function _Safe4337Pack_toSafeOperation(safeOperationResponse) {
469
+ const { validUntil, validAfter, userOperation } = safeOperationResponse;
470
+ const safeOperation = new SafeOperation_1.default({
471
+ sender: userOperation?.sender || '0x',
472
+ nonce: userOperation?.nonce?.toString() || '0',
473
+ initCode: userOperation?.initCode || '',
474
+ callData: userOperation?.callData || '',
475
+ callGasLimit: BigInt(userOperation?.callGasLimit || 0n),
476
+ verificationGasLimit: BigInt(userOperation?.verificationGasLimit || 0),
477
+ preVerificationGas: BigInt(userOperation?.preVerificationGas || 0),
478
+ maxFeePerGas: BigInt(userOperation?.maxFeePerGas || 0),
479
+ maxPriorityFeePerGas: BigInt(userOperation?.maxPriorityFeePerGas || 0),
480
+ paymasterAndData: ethers_1.ethers.hexlify(ethers_1.ethers.concat([userOperation?.paymaster || '0x', userOperation?.paymasterData || '0x'])),
481
+ signature: safeOperationResponse.preparedSignature || '0x'
482
+ }, {
483
+ chainId: __classPrivateFieldGet(this, _Safe4337Pack_chainId, "f"),
484
+ moduleAddress: __classPrivateFieldGet(this, _Safe4337Pack_SAFE_4337_MODULE_ADDRESS, "f"),
485
+ entryPoint: userOperation?.entryPoint || __classPrivateFieldGet(this, _Safe4337Pack_ENTRYPOINT_ADDRESS, "f"),
486
+ validAfter: __classPrivateFieldGet(this, _Safe4337Pack_instances, "m", _Safe4337Pack_timestamp).call(this, validAfter),
487
+ validUntil: __classPrivateFieldGet(this, _Safe4337Pack_instances, "m", _Safe4337Pack_timestamp).call(this, validUntil)
460
488
  });
461
- return new protocol_kit_1.EthSafeSignature(signerAddress, signature);
462
- }, _Safe4337Pack_getAccountNonce =
489
+ if (safeOperationResponse.confirmations) {
490
+ safeOperationResponse.confirmations.forEach((confirmation) => {
491
+ safeOperation.addSignature(new protocol_kit_1.EthSafeSignature(confirmation.owner, confirmation.signature));
492
+ });
493
+ }
494
+ return safeOperation;
495
+ }, _Safe4337Pack_timestamp = function _Safe4337Pack_timestamp(date) {
496
+ return date ? new Date(date).getTime() / 1000 : undefined;
497
+ }, _Safe4337Pack_getSafeNonceFromEntrypoint =
463
498
  /**
464
499
  * Gets account nonce from the bundler.
465
500
  *
466
- * @param {string} sender - Account address for which the nonce is to be fetched.
501
+ * @param {string} safeAddress - Account address for which the nonce is to be fetched.
467
502
  * @returns {Promise<string>} The Promise object will resolve to the account nonce.
468
503
  */
469
- async function _Safe4337Pack_getAccountNonce(sender) {
504
+ async function _Safe4337Pack_getSafeNonceFromEntrypoint(safeAddress) {
470
505
  const abi = [
471
506
  {
472
507
  inputs: [
@@ -479,8 +514,8 @@ async function _Safe4337Pack_getAccountNonce(sender) {
479
514
  type: 'function'
480
515
  }
481
516
  ];
482
- const contract = new ethers_1.ethers.Contract(__classPrivateFieldGet(this, _Safe4337Pack_ENTRYPOINT_ADDRESS, "f") || '0x', abi, __classPrivateFieldGet(this, _Safe4337Pack_publicClient, "f"));
483
- const newNonce = await contract.getNonce(sender, BigInt(0));
517
+ const contract = new ethers_1.ethers.Contract(__classPrivateFieldGet(this, _Safe4337Pack_ENTRYPOINT_ADDRESS, "f") || '0x', abi, this.protocolKit.getSafeProvider().getExternalProvider());
518
+ const newNonce = await contract.getNonce(safeAddress, BigInt(0));
484
519
  return newNonce.toString();
485
520
  }, _Safe4337Pack_encodeExecuteUserOpCallData = function _Safe4337Pack_encodeExecuteUserOpCallData(transaction) {
486
521
  return constants_1.INTERFACES.encodeFunctionData('executeUserOp', [
@@ -489,9 +524,5 @@ async function _Safe4337Pack_getAccountNonce(sender) {
489
524
  transaction.data,
490
525
  transaction.operation || safe_core_sdk_types_1.OperationType.Call
491
526
  ]);
492
- }, _Safe4337Pack_encodeMultiSendCallData = function _Safe4337Pack_encodeMultiSendCallData(transactions) {
493
- return constants_1.INTERFACES.encodeFunctionData('multiSend', [
494
- (0, protocol_kit_1.encodeMultiSendData)(transactions.map((tx) => ({ ...tx, operation: tx.operation ?? safe_core_sdk_types_1.OperationType.Call })))
495
- ]);
496
527
  };
497
528
  //# sourceMappingURL=Safe4337Pack.js.map