permissionless 0.2.0-rc-5 → 0.2.1
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 +12 -0
- package/_cjs/accounts/biconomy/toBiconomySmartAccount.js +12 -7
- package/_cjs/accounts/biconomy/toBiconomySmartAccount.js.map +1 -1
- package/_cjs/accounts/kernel/toEcdsaKernelSmartAccount.js +7 -5
- package/_cjs/accounts/kernel/toEcdsaKernelSmartAccount.js.map +1 -1
- package/_cjs/accounts/kernel/utils/encodeCallData.js +5 -1
- package/_cjs/accounts/kernel/utils/encodeCallData.js.map +1 -1
- package/_cjs/accounts/light/toLightSmartAccount.js +11 -5
- package/_cjs/accounts/light/toLightSmartAccount.js.map +1 -1
- package/_cjs/accounts/safe/toSafeSmartAccount.js +16 -11
- package/_cjs/accounts/safe/toSafeSmartAccount.js.map +1 -1
- package/_cjs/accounts/simple/toSimpleSmartAccount.js +9 -3
- package/_cjs/accounts/simple/toSimpleSmartAccount.js.map +1 -1
- package/_cjs/accounts/trust/toTrustSmartAccount.js +6 -4
- package/_cjs/accounts/trust/toTrustSmartAccount.js.map +1 -1
- package/_cjs/accounts/trust/utils/encodeCallData.js +5 -1
- package/_cjs/accounts/trust/utils/encodeCallData.js.map +1 -1
- package/_cjs/actions/pimlico/getTokenQuotes.js +25 -0
- package/_cjs/actions/pimlico/getTokenQuotes.js.map +1 -0
- package/_cjs/actions/pimlico/sendCompressedUserOperation.js.map +1 -1
- package/_cjs/actions/pimlico/sponsorUserOperation.js.map +1 -1
- package/_cjs/actions/pimlico/validateSponsorshipPolicies.js.map +1 -1
- package/_cjs/actions/pimlico.js +3 -1
- package/_cjs/actions/pimlico.js.map +1 -1
- package/_cjs/clients/decorators/pimlico.js +5 -0
- package/_cjs/clients/decorators/pimlico.js.map +1 -1
- package/_cjs/clients/pimlico.js +10 -5
- package/_cjs/clients/pimlico.js.map +1 -1
- package/_cjs/utils/encode7579Calls.js +7 -3
- package/_cjs/utils/encode7579Calls.js.map +1 -1
- package/_cjs/utils/getRequiredPrefund.js +5 -7
- package/_cjs/utils/getRequiredPrefund.js.map +1 -1
- package/_cjs/utils/index.js +3 -5
- package/_cjs/utils/index.js.map +1 -1
- package/_cjs/utils/toOwner.js +53 -0
- package/_cjs/utils/toOwner.js.map +1 -0
- package/_esm/accounts/biconomy/toBiconomySmartAccount.js +12 -7
- package/_esm/accounts/biconomy/toBiconomySmartAccount.js.map +1 -1
- package/_esm/accounts/kernel/toEcdsaKernelSmartAccount.js +7 -5
- package/_esm/accounts/kernel/toEcdsaKernelSmartAccount.js.map +1 -1
- package/_esm/accounts/kernel/utils/encodeCallData.js +5 -1
- package/_esm/accounts/kernel/utils/encodeCallData.js.map +1 -1
- package/_esm/accounts/light/toLightSmartAccount.js +11 -5
- package/_esm/accounts/light/toLightSmartAccount.js.map +1 -1
- package/_esm/accounts/safe/toSafeSmartAccount.js +17 -12
- package/_esm/accounts/safe/toSafeSmartAccount.js.map +1 -1
- package/_esm/accounts/simple/toSimpleSmartAccount.js +9 -3
- package/_esm/accounts/simple/toSimpleSmartAccount.js.map +1 -1
- package/_esm/accounts/trust/toTrustSmartAccount.js +6 -4
- package/_esm/accounts/trust/toTrustSmartAccount.js.map +1 -1
- package/_esm/accounts/trust/utils/encodeCallData.js +5 -1
- package/_esm/accounts/trust/utils/encodeCallData.js.map +1 -1
- package/_esm/actions/pimlico/getTokenQuotes.js +31 -0
- package/_esm/actions/pimlico/getTokenQuotes.js.map +1 -0
- package/_esm/actions/pimlico/sendCompressedUserOperation.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 +2 -1
- package/_esm/actions/pimlico.js.map +1 -1
- package/_esm/clients/decorators/pimlico.js +6 -1
- package/_esm/clients/decorators/pimlico.js.map +1 -1
- package/_esm/clients/pimlico.js +11 -6
- package/_esm/clients/pimlico.js.map +1 -1
- package/_esm/utils/encode7579Calls.js +7 -3
- package/_esm/utils/encode7579Calls.js.map +1 -1
- package/_esm/utils/getRequiredPrefund.js +5 -7
- package/_esm/utils/getRequiredPrefund.js.map +1 -1
- package/_esm/utils/index.js +2 -3
- package/_esm/utils/index.js.map +1 -1
- package/_esm/utils/toOwner.js +50 -0
- package/_esm/utils/toOwner.js.map +1 -0
- package/_types/accounts/biconomy/toBiconomySmartAccount.d.ts +5 -3
- package/_types/accounts/biconomy/toBiconomySmartAccount.d.ts.map +1 -1
- package/_types/accounts/kernel/toEcdsaKernelSmartAccount.d.ts +4 -2
- package/_types/accounts/kernel/toEcdsaKernelSmartAccount.d.ts.map +1 -1
- package/_types/accounts/kernel/utils/encodeCallData.d.ts.map +1 -1
- package/_types/accounts/light/toLightSmartAccount.d.ts +2 -2
- package/_types/accounts/light/toLightSmartAccount.d.ts.map +1 -1
- package/_types/accounts/safe/toSafeSmartAccount.d.ts +4 -2
- package/_types/accounts/safe/toSafeSmartAccount.d.ts.map +1 -1
- package/_types/accounts/simple/toSimpleSmartAccount.d.ts +2 -2
- package/_types/accounts/simple/toSimpleSmartAccount.d.ts.map +1 -1
- package/_types/accounts/trust/toTrustSmartAccount.d.ts +8 -8
- package/_types/accounts/trust/toTrustSmartAccount.d.ts.map +1 -1
- package/_types/accounts/trust/utils/encodeCallData.d.ts.map +1 -1
- package/_types/actions/pimlico/getTokenQuotes.d.ts +24 -0
- package/_types/actions/pimlico/getTokenQuotes.d.ts.map +1 -0
- package/_types/actions/pimlico/sendCompressedUserOperation.d.ts +1 -2
- package/_types/actions/pimlico/sendCompressedUserOperation.d.ts.map +1 -1
- package/_types/actions/pimlico/sponsorUserOperation.d.ts +4 -4
- package/_types/actions/pimlico/sponsorUserOperation.d.ts.map +1 -1
- package/_types/actions/pimlico/validateSponsorshipPolicies.d.ts +6 -6
- package/_types/actions/pimlico/validateSponsorshipPolicies.d.ts.map +1 -1
- package/_types/actions/pimlico.d.ts +3 -2
- package/_types/actions/pimlico.d.ts.map +1 -1
- package/_types/clients/decorators/pimlico.d.ts +10 -10
- package/_types/clients/decorators/pimlico.d.ts.map +1 -1
- package/_types/clients/pimlico.d.ts +7 -26
- package/_types/clients/pimlico.d.ts.map +1 -1
- package/_types/types/pimlico.d.ts +20 -5
- package/_types/types/pimlico.d.ts.map +1 -1
- package/_types/utils/encode7579Calls.d.ts.map +1 -1
- package/_types/utils/getRequiredPrefund.d.ts.map +1 -1
- package/_types/utils/index.d.ts +2 -3
- package/_types/utils/index.d.ts.map +1 -1
- package/_types/utils/toOwner.d.ts +6 -0
- package/_types/utils/toOwner.d.ts.map +1 -0
- package/accounts/biconomy/toBiconomySmartAccount.ts +33 -10
- package/accounts/kernel/toEcdsaKernelSmartAccount.ts +24 -7
- package/accounts/kernel/utils/encodeCallData.ts +8 -1
- package/accounts/light/toLightSmartAccount.ts +25 -6
- package/accounts/safe/toSafeSmartAccount.ts +33 -13
- package/accounts/simple/toSimpleSmartAccount.ts +23 -4
- package/accounts/trust/toTrustSmartAccount.ts +30 -24
- package/accounts/trust/utils/encodeCallData.ts +7 -1
- package/actions/pimlico/getTokenQuotes.test.ts +36 -0
- package/actions/pimlico/getTokenQuotes.ts +67 -0
- package/actions/pimlico/sendCompressedUserOperation.ts +1 -5
- package/actions/pimlico/sponsorUserOperation.ts +4 -19
- package/actions/pimlico/validateSponsorshipPolicies.ts +8 -29
- package/actions/pimlico.ts +10 -2
- package/actions/public/getSenderAddress.test.ts +1 -2
- package/actions/smartAccount/signMessage.test.ts +1 -1
- package/actions/smartAccount/signTypedData.test.ts +1 -1
- package/clients/decorators/pimlico.ts +32 -32
- package/clients/pimlico.ts +20 -49
- package/package.json +8 -2
- package/types/pimlico.ts +19 -12
- package/utils/encode7579Calls.ts +9 -3
- package/utils/getRequiredPrefund.test.ts +32 -9
- package/utils/getRequiredPrefund.ts +4 -8
- package/utils/index.ts +2 -4
- package/utils/toOwner.ts +91 -0
- package/_cjs/utils/providerToSmartAccountSigner.js +0 -32
- package/_cjs/utils/providerToSmartAccountSigner.js.map +0 -1
- package/_cjs/utils/walletClientToSmartAccountSigner.js +0 -26
- package/_cjs/utils/walletClientToSmartAccountSigner.js.map +0 -1
- package/_esm/utils/providerToSmartAccountSigner.js +0 -28
- package/_esm/utils/providerToSmartAccountSigner.js.map +0 -1
- package/_esm/utils/walletClientToSmartAccountSigner.js +0 -22
- package/_esm/utils/walletClientToSmartAccountSigner.js.map +0 -1
- package/_types/utils/providerToSmartAccountSigner.d.ts +0 -227
- package/_types/utils/providerToSmartAccountSigner.d.ts.map +0 -1
- package/_types/utils/walletClientToSmartAccountSigner.d.ts +0 -3
- package/_types/utils/walletClientToSmartAccountSigner.d.ts.map +0 -1
- package/utils/providerToSmartAccountSigner.ts +0 -34
- package/utils/walletClientToSmartAccountSigner.ts +0 -48
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# permissionless
|
|
2
2
|
|
|
3
|
+
## 0.2.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- de9e50a460ef690b3fff3b0764c2fde998646081: Fixed: type checks before encoding calldata
|
|
8
|
+
|
|
9
|
+
## 0.2.0
|
|
10
|
+
|
|
11
|
+
### Minor Changes
|
|
12
|
+
|
|
13
|
+
- 2e4d504c12dbb4af6eeccc9b62648cae60193424: permissionless.js 0.2.0 released. Migration guide - https://docs.pimlico.io/permissionless/how-to/migration-guide
|
|
14
|
+
|
|
3
15
|
## 0.1.45
|
|
4
16
|
|
|
5
17
|
### Patch Changes
|
|
@@ -6,6 +6,7 @@ const account_abstraction_1 = require("viem/account-abstraction");
|
|
|
6
6
|
const actions_1 = require("viem/actions");
|
|
7
7
|
const getAccountNonce_1 = require("../../actions/public/getAccountNonce.js");
|
|
8
8
|
const getSenderAddress_1 = require("../../actions/public/getSenderAddress.js");
|
|
9
|
+
const toOwner_1 = require("../../utils/toOwner.js");
|
|
9
10
|
const BiconomySmartAccountAbi_1 = require("./abi/BiconomySmartAccountAbi.js");
|
|
10
11
|
const BICONOMY_ADDRESSES = {
|
|
11
12
|
ECDSA_OWNERSHIP_REGISTRY_MODULE: "0x0000001c5b32F37F5beA87BDD5374eB2aC54eA8e",
|
|
@@ -26,7 +27,8 @@ const getAccountInitCode = async ({ owner, index, ecdsaModuleAddress }) => {
|
|
|
26
27
|
});
|
|
27
28
|
};
|
|
28
29
|
async function toBiconomySmartAccount(parameters) {
|
|
29
|
-
const {
|
|
30
|
+
const { owners, client, index = 0n, address } = parameters;
|
|
31
|
+
const localOwner = await (0, toOwner_1.toOwner)({ owner: owners[0] });
|
|
30
32
|
const entryPoint = {
|
|
31
33
|
address: parameters.entryPoint?.address ?? account_abstraction_1.entryPoint06Address,
|
|
32
34
|
abi: account_abstraction_1.entryPoint06Abi,
|
|
@@ -40,7 +42,7 @@ async function toBiconomySmartAccount(parameters) {
|
|
|
40
42
|
return {
|
|
41
43
|
factory: factoryAddress,
|
|
42
44
|
factoryData: await getAccountInitCode({
|
|
43
|
-
owner:
|
|
45
|
+
owner: localOwner.address,
|
|
44
46
|
index,
|
|
45
47
|
ecdsaModuleAddress
|
|
46
48
|
})
|
|
@@ -81,11 +83,14 @@ async function toBiconomySmartAccount(parameters) {
|
|
|
81
83
|
]
|
|
82
84
|
});
|
|
83
85
|
}
|
|
84
|
-
const
|
|
86
|
+
const call = calls.length === 0 ? undefined : calls[0];
|
|
87
|
+
if (!call) {
|
|
88
|
+
throw new Error("No calls to encode");
|
|
89
|
+
}
|
|
85
90
|
return (0, viem_1.encodeFunctionData)({
|
|
86
91
|
abi: BiconomySmartAccountAbi_1.BiconomyAbi,
|
|
87
92
|
functionName: "execute_ncC",
|
|
88
|
-
args: [to, value ?? 0n, data ?? "0x"]
|
|
93
|
+
args: [call.to, call.value ?? 0n, call.data ?? "0x"]
|
|
89
94
|
});
|
|
90
95
|
},
|
|
91
96
|
async getStubSignature() {
|
|
@@ -96,7 +101,7 @@ async function toBiconomySmartAccount(parameters) {
|
|
|
96
101
|
return this.signMessage({ message: hash });
|
|
97
102
|
},
|
|
98
103
|
async signMessage({ message }) {
|
|
99
|
-
let signature = await
|
|
104
|
+
let signature = await localOwner.signMessage({
|
|
100
105
|
message
|
|
101
106
|
});
|
|
102
107
|
const potentiallyIncorrectV = Number.parseInt(signature.slice(-2), 16);
|
|
@@ -108,7 +113,7 @@ async function toBiconomySmartAccount(parameters) {
|
|
|
108
113
|
return (0, viem_1.encodeAbiParameters)([{ type: "bytes" }, { type: "address" }], [signature, ecdsaModuleAddress]);
|
|
109
114
|
},
|
|
110
115
|
async signTypedData(typedData) {
|
|
111
|
-
let signature = await
|
|
116
|
+
let signature = await localOwner.signTypedData(typedData);
|
|
112
117
|
const potentiallyIncorrectV = Number.parseInt(signature.slice(-2), 16);
|
|
113
118
|
if (![27, 28].includes(potentiallyIncorrectV)) {
|
|
114
119
|
const correctV = potentiallyIncorrectV + 27;
|
|
@@ -132,7 +137,7 @@ async function toBiconomySmartAccount(parameters) {
|
|
|
132
137
|
chainId: chainId
|
|
133
138
|
});
|
|
134
139
|
const signature = await (0, actions_1.signMessage)(client, {
|
|
135
|
-
account:
|
|
140
|
+
account: localOwner,
|
|
136
141
|
message: { raw: hash }
|
|
137
142
|
});
|
|
138
143
|
const signatureWithModuleAddress = (0, viem_1.encodeAbiParameters)((0, viem_1.parseAbiParameters)("bytes, address"), [signature, ecdsaModuleAddress]);
|
|
@@ -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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"}
|
|
@@ -7,6 +7,7 @@ const actions_1 = require("viem/actions");
|
|
|
7
7
|
const utils_1 = require("viem/utils");
|
|
8
8
|
const getAccountNonce_1 = require("../../actions/public/getAccountNonce.js");
|
|
9
9
|
const getSenderAddress_1 = require("../../actions/public/getSenderAddress.js");
|
|
10
|
+
const toOwner_1 = require("../../utils/toOwner.js");
|
|
10
11
|
const KernelAccountAbi_1 = require("./abi/KernelAccountAbi.js");
|
|
11
12
|
const KernelV3AccountAbi_1 = require("./abi/KernelV3AccountAbi.js");
|
|
12
13
|
const KernelV3MetaFactoryAbi_1 = require("./abi/KernelV3MetaFactoryAbi.js");
|
|
@@ -157,7 +158,8 @@ const getAccountInitCode = async ({ entryPointVersion, kernelVersion, owner, ind
|
|
|
157
158
|
});
|
|
158
159
|
};
|
|
159
160
|
async function toEcdsaKernelSmartAccount(parameters) {
|
|
160
|
-
const { client, address, index = 0n,
|
|
161
|
+
const { client, address, index = 0n, owners, version, ecdsaValidatorAddress: _ecdsaValidatorAddress, factoryAddress: _factoryAddress, metaFactoryAddress: _metaFactoryAddress, accountLogicAddress: _accountLogicAddress } = parameters;
|
|
162
|
+
const localOwner = await (0, toOwner_1.toOwner)({ owner: owners[0] });
|
|
161
163
|
const entryPoint = {
|
|
162
164
|
address: parameters.entryPoint?.address ?? account_abstraction_1.entryPoint07Address,
|
|
163
165
|
abi: (parameters.entryPoint?.version ?? "0.7") === "0.6"
|
|
@@ -176,7 +178,7 @@ async function toEcdsaKernelSmartAccount(parameters) {
|
|
|
176
178
|
const generateInitCode = () => getAccountInitCode({
|
|
177
179
|
entryPointVersion: entryPoint.version,
|
|
178
180
|
kernelVersion,
|
|
179
|
-
owner:
|
|
181
|
+
owner: localOwner.address,
|
|
180
182
|
index,
|
|
181
183
|
factoryAddress,
|
|
182
184
|
accountLogicAddress,
|
|
@@ -236,7 +238,7 @@ async function toEcdsaKernelSmartAccount(parameters) {
|
|
|
236
238
|
},
|
|
237
239
|
async signMessage({ message }) {
|
|
238
240
|
const signature = await (0, signMessage_1.signMessage)({
|
|
239
|
-
owner:
|
|
241
|
+
owner: localOwner,
|
|
240
242
|
message,
|
|
241
243
|
accountAddress: await this.getAddress(),
|
|
242
244
|
kernelVersion,
|
|
@@ -252,7 +254,7 @@ async function toEcdsaKernelSmartAccount(parameters) {
|
|
|
252
254
|
},
|
|
253
255
|
async signTypedData(typedData) {
|
|
254
256
|
const signature = await (0, signTypedData_1.signTypedData)({
|
|
255
|
-
owner,
|
|
257
|
+
owner: localOwner,
|
|
256
258
|
chainId: await getMemoizedChainId(),
|
|
257
259
|
...typedData,
|
|
258
260
|
accountAddress: await this.getAddress(),
|
|
@@ -278,7 +280,7 @@ async function toEcdsaKernelSmartAccount(parameters) {
|
|
|
278
280
|
entryPointVersion: entryPoint.version,
|
|
279
281
|
chainId: chainId
|
|
280
282
|
});
|
|
281
|
-
const signature = await
|
|
283
|
+
const signature = await localOwner.signMessage({
|
|
282
284
|
message: { raw: hash }
|
|
283
285
|
});
|
|
284
286
|
if ((0, isKernelV2_1.isKernelV2)(kernelVersion)) {
|
|
@@ -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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"}
|
|
@@ -20,10 +20,14 @@ const encodeCallData = ({ kernelVersion, calls }) => {
|
|
|
20
20
|
]
|
|
21
21
|
});
|
|
22
22
|
}
|
|
23
|
+
const call = calls.length === 0 ? undefined : calls[0];
|
|
24
|
+
if (!call) {
|
|
25
|
+
throw new Error("No calls to encode");
|
|
26
|
+
}
|
|
23
27
|
return (0, viem_1.encodeFunctionData)({
|
|
24
28
|
abi: KernelAccountAbi_1.KernelExecuteAbi,
|
|
25
29
|
functionName: "execute",
|
|
26
|
-
args: [
|
|
30
|
+
args: [call.to, call.value ?? 0n, call.data ?? "0x", 0]
|
|
27
31
|
});
|
|
28
32
|
}
|
|
29
33
|
return (0, encode7579Calls_1.encode7579Calls)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encodeCallData.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/encodeCallData.ts"],"names":[],"mappings":";;;AAAA,+BAAiE;AACjE,oEAAgE;AAChE,8DAA0D;AAE1D,6CAAyC;AAElC,MAAM,cAAc,GAAG,CAAC,EAC3B,aAAa,EACb,KAAK,EAQR,EAAE,EAAE;IACD,IAAI,IAAA,uBAAU,EAAC,aAAa,CAAC,EAAE,CAAC;QAC5B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAEnB,OAAO,IAAA,yBAAkB,EAAC;gBACtB,GAAG,EAAE,mCAAgB;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,OAAO,IAAA,yBAAkB,EAAC;YACtB,GAAG,EAAE,mCAAgB;YACrB,YAAY,EAAE,SAAS;YACvB,IAAI,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"encodeCallData.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/encodeCallData.ts"],"names":[],"mappings":";;;AAAA,+BAAiE;AACjE,oEAAgE;AAChE,8DAA0D;AAE1D,6CAAyC;AAElC,MAAM,cAAc,GAAG,CAAC,EAC3B,aAAa,EACb,KAAK,EAQR,EAAE,EAAE;IACD,IAAI,IAAA,uBAAU,EAAC,aAAa,CAAC,EAAE,CAAC;QAC5B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAEnB,OAAO,IAAA,yBAAkB,EAAC;gBACtB,GAAG,EAAE,mCAAgB;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,mCAAgB;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,iCAAe,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"}
|
|
@@ -7,6 +7,7 @@ const actions_1 = require("viem/actions");
|
|
|
7
7
|
const utils_1 = require("viem/utils");
|
|
8
8
|
const getAccountNonce_1 = require("../../actions/public/getAccountNonce.js");
|
|
9
9
|
const getSenderAddress_1 = require("../../actions/public/getSenderAddress.js");
|
|
10
|
+
const toOwner_1 = require("../../utils/toOwner.js");
|
|
10
11
|
const getAccountInitCode = async (owner, index = BigInt(0)) => {
|
|
11
12
|
if (!owner)
|
|
12
13
|
throw new Error("Owner account not found");
|
|
@@ -79,6 +80,7 @@ var SignatureType;
|
|
|
79
80
|
})(SignatureType || (SignatureType = {}));
|
|
80
81
|
async function toLightSmartAccount(parameters) {
|
|
81
82
|
const { version, factoryAddress: _factoryAddress, address, owner, client, index = BigInt(0), nonceKey } = parameters;
|
|
83
|
+
const localOwner = await (0, toOwner_1.toOwner)({ owner });
|
|
82
84
|
const entryPoint = {
|
|
83
85
|
address: parameters.entryPoint?.address ?? account_abstraction_1.entryPoint07Address,
|
|
84
86
|
abi: (parameters.entryPoint?.version ?? "0.7") === "0.6"
|
|
@@ -102,7 +104,7 @@ async function toLightSmartAccount(parameters) {
|
|
|
102
104
|
const getFactoryArgs = async () => {
|
|
103
105
|
return {
|
|
104
106
|
factory: factoryAddress,
|
|
105
|
-
factoryData: await getAccountInitCode(
|
|
107
|
+
factoryData: await getAccountInitCode(localOwner.address, index)
|
|
106
108
|
};
|
|
107
109
|
};
|
|
108
110
|
return (0, account_abstraction_1.toSmartAccount)({
|
|
@@ -156,6 +158,10 @@ async function toLightSmartAccount(parameters) {
|
|
|
156
158
|
]
|
|
157
159
|
});
|
|
158
160
|
}
|
|
161
|
+
const call = calls.length === 0 ? undefined : calls[0];
|
|
162
|
+
if (!call) {
|
|
163
|
+
throw new Error("No calls to encode");
|
|
164
|
+
}
|
|
159
165
|
return (0, viem_1.encodeFunctionData)({
|
|
160
166
|
abi: [
|
|
161
167
|
{
|
|
@@ -183,7 +189,7 @@ async function toLightSmartAccount(parameters) {
|
|
|
183
189
|
}
|
|
184
190
|
],
|
|
185
191
|
functionName: "execute",
|
|
186
|
-
args: [
|
|
192
|
+
args: [call.to, call.value ?? 0n, call.data ?? "0x"]
|
|
187
193
|
});
|
|
188
194
|
},
|
|
189
195
|
async getNonce(args) {
|
|
@@ -208,7 +214,7 @@ async function toLightSmartAccount(parameters) {
|
|
|
208
214
|
return this.signMessage({ message: hash });
|
|
209
215
|
},
|
|
210
216
|
async signMessage({ message }) {
|
|
211
|
-
const signature = await signWith1271WrapperV1(
|
|
217
|
+
const signature = await signWith1271WrapperV1(localOwner, await getMemoizedChainId(), await this.getAddress(), (0, viem_1.hashMessage)(message));
|
|
212
218
|
switch (version) {
|
|
213
219
|
case "1.1.0":
|
|
214
220
|
return signature;
|
|
@@ -219,7 +225,7 @@ async function toLightSmartAccount(parameters) {
|
|
|
219
225
|
}
|
|
220
226
|
},
|
|
221
227
|
async signTypedData(typedData) {
|
|
222
|
-
const signature = await signWith1271WrapperV1(
|
|
228
|
+
const signature = await signWith1271WrapperV1(localOwner, await getMemoizedChainId(), await this.getAddress(), (0, viem_1.hashTypedData)(typedData));
|
|
223
229
|
switch (version) {
|
|
224
230
|
case "1.1.0":
|
|
225
231
|
return signature;
|
|
@@ -241,7 +247,7 @@ async function toLightSmartAccount(parameters) {
|
|
|
241
247
|
chainId: chainId
|
|
242
248
|
});
|
|
243
249
|
const signature = await (0, actions_1.signMessage)(client, {
|
|
244
|
-
account:
|
|
250
|
+
account: localOwner,
|
|
245
251
|
message: {
|
|
246
252
|
raw: hash
|
|
247
253
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toLightSmartAccount.js","sourceRoot":"","sources":["../../../accounts/light/toLightSmartAccount.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"toLightSmartAccount.js","sourceRoot":"","sources":["../../../accounts/light/toLightSmartAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -694,7 +694,8 @@ const getAccountAddress = async ({ client, owner, safeModuleSetupAddress, safe43
|
|
|
694
694
|
});
|
|
695
695
|
};
|
|
696
696
|
async function toSafeSmartAccount(parameters) {
|
|
697
|
-
const { client,
|
|
697
|
+
const { client, owners, address, version, safe4337ModuleAddress: _safe4337ModuleAddress, safeProxyFactoryAddress: _safeProxyFactoryAddress, safeSingletonAddress: _safeSingletonAddress, erc7579LaunchpadAddress, saltNonce = BigInt(0), validUntil = 0, validAfter = 0, nonceKey, paymentToken, payment, paymentReceiver } = parameters;
|
|
698
|
+
const localOwner = await (0, utils_2.toOwner)({ owner: owners[0] });
|
|
698
699
|
const entryPoint = {
|
|
699
700
|
address: parameters.entryPoint?.address ?? account_abstraction_1.entryPoint07Address,
|
|
700
701
|
abi: (parameters.entryPoint?.version ?? "0.7") === "0.6"
|
|
@@ -750,7 +751,7 @@ async function toSafeSmartAccount(parameters) {
|
|
|
750
751
|
return {
|
|
751
752
|
factory: safeProxyFactoryAddress,
|
|
752
753
|
factoryData: await getAccountInitCode({
|
|
753
|
-
owner:
|
|
754
|
+
owner: localOwner.address,
|
|
754
755
|
safeModuleSetupAddress,
|
|
755
756
|
safe4337ModuleAddress,
|
|
756
757
|
safeSingletonAddress,
|
|
@@ -780,7 +781,7 @@ async function toSafeSmartAccount(parameters) {
|
|
|
780
781
|
return accountAddress;
|
|
781
782
|
accountAddress = await getAccountAddress({
|
|
782
783
|
client,
|
|
783
|
-
owner:
|
|
784
|
+
owner: localOwner.address,
|
|
784
785
|
safeModuleSetupAddress,
|
|
785
786
|
safe4337ModuleAddress,
|
|
786
787
|
safeProxyFactoryAddress,
|
|
@@ -811,7 +812,7 @@ async function toSafeSmartAccount(parameters) {
|
|
|
811
812
|
safe4337ModuleAddress,
|
|
812
813
|
safeSingletonAddress,
|
|
813
814
|
erc7579LaunchpadAddress,
|
|
814
|
-
owner:
|
|
815
|
+
owner: localOwner.address,
|
|
815
816
|
validators,
|
|
816
817
|
executors,
|
|
817
818
|
fallbacks,
|
|
@@ -870,9 +871,13 @@ async function toSafeSmartAccount(parameters) {
|
|
|
870
871
|
operationType = 1;
|
|
871
872
|
}
|
|
872
873
|
else {
|
|
873
|
-
|
|
874
|
-
|
|
875
|
-
|
|
874
|
+
const call = calls.length === 0 ? undefined : calls[0];
|
|
875
|
+
if (!call) {
|
|
876
|
+
throw new Error("No calls to encode");
|
|
877
|
+
}
|
|
878
|
+
to = call.to;
|
|
879
|
+
data = call.data ?? "0x";
|
|
880
|
+
value = call.value ?? 0n;
|
|
876
881
|
}
|
|
877
882
|
return (0, viem_1.encodeFunctionData)({
|
|
878
883
|
abi: executeUserOpWithErrorStringAbi,
|
|
@@ -907,14 +912,14 @@ async function toSafeSmartAccount(parameters) {
|
|
|
907
912
|
message: generateSafeMessageMessage(message)
|
|
908
913
|
}
|
|
909
914
|
});
|
|
910
|
-
return adjustVInSignature("eth_sign", await
|
|
915
|
+
return adjustVInSignature("eth_sign", await localOwner.signMessage({
|
|
911
916
|
message: {
|
|
912
917
|
raw: (0, viem_1.toBytes)(messageHash)
|
|
913
918
|
}
|
|
914
919
|
}));
|
|
915
920
|
},
|
|
916
921
|
async signTypedData(typedData) {
|
|
917
|
-
return adjustVInSignature("eth_signTypedData", await
|
|
922
|
+
return adjustVInSignature("eth_signTypedData", await localOwner.signTypedData({
|
|
918
923
|
domain: {
|
|
919
924
|
chainId: await getMemoizedChainId(),
|
|
920
925
|
verifyingContract: await this.getAddress()
|
|
@@ -971,9 +976,9 @@ async function toSafeSmartAccount(parameters) {
|
|
|
971
976
|
}
|
|
972
977
|
const signatures = [
|
|
973
978
|
{
|
|
974
|
-
signer:
|
|
979
|
+
signer: localOwner.address,
|
|
975
980
|
data: await (0, actions_1.signTypedData)(client, {
|
|
976
|
-
account:
|
|
981
|
+
account: localOwner,
|
|
977
982
|
domain: {
|
|
978
983
|
chainId,
|
|
979
984
|
verifyingContract
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toSafeSmartAccount.js","sourceRoot":"","sources":["../../../accounts/safe/toSafeSmartAccount.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"toSafeSmartAccount.js","sourceRoot":"","sources":["../../../accounts/safe/toSafeSmartAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ const actions_1 = require("viem/actions");
|
|
|
7
7
|
const utils_1 = require("viem/utils");
|
|
8
8
|
const getAccountNonce_1 = require("../../actions/public/getAccountNonce.js");
|
|
9
9
|
const getSenderAddress_1 = require("../../actions/public/getSenderAddress.js");
|
|
10
|
+
const toOwner_1 = require("../../utils/toOwner.js");
|
|
10
11
|
const getAccountInitCode = async (owner, index = BigInt(0)) => {
|
|
11
12
|
if (!owner)
|
|
12
13
|
throw new Error("Owner account not found");
|
|
@@ -51,6 +52,7 @@ const getFactoryAddress = (entryPointVersion, factoryAddress) => {
|
|
|
51
52
|
};
|
|
52
53
|
async function toSimpleSmartAccount(parameters) {
|
|
53
54
|
const { client, owner, factoryAddress: _factoryAddress, index = BigInt(0), address, nonceKey } = parameters;
|
|
55
|
+
const localOwner = await (0, toOwner_1.toOwner)({ owner });
|
|
54
56
|
const entryPoint = {
|
|
55
57
|
address: parameters.entryPoint?.address ?? account_abstraction_1.entryPoint07Address,
|
|
56
58
|
abi: (parameters.entryPoint?.version ?? "0.7") === "0.6"
|
|
@@ -72,7 +74,7 @@ async function toSimpleSmartAccount(parameters) {
|
|
|
72
74
|
const getFactoryArgs = async () => {
|
|
73
75
|
return {
|
|
74
76
|
factory: factoryAddress,
|
|
75
|
-
factoryData: await getAccountInitCode(
|
|
77
|
+
factoryData: await getAccountInitCode(localOwner.address, index)
|
|
76
78
|
};
|
|
77
79
|
};
|
|
78
80
|
return (0, account_abstraction_1.toSmartAccount)({
|
|
@@ -155,6 +157,10 @@ async function toSimpleSmartAccount(parameters) {
|
|
|
155
157
|
]
|
|
156
158
|
});
|
|
157
159
|
}
|
|
160
|
+
const call = calls.length === 0 ? undefined : calls[0];
|
|
161
|
+
if (!call) {
|
|
162
|
+
throw new Error("No calls to encode");
|
|
163
|
+
}
|
|
158
164
|
return (0, viem_1.encodeFunctionData)({
|
|
159
165
|
abi: [
|
|
160
166
|
{
|
|
@@ -182,7 +188,7 @@ async function toSimpleSmartAccount(parameters) {
|
|
|
182
188
|
}
|
|
183
189
|
],
|
|
184
190
|
functionName: "execute",
|
|
185
|
-
args: [
|
|
191
|
+
args: [call.to, call.value ?? 0n, call.data ?? "0x"]
|
|
186
192
|
});
|
|
187
193
|
},
|
|
188
194
|
async getNonce(args) {
|
|
@@ -207,7 +213,7 @@ async function toSimpleSmartAccount(parameters) {
|
|
|
207
213
|
async signUserOperation(parameters) {
|
|
208
214
|
const { chainId = await getMemoizedChainId(), ...userOperation } = parameters;
|
|
209
215
|
return (0, actions_1.signMessage)(client, {
|
|
210
|
-
account:
|
|
216
|
+
account: localOwner,
|
|
211
217
|
message: {
|
|
212
218
|
raw: (0, account_abstraction_1.getUserOperationHash)({
|
|
213
219
|
userOperation: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toSimpleSmartAccount.js","sourceRoot":"","sources":["../../../accounts/simple/toSimpleSmartAccount.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"toSimpleSmartAccount.js","sourceRoot":"","sources":["../../../accounts/simple/toSimpleSmartAccount.ts"],"names":[],"mappings":"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"}
|