permissionless 0.2.14 → 0.2.16
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/toBiconomySmartAccount.js +11 -11
- package/_cjs/accounts/biconomy/toBiconomySmartAccount.js.map +1 -1
- package/_cjs/accounts/index.js +16 -16
- package/_cjs/accounts/index.js.map +1 -1
- package/_cjs/accounts/kernel/toEcdsaKernelSmartAccount.js +30 -30
- package/_cjs/accounts/kernel/toEcdsaKernelSmartAccount.js.map +1 -1
- package/_cjs/accounts/kernel/utils/encodeCallData.js +7 -7
- package/_cjs/accounts/kernel/utils/encodeCallData.js.map +1 -1
- package/_cjs/accounts/kernel/utils/getNonceKey.js +5 -5
- package/_cjs/accounts/kernel/utils/getNonceKey.js.map +1 -1
- package/_cjs/accounts/kernel/utils/signMessage.js +4 -4
- package/_cjs/accounts/kernel/utils/signMessage.js.map +1 -1
- package/_cjs/accounts/kernel/utils/signTypedData.js +4 -4
- package/_cjs/accounts/kernel/utils/signTypedData.js.map +1 -1
- package/_cjs/accounts/light/toLightSmartAccount.js +6 -6
- package/_cjs/accounts/light/toLightSmartAccount.js.map +1 -1
- package/_cjs/accounts/nexus/toNexusSmartAccount.js +6 -6
- package/_cjs/accounts/nexus/toNexusSmartAccount.js.map +1 -1
- package/_cjs/accounts/safe/toSafeSmartAccount.js +9 -8
- package/_cjs/accounts/safe/toSafeSmartAccount.js.map +1 -1
- package/_cjs/accounts/simple/toSimpleSmartAccount.js +6 -6
- package/_cjs/accounts/simple/toSimpleSmartAccount.js.map +1 -1
- package/_cjs/accounts/thirdweb/toThirdwebSmartAccount.js +14 -14
- package/_cjs/accounts/thirdweb/toThirdwebSmartAccount.js.map +1 -1
- package/_cjs/accounts/trust/toTrustSmartAccount.js +10 -10
- package/_cjs/accounts/trust/toTrustSmartAccount.js.map +1 -1
- package/_cjs/actions/erc7579/accountId.js +2 -2
- package/_cjs/actions/erc7579/accountId.js.map +1 -1
- package/_cjs/actions/erc7579/installModule.js +4 -4
- package/_cjs/actions/erc7579/installModule.js.map +1 -1
- package/_cjs/actions/erc7579/installModules.js +4 -4
- package/_cjs/actions/erc7579/installModules.js.map +1 -1
- package/_cjs/actions/erc7579/isModuleInstalled.js +5 -5
- package/_cjs/actions/erc7579/isModuleInstalled.js.map +1 -1
- package/_cjs/actions/erc7579/supportsExecutionMode.js +2 -2
- package/_cjs/actions/erc7579/supportsExecutionMode.js.map +1 -1
- package/_cjs/actions/erc7579/supportsModule.js +2 -2
- package/_cjs/actions/erc7579/supportsModule.js.map +1 -1
- package/_cjs/actions/erc7579/uninstallModule.js +4 -4
- package/_cjs/actions/erc7579/uninstallModule.js.map +1 -1
- package/_cjs/actions/erc7579/uninstallModules.js +4 -4
- package/_cjs/actions/erc7579/uninstallModules.js.map +1 -1
- package/_cjs/actions/erc7579.js +24 -24
- package/_cjs/actions/erc7579.js.map +1 -1
- package/_cjs/actions/index.js +5 -5
- package/_cjs/actions/index.js.map +1 -1
- package/_cjs/actions/pimlico/sponsorUserOperation.js +3 -3
- package/_cjs/actions/pimlico/sponsorUserOperation.js.map +1 -1
- package/_cjs/actions/pimlico/validateSponsorshipPolicies.js +2 -2
- package/_cjs/actions/pimlico/validateSponsorshipPolicies.js.map +1 -1
- package/_cjs/actions/pimlico.js +14 -14
- package/_cjs/actions/pimlico.js.map +1 -1
- package/_cjs/actions/public/getSenderAddress.js +30 -137
- package/_cjs/actions/public/getSenderAddress.js.map +1 -1
- package/_cjs/actions/smartAccount/sendTransaction.js +2 -2
- package/_cjs/actions/smartAccount/sendTransaction.js.map +1 -1
- package/_cjs/actions/smartAccount/signMessage.js +2 -2
- package/_cjs/actions/smartAccount/signMessage.js.map +1 -1
- package/_cjs/actions/smartAccount/signTypedData.js +2 -2
- package/_cjs/actions/smartAccount/signTypedData.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 +8 -8
- package/_cjs/actions/smartAccount.js.map +1 -1
- package/_cjs/clients/createSmartAccountClient.js +3 -3
- package/_cjs/clients/createSmartAccountClient.js.map +1 -1
- package/_cjs/clients/decorators/pimlico.js +10 -10
- package/_cjs/clients/decorators/pimlico.js.map +1 -1
- package/_cjs/clients/decorators/smartAccount.js +11 -11
- package/_cjs/clients/decorators/smartAccount.js.map +1 -1
- package/_cjs/clients/index.js.map +1 -1
- package/_cjs/clients/pimlico.js +2 -2
- package/_cjs/clients/pimlico.js.map +1 -1
- package/_cjs/experimental/pimlico/index.js +2 -2
- package/_cjs/experimental/pimlico/index.js.map +1 -1
- package/_cjs/experimental/pimlico/utils/prepareUserOperationForErc20Paymaster.js +6 -5
- package/_cjs/experimental/pimlico/utils/prepareUserOperationForErc20Paymaster.js.map +1 -1
- package/_cjs/index.js.map +1 -1
- package/_cjs/utils/encode7579Calls.js +3 -3
- package/_cjs/utils/encode7579Calls.js.map +1 -1
- package/_cjs/utils/encodeInstallModule.js +4 -4
- package/_cjs/utils/encodeInstallModule.js.map +1 -1
- package/_cjs/utils/encodeUninstallModule.js +4 -4
- package/_cjs/utils/encodeUninstallModule.js.map +1 -1
- package/_cjs/utils/index.js +25 -25
- package/_cjs/utils/index.js.map +1 -1
- package/_cjs/utils/toOwner.js.map +1 -1
- package/_esm/accounts/biconomy/toBiconomySmartAccount.js.map +1 -1
- package/_esm/accounts/index.js.map +1 -1
- package/_esm/accounts/kernel/toEcdsaKernelSmartAccount.js.map +1 -1
- package/_esm/accounts/kernel/utils/encodeCallData.js.map +1 -1
- package/_esm/accounts/kernel/utils/getNonceKey.js.map +1 -1
- package/_esm/accounts/kernel/utils/signMessage.js.map +1 -1
- package/_esm/accounts/kernel/utils/signTypedData.js.map +1 -1
- package/_esm/accounts/light/toLightSmartAccount.js.map +1 -1
- package/_esm/accounts/nexus/toNexusSmartAccount.js +1 -1
- package/_esm/accounts/nexus/toNexusSmartAccount.js.map +1 -1
- package/_esm/accounts/safe/toSafeSmartAccount.js +2 -1
- package/_esm/accounts/safe/toSafeSmartAccount.js.map +1 -1
- package/_esm/accounts/simple/toSimpleSmartAccount.js.map +1 -1
- package/_esm/accounts/thirdweb/toThirdwebSmartAccount.js.map +1 -1
- package/_esm/accounts/trust/toTrustSmartAccount.js.map +1 -1
- package/_esm/actions/erc7579/accountId.js.map +1 -1
- package/_esm/actions/erc7579/installModule.js +1 -1
- package/_esm/actions/erc7579/installModule.js.map +1 -1
- package/_esm/actions/erc7579/installModules.js.map +1 -1
- package/_esm/actions/erc7579/isModuleInstalled.js.map +1 -1
- package/_esm/actions/erc7579/supportsExecutionMode.js.map +1 -1
- package/_esm/actions/erc7579/supportsModule.js.map +1 -1
- package/_esm/actions/erc7579/uninstallModule.js.map +1 -1
- package/_esm/actions/erc7579/uninstallModules.js.map +1 -1
- package/_esm/actions/erc7579.js.map +1 -1
- package/_esm/actions/index.js.map +1 -1
- package/_esm/actions/pimlico/sponsorUserOperation.js.map +1 -1
- package/_esm/actions/pimlico/validateSponsorshipPolicies.js.map +1 -1
- package/_esm/actions/pimlico.js.map +1 -1
- package/_esm/actions/public/getSenderAddress.js +33 -142
- package/_esm/actions/public/getSenderAddress.js.map +1 -1
- package/_esm/actions/smartAccount/sendTransaction.js.map +1 -1
- package/_esm/actions/smartAccount/signMessage.js.map +1 -1
- package/_esm/actions/smartAccount/signTypedData.js.map +1 -1
- package/_esm/actions/smartAccount/writeContract.js.map +1 -1
- package/_esm/actions/smartAccount.js.map +1 -1
- package/_esm/clients/createSmartAccountClient.js +2 -2
- package/_esm/clients/createSmartAccountClient.js.map +1 -1
- package/_esm/clients/decorators/pimlico.js.map +1 -1
- package/_esm/clients/decorators/smartAccount.js +3 -3
- package/_esm/clients/decorators/smartAccount.js.map +1 -1
- package/_esm/clients/index.js.map +1 -1
- package/_esm/clients/pimlico.js.map +1 -1
- package/_esm/experimental/pimlico/index.js.map +1 -1
- package/_esm/experimental/pimlico/utils/prepareUserOperationForErc20Paymaster.js +2 -1
- package/_esm/experimental/pimlico/utils/prepareUserOperationForErc20Paymaster.js.map +1 -1
- package/_esm/index.js.map +1 -1
- package/_esm/utils/encode7579Calls.js.map +1 -1
- package/_esm/utils/encodeInstallModule.js.map +1 -1
- package/_esm/utils/encodeUninstallModule.js.map +1 -1
- package/_esm/utils/index.js.map +1 -1
- package/_esm/utils/toOwner.js.map +1 -1
- package/_types/accounts/biconomy/toBiconomySmartAccount.d.ts +3 -2
- package/_types/accounts/biconomy/toBiconomySmartAccount.d.ts.map +1 -1
- package/_types/accounts/index.d.ts +8 -8
- package/_types/accounts/index.d.ts.map +1 -1
- package/_types/accounts/kernel/toEcdsaKernelSmartAccount.d.ts +3 -2
- package/_types/accounts/kernel/toEcdsaKernelSmartAccount.d.ts.map +1 -1
- package/_types/accounts/kernel/utils/encodeCallData.d.ts +1 -1
- package/_types/accounts/kernel/utils/encodeCallData.d.ts.map +1 -1
- package/_types/accounts/kernel/utils/getNonceKey.d.ts +1 -1
- package/_types/accounts/kernel/utils/getNonceKey.d.ts.map +1 -1
- package/_types/accounts/kernel/utils/isKernelV2.d.ts +1 -1
- package/_types/accounts/kernel/utils/isKernelV2.d.ts.map +1 -1
- package/_types/accounts/kernel/utils/signMessage.d.ts +1 -1
- package/_types/accounts/kernel/utils/signMessage.d.ts.map +1 -1
- package/_types/accounts/kernel/utils/signTypedData.d.ts +1 -1
- package/_types/accounts/kernel/utils/signTypedData.d.ts.map +1 -1
- package/_types/accounts/kernel/utils/wrapMessageHash.d.ts +1 -1
- package/_types/accounts/kernel/utils/wrapMessageHash.d.ts.map +1 -1
- package/_types/accounts/light/toLightSmartAccount.d.ts +3 -2
- package/_types/accounts/light/toLightSmartAccount.d.ts.map +1 -1
- package/_types/accounts/nexus/toNexusSmartAccount.d.ts +3 -2
- package/_types/accounts/nexus/toNexusSmartAccount.d.ts.map +1 -1
- package/_types/accounts/safe/toSafeSmartAccount.d.ts +3 -2
- package/_types/accounts/safe/toSafeSmartAccount.d.ts.map +1 -1
- package/_types/accounts/simple/toSimpleSmartAccount.d.ts +3 -2
- package/_types/accounts/simple/toSimpleSmartAccount.d.ts.map +1 -1
- package/_types/accounts/thirdweb/toThirdwebSmartAccount.d.ts +3 -2
- package/_types/accounts/thirdweb/toThirdwebSmartAccount.d.ts.map +1 -1
- package/_types/accounts/trust/toTrustSmartAccount.d.ts +3 -2
- package/_types/accounts/trust/toTrustSmartAccount.d.ts.map +1 -1
- package/_types/actions/erc7579/installModule.d.ts +1 -1
- package/_types/actions/erc7579/installModule.d.ts.map +1 -1
- package/_types/actions/erc7579/installModules.d.ts +1 -1
- package/_types/actions/erc7579/installModules.d.ts.map +1 -1
- package/_types/actions/erc7579/isModuleInstalled.d.ts +1 -1
- package/_types/actions/erc7579/isModuleInstalled.d.ts.map +1 -1
- package/_types/actions/erc7579/uninstallModule.d.ts +1 -1
- package/_types/actions/erc7579/uninstallModule.d.ts.map +1 -1
- package/_types/actions/erc7579/uninstallModules.d.ts +1 -1
- package/_types/actions/erc7579/uninstallModules.d.ts.map +1 -1
- package/_types/actions/erc7579.d.ts +10 -10
- package/_types/actions/erc7579.d.ts.map +1 -1
- package/_types/actions/index.d.ts +4 -4
- package/_types/actions/index.d.ts.map +1 -1
- package/_types/actions/pimlico/getTokenQuotes.d.ts +1 -1
- package/_types/actions/pimlico/getTokenQuotes.d.ts.map +1 -1
- package/_types/actions/pimlico/getUserOperationGasPrice.d.ts +1 -1
- package/_types/actions/pimlico/getUserOperationGasPrice.d.ts.map +1 -1
- package/_types/actions/pimlico/getUserOperationStatus.d.ts +1 -1
- package/_types/actions/pimlico/getUserOperationStatus.d.ts.map +1 -1
- package/_types/actions/pimlico/sendCompressedUserOperation.d.ts +1 -1
- package/_types/actions/pimlico/sendCompressedUserOperation.d.ts.map +1 -1
- package/_types/actions/pimlico/sponsorUserOperation.d.ts +1 -1
- package/_types/actions/pimlico/sponsorUserOperation.d.ts.map +1 -1
- package/_types/actions/pimlico/validateSponsorshipPolicies.d.ts +1 -1
- package/_types/actions/pimlico/validateSponsorshipPolicies.d.ts.map +1 -1
- package/_types/actions/pimlico.d.ts +8 -8
- package/_types/actions/pimlico.d.ts.map +1 -1
- package/_types/actions/public/getSenderAddress.d.ts.map +1 -1
- package/_types/actions/smartAccount.d.ts +4 -4
- package/_types/actions/smartAccount.d.ts.map +1 -1
- package/_types/clients/createSmartAccountClient.d.ts +1 -1
- package/_types/clients/createSmartAccountClient.d.ts.map +1 -1
- package/_types/clients/decorators/pimlico.d.ts +4 -4
- package/_types/clients/decorators/pimlico.d.ts.map +1 -1
- package/_types/clients/decorators/smartAccount.d.ts +5 -51
- package/_types/clients/decorators/smartAccount.d.ts.map +1 -1
- package/_types/clients/index.d.ts +2 -2
- package/_types/clients/index.d.ts.map +1 -1
- package/_types/clients/pimlico.d.ts +2 -2
- package/_types/clients/pimlico.d.ts.map +1 -1
- package/_types/experimental/pimlico/index.d.ts +1 -1
- package/_types/experimental/pimlico/index.d.ts.map +1 -1
- package/_types/experimental/pimlico/utils/prepareUserOperationForErc20Paymaster.d.ts.map +1 -1
- package/_types/index.d.ts +3 -3
- package/_types/index.d.ts.map +1 -1
- package/_types/utils/encode7579Calls.d.ts +1 -1
- package/_types/utils/encode7579Calls.d.ts.map +1 -1
- package/_types/utils/encodeInstallModule.d.ts +1 -1
- package/_types/utils/encodeInstallModule.d.ts.map +1 -1
- package/_types/utils/encodeUninstallModule.d.ts +1 -1
- package/_types/utils/encodeUninstallModule.d.ts.map +1 -1
- package/_types/utils/index.d.ts +12 -12
- package/_types/utils/index.d.ts.map +1 -1
- package/_types/utils/toOwner.d.ts +6 -3
- package/_types/utils/toOwner.d.ts.map +1 -1
- package/accounts/biconomy/toBiconomySmartAccount.ts +4 -5
- package/accounts/index.ts +8 -8
- package/accounts/kernel/toEcdsaKernelSmartAccount.ts +16 -14
- package/accounts/kernel/utils/encodeCallData.ts +4 -4
- package/accounts/kernel/utils/getNonceKey.ts +3 -3
- package/accounts/kernel/utils/isKernelV2.ts +1 -1
- package/accounts/kernel/utils/signMessage.ts +5 -2
- package/accounts/kernel/utils/signTypedData.ts +5 -2
- package/accounts/kernel/utils/wrapMessageHash.ts +1 -1
- package/accounts/light/toLightSmartAccount.ts +4 -5
- package/accounts/nexus/toNexusSmartAccount.ts +4 -5
- package/accounts/safe/toSafeSmartAccount.ts +5 -5
- package/accounts/simple/toSimpleSmartAccount.ts +4 -5
- package/accounts/thirdweb/toThirdwebSmartAccount.ts +8 -9
- package/accounts/trust/toTrustSmartAccount.ts +6 -7
- package/actions/erc7579/accountId.ts +1 -1
- package/actions/erc7579/installModule.ts +3 -3
- package/actions/erc7579/installModules.ts +2 -2
- package/actions/erc7579/isModuleInstalled.ts +2 -2
- package/actions/erc7579/supportsExecutionMode.ts +1 -1
- package/actions/erc7579/supportsModule.ts +1 -1
- package/actions/erc7579/uninstallModule.ts +3 -3
- package/actions/erc7579/uninstallModules.ts +2 -2
- package/actions/erc7579.ts +13 -10
- package/actions/index.ts +4 -4
- package/actions/pimlico/getTokenQuotes.ts +1 -1
- package/actions/pimlico/getUserOperationGasPrice.ts +1 -1
- package/actions/pimlico/getUserOperationStatus.ts +1 -1
- package/actions/pimlico/sendCompressedUserOperation.ts +1 -1
- package/actions/pimlico/sponsorUserOperation.ts +2 -2
- package/actions/pimlico/validateSponsorshipPolicies.ts +2 -2
- package/actions/pimlico.ts +8 -8
- package/actions/public/getSenderAddress.test.ts +1 -1
- package/actions/public/getSenderAddress.ts +42 -186
- package/actions/smartAccount/sendTransaction.ts +1 -1
- package/actions/smartAccount/signMessage.ts +1 -1
- package/actions/smartAccount/signTypedData.ts +1 -1
- package/actions/smartAccount/writeContract.ts +1 -1
- package/actions/smartAccount.ts +4 -4
- package/clients/createSmartAccountClient.ts +3 -3
- package/clients/decorators/pimlico.ts +4 -4
- package/clients/decorators/smartAccount.ts +12 -14
- package/clients/index.ts +2 -2
- package/clients/pimlico.ts +2 -2
- package/experimental/pimlico/index.ts +1 -1
- package/experimental/pimlico/utils/prepareUserOperationForErc20Paymaster.ts +3 -2
- package/index.ts +3 -3
- package/package.json +1 -1
- package/utils/encode7579Calls.ts +1 -1
- package/utils/encodeInstallModule.ts +2 -2
- package/utils/encodeUninstallModule.ts +2 -2
- package/utils/index.ts +15 -12
- package/utils/toOwner.ts +7 -12
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# permissionless
|
|
2
2
|
|
|
3
|
+
## 0.2.16
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- a0730b515bf9e8b21dcfecfad546f41619f5eabe: Upgraded moduleResolution to nodenext for esm & types build
|
|
8
|
+
- 22de50df7305dd59301e7b4511b63abffc857daa: Improved `getSenderAddress` to avoid relying on EntryPoint reverts with RPC.
|
|
9
|
+
|
|
10
|
+
## 0.2.15
|
|
11
|
+
|
|
12
|
+
### Patch Changes
|
|
13
|
+
|
|
14
|
+
- fc37a3e023b8a279de2eb09c50cdf4f46aa94e8c: Fixed ethereum provider by changing type of EIP1193Provider to EthereumProvider
|
|
15
|
+
|
|
3
16
|
## 0.2.14
|
|
4
17
|
|
|
5
18
|
### Patch Changes
|
|
@@ -4,9 +4,9 @@ exports.toBiconomySmartAccount = toBiconomySmartAccount;
|
|
|
4
4
|
const viem_1 = require("viem");
|
|
5
5
|
const account_abstraction_1 = require("viem/account-abstraction");
|
|
6
6
|
const actions_1 = require("viem/actions");
|
|
7
|
-
const
|
|
8
|
-
const
|
|
9
|
-
const
|
|
7
|
+
const getAccountNonce_js_1 = require("../../actions/public/getAccountNonce.js");
|
|
8
|
+
const toOwner_js_1 = require("../../utils/toOwner.js");
|
|
9
|
+
const BiconomySmartAccountAbi_js_1 = require("./abi/BiconomySmartAccountAbi.js");
|
|
10
10
|
const BICONOMY_PROXY_CREATION_CODE = "0x6080346100aa57601f61012038819003918201601f19168301916001600160401b038311848410176100af578084926020946040528339810103126100aa57516001600160a01b0381168082036100aa5715610065573055604051605a90816100c68239f35b60405162461bcd60e51b815260206004820152601e60248201527f496e76616c696420696d706c656d656e746174696f6e206164647265737300006044820152606490fd5b600080fd5b634e487b7160e01b600052604160045260246000fdfe608060405230546000808092368280378136915af43d82803e156020573d90f35b3d90fdfea2646970667358221220a03b18dce0be0b4c9afe58a9eb85c35205e2cf087da098bbf1d23945bf89496064736f6c63430008110033";
|
|
11
11
|
const BICONOMY_ADDRESSES = {
|
|
12
12
|
ECDSA_OWNERSHIP_REGISTRY_MODULE: "0x0000001c5b32F37F5beA87BDD5374eB2aC54eA8e",
|
|
@@ -18,24 +18,24 @@ const getAccountInitCode = async ({ owner, index, ecdsaModuleAddress }) => {
|
|
|
18
18
|
if (!owner)
|
|
19
19
|
throw new Error("Owner account not found");
|
|
20
20
|
const ecdsaOwnershipInitData = (0, viem_1.encodeFunctionData)({
|
|
21
|
-
abi:
|
|
21
|
+
abi: BiconomySmartAccountAbi_js_1.BiconomyAbi,
|
|
22
22
|
functionName: "initForSmartAccount",
|
|
23
23
|
args: [owner]
|
|
24
24
|
});
|
|
25
25
|
return (0, viem_1.encodeFunctionData)({
|
|
26
|
-
abi:
|
|
26
|
+
abi: BiconomySmartAccountAbi_js_1.FactoryAbi,
|
|
27
27
|
functionName: "deployCounterFactualAccount",
|
|
28
28
|
args: [ecdsaModuleAddress, ecdsaOwnershipInitData, index]
|
|
29
29
|
});
|
|
30
30
|
};
|
|
31
31
|
const getAccountAddress = async ({ factoryAddress, accountLogicAddress, fallbackHandlerAddress, ecdsaModuleAddress, owner, index = BigInt(0) }) => {
|
|
32
32
|
const ecdsaOwnershipInitData = (0, viem_1.encodeFunctionData)({
|
|
33
|
-
abi:
|
|
33
|
+
abi: BiconomySmartAccountAbi_js_1.BiconomyAbi,
|
|
34
34
|
functionName: "initForSmartAccount",
|
|
35
35
|
args: [owner]
|
|
36
36
|
});
|
|
37
37
|
const initialisationData = (0, viem_1.encodeFunctionData)({
|
|
38
|
-
abi:
|
|
38
|
+
abi: BiconomySmartAccountAbi_js_1.BiconomyAbi,
|
|
39
39
|
functionName: "init",
|
|
40
40
|
args: [
|
|
41
41
|
fallbackHandlerAddress,
|
|
@@ -54,7 +54,7 @@ const getAccountAddress = async ({ factoryAddress, accountLogicAddress, fallback
|
|
|
54
54
|
};
|
|
55
55
|
async function toBiconomySmartAccount(parameters) {
|
|
56
56
|
const { owners, client, index = 0n, address, accountLogicAddress = BICONOMY_ADDRESSES.ACCOUNT_V2_0_LOGIC, fallbackHandlerAddress = BICONOMY_ADDRESSES.DEFAULT_FALLBACK_HANDLER_ADDRESS, ecdsaModuleAddress = BICONOMY_ADDRESSES.ECDSA_OWNERSHIP_REGISTRY_MODULE, factoryAddress = BICONOMY_ADDRESSES.FACTORY_ADDRESS } = parameters;
|
|
57
|
-
const localOwner = await (0,
|
|
57
|
+
const localOwner = await (0, toOwner_js_1.toOwner)({ owner: owners[0] });
|
|
58
58
|
const entryPoint = {
|
|
59
59
|
address: parameters.entryPoint?.address ?? account_abstraction_1.entryPoint06Address,
|
|
60
60
|
abi: account_abstraction_1.entryPoint06Abi,
|
|
@@ -90,7 +90,7 @@ async function toBiconomySmartAccount(parameters) {
|
|
|
90
90
|
},
|
|
91
91
|
async getNonce(args) {
|
|
92
92
|
const address = await this.getAddress();
|
|
93
|
-
return (0,
|
|
93
|
+
return (0, getAccountNonce_js_1.getAccountNonce)(client, {
|
|
94
94
|
address,
|
|
95
95
|
entryPointAddress: entryPoint.address,
|
|
96
96
|
key: parameters?.nonceKey ?? args?.key
|
|
@@ -99,7 +99,7 @@ async function toBiconomySmartAccount(parameters) {
|
|
|
99
99
|
encodeCalls: async (calls) => {
|
|
100
100
|
if (calls.length > 1) {
|
|
101
101
|
return (0, viem_1.encodeFunctionData)({
|
|
102
|
-
abi:
|
|
102
|
+
abi: BiconomySmartAccountAbi_js_1.BiconomyAbi,
|
|
103
103
|
functionName: "executeBatch_y6U",
|
|
104
104
|
args: [
|
|
105
105
|
calls.map((a) => a.to),
|
|
@@ -113,7 +113,7 @@ async function toBiconomySmartAccount(parameters) {
|
|
|
113
113
|
throw new Error("No calls to encode");
|
|
114
114
|
}
|
|
115
115
|
return (0, viem_1.encodeFunctionData)({
|
|
116
|
-
abi:
|
|
116
|
+
abi: BiconomySmartAccountAbi_js_1.BiconomyAbi,
|
|
117
117
|
functionName: "execute_ncC",
|
|
118
118
|
args: [call.to, call.value ?? 0n, call.data ?? "0x"]
|
|
119
119
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toBiconomySmartAccount.js","sourceRoot":"","sources":["../../../accounts/biconomy/toBiconomySmartAccount.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"toBiconomySmartAccount.js","sourceRoot":"","sources":["../../../accounts/biconomy/toBiconomySmartAccount.ts"],"names":[],"mappings":"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"}
|
package/_cjs/accounts/index.js
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.toThirdwebSmartAccount = exports.toBiconomySmartAccount = exports.toNexusSmartAccount = exports.toEcdsaKernelSmartAccount = exports.toSafeSmartAccount = exports.toTrustSmartAccount = exports.toLightSmartAccount = exports.toSimpleSmartAccount = void 0;
|
|
4
|
-
const
|
|
5
|
-
Object.defineProperty(exports, "toSimpleSmartAccount", { enumerable: true, get: function () { return
|
|
6
|
-
const
|
|
7
|
-
Object.defineProperty(exports, "toLightSmartAccount", { enumerable: true, get: function () { return
|
|
8
|
-
const
|
|
9
|
-
Object.defineProperty(exports, "toTrustSmartAccount", { enumerable: true, get: function () { return
|
|
10
|
-
const
|
|
11
|
-
Object.defineProperty(exports, "toSafeSmartAccount", { enumerable: true, get: function () { return
|
|
12
|
-
const
|
|
13
|
-
Object.defineProperty(exports, "toEcdsaKernelSmartAccount", { enumerable: true, get: function () { return
|
|
14
|
-
const
|
|
15
|
-
Object.defineProperty(exports, "toBiconomySmartAccount", { enumerable: true, get: function () { return
|
|
16
|
-
const
|
|
17
|
-
Object.defineProperty(exports, "toNexusSmartAccount", { enumerable: true, get: function () { return
|
|
18
|
-
const
|
|
19
|
-
Object.defineProperty(exports, "toThirdwebSmartAccount", { enumerable: true, get: function () { return
|
|
4
|
+
const toSimpleSmartAccount_js_1 = require("./simple/toSimpleSmartAccount.js");
|
|
5
|
+
Object.defineProperty(exports, "toSimpleSmartAccount", { enumerable: true, get: function () { return toSimpleSmartAccount_js_1.toSimpleSmartAccount; } });
|
|
6
|
+
const toLightSmartAccount_js_1 = require("./light/toLightSmartAccount.js");
|
|
7
|
+
Object.defineProperty(exports, "toLightSmartAccount", { enumerable: true, get: function () { return toLightSmartAccount_js_1.toLightSmartAccount; } });
|
|
8
|
+
const toTrustSmartAccount_js_1 = require("./trust/toTrustSmartAccount.js");
|
|
9
|
+
Object.defineProperty(exports, "toTrustSmartAccount", { enumerable: true, get: function () { return toTrustSmartAccount_js_1.toTrustSmartAccount; } });
|
|
10
|
+
const toSafeSmartAccount_js_1 = require("./safe/toSafeSmartAccount.js");
|
|
11
|
+
Object.defineProperty(exports, "toSafeSmartAccount", { enumerable: true, get: function () { return toSafeSmartAccount_js_1.toSafeSmartAccount; } });
|
|
12
|
+
const toEcdsaKernelSmartAccount_js_1 = require("./kernel/toEcdsaKernelSmartAccount.js");
|
|
13
|
+
Object.defineProperty(exports, "toEcdsaKernelSmartAccount", { enumerable: true, get: function () { return toEcdsaKernelSmartAccount_js_1.toEcdsaKernelSmartAccount; } });
|
|
14
|
+
const toBiconomySmartAccount_js_1 = require("./biconomy/toBiconomySmartAccount.js");
|
|
15
|
+
Object.defineProperty(exports, "toBiconomySmartAccount", { enumerable: true, get: function () { return toBiconomySmartAccount_js_1.toBiconomySmartAccount; } });
|
|
16
|
+
const toNexusSmartAccount_js_1 = require("./nexus/toNexusSmartAccount.js");
|
|
17
|
+
Object.defineProperty(exports, "toNexusSmartAccount", { enumerable: true, get: function () { return toNexusSmartAccount_js_1.toNexusSmartAccount; } });
|
|
18
|
+
const toThirdwebSmartAccount_js_1 = require("./thirdweb/toThirdwebSmartAccount.js");
|
|
19
|
+
Object.defineProperty(exports, "toThirdwebSmartAccount", { enumerable: true, get: function () { return toThirdwebSmartAccount_js_1.toThirdwebSmartAccount; } });
|
|
20
20
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../accounts/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../accounts/index.ts"],"names":[],"mappings":";;;AAAA,8EAKyC;AA0DrC,qGA3DA,8CAAoB,OA2DA;AAxDxB,2EAMuC;AAuDnC,oGAxDA,4CAAmB,OAwDA;AArDvB,2EAKuC;AAoDnC,oGArDA,4CAAmB,OAqDA;AAlDvB,wEAMqC;AAgDjC,mGAjDA,0CAAkB,OAiDA;AA9CtB,wFAM8C;AA8C1C,0GA/CA,wDAAyB,OA+CA;AA5C7B,oFAK6C;AA+CzC,uGAhDA,kDAAsB,OAgDA;AA7C1B,2EAKuC;AAoCnC,oGArCA,4CAAmB,OAqCA;AAlCvB,oFAK6C;AAqCzC,uGAtCA,kDAAsB,OAsCA"}
|
|
@@ -6,18 +6,18 @@ const viem_1 = require("viem");
|
|
|
6
6
|
const account_abstraction_1 = require("viem/account-abstraction");
|
|
7
7
|
const actions_1 = require("viem/actions");
|
|
8
8
|
const utils_1 = require("viem/utils");
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
const
|
|
12
|
-
const
|
|
13
|
-
const
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
const
|
|
17
|
-
const
|
|
18
|
-
const
|
|
19
|
-
const
|
|
20
|
-
const
|
|
9
|
+
const getAccountNonce_js_1 = require("../../actions/public/getAccountNonce.js");
|
|
10
|
+
const getSenderAddress_js_1 = require("../../actions/public/getSenderAddress.js");
|
|
11
|
+
const toOwner_js_1 = require("../../utils/toOwner.js");
|
|
12
|
+
const KernelAccountAbi_js_1 = require("./abi/KernelAccountAbi.js");
|
|
13
|
+
const KernelV3AccountAbi_js_1 = require("./abi/KernelV3AccountAbi.js");
|
|
14
|
+
const KernelV3MetaFactoryAbi_js_1 = require("./abi/KernelV3MetaFactoryAbi.js");
|
|
15
|
+
const constants_js_1 = require("./constants.js");
|
|
16
|
+
const encodeCallData_js_1 = require("./utils/encodeCallData.js");
|
|
17
|
+
const getNonceKey_js_1 = require("./utils/getNonceKey.js");
|
|
18
|
+
const isKernelV2_js_1 = require("./utils/isKernelV2.js");
|
|
19
|
+
const signMessage_js_1 = require("./utils/signMessage.js");
|
|
20
|
+
const signTypedData_js_1 = require("./utils/signTypedData.js");
|
|
21
21
|
const createAccountAbi = [
|
|
22
22
|
{
|
|
23
23
|
inputs: [
|
|
@@ -103,20 +103,20 @@ const getDefaultAddresses = ({ ecdsaValidatorAddress: _ecdsaValidatorAddress, ac
|
|
|
103
103
|
};
|
|
104
104
|
};
|
|
105
105
|
const getEcdsaRootIdentifierForKernelV3 = (validatorAddress) => {
|
|
106
|
-
return (0, viem_1.concatHex)([
|
|
106
|
+
return (0, viem_1.concatHex)([constants_js_1.VALIDATOR_TYPE.VALIDATOR, validatorAddress]);
|
|
107
107
|
};
|
|
108
108
|
exports.getEcdsaRootIdentifierForKernelV3 = getEcdsaRootIdentifierForKernelV3;
|
|
109
109
|
const getInitializationData = ({ entryPoint: { version: entryPointVersion }, kernelVersion, owner, ecdsaValidatorAddress }) => {
|
|
110
110
|
if (entryPointVersion === "0.6") {
|
|
111
111
|
return (0, viem_1.encodeFunctionData)({
|
|
112
|
-
abi:
|
|
112
|
+
abi: KernelAccountAbi_js_1.KernelInitAbi,
|
|
113
113
|
functionName: "initialize",
|
|
114
114
|
args: [ecdsaValidatorAddress, owner]
|
|
115
115
|
});
|
|
116
116
|
}
|
|
117
117
|
if (kernelVersion === "0.3.0-beta") {
|
|
118
118
|
return (0, viem_1.encodeFunctionData)({
|
|
119
|
-
abi:
|
|
119
|
+
abi: KernelV3AccountAbi_js_1.KernelV3InitAbi,
|
|
120
120
|
functionName: "initialize",
|
|
121
121
|
args: [
|
|
122
122
|
(0, exports.getEcdsaRootIdentifierForKernelV3)(ecdsaValidatorAddress),
|
|
@@ -127,7 +127,7 @@ const getInitializationData = ({ entryPoint: { version: entryPointVersion }, ker
|
|
|
127
127
|
});
|
|
128
128
|
}
|
|
129
129
|
return (0, viem_1.encodeFunctionData)({
|
|
130
|
-
abi:
|
|
130
|
+
abi: KernelV3AccountAbi_js_1.KernelV3_1AccountAbi,
|
|
131
131
|
functionName: "initialize",
|
|
132
132
|
args: [
|
|
133
133
|
(0, exports.getEcdsaRootIdentifierForKernelV3)(ecdsaValidatorAddress),
|
|
@@ -153,14 +153,14 @@ const getAccountInitCode = async ({ entryPointVersion, kernelVersion, owner, ind
|
|
|
153
153
|
});
|
|
154
154
|
}
|
|
155
155
|
return (0, viem_1.encodeFunctionData)({
|
|
156
|
-
abi:
|
|
156
|
+
abi: KernelV3MetaFactoryAbi_js_1.KernelV3MetaFactoryDeployWithFactoryAbi,
|
|
157
157
|
functionName: "deployWithFactory",
|
|
158
158
|
args: [factoryAddress, initializationData, (0, viem_1.toHex)(index, { size: 32 })]
|
|
159
159
|
});
|
|
160
160
|
};
|
|
161
161
|
async function toEcdsaKernelSmartAccount(parameters) {
|
|
162
162
|
const { client, address, index = 0n, owners, version, ecdsaValidatorAddress: _ecdsaValidatorAddress, factoryAddress: _factoryAddress, metaFactoryAddress: _metaFactoryAddress, accountLogicAddress: _accountLogicAddress } = parameters;
|
|
163
|
-
const localOwner = await (0,
|
|
163
|
+
const localOwner = await (0, toOwner_js_1.toOwner)({ owner: owners[0] });
|
|
164
164
|
const entryPoint = {
|
|
165
165
|
address: parameters.entryPoint?.address ?? account_abstraction_1.entryPoint07Address,
|
|
166
166
|
abi: (parameters.entryPoint?.version ?? "0.7") === "0.6"
|
|
@@ -211,7 +211,7 @@ async function toEcdsaKernelSmartAccount(parameters) {
|
|
|
211
211
|
if (accountAddress)
|
|
212
212
|
return accountAddress;
|
|
213
213
|
const { factory, factoryData } = await getFactoryArgs();
|
|
214
|
-
accountAddress = await (0,
|
|
214
|
+
accountAddress = await (0, getSenderAddress_js_1.getSenderAddress)(client, {
|
|
215
215
|
factory,
|
|
216
216
|
factoryData,
|
|
217
217
|
entryPointAddress: entryPoint.address
|
|
@@ -219,33 +219,33 @@ async function toEcdsaKernelSmartAccount(parameters) {
|
|
|
219
219
|
return accountAddress;
|
|
220
220
|
},
|
|
221
221
|
async encodeCalls(calls) {
|
|
222
|
-
return (0,
|
|
222
|
+
return (0, encodeCallData_js_1.encodeCallData)({ calls, kernelVersion });
|
|
223
223
|
},
|
|
224
224
|
async getNonce(_args) {
|
|
225
|
-
return (0,
|
|
225
|
+
return (0, getAccountNonce_js_1.getAccountNonce)(client, {
|
|
226
226
|
address: await this.getAddress(),
|
|
227
227
|
entryPointAddress: entryPoint.address,
|
|
228
|
-
key: (0,
|
|
228
|
+
key: (0, getNonceKey_js_1.getNonceKeyWithEncoding)(kernelVersion, ecdsaValidatorAddress, parameters.nonceKey ?? 0n)
|
|
229
229
|
});
|
|
230
230
|
},
|
|
231
231
|
async getStubSignature() {
|
|
232
|
-
if ((0,
|
|
233
|
-
return (0, viem_1.concatHex)([
|
|
232
|
+
if ((0, isKernelV2_js_1.isKernelV2)(kernelVersion)) {
|
|
233
|
+
return (0, viem_1.concatHex)([constants_js_1.ROOT_MODE_KERNEL_V2, constants_js_1.DUMMY_ECDSA_SIGNATURE]);
|
|
234
234
|
}
|
|
235
|
-
return
|
|
235
|
+
return constants_js_1.DUMMY_ECDSA_SIGNATURE;
|
|
236
236
|
},
|
|
237
237
|
async sign({ hash }) {
|
|
238
238
|
return this.signMessage({ message: hash });
|
|
239
239
|
},
|
|
240
240
|
async signMessage({ message }) {
|
|
241
|
-
const signature = await (0,
|
|
241
|
+
const signature = await (0, signMessage_js_1.signMessage)({
|
|
242
242
|
owner: localOwner,
|
|
243
243
|
message,
|
|
244
244
|
accountAddress: await this.getAddress(),
|
|
245
245
|
kernelVersion,
|
|
246
246
|
chainId: await getMemoizedChainId()
|
|
247
247
|
});
|
|
248
|
-
if ((0,
|
|
248
|
+
if ((0, isKernelV2_js_1.isKernelV2)(kernelVersion)) {
|
|
249
249
|
return signature;
|
|
250
250
|
}
|
|
251
251
|
return (0, viem_1.concatHex)([
|
|
@@ -254,14 +254,14 @@ async function toEcdsaKernelSmartAccount(parameters) {
|
|
|
254
254
|
]);
|
|
255
255
|
},
|
|
256
256
|
async signTypedData(typedData) {
|
|
257
|
-
const signature = await (0,
|
|
257
|
+
const signature = await (0, signTypedData_js_1.signTypedData)({
|
|
258
258
|
owner: localOwner,
|
|
259
259
|
chainId: await getMemoizedChainId(),
|
|
260
260
|
...typedData,
|
|
261
261
|
accountAddress: await this.getAddress(),
|
|
262
262
|
kernelVersion
|
|
263
263
|
});
|
|
264
|
-
if ((0,
|
|
264
|
+
if ((0, isKernelV2_js_1.isKernelV2)(kernelVersion)) {
|
|
265
265
|
return signature;
|
|
266
266
|
}
|
|
267
267
|
return (0, viem_1.concatHex)([
|
|
@@ -284,7 +284,7 @@ async function toEcdsaKernelSmartAccount(parameters) {
|
|
|
284
284
|
const signature = await localOwner.signMessage({
|
|
285
285
|
message: { raw: hash }
|
|
286
286
|
});
|
|
287
|
-
if ((0,
|
|
287
|
+
if ((0, isKernelV2_js_1.isKernelV2)(kernelVersion)) {
|
|
288
288
|
return (0, viem_1.concatHex)(["0x00000000", signature]);
|
|
289
289
|
}
|
|
290
290
|
return signature;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toEcdsaKernelSmartAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/toEcdsaKernelSmartAccount.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"toEcdsaKernelSmartAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/toEcdsaKernelSmartAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.encodeCallData = void 0;
|
|
4
4
|
const viem_1 = require("viem");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
const
|
|
5
|
+
const encode7579Calls_js_1 = require("../../../utils/encode7579Calls.js");
|
|
6
|
+
const KernelAccountAbi_js_1 = require("../abi/KernelAccountAbi.js");
|
|
7
|
+
const isKernelV2_js_1 = require("./isKernelV2.js");
|
|
8
8
|
const encodeCallData = ({ kernelVersion, calls }) => {
|
|
9
|
-
if ((0,
|
|
9
|
+
if ((0, isKernelV2_js_1.isKernelV2)(kernelVersion)) {
|
|
10
10
|
if (calls.length > 1) {
|
|
11
11
|
return (0, viem_1.encodeFunctionData)({
|
|
12
|
-
abi:
|
|
12
|
+
abi: KernelAccountAbi_js_1.KernelExecuteAbi,
|
|
13
13
|
functionName: "executeBatch",
|
|
14
14
|
args: [
|
|
15
15
|
calls.map((tx) => ({
|
|
@@ -25,12 +25,12 @@ const encodeCallData = ({ kernelVersion, calls }) => {
|
|
|
25
25
|
throw new Error("No calls to encode");
|
|
26
26
|
}
|
|
27
27
|
return (0, viem_1.encodeFunctionData)({
|
|
28
|
-
abi:
|
|
28
|
+
abi: KernelAccountAbi_js_1.KernelExecuteAbi,
|
|
29
29
|
functionName: "execute",
|
|
30
30
|
args: [call.to, call.value ?? 0n, call.data ?? "0x", 0]
|
|
31
31
|
});
|
|
32
32
|
}
|
|
33
|
-
return (0,
|
|
33
|
+
return (0, encode7579Calls_js_1.encode7579Calls)({
|
|
34
34
|
mode: {
|
|
35
35
|
type: calls.length > 1 ? "batchcall" : "call",
|
|
36
36
|
revertOnError: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encodeCallData.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/encodeCallData.ts"],"names":[],"mappings":";;;AAAA,+BAAiE;AACjE,
|
|
1
|
+
{"version":3,"file":"encodeCallData.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/encodeCallData.ts"],"names":[],"mappings":";;;AAAA,+BAAiE;AACjE,0EAAmE;AACnE,oEAA6D;AAE7D,mDAA4C;AAErC,MAAM,cAAc,GAAG,CAAC,EAC3B,aAAa,EACb,KAAK,EAQR,EAAE,EAAE;IACD,IAAI,IAAA,0BAAU,EAAC,aAAa,CAAC,EAAE,CAAC;QAC5B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAEnB,OAAO,IAAA,yBAAkB,EAAC;gBACtB,GAAG,EAAE,sCAAgB;gBACrB,YAAY,EAAE,cAAc;gBAC5B,IAAI,EAAE;oBACF,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;wBACf,EAAE,EAAE,EAAE,CAAC,EAAE;wBACT,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE;wBACrB,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,IAAI;qBACxB,CAAC,CAAC;iBACN;aACJ,CAAC,CAAA;QACN,CAAC;QAED,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAEtD,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;QACzC,CAAC;QAGD,OAAO,IAAA,yBAAkB,EAAC;YACtB,GAAG,EAAE,sCAAgB;YACrB,YAAY,EAAE,SAAS;YACvB,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;SAC1D,CAAC,CAAA;IACN,CAAC;IAED,OAAO,IAAA,oCAAe,EAAC;QACnB,IAAI,EAAE;YACF,IAAI,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM;YAC7C,aAAa,EAAE,KAAK;YACpB,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,IAAI;SAChB;QACD,QAAQ,EAAE,KAAK;KAClB,CAAC,CAAA;AACN,CAAC,CAAA;AAlDY,QAAA,cAAc,kBAkD1B"}
|
|
@@ -2,16 +2,16 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getNonceKeyWithEncoding = void 0;
|
|
4
4
|
const viem_1 = require("viem");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
5
|
+
const constants_js_1 = require("../constants.js");
|
|
6
|
+
const isKernelV2_js_1 = require("./isKernelV2.js");
|
|
7
7
|
const getNonceKeyWithEncoding = (kernelVersion, validatorAddress, nonceKey = 0n) => {
|
|
8
|
-
if ((0,
|
|
8
|
+
if ((0, isKernelV2_js_1.isKernelV2)(kernelVersion)) {
|
|
9
9
|
return nonceKey;
|
|
10
10
|
}
|
|
11
11
|
if (nonceKey > viem_1.maxUint16)
|
|
12
12
|
throw new Error(`nonce key must be equal or less than 2 bytes(maxUint16) for Kernel version ${kernelVersion}`);
|
|
13
|
-
const validatorMode =
|
|
14
|
-
const validatorType =
|
|
13
|
+
const validatorMode = constants_js_1.VALIDATOR_MODE.DEFAULT;
|
|
14
|
+
const validatorType = constants_js_1.VALIDATOR_TYPE.ROOT;
|
|
15
15
|
const encoding = (0, viem_1.pad)((0, viem_1.concatHex)([
|
|
16
16
|
validatorMode,
|
|
17
17
|
validatorType,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNonceKey.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/getNonceKey.ts"],"names":[],"mappings":";;;AAAA,+BAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"getNonceKey.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/getNonceKey.ts"],"names":[],"mappings":";;;AAAA,+BAAqE;AACrE,kDAAgE;AAEhE,mDAA4C;AAErC,MAAM,uBAAuB,GAAG,CACnC,aAA2C,EAC3C,gBAAyB,EACzB,QAAQ,GAAG,EAAE,EACf,EAAE;IACA,IAAI,IAAA,0BAAU,EAAC,aAAa,CAAC,EAAE,CAAC;QAC5B,OAAO,QAAQ,CAAA;IACnB,CAAC;IAED,IAAI,QAAQ,GAAG,gBAAS;QACpB,MAAM,IAAI,KAAK,CACX,8EAA8E,aAAa,EAAE,CAChG,CAAA;IAEL,MAAM,aAAa,GAAG,6BAAc,CAAC,OAAO,CAAA;IAC5C,MAAM,aAAa,GAAG,6BAAc,CAAC,IAAI,CAAA;IACzC,MAAM,QAAQ,GAAG,IAAA,UAAG,EAChB,IAAA,gBAAS,EAAC;QACN,aAAa;QACb,aAAa;QACb,gBAAgB;QAChB,IAAA,YAAK,EAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;KAC/B,CAAC,EACF,EAAE,IAAI,EAAE,EAAE,EAAE,CACf,CAAA;IAED,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAA;AAC3B,CAAC,CAAA;AA3BY,QAAA,uBAAuB,2BA2BnC"}
|
|
@@ -2,15 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.signMessage = signMessage;
|
|
4
4
|
const viem_1 = require("viem");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
5
|
+
const isKernelV2_js_1 = require("./isKernelV2.js");
|
|
6
|
+
const wrapMessageHash_js_1 = require("./wrapMessageHash.js");
|
|
7
7
|
async function signMessage({ message, owner, accountAddress, kernelVersion: accountVersion, chainId }) {
|
|
8
|
-
if ((0,
|
|
8
|
+
if ((0, isKernelV2_js_1.isKernelV2)(accountVersion)) {
|
|
9
9
|
return owner.signMessage({
|
|
10
10
|
message
|
|
11
11
|
});
|
|
12
12
|
}
|
|
13
|
-
const wrappedMessageHash = (0,
|
|
13
|
+
const wrappedMessageHash = (0, wrapMessageHash_js_1.wrapMessageHash)((0, viem_1.hashMessage)(message), {
|
|
14
14
|
kernelVersion: accountVersion,
|
|
15
15
|
accountAddress,
|
|
16
16
|
chainId
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signMessage.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/signMessage.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"signMessage.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/signMessage.ts"],"names":[],"mappings":";;AAaA,kCA6BC;AA1CD,+BAKa;AAEb,mDAA4C;AAC5C,6DAG6B;AAEtB,KAAK,UAAU,WAAW,CAAC,EAC9B,OAAO,EACP,KAAK,EACL,cAAc,EACd,aAAa,EAAE,cAAc,EAC7B,OAAO,EAKc;IACrB,IAAI,IAAA,0BAAU,EAAC,cAAc,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC,WAAW,CAAC;YACrB,OAAO;SACV,CAAC,CAAA;IACN,CAAC;IAED,MAAM,kBAAkB,GAAG,IAAA,oCAAe,EAAC,IAAA,kBAAW,EAAC,OAAO,CAAC,EAAE;QAC7D,aAAa,EAAE,cAAc;QAC7B,cAAc;QACd,OAAO;KAIV,CAAC,CAAA;IAEF,OAAO,KAAK,CAAC,WAAW,CAAC;QACrB,OAAO,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE;KACvC,CAAC,CAAA;AACN,CAAC"}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.signTypedData = signTypedData;
|
|
4
4
|
const viem_1 = require("viem");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
5
|
+
const isKernelV2_js_1 = require("./isKernelV2.js");
|
|
6
|
+
const wrapMessageHash_js_1 = require("./wrapMessageHash.js");
|
|
7
7
|
async function signTypedData(parameters) {
|
|
8
8
|
const { owner, accountAddress, kernelVersion: accountVersion, chainId, ...typedData } = parameters;
|
|
9
|
-
if ((0,
|
|
9
|
+
if ((0, isKernelV2_js_1.isKernelV2)(accountVersion)) {
|
|
10
10
|
return owner.signTypedData({
|
|
11
11
|
...typedData
|
|
12
12
|
});
|
|
@@ -25,7 +25,7 @@ async function signTypedData(parameters) {
|
|
|
25
25
|
types
|
|
26
26
|
});
|
|
27
27
|
const typedHash = (0, viem_1.hashTypedData)({ message, primaryType, types, domain });
|
|
28
|
-
const wrappedMessageHash = (0,
|
|
28
|
+
const wrappedMessageHash = (0, wrapMessageHash_js_1.wrapMessageHash)(typedHash, {
|
|
29
29
|
kernelVersion: accountVersion,
|
|
30
30
|
accountAddress,
|
|
31
31
|
chainId: chainId
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signTypedData.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/signTypedData.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"signTypedData.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/signTypedData.ts"],"names":[],"mappings":";;AAcA,sCA+CC;AA7DD,+BAOa;AACb,mDAA4C;AAC5C,6DAG6B;AAEtB,KAAK,UAAU,aAAa,CAC/B,UAGK;IAEL,MAAM,EACF,KAAK,EACL,cAAc,EACd,aAAa,EAAE,cAAc,EAC7B,OAAO,EACP,GAAG,SAAS,EACf,GAAG,UAAU,CAAA;IAEd,IAAI,IAAA,0BAAU,EAAC,cAAc,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC,aAAa,CAAC;YACvB,GAAG,SAAS;SACf,CAAC,CAAA;IACN,CAAC;IACD,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IACjE,MAAM,KAAK,GAAG;QACV,YAAY,EAAE,IAAA,8BAAuB,EAAC;YAClC,MAAM,EAAE,MAAM;SACjB,CAAC;QACF,GAAG,MAAM;KACZ,CAAA;IAID,IAAA,wBAAiB,EAAC;QACd,MAAM;QACN,OAAO;QACP,WAAW;QACX,KAAK;KACR,CAAC,CAAA;IAEF,MAAM,SAAS,GAAG,IAAA,oBAAa,EAAC,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;IAExE,MAAM,kBAAkB,GAAG,IAAA,oCAAe,EAAC,SAAS,EAAE;QAClD,aAAa,EAAE,cAAc;QAC7B,cAAc;QACd,OAAO,EAAE,OAAO;KACnB,CAAC,CAAA;IAEF,OAAO,KAAK,CAAC,WAAW,CAAC;QACrB,OAAO,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE;KACvC,CAAC,CAAA;AACN,CAAC"}
|
|
@@ -5,9 +5,9 @@ const viem_1 = require("viem");
|
|
|
5
5
|
const account_abstraction_1 = require("viem/account-abstraction");
|
|
6
6
|
const actions_1 = require("viem/actions");
|
|
7
7
|
const utils_1 = require("viem/utils");
|
|
8
|
-
const
|
|
9
|
-
const
|
|
10
|
-
const
|
|
8
|
+
const getAccountNonce_js_1 = require("../../actions/public/getAccountNonce.js");
|
|
9
|
+
const getSenderAddress_js_1 = require("../../actions/public/getSenderAddress.js");
|
|
10
|
+
const toOwner_js_1 = require("../../utils/toOwner.js");
|
|
11
11
|
const getAccountInitCode = async (owner, index = BigInt(0)) => {
|
|
12
12
|
if (!owner)
|
|
13
13
|
throw new Error("Owner account not found");
|
|
@@ -80,7 +80,7 @@ var SignatureType;
|
|
|
80
80
|
})(SignatureType || (SignatureType = {}));
|
|
81
81
|
async function toLightSmartAccount(parameters) {
|
|
82
82
|
const { version, factoryAddress: _factoryAddress, address, owner, client, index = BigInt(0), nonceKey } = parameters;
|
|
83
|
-
const localOwner = await (0,
|
|
83
|
+
const localOwner = await (0, toOwner_js_1.toOwner)({ owner });
|
|
84
84
|
const entryPoint = {
|
|
85
85
|
address: parameters.entryPoint?.address ?? account_abstraction_1.entryPoint07Address,
|
|
86
86
|
abi: (parameters.entryPoint?.version ?? "0.7") === "0.6"
|
|
@@ -115,7 +115,7 @@ async function toLightSmartAccount(parameters) {
|
|
|
115
115
|
if (accountAddress)
|
|
116
116
|
return accountAddress;
|
|
117
117
|
const { factory, factoryData } = await getFactoryArgs();
|
|
118
|
-
accountAddress = await (0,
|
|
118
|
+
accountAddress = await (0, getSenderAddress_js_1.getSenderAddress)(client, {
|
|
119
119
|
factory,
|
|
120
120
|
factoryData,
|
|
121
121
|
entryPointAddress: entryPoint.address
|
|
@@ -193,7 +193,7 @@ async function toLightSmartAccount(parameters) {
|
|
|
193
193
|
});
|
|
194
194
|
},
|
|
195
195
|
async getNonce(args) {
|
|
196
|
-
return (0,
|
|
196
|
+
return (0, getAccountNonce_js_1.getAccountNonce)(client, {
|
|
197
197
|
address: await this.getAddress(),
|
|
198
198
|
entryPointAddress: entryPoint.address,
|
|
199
199
|
key: nonceKey ?? args?.key
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toLightSmartAccount.js","sourceRoot":"","sources":["../../../accounts/light/toLightSmartAccount.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"toLightSmartAccount.js","sourceRoot":"","sources":["../../../accounts/light/toLightSmartAccount.ts"],"names":[],"mappings":"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"}
|