permissionless 0.1.16 → 0.1.18
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/CHANGELOG.md +13 -0
- package/_cjs/accounts/biconomy/signerToBiconomySmartAccount.js +2 -2
- package/_cjs/accounts/biconomy/signerToBiconomySmartAccount.js.map +1 -1
- package/_cjs/accounts/kernel/signerToEcdsaKernelSmartAccount.js +1 -1
- package/_cjs/accounts/kernel/signerToEcdsaKernelSmartAccount.js.map +1 -1
- package/_cjs/accounts/safe/signerToSafeSmartAccount.js +10 -9
- package/_cjs/accounts/safe/signerToSafeSmartAccount.js.map +1 -1
- package/_cjs/accounts/simple/signerToSimpleSmartAccount.js +3 -3
- package/_cjs/accounts/simple/signerToSimpleSmartAccount.js.map +1 -1
- package/_cjs/actions/bundler/waitForUserOperationReceipt.js +2 -2
- package/_cjs/actions/bundler/waitForUserOperationReceipt.js.map +1 -1
- package/_cjs/actions/public/getAccountNonce.js +2 -2
- package/_cjs/actions/public/getAccountNonce.js.map +1 -1
- package/_cjs/actions/public/getSenderAddress.js +2 -2
- package/_cjs/actions/public/getSenderAddress.js.map +1 -1
- package/_cjs/actions/smartAccount/deployContract.js +7 -7
- package/_cjs/actions/smartAccount/deployContract.js.map +1 -1
- package/_cjs/actions/smartAccount/prepareUserOperationRequest.js +30 -20
- package/_cjs/actions/smartAccount/prepareUserOperationRequest.js.map +1 -1
- package/_cjs/actions/smartAccount/sendTransaction.js +9 -9
- package/_cjs/actions/smartAccount/sendTransaction.js.map +1 -1
- package/_cjs/actions/smartAccount/sendTransactions.js +9 -9
- package/_cjs/actions/smartAccount/sendTransactions.js.map +1 -1
- package/_cjs/actions/smartAccount/sendUserOperation.js +5 -5
- package/_cjs/actions/smartAccount/sendUserOperation.js.map +1 -1
- package/_cjs/actions/smartAccount/writeContract.js +2 -2
- package/_cjs/actions/smartAccount/writeContract.js.map +1 -1
- package/_cjs/actions/smartAccount.js.map +1 -1
- package/_cjs/errors/account.js +1 -1
- package/_cjs/errors/account.js.map +1 -1
- package/_cjs/utils/getPackedUserOperation.js +3 -2
- package/_cjs/utils/getPackedUserOperation.js.map +1 -1
- package/_cjs/utils/getRequiredPrefund.js +6 -4
- package/_cjs/utils/getRequiredPrefund.js.map +1 -1
- package/_cjs/utils/getUserOperationHash.js +3 -2
- package/_cjs/utils/getUserOperationHash.js.map +1 -1
- package/_cjs/utils/index.js +1 -3
- package/_cjs/utils/index.js.map +1 -1
- package/_esm/accounts/biconomy/signerToBiconomySmartAccount.js +2 -2
- package/_esm/accounts/biconomy/signerToBiconomySmartAccount.js.map +1 -1
- package/_esm/accounts/kernel/signerToEcdsaKernelSmartAccount.js +1 -1
- package/_esm/accounts/kernel/signerToEcdsaKernelSmartAccount.js.map +1 -1
- package/_esm/accounts/safe/signerToSafeSmartAccount.js +10 -9
- package/_esm/accounts/safe/signerToSafeSmartAccount.js.map +1 -1
- package/_esm/accounts/simple/signerToSimpleSmartAccount.js +3 -3
- package/_esm/accounts/simple/signerToSimpleSmartAccount.js.map +1 -1
- package/_esm/actions/bundler/waitForUserOperationReceipt.js +2 -2
- package/_esm/actions/bundler/waitForUserOperationReceipt.js.map +1 -1
- package/_esm/actions/public/getAccountNonce.js +2 -2
- package/_esm/actions/public/getAccountNonce.js.map +1 -1
- package/_esm/actions/public/getSenderAddress.js +2 -2
- package/_esm/actions/public/getSenderAddress.js.map +1 -1
- package/_esm/actions/smartAccount/deployContract.js +5 -5
- package/_esm/actions/smartAccount/deployContract.js.map +1 -1
- package/_esm/actions/smartAccount/prepareUserOperationRequest.js +29 -15
- package/_esm/actions/smartAccount/prepareUserOperationRequest.js.map +1 -1
- package/_esm/actions/smartAccount/sendTransaction.js +6 -6
- package/_esm/actions/smartAccount/sendTransaction.js.map +1 -1
- package/_esm/actions/smartAccount/sendTransactions.js +6 -6
- package/_esm/actions/smartAccount/sendTransactions.js.map +1 -1
- package/_esm/actions/smartAccount/sendUserOperation.js +2 -2
- package/_esm/actions/smartAccount/sendUserOperation.js.map +1 -1
- package/_esm/actions/smartAccount/signTypedData.js +0 -1
- package/_esm/actions/smartAccount/signTypedData.js.map +1 -1
- package/_esm/actions/smartAccount/writeContract.js +2 -2
- package/_esm/actions/smartAccount/writeContract.js.map +1 -1
- package/_esm/actions/smartAccount.js.map +1 -1
- package/_esm/errors/account.js +1 -1
- package/_esm/errors/account.js.map +1 -1
- package/_esm/utils/getPackedUserOperation.js +3 -2
- package/_esm/utils/getPackedUserOperation.js.map +1 -1
- package/_esm/utils/getRequiredPrefund.js +6 -4
- package/_esm/utils/getRequiredPrefund.js.map +1 -1
- package/_esm/utils/getUserOperationHash.js +3 -2
- package/_esm/utils/getUserOperationHash.js.map +1 -1
- package/_esm/utils/index.js +1 -2
- package/_esm/utils/index.js.map +1 -1
- package/_types/accounts/biconomy/signerToBiconomySmartAccount.d.ts.map +1 -1
- package/_types/accounts/kernel/signerToEcdsaKernelSmartAccount.d.ts.map +1 -1
- package/_types/accounts/safe/signerToSafeSmartAccount.d.ts.map +1 -1
- package/_types/accounts/simple/signerToSimpleSmartAccount.d.ts.map +1 -1
- package/_types/actions/bundler/waitForUserOperationReceipt.d.ts.map +1 -1
- package/_types/actions/public/getAccountNonce.d.ts.map +1 -1
- package/_types/actions/public/getSenderAddress.d.ts.map +1 -1
- package/_types/actions/smartAccount/deployContract.d.ts.map +1 -1
- package/_types/actions/smartAccount/prepareUserOperationRequest.d.ts +3 -1
- package/_types/actions/smartAccount/prepareUserOperationRequest.d.ts.map +1 -1
- package/_types/actions/smartAccount/sendTransaction.d.ts.map +1 -1
- package/_types/actions/smartAccount/sendTransactions.d.ts.map +1 -1
- package/_types/actions/smartAccount/sendUserOperation.d.ts.map +1 -1
- package/_types/actions/smartAccount/signTypedData.d.ts +1 -1
- package/_types/actions/smartAccount/signTypedData.d.ts.map +1 -1
- package/_types/actions/smartAccount/writeContract.d.ts.map +1 -1
- package/_types/actions/smartAccount.d.ts +2 -2
- package/_types/actions/smartAccount.d.ts.map +1 -1
- package/_types/clients/createBundlerClient.d.ts +3 -0
- package/_types/clients/createBundlerClient.d.ts.map +1 -1
- package/_types/clients/pimlico.d.ts +6 -0
- package/_types/clients/pimlico.d.ts.map +1 -1
- package/_types/clients/stackup.d.ts +3 -0
- package/_types/clients/stackup.d.ts.map +1 -1
- package/_types/types/index.d.ts +1 -0
- package/_types/types/index.d.ts.map +1 -1
- package/_types/utils/getPackedUserOperation.d.ts.map +1 -1
- package/_types/utils/getRequiredPrefund.d.ts.map +1 -1
- package/_types/utils/getUserOperationHash.d.ts.map +1 -1
- package/_types/utils/index.d.ts +1 -2
- package/_types/utils/index.d.ts.map +1 -1
- package/accounts/biconomy/signerToBiconomySmartAccount.ts +2 -2
- package/accounts/kernel/signerToEcdsaKernelSmartAccount.ts +1 -1
- package/accounts/safe/signerToSafeSmartAccount.ts +17 -11
- package/accounts/simple/signerToSimpleSmartAccount.ts +6 -3
- package/actions/bundler/waitForUserOperationReceipt.ts +3 -2
- package/actions/public/getAccountNonce.ts +3 -2
- package/actions/public/getSenderAddress.ts +3 -2
- package/actions/smartAccount/deployContract.ts +7 -5
- package/actions/smartAccount/prepareUserOperationRequest.ts +71 -50
- package/actions/smartAccount/sendTransaction.ts +8 -6
- package/actions/smartAccount/sendTransactions.ts +8 -6
- package/actions/smartAccount/sendUserOperation.ts +3 -2
- package/actions/smartAccount/signTypedData.ts +1 -1
- package/actions/smartAccount/writeContract.ts +3 -2
- package/actions/smartAccount.ts +2 -0
- package/errors/account.ts +1 -1
- package/package.json +2 -2
- package/types/index.ts +2 -0
- package/utils/getPackedUserOperation.ts +10 -4
- package/utils/getRequiredPrefund.ts +6 -4
- package/utils/getUserOperationHash.ts +10 -4
- package/utils/index.ts +0 -2
- package/_cjs/utils/getAction.js +0 -8
- package/_cjs/utils/getAction.js.map +0 -1
- package/_esm/utils/getAction.js +0 -7
- package/_esm/utils/getAction.js.map +0 -1
- package/_types/utils/getAction.d.ts +0 -3
- package/_types/utils/getAction.d.ts.map +0 -1
- package/utils/getAction.ts +0 -16
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# permissionless
|
|
2
2
|
|
|
3
|
+
## 0.1.18
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- ace8a11af38488a305419e4ea8245eb7890fd5f3: Changed sponsorUserOperation action return type to include maxFeePerGas and maxPriorityFeePerGas if returned by paymaster and return it as part of userOperation from prepareUserOperationRequest action
|
|
8
|
+
|
|
9
|
+
## 0.1.17
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- 8652af7665f15e77e65cb62682dd36d8acecc204: Fixed use of BigInt literals for targeting lower than ES2020
|
|
14
|
+
- 3651f6c57c2e05aab66967295d1b510ece220949: fix getAction for cases where minifier changes function names
|
|
15
|
+
|
|
3
16
|
## 0.1.16
|
|
4
17
|
|
|
5
18
|
### Patch Changes
|
|
@@ -62,7 +62,7 @@ const getAccountInitCode = async ({ owner, index, ecdsaModuleAddress }) => {
|
|
|
62
62
|
args: [ecdsaModuleAddress, ecdsaOwnershipInitData, index]
|
|
63
63
|
});
|
|
64
64
|
};
|
|
65
|
-
const getAccountAddress = async ({ factoryAddress, accountLogicAddress, fallbackHandlerAddress, ecdsaModuleAddress, owner, index =
|
|
65
|
+
const getAccountAddress = async ({ factoryAddress, accountLogicAddress, fallbackHandlerAddress, ecdsaModuleAddress, owner, index = BigInt(0) }) => {
|
|
66
66
|
const ecdsaOwnershipInitData = (0, viem_1.encodeFunctionData)({
|
|
67
67
|
abi: BiconomySmartAccountAbi_1.BiconomyInitAbi,
|
|
68
68
|
functionName: "initForSmartAccount",
|
|
@@ -86,7 +86,7 @@ const getAccountAddress = async ({ factoryAddress, accountLogicAddress, fallback
|
|
|
86
86
|
opcode: "CREATE2"
|
|
87
87
|
});
|
|
88
88
|
};
|
|
89
|
-
async function signerToBiconomySmartAccount(client, { signer, address, entryPoint: entryPointAddress, index =
|
|
89
|
+
async function signerToBiconomySmartAccount(client, { signer, address, entryPoint: entryPointAddress, index = BigInt(0), factoryAddress = BICONOMY_ADDRESSES.FACTORY_ADDRESS, accountLogicAddress = BICONOMY_ADDRESSES.ACCOUNT_V2_0_LOGIC, fallbackHandlerAddress = BICONOMY_ADDRESSES.DEFAULT_FALLBACK_HANDLER_ADDRESS, ecdsaModuleAddress = BICONOMY_ADDRESSES.ECDSA_OWNERSHIP_REGISTRY_MODULE }) {
|
|
90
90
|
const entryPointVersion = (0, utils_1.getEntryPointVersion)(entryPointAddress);
|
|
91
91
|
if (entryPointVersion !== "v0.6") {
|
|
92
92
|
throw new Error("Only EntryPoint 0.6 is supported");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signerToBiconomySmartAccount.js","sourceRoot":"","sources":["../../../accounts/biconomy/signerToBiconomySmartAccount.ts"],"names":[],"mappings":";;;AACA,+BAgBa;AACb,0CAAqE;AACrE,0EAAsE;AAGtE,uCAAkD;AAClD,2EAAuE;AACvE,+EAA2E;AAC3E,sDAAkD;AAClD,oCAIiB;AACjB,2EAGsC;AAYtC,MAAM,gBAAgB,GAAG;IACrB;QACI,MAAM,EAAE;YACJ;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,qBAAqB;gBAC3B,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,YAAY,EAAE,OAAO;gBACrB,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,OAAO;aAChB;YACD;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,SAAS;aAClB;SACJ;QACD,IAAI,EAAE,6BAA6B;QACnC,OAAO,EAAE;YACL;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,SAAS;aAClB;SACJ;QACD,eAAe,EAAE,YAAY;QAC7B,IAAI,EAAE,UAAU;KACnB;CACK,CAAA;AAKV,MAAM,kBAAkB,GAKpB;IACA,+BAA+B,EAC3B,4CAA4C;IAChD,kBAAkB,EAAE,4CAA4C;IAChE,eAAe,EAAE,4CAA4C;IAC7D,gCAAgC,EAC5B,4CAA4C;CACnD,CAAA;AAED,MAAM,4BAA4B,GAC9B,okBAAokB,CAAA;AASxkB,MAAM,kBAAkB,GAAG,KAAK,EAAE,EAC9B,KAAK,EACL,KAAK,EACL,kBAAkB,EAKrB,EAAgB,EAAE;IACf,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAGtD,MAAM,sBAAsB,GAAG,IAAA,yBAAkB,EAAC;QAC9C,GAAG,EAAE,yCAAe;QACpB,YAAY,EAAE,qBAAqB;QACnC,IAAI,EAAE,CAAC,KAAK,CAAC;KAChB,CAAC,CAAA;IAGF,OAAO,IAAA,yBAAkB,EAAC;QACtB,GAAG,EAAE,gBAAgB;QACrB,YAAY,EAAE,6BAA6B;QAC3C,IAAI,EAAE,CAAC,kBAAkB,EAAE,sBAAsB,EAAE,KAAK,CAAC;KAC5D,CAAC,CAAA;AACN,CAAC,CAAA;AAED,MAAM,iBAAiB,GAAG,KAAK,EAAE,EAC7B,cAAc,EACd,mBAAmB,EACnB,sBAAsB,EACtB,kBAAkB,EAClB,KAAK,EACL,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"signerToBiconomySmartAccount.js","sourceRoot":"","sources":["../../../accounts/biconomy/signerToBiconomySmartAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -100,7 +100,7 @@ const getAccountAddress = async ({ client, owner, entryPoint: entryPointAddress,
|
|
|
100
100
|
entryPoint: entryPointAddress
|
|
101
101
|
});
|
|
102
102
|
};
|
|
103
|
-
async function signerToEcdsaKernelSmartAccount(client, { signer, address, entryPoint: entryPointAddress, index =
|
|
103
|
+
async function signerToEcdsaKernelSmartAccount(client, { signer, address, entryPoint: entryPointAddress, index = BigInt(0), factoryAddress = KERNEL_ADDRESSES.FACTORY_ADDRESS, accountLogicAddress = KERNEL_ADDRESSES.ACCOUNT_V2_2_LOGIC, ecdsaValidatorAddress = KERNEL_ADDRESSES.ECDSA_VALIDATOR, deployedAccountAddress }) {
|
|
104
104
|
const entryPointVersion = (0, utils_1.getEntryPointVersion)(entryPointAddress);
|
|
105
105
|
if (entryPointVersion !== "v0.6") {
|
|
106
106
|
throw new Error("Only EntryPoint 0.6 is supported");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signerToEcdsaKernelSmartAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/signerToEcdsaKernelSmartAccount.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"signerToEcdsaKernelSmartAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/signerToEcdsaKernelSmartAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -146,7 +146,7 @@ const getInitializerCode = async ({ owner, safeModuleSetupAddress, safe4337Modul
|
|
|
146
146
|
functionName: "enableModules",
|
|
147
147
|
args: [[safe4337ModuleAddress, ...safeModules]]
|
|
148
148
|
}),
|
|
149
|
-
value:
|
|
149
|
+
value: BigInt(0),
|
|
150
150
|
operation: 1
|
|
151
151
|
},
|
|
152
152
|
...setupTransactions.map((tx) => ({ ...tx, operation: 0 }))
|
|
@@ -205,12 +205,12 @@ const getInitializerCode = async ({ owner, safeModuleSetupAddress, safe4337Modul
|
|
|
205
205
|
functionName: "setup",
|
|
206
206
|
args: [
|
|
207
207
|
[owner],
|
|
208
|
-
|
|
208
|
+
BigInt(1),
|
|
209
209
|
multiSendAddress,
|
|
210
210
|
multiSendCallData,
|
|
211
211
|
safe4337ModuleAddress,
|
|
212
212
|
viem_1.zeroAddress,
|
|
213
|
-
|
|
213
|
+
BigInt(0),
|
|
214
214
|
viem_1.zeroAddress
|
|
215
215
|
]
|
|
216
216
|
});
|
|
@@ -219,17 +219,18 @@ function getPaymasterAndData(unpackedUserOperation) {
|
|
|
219
219
|
return unpackedUserOperation.paymaster
|
|
220
220
|
? (0, viem_1.concat)([
|
|
221
221
|
unpackedUserOperation.paymaster,
|
|
222
|
-
(0, viem_1.pad)((0, viem_1.toHex)(unpackedUserOperation.paymasterVerificationGasLimit ||
|
|
222
|
+
(0, viem_1.pad)((0, viem_1.toHex)(unpackedUserOperation.paymasterVerificationGasLimit ||
|
|
223
|
+
BigInt(0)), {
|
|
223
224
|
size: 16
|
|
224
225
|
}),
|
|
225
|
-
(0, viem_1.pad)((0, viem_1.toHex)(unpackedUserOperation.paymasterPostOpGasLimit ||
|
|
226
|
+
(0, viem_1.pad)((0, viem_1.toHex)(unpackedUserOperation.paymasterPostOpGasLimit || BigInt(0)), {
|
|
226
227
|
size: 16
|
|
227
228
|
}),
|
|
228
229
|
unpackedUserOperation.paymasterData || "0x"
|
|
229
230
|
])
|
|
230
231
|
: "0x";
|
|
231
232
|
}
|
|
232
|
-
const getAccountInitCode = async ({ owner, safeModuleSetupAddress, safe4337ModuleAddress, safeSingletonAddress, multiSendAddress, saltNonce =
|
|
233
|
+
const getAccountInitCode = async ({ owner, safeModuleSetupAddress, safe4337ModuleAddress, safeSingletonAddress, multiSendAddress, saltNonce = BigInt(0), setupTransactions = [], safeModules = [] }) => {
|
|
233
234
|
if (!owner)
|
|
234
235
|
throw new Error("Owner account not found");
|
|
235
236
|
const initializer = await getInitializerCode({
|
|
@@ -277,7 +278,7 @@ const getAccountInitCode = async ({ owner, safeModuleSetupAddress, safe4337Modul
|
|
|
277
278
|
});
|
|
278
279
|
return initCodeCallData;
|
|
279
280
|
};
|
|
280
|
-
const getAccountAddress = async ({ client, owner, safeModuleSetupAddress, safe4337ModuleAddress, safeProxyFactoryAddress, safeSingletonAddress, multiSendAddress, setupTransactions = [], safeModules = [], saltNonce =
|
|
281
|
+
const getAccountAddress = async ({ client, owner, safeModuleSetupAddress, safe4337ModuleAddress, safeProxyFactoryAddress, safeSingletonAddress, multiSendAddress, setupTransactions = [], safeModules = [], saltNonce = BigInt(0) }) => {
|
|
281
282
|
const proxyCreationCode = await (0, actions_1.readContract)(client, {
|
|
282
283
|
abi: [
|
|
283
284
|
{
|
|
@@ -343,7 +344,7 @@ const getDefaultAddresses = (safeVersion, entryPointAddress, { addModuleLibAddre
|
|
|
343
344
|
multiSendCallOnlyAddress
|
|
344
345
|
};
|
|
345
346
|
};
|
|
346
|
-
async function signerToSafeSmartAccount(client, { signer, address, safeVersion, entryPoint: entryPointAddress, safeModuleSetupAddress: _safeModuleSetupAddress, safe4337ModuleAddress: _safe4337ModuleAddress, safeProxyFactoryAddress: _safeProxyFactoryAddress, safeSingletonAddress: _safeSingletonAddress, multiSendAddress: _multiSendAddress, multiSendCallOnlyAddress: _multiSendCallOnlyAddress, saltNonce =
|
|
347
|
+
async function signerToSafeSmartAccount(client, { signer, address, safeVersion, entryPoint: entryPointAddress, safeModuleSetupAddress: _safeModuleSetupAddress, safe4337ModuleAddress: _safe4337ModuleAddress, safeProxyFactoryAddress: _safeProxyFactoryAddress, safeSingletonAddress: _safeSingletonAddress, multiSendAddress: _multiSendAddress, multiSendCallOnlyAddress: _multiSendCallOnlyAddress, saltNonce = BigInt(0), validUntil = 0, validAfter = 0, safeModules = [], setupTransactions = [] }) {
|
|
347
348
|
const chainId = client.chain?.id ?? (await (0, actions_1.getChainId)(client));
|
|
348
349
|
const viemSigner = {
|
|
349
350
|
...signer,
|
|
@@ -527,7 +528,7 @@ async function signerToSafeSmartAccount(client, { signer, address, safeVersion,
|
|
|
527
528
|
if (Array.isArray(args)) {
|
|
528
529
|
const argsArray = args;
|
|
529
530
|
to = multiSendCallOnlyAddress;
|
|
530
|
-
value =
|
|
531
|
+
value = BigInt(0);
|
|
531
532
|
data = encodeMultiSend(argsArray.map((tx) => ({ ...tx, operation: 0 })));
|
|
532
533
|
operationType = 1;
|
|
533
534
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signerToSafeSmartAccount.js","sourceRoot":"","sources":["../../../accounts/safe/signerToSafeSmartAccount.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"signerToSafeSmartAccount.js","sourceRoot":"","sources":["../../../accounts/safe/signerToSafeSmartAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ const getUserOperationHash_1 = require("../../utils/getUserOperationHash.js");
|
|
|
10
10
|
const isSmartAccountDeployed_1 = require("../../utils/isSmartAccountDeployed.js");
|
|
11
11
|
const toSmartAccount_1 = require("../toSmartAccount.js");
|
|
12
12
|
const types_1 = require("../types.js");
|
|
13
|
-
const getAccountInitCode = async (owner, index =
|
|
13
|
+
const getAccountInitCode = async (owner, index = BigInt(0)) => {
|
|
14
14
|
if (!owner)
|
|
15
15
|
throw new Error("Owner account not found");
|
|
16
16
|
return (0, viem_1.encodeFunctionData)({
|
|
@@ -44,7 +44,7 @@ const getAccountInitCode = async (owner, index = 0n) => {
|
|
|
44
44
|
args: [owner, index]
|
|
45
45
|
});
|
|
46
46
|
};
|
|
47
|
-
const getAccountAddress = async ({ client, factoryAddress, entryPoint: entryPointAddress, owner, index =
|
|
47
|
+
const getAccountAddress = async ({ client, factoryAddress, entryPoint: entryPointAddress, owner, index = BigInt(0) }) => {
|
|
48
48
|
const entryPointVersion = (0, utils_1.getEntryPointVersion)(entryPointAddress);
|
|
49
49
|
const factoryData = await getAccountInitCode(owner, index);
|
|
50
50
|
if (entryPointVersion === "v0.6") {
|
|
@@ -59,7 +59,7 @@ const getAccountAddress = async ({ client, factoryAddress, entryPoint: entryPoin
|
|
|
59
59
|
entryPoint: entryPointAddress
|
|
60
60
|
});
|
|
61
61
|
};
|
|
62
|
-
async function signerToSimpleSmartAccount(client, { signer, factoryAddress, entryPoint: entryPointAddress, index =
|
|
62
|
+
async function signerToSimpleSmartAccount(client, { signer, factoryAddress, entryPoint: entryPointAddress, index = BigInt(0), address }) {
|
|
63
63
|
const viemSigner = {
|
|
64
64
|
...signer,
|
|
65
65
|
signTransaction: (_, __) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signerToSimpleSmartAccount.js","sourceRoot":"","sources":["../../../accounts/simple/signerToSimpleSmartAccount.ts"],"names":[],"mappings":";;;AAAA,+BASa;AACb,0CAAsD;AACtD,0EAAsE;AACtE,4EAAwE;AAOxE,uCAAkD;AAClD,2EAAuE;AACvE,+EAA2E;AAC3E,sDAAkD;AAClD,oCAIiB;AAQjB,MAAM,kBAAkB,GAAG,KAAK,
|
|
1
|
+
{"version":3,"file":"signerToSimpleSmartAccount.js","sourceRoot":"","sources":["../../../accounts/simple/signerToSimpleSmartAccount.ts"],"names":[],"mappings":";;;AAAA,+BASa;AACb,0CAAsD;AACtD,0EAAsE;AACtE,4EAAwE;AAOxE,uCAAkD;AAClD,2EAAuE;AACvE,+EAA2E;AAC3E,sDAAkD;AAClD,oCAIiB;AAQjB,MAAM,kBAAkB,GAAG,KAAK,EAC5B,KAAc,EACd,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,EACL,EAAE;IACd,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAEtD,OAAO,IAAA,yBAAkB,EAAC;QACtB,GAAG,EAAE;YACD;gBACI,MAAM,EAAE;oBACJ;wBACI,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,SAAS;qBAClB;oBACD;wBACI,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,SAAS;qBAClB;iBACJ;gBACD,IAAI,EAAE,eAAe;gBACrB,OAAO,EAAE;oBACL;wBACI,YAAY,EAAE,wBAAwB;wBACtC,IAAI,EAAE,KAAK;wBACX,IAAI,EAAE,SAAS;qBAClB;iBACJ;gBACD,eAAe,EAAE,YAAY;gBAC7B,IAAI,EAAE,UAAU;aACnB;SACJ;QACD,YAAY,EAAE,eAAe;QAC7B,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC;KACvB,CAAC,CAAA;AACN,CAAC,CAAA;AAED,MAAM,iBAAiB,GAAG,KAAK,EAI7B,EACE,MAAM,EACN,cAAc,EACd,UAAU,EAAE,iBAAiB,EAC7B,KAAK,EACL,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,EAOpB,EAAoB,EAAE;IACnB,MAAM,iBAAiB,GAAG,IAAA,4BAAoB,EAAC,iBAAiB,CAAC,CAAA;IAEjE,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IAE1D,IAAI,iBAAiB,KAAK,MAAM,EAAE,CAAC;QAC/B,OAAO,IAAA,mCAAgB,EAA8B,MAAM,EAAE;YACzD,QAAQ,EAAE,IAAA,gBAAS,EAAC,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;YAClD,UAAU,EAAE,iBAAgD;SAC/D,CAAC,CAAA;IACN,CAAC;IAGD,OAAO,IAAA,mCAAgB,EAA8B,MAAM,EAAE;QACzD,OAAO,EAAE,cAAc;QACvB,WAAW;QACX,UAAU,EAAE,iBAAgD;KAC/D,CAAC,CAAA;AACN,CAAC,CAAA;AAmBM,KAAK,UAAU,0BAA0B,CAO5C,MAA6C,EAC7C,EACI,MAAM,EACN,cAAc,EACd,UAAU,EAAE,iBAAiB,EAC7B,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,EACjB,OAAO,EAC2D;IAEtE,MAAM,UAAU,GAAiB;QAC7B,GAAG,MAAM;QACT,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE;YACvB,MAAM,IAAI,iDAAyC,EAAE,CAAA;QACzD,CAAC;KACY,CAAA;IAEjB,MAAM,CAAC,cAAc,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAChD,OAAO;YACH,iBAAiB,CAAiC;gBAC9C,MAAM;gBACN,cAAc;gBACd,UAAU,EAAE,iBAAiB;gBAC7B,KAAK,EAAE,UAAU,CAAC,OAAO;gBACzB,KAAK;aACR,CAAC;QACN,MAAM,CAAC,KAAK,EAAE,EAAE,IAAI,IAAA,oBAAU,EAAC,MAAM,CAAC;KACzC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;IAEjE,IAAI,oBAAoB,GAAG,MAAM,IAAA,+CAAsB,EACnD,MAAM,EACN,cAAc,CACjB,CAAA;IAED,OAAO,IAAA,+BAAc,EAAC;QAClB,OAAO,EAAE,cAAc;QACvB,WAAW,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAA;QAC1D,CAAC;QACD,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE;YACvB,MAAM,IAAI,iDAAyC,EAAE,CAAA;QACzD,CAAC;QACD,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAA;QAC1D,CAAC;QACD,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,cAAc;QACzB,UAAU,EAAE,iBAAiB;QAC7B,MAAM,EAAE,oBAAoB;QAC5B,KAAK,CAAC,QAAQ;YACV,OAAO,IAAA,iCAAe,EAAC,MAAM,EAAE;gBAC3B,MAAM,EAAE,cAAc;gBACtB,UAAU,EAAE,iBAAiB;aAChC,CAAC,CAAA;QACN,CAAC;QACD,KAAK,CAAC,iBAAiB,CAAC,aAAa;YACjC,OAAO,IAAA,qBAAW,EAAC,MAAM,EAAE;gBACvB,OAAO,EAAE,UAAU;gBACnB,OAAO,EAAE;oBACL,GAAG,EAAE,IAAA,2CAAoB,EAAC;wBACtB,aAAa;wBACb,UAAU,EAAE,iBAAiB;wBAC7B,OAAO,EAAE,OAAO;qBACnB,CAAC;iBACL;aACJ,CAAC,CAAA;QACN,CAAC;QACD,KAAK,CAAC,WAAW;YACb,IAAI,oBAAoB;gBAAE,OAAO,IAAI,CAAA;YAErC,oBAAoB,GAAG,MAAM,IAAA,+CAAsB,EAC/C,MAAM,EACN,cAAc,CACjB,CAAA;YAED,IAAI,oBAAoB;gBAAE,OAAO,IAAI,CAAA;YAErC,OAAO,IAAA,gBAAS,EAAC;gBACb,cAAc;gBACd,MAAM,kBAAkB,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC;aACtD,CAAC,CAAA;QACN,CAAC;QACD,KAAK,CAAC,UAAU;YACZ,IAAI,oBAAoB;gBAAE,OAAO,SAAS,CAAA;YAC1C,oBAAoB,GAAG,MAAM,IAAA,+CAAsB,EAC/C,MAAM,EACN,cAAc,CACjB,CAAA;YACD,IAAI,oBAAoB;gBAAE,OAAO,SAAS,CAAA;YAC1C,OAAO,cAAc,CAAA;QACzB,CAAC;QACD,KAAK,CAAC,cAAc;YAChB,IAAI,oBAAoB;gBAAE,OAAO,SAAS,CAAA;YAC1C,oBAAoB,GAAG,MAAM,IAAA,+CAAsB,EAC/C,MAAM,EACN,cAAc,CACjB,CAAA;YACD,IAAI,oBAAoB;gBAAE,OAAO,SAAS,CAAA;YAC1C,OAAO,kBAAkB,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QACxD,CAAC;QACD,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAA;QACxE,CAAC;QACD,KAAK,CAAC,cAAc,CAAC,IAAI;YACrB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBACtB,MAAM,SAAS,GAAG,IAIf,CAAA;gBAEH,IAAI,IAAA,4BAAoB,EAAC,iBAAiB,CAAC,KAAK,MAAM,EAAE,CAAC;oBACrD,OAAO,IAAA,yBAAkB,EAAC;wBACtB,GAAG,EAAE;4BACD;gCACI,MAAM,EAAE;oCACJ;wCACI,YAAY,EAAE,WAAW;wCACzB,IAAI,EAAE,MAAM;wCACZ,IAAI,EAAE,WAAW;qCACpB;oCACD;wCACI,YAAY,EAAE,SAAS;wCACvB,IAAI,EAAE,MAAM;wCACZ,IAAI,EAAE,SAAS;qCAClB;iCACJ;gCACD,IAAI,EAAE,cAAc;gCACpB,OAAO,EAAE,EAAE;gCACX,eAAe,EAAE,YAAY;gCAC7B,IAAI,EAAE,UAAU;6BACnB;yBACJ;wBACD,YAAY,EAAE,cAAc;wBAC5B,IAAI,EAAE;4BACF,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;4BAC1B,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;yBAC/B;qBACJ,CAAC,CAAA;gBACN,CAAC;gBACD,OAAO,IAAA,yBAAkB,EAAC;oBACtB,GAAG,EAAE;wBACD;4BACI,MAAM,EAAE;gCACJ;oCACI,YAAY,EAAE,WAAW;oCACzB,IAAI,EAAE,MAAM;oCACZ,IAAI,EAAE,WAAW;iCACpB;gCACD;oCACI,YAAY,EAAE,WAAW;oCACzB,IAAI,EAAE,OAAO;oCACb,IAAI,EAAE,WAAW;iCACpB;gCACD;oCACI,YAAY,EAAE,SAAS;oCACvB,IAAI,EAAE,MAAM;oCACZ,IAAI,EAAE,SAAS;iCAClB;6BACJ;4BACD,IAAI,EAAE,cAAc;4BACpB,OAAO,EAAE,EAAE;4BACX,eAAe,EAAE,YAAY;4BAC7B,IAAI,EAAE,UAAU;yBACnB;qBACJ;oBACD,YAAY,EAAE,cAAc;oBAC5B,IAAI,EAAE;wBACF,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBAC1B,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;wBAC7B,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;qBAC/B;iBACJ,CAAC,CAAA;YACN,CAAC;YAED,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAI3B,CAAA;YAED,OAAO,IAAA,yBAAkB,EAAC;gBACtB,GAAG,EAAE;oBACD;wBACI,MAAM,EAAE;4BACJ;gCACI,YAAY,EAAE,SAAS;gCACvB,IAAI,EAAE,MAAM;gCACZ,IAAI,EAAE,SAAS;6BAClB;4BACD;gCACI,YAAY,EAAE,SAAS;gCACvB,IAAI,EAAE,OAAO;gCACb,IAAI,EAAE,SAAS;6BAClB;4BACD;gCACI,YAAY,EAAE,OAAO;gCACrB,IAAI,EAAE,MAAM;gCACZ,IAAI,EAAE,OAAO;6BAChB;yBACJ;wBACD,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,EAAE;wBACX,eAAe,EAAE,YAAY;wBAC7B,IAAI,EAAE,UAAU;qBACnB;iBACJ;gBACD,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC;aAC1B,CAAC,CAAA;QACN,CAAC;QACD,KAAK,CAAC,iBAAiB,CAAC,cAAc;YAClC,OAAO,sIAAsI,CAAA;QACjJ,CAAC;KACJ,CAAC,CAAA;AACN,CAAC;AA/ND,gEA+NC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.waitForUserOperationReceipt = exports.WaitForUserOperationReceiptTimeoutError = void 0;
|
|
4
4
|
const viem_1 = require("viem");
|
|
5
|
-
const
|
|
5
|
+
const utils_1 = require("viem/utils");
|
|
6
6
|
const observe_1 = require("../../utils/observe.js");
|
|
7
7
|
const getUserOperationReceipt_1 = require("./getUserOperationReceipt.js");
|
|
8
8
|
class WaitForUserOperationReceiptTimeoutError extends viem_1.BaseError {
|
|
@@ -36,7 +36,7 @@ const waitForUserOperationReceipt = (bundlerClient, { hash, pollingInterval = bu
|
|
|
36
36
|
clearTimeout(timeoutTimer);
|
|
37
37
|
};
|
|
38
38
|
try {
|
|
39
|
-
const _userOperationReceipt = await (0,
|
|
39
|
+
const _userOperationReceipt = await (0, utils_1.getAction)(bundlerClient, getUserOperationReceipt_1.getUserOperationReceipt, "getUserOperationReceipt")({ hash });
|
|
40
40
|
if (_userOperationReceipt !== null) {
|
|
41
41
|
userOperationReceipt = _userOperationReceipt;
|
|
42
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waitForUserOperationReceipt.js","sourceRoot":"","sources":["../../../actions/bundler/waitForUserOperationReceipt.ts"],"names":[],"mappings":";;;AAAA,+BAQa;
|
|
1
|
+
{"version":3,"file":"waitForUserOperationReceipt.js","sourceRoot":"","sources":["../../../actions/bundler/waitForUserOperationReceipt.ts"],"names":[],"mappings":";;;AAAA,+BAQa;AACb,sCAAsC;AAEtC,iDAA6C;AAC7C,uEAGkC;AAElC,MAAa,uCAAwC,SAAQ,gBAAS;IAElE,YAAY,EAAE,IAAI,EAAkB;QAChC,KAAK,CACD,sDAAsD,IAAI,oBAAoB,CACjF,CAAA;QAJI;;;;mBAAO,yCAAyC;WAAA;IAKzD,CAAC;CACJ;AAPD,0FAOC;AAmCM,MAAM,2BAA2B,GAAG,CAKvC,aAAmD,EACnD,EACI,IAAI,EACJ,eAAe,GAAG,aAAa,CAAC,eAAe,EAC/C,OAAO,EACuC,EACE,EAAE;IACtD,MAAM,UAAU,GAAG,IAAA,gBAAS,EAAC;QACzB,6BAA6B;QAC7B,aAAa,CAAC,GAAG;QACjB,IAAI;KACP,CAAC,CAAA;IAEF,IAAI,oBAAuD,CAAA;IAE3D,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,MAAM,SAAS,GAAG,IAAA,iBAAO,EACrB,UAAU,EACV,EAAE,OAAO,EAAE,MAAM,EAAE,EACnB,KAAK,EAAE,IAAI,EAAE,EAAE;YACX,IAAI,YAA2C,CAAA;YAE/C,MAAM,eAAe,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;gBAC3C,MAAM,IAAI,GAAG,CAAC,EAAc,EAAE,EAAE;oBAC5B,aAAa,CAAC,eAAe,CAAC,CAAA;oBAC9B,EAAE,EAAE,CAAA;oBACJ,SAAS,EAAE,CAAA;oBACX,IAAI,OAAO;wBAAE,YAAY,CAAC,YAAY,CAAC,CAAA;gBAC3C,CAAC,CAAA;gBACD,IAAI,CAAC;oBACD,MAAM,qBAAqB,GAAG,MAAM,IAAA,iBAAS,EACzC,aAAa,EACb,iDAAuB,EACvB,yBAAyB,CAC5B,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;oBAEX,IAAI,qBAAqB,KAAK,IAAI,EAAE,CAAC;wBACjC,oBAAoB,GAAG,qBAAqB,CAAA;oBAChD,CAAC;oBAED,IAAI,oBAAoB,EAAE,CAAC;wBACvB,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAA;wBAC9C,OAAM;oBACV,CAAC;gBACL,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACX,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;oBAC5B,OAAM;gBACV,CAAC;YACL,CAAC,EAAE,eAAe,CAAC,CAAA;YAEnB,IAAI,OAAO,EAAE,CAAC;gBACV,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;oBAC3B,aAAa,CAAC,eAAe,CAAC,CAAA;oBAC9B,SAAS,EAAE,CAAA;oBACX,MAAM,CACF,IAAI,uCAAuC,CAAC;wBACxC,IAAI;qBACP,CAAC,CACL,CAAA;oBACD,YAAY,CAAC,YAAY,CAAC,CAAA;gBAC9B,CAAC,EAAE,OAAO,CAAC,CAAA;YACf,CAAC;QACL,CAAC,CACJ,CAAA;IACL,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAtEY,QAAA,2BAA2B,+BAsEvC"}
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getAccountNonce = void 0;
|
|
4
4
|
const actions_1 = require("viem/actions");
|
|
5
|
-
const
|
|
5
|
+
const utils_1 = require("viem/utils");
|
|
6
6
|
const getAccountNonce = async (client, args) => {
|
|
7
7
|
const { sender, entryPoint, key = BigInt(0) } = args;
|
|
8
|
-
return await (0,
|
|
8
|
+
return await (0, utils_1.getAction)(client, actions_1.readContract, "readContract")({
|
|
9
9
|
address: entryPoint,
|
|
10
10
|
abi: [
|
|
11
11
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAccountNonce.js","sourceRoot":"","sources":["../../../actions/public/getAccountNonce.ts"],"names":[],"mappings":";;;AACA,0CAA2C;
|
|
1
|
+
{"version":3,"file":"getAccountNonce.js","sourceRoot":"","sources":["../../../actions/public/getAccountNonce.ts"],"names":[],"mappings":";;;AACA,0CAA2C;AAC3C,sCAAsC;AAoC/B,MAAM,eAAe,GAAG,KAAK,EAIhC,MAAkC,EAClC,IAAqC,EACtB,EAAE;IACjB,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAA;IAEpD,OAAO,MAAM,IAAA,iBAAS,EAClB,MAAM,EACN,sBAAY,EACZ,cAAc,CACjB,CAAC;QACE,OAAO,EAAE,UAAU;QACnB,GAAG,EAAE;YACD;gBACI,MAAM,EAAE;oBACJ;wBACI,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,SAAS;qBAClB;oBACD;wBACI,IAAI,EAAE,KAAK;wBACX,IAAI,EAAE,SAAS;qBAClB;iBACJ;gBACD,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE;oBACL;wBACI,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,SAAS;qBAClB;iBACJ;gBACD,eAAe,EAAE,MAAM;gBACvB,IAAI,EAAE,UAAU;aACnB;SACJ;QACD,YAAY,EAAE,UAAU;QACxB,IAAI,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC;KACtB,CAAC,CAAA;AACN,CAAC,CAAA;AAzCY,QAAA,eAAe,mBAyC3B"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getSenderAddress = exports.InvalidEntryPointError = void 0;
|
|
4
4
|
const viem_1 = require("viem");
|
|
5
5
|
const actions_1 = require("viem/actions");
|
|
6
|
-
const
|
|
6
|
+
const utils_1 = require("viem/utils");
|
|
7
7
|
class InvalidEntryPointError extends viem_1.BaseError {
|
|
8
8
|
constructor({ cause, entryPoint } = {}) {
|
|
9
9
|
super(`The entry point address (\`entryPoint\`${entryPoint ? ` = ${entryPoint}` : ""}) is not a valid entry point. getSenderAddress did not revert with a SenderAddressResult error.`, {
|
|
@@ -24,7 +24,7 @@ const getSenderAddress = async (client, args) => {
|
|
|
24
24
|
throw new Error("Either `initCode` or `factory` and `factoryData` must be provided");
|
|
25
25
|
}
|
|
26
26
|
try {
|
|
27
|
-
await (0,
|
|
27
|
+
await (0, utils_1.getAction)(client, actions_1.simulateContract, "simulateContract")({
|
|
28
28
|
address: entryPoint,
|
|
29
29
|
abi: [
|
|
30
30
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSenderAddress.js","sourceRoot":"","sources":["../../../actions/public/getSenderAddress.ts"],"names":[],"mappings":";;;AAAA,+BAaa;AAEb,0CAA+C;
|
|
1
|
+
{"version":3,"file":"getSenderAddress.js","sourceRoot":"","sources":["../../../actions/public/getSenderAddress.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.deployContract = void 0;
|
|
4
|
-
const utils_1 = require("
|
|
5
|
-
const
|
|
4
|
+
const utils_1 = require("viem/utils");
|
|
5
|
+
const utils_2 = require("../../utils/index.js");
|
|
6
6
|
const signUserOperationHashWithECDSA_1 = require("../../utils/signUserOperationHashWithECDSA.js");
|
|
7
7
|
const waitForUserOperationReceipt_1 = require("../bundler/waitForUserOperationReceipt.js");
|
|
8
8
|
const sendUserOperation_1 = require("./sendUserOperation.js");
|
|
@@ -14,12 +14,12 @@ async function deployContract(client, args) {
|
|
|
14
14
|
docsPath: "/docs/actions/wallet/sendTransaction"
|
|
15
15
|
});
|
|
16
16
|
}
|
|
17
|
-
const account = (0,
|
|
18
|
-
const userOpHash = await (0,
|
|
17
|
+
const account = (0, utils_2.parseAccount)(account_);
|
|
18
|
+
const userOpHash = await (0, utils_1.getAction)(client, (sendUserOperation_1.sendUserOperation), "sendUserOperation")({
|
|
19
19
|
userOperation: {
|
|
20
20
|
sender: account.address,
|
|
21
|
-
maxFeePerGas: request.maxFeePerGas ||
|
|
22
|
-
maxPriorityFeePerGas: request.maxPriorityFeePerGas ||
|
|
21
|
+
maxFeePerGas: request.maxFeePerGas || BigInt(0),
|
|
22
|
+
maxPriorityFeePerGas: request.maxPriorityFeePerGas || BigInt(0),
|
|
23
23
|
callData: await account.encodeDeployCallData({
|
|
24
24
|
abi,
|
|
25
25
|
bytecode,
|
|
@@ -29,7 +29,7 @@ async function deployContract(client, args) {
|
|
|
29
29
|
account: account,
|
|
30
30
|
middleware
|
|
31
31
|
});
|
|
32
|
-
const userOperationReceipt = await (0,
|
|
32
|
+
const userOperationReceipt = await (0, utils_1.getAction)(client, waitForUserOperationReceipt_1.waitForUserOperationReceipt, "waitForUserOperationReceipt")({
|
|
33
33
|
hash: userOpHash
|
|
34
34
|
});
|
|
35
35
|
return userOperationReceipt?.receipt.transactionHash;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployContract.js","sourceRoot":"","sources":["../../../actions/smartAccount/deployContract.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"deployContract.js","sourceRoot":"","sources":["../../../actions/smartAccount/deployContract.ts"],"names":[],"mappings":";;;AASA,sCAAsC;AAItC,wCAA2C;AAC3C,+FAAyF;AACzF,wFAAoF;AAEpF,2DAAuD;AAyChD,KAAK,UAAU,cAAc,CAKhC,MAA2C,EAC3C,IAAiE;IAEjE,MAAM,EACF,GAAG,EACH,IAAI,EAAE,eAAe,EACrB,QAAQ,EACR,UAAU,EACV,GAAG,OAAO,EACb,GAAG,IAAI,CAAA;IAER,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,OAAO,CAAA;IAEtD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,MAAM,IAAI,6DAA4B,CAAC;YACnC,QAAQ,EAAE,sCAAsC;SACnD,CAAC,CAAA;IACN,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,oBAAY,EAAC,QAAQ,CAA6B,CAAA;IAElE,MAAM,UAAU,GAAG,MAAM,IAAA,iBAAS,EAC9B,MAAM,EACN,CAAA,qCAA6B,CAAA,EAC7B,mBAAmB,CACtB,CAAC;QACE,aAAa,EAAE;YACX,MAAM,EAAE,OAAO,CAAC,OAAO;YACvB,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,MAAM,CAAC,CAAC,CAAC;YAC/C,oBAAoB,EAAE,OAAO,CAAC,oBAAoB,IAAI,MAAM,CAAC,CAAC,CAAC;YAC/D,QAAQ,EAAE,MAAM,OAAO,CAAC,oBAAoB,CAAC;gBACzC,GAAG;gBACH,QAAQ;gBACR,IAAI,EAAE,eAAe;aACM,CAAC;SACnC;QACD,OAAO,EAAE,OAAO;QAChB,UAAU;KACb,CAAC,CAAA;IAEF,MAAM,oBAAoB,GAAG,MAAM,IAAA,iBAAS,EACxC,MAAM,EACN,yDAA2B,EAC3B,6BAA6B,CAChC,CAAC;QACE,IAAI,EAAE,UAAU;KACnB,CAAC,CAAA;IAEF,OAAO,oBAAoB,EAAE,OAAO,CAAC,eAAe,CAAA;AACxD,CAAC;AAtDD,wCAsDC"}
|
|
@@ -2,15 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.prepareUserOperationRequest = void 0;
|
|
4
4
|
const actions_1 = require("viem/actions");
|
|
5
|
-
const utils_1 = require("
|
|
6
|
-
const
|
|
5
|
+
const utils_1 = require("viem/utils");
|
|
6
|
+
const utils_2 = require("../../utils/index.js");
|
|
7
7
|
const getEntryPointVersion_1 = require("../../utils/getEntryPointVersion.js");
|
|
8
8
|
const estimateUserOperationGas_1 = require("../bundler/estimateUserOperationGas.js");
|
|
9
9
|
async function prepareUserOperationRequestForEntryPointV06(client, args, stateOverrides) {
|
|
10
10
|
const { account: account_ = client.account, userOperation: partialUserOperation, middleware } = args;
|
|
11
11
|
if (!account_)
|
|
12
|
-
throw new
|
|
13
|
-
const account = (0,
|
|
12
|
+
throw new utils_2.AccountOrClientNotFoundError();
|
|
13
|
+
const account = (0, utils_2.parseAccount)(account_);
|
|
14
14
|
const [sender, nonce, initCode, callData] = await Promise.all([
|
|
15
15
|
partialUserOperation.sender || account.address,
|
|
16
16
|
partialUserOperation.nonce || account.getNonce(),
|
|
@@ -24,11 +24,11 @@ async function prepareUserOperationRequestForEntryPointV06(client, args, stateOv
|
|
|
24
24
|
callData,
|
|
25
25
|
paymasterAndData: "0x",
|
|
26
26
|
signature: partialUserOperation.signature || "0x",
|
|
27
|
-
maxFeePerGas: partialUserOperation.maxFeePerGas ||
|
|
28
|
-
maxPriorityFeePerGas: partialUserOperation.maxPriorityFeePerGas ||
|
|
29
|
-
callGasLimit: partialUserOperation.callGasLimit ||
|
|
30
|
-
verificationGasLimit: partialUserOperation.verificationGasLimit ||
|
|
31
|
-
preVerificationGas: partialUserOperation.preVerificationGas ||
|
|
27
|
+
maxFeePerGas: partialUserOperation.maxFeePerGas || BigInt(0),
|
|
28
|
+
maxPriorityFeePerGas: partialUserOperation.maxPriorityFeePerGas || BigInt(0),
|
|
29
|
+
callGasLimit: partialUserOperation.callGasLimit || BigInt(0),
|
|
30
|
+
verificationGasLimit: partialUserOperation.verificationGasLimit || BigInt(0),
|
|
31
|
+
preVerificationGas: partialUserOperation.preVerificationGas || BigInt(0)
|
|
32
32
|
};
|
|
33
33
|
if (userOperation.signature === "0x") {
|
|
34
34
|
userOperation.signature = await account.getDummySignature(userOperation);
|
|
@@ -66,12 +66,17 @@ async function prepareUserOperationRequestForEntryPointV06(client, args, stateOv
|
|
|
66
66
|
sponsorUserOperationData.preVerificationGas;
|
|
67
67
|
userOperation.paymasterAndData =
|
|
68
68
|
sponsorUserOperationData.paymasterAndData;
|
|
69
|
+
userOperation.maxFeePerGas =
|
|
70
|
+
sponsorUserOperationData.maxFeePerGas || userOperation.maxFeePerGas;
|
|
71
|
+
userOperation.maxPriorityFeePerGas =
|
|
72
|
+
sponsorUserOperationData.maxPriorityFeePerGas ||
|
|
73
|
+
userOperation.maxPriorityFeePerGas;
|
|
69
74
|
return userOperation;
|
|
70
75
|
}
|
|
71
76
|
if (!userOperation.callGasLimit ||
|
|
72
77
|
!userOperation.verificationGasLimit ||
|
|
73
78
|
!userOperation.preVerificationGas) {
|
|
74
|
-
const gasParameters = await (0,
|
|
79
|
+
const gasParameters = await (0, utils_1.getAction)(client, estimateUserOperationGas_1.estimateUserOperationGas, "estimateUserOperationGas")({
|
|
75
80
|
userOperation,
|
|
76
81
|
entryPoint: account.entryPoint
|
|
77
82
|
}, stateOverrides);
|
|
@@ -87,8 +92,8 @@ async function prepareUserOperationRequestForEntryPointV06(client, args, stateOv
|
|
|
87
92
|
async function prepareUserOperationRequestEntryPointV07(client, args, stateOverrides) {
|
|
88
93
|
const { account: account_ = client.account, userOperation: partialUserOperation, middleware } = args;
|
|
89
94
|
if (!account_)
|
|
90
|
-
throw new
|
|
91
|
-
const account = (0,
|
|
95
|
+
throw new utils_2.AccountOrClientNotFoundError();
|
|
96
|
+
const account = (0, utils_2.parseAccount)(account_);
|
|
92
97
|
const [sender, nonce, factory, factoryData, callData, gasEstimation] = await Promise.all([
|
|
93
98
|
partialUserOperation.sender || account.address,
|
|
94
99
|
partialUserOperation.nonce || account.getNonce(),
|
|
@@ -106,15 +111,15 @@ async function prepareUserOperationRequestEntryPointV07(client, args, stateOverr
|
|
|
106
111
|
factory: factory,
|
|
107
112
|
factoryData: factoryData,
|
|
108
113
|
callData,
|
|
109
|
-
callGasLimit: partialUserOperation.callGasLimit ||
|
|
110
|
-
verificationGasLimit: partialUserOperation.verificationGasLimit ||
|
|
111
|
-
preVerificationGas: partialUserOperation.preVerificationGas ||
|
|
114
|
+
callGasLimit: partialUserOperation.callGasLimit || BigInt(0),
|
|
115
|
+
verificationGasLimit: partialUserOperation.verificationGasLimit || BigInt(0),
|
|
116
|
+
preVerificationGas: partialUserOperation.preVerificationGas || BigInt(0),
|
|
112
117
|
maxFeePerGas: partialUserOperation.maxFeePerGas ||
|
|
113
118
|
gasEstimation?.maxFeePerGas ||
|
|
114
|
-
|
|
119
|
+
BigInt(0),
|
|
115
120
|
maxPriorityFeePerGas: partialUserOperation.maxPriorityFeePerGas ||
|
|
116
121
|
gasEstimation?.maxPriorityFeePerGas ||
|
|
117
|
-
|
|
122
|
+
BigInt(0),
|
|
118
123
|
signature: partialUserOperation.signature || "0x"
|
|
119
124
|
};
|
|
120
125
|
if (userOperation.signature === "0x") {
|
|
@@ -157,12 +162,17 @@ async function prepareUserOperationRequestEntryPointV07(client, args, stateOverr
|
|
|
157
162
|
userOperation.paymasterPostOpGasLimit =
|
|
158
163
|
sponsorUserOperationData.paymasterPostOpGasLimit;
|
|
159
164
|
userOperation.paymasterData = sponsorUserOperationData.paymasterData;
|
|
165
|
+
userOperation.maxFeePerGas =
|
|
166
|
+
sponsorUserOperationData.maxFeePerGas || userOperation.maxFeePerGas;
|
|
167
|
+
userOperation.maxPriorityFeePerGas =
|
|
168
|
+
sponsorUserOperationData.maxPriorityFeePerGas ||
|
|
169
|
+
userOperation.maxPriorityFeePerGas;
|
|
160
170
|
return userOperation;
|
|
161
171
|
}
|
|
162
172
|
if (!userOperation.callGasLimit ||
|
|
163
173
|
!userOperation.verificationGasLimit ||
|
|
164
174
|
!userOperation.preVerificationGas) {
|
|
165
|
-
const gasParameters = await (0,
|
|
175
|
+
const gasParameters = await (0, utils_1.getAction)(client, (estimateUserOperationGas_1.estimateUserOperationGas), "estimateUserOperationGas")({
|
|
166
176
|
userOperation,
|
|
167
177
|
entryPoint: account.entryPoint
|
|
168
178
|
}, stateOverrides);
|
|
@@ -184,8 +194,8 @@ async function prepareUserOperationRequestEntryPointV07(client, args, stateOverr
|
|
|
184
194
|
async function prepareUserOperationRequest(client, args, stateOverrides) {
|
|
185
195
|
const { account: account_ = client.account } = args;
|
|
186
196
|
if (!account_)
|
|
187
|
-
throw new
|
|
188
|
-
const account = (0,
|
|
197
|
+
throw new utils_2.AccountOrClientNotFoundError();
|
|
198
|
+
const account = (0, utils_2.parseAccount)(account_);
|
|
189
199
|
const entryPointVersion = (0, getEntryPointVersion_1.getEntryPointVersion)(account.entryPoint);
|
|
190
200
|
if (entryPointVersion === "v0.6") {
|
|
191
201
|
return prepareUserOperationRequestForEntryPointV06(client, args, stateOverrides);
|