permissionless 0.2.17 → 0.2.19
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/thirdweb/toThirdwebSmartAccount.js +7 -3
- package/_cjs/accounts/thirdweb/toThirdwebSmartAccount.js.map +1 -1
- package/_esm/accounts/thirdweb/toThirdwebSmartAccount.js +7 -3
- package/_esm/accounts/thirdweb/toThirdwebSmartAccount.js.map +1 -1
- package/_types/accounts/thirdweb/toThirdwebSmartAccount.d.ts +7 -2
- package/_types/accounts/thirdweb/toThirdwebSmartAccount.d.ts.map +1 -1
- package/_types/types/pimlico.d.ts +7 -3
- package/_types/types/pimlico.d.ts.map +1 -1
- package/accounts/thirdweb/toThirdwebSmartAccount.ts +13 -3
- package/package.json +1 -1
- package/types/pimlico.ts +5 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# permissionless
|
|
2
2
|
|
|
3
|
+
## 0.2.19
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- f82cd134ae25ec871318cfb698b10130c24dc94b: Fixed typescript error to name all tuple members
|
|
8
|
+
|
|
9
|
+
## 0.2.18
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- b23471a3daa08cda57d09366c01356f38564fd7a: Added thirdweb factory version
|
|
14
|
+
|
|
3
15
|
## 0.2.17
|
|
4
16
|
|
|
5
17
|
### Patch Changes
|
|
@@ -14,10 +14,14 @@ const signMessage_js_1 = require("./utils/signMessage.js");
|
|
|
14
14
|
const signTypedData_js_1 = require("./utils/signTypedData.js");
|
|
15
15
|
exports.THIRDWEB_ADDRESSES = {
|
|
16
16
|
"0.6": {
|
|
17
|
-
|
|
17
|
+
"1.5.20": {
|
|
18
|
+
factoryAddress: "0x85e23b94e7F5E9cC1fF78BCe78cfb15B81f0DF00"
|
|
19
|
+
}
|
|
18
20
|
},
|
|
19
21
|
"0.7": {
|
|
20
|
-
|
|
22
|
+
"1.5.20": {
|
|
23
|
+
factoryAddress: "0x4be0ddfebca9a5a4a617dee4dece99e7c862dceb"
|
|
24
|
+
}
|
|
21
25
|
}
|
|
22
26
|
};
|
|
23
27
|
async function toThirdwebSmartAccount(parameters) {
|
|
@@ -28,7 +32,7 @@ async function toThirdwebSmartAccount(parameters) {
|
|
|
28
32
|
: account_abstraction_1.entryPoint07Abi,
|
|
29
33
|
version: parameters.entryPoint?.version ?? "0.7"
|
|
30
34
|
};
|
|
31
|
-
const { owner, client, salt, address, factoryAddress = exports.THIRDWEB_ADDRESSES[entryPoint.version].factoryAddress } = parameters;
|
|
35
|
+
const { owner, client, salt, version, address, factoryAddress = exports.THIRDWEB_ADDRESSES[entryPoint.version][version ?? "1.5.20"].factoryAddress } = parameters;
|
|
32
36
|
const admin = await (0, toOwner_js_1.toOwner)({ owner });
|
|
33
37
|
let accountAddress = address;
|
|
34
38
|
let chainId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toThirdwebSmartAccount.js","sourceRoot":"","sources":["../../../accounts/thirdweb/toThirdwebSmartAccount.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"toThirdwebSmartAccount.js","sourceRoot":"","sources":["../../../accounts/thirdweb/toThirdwebSmartAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,10 +13,14 @@ import { signTypedData } from "./utils/signTypedData.js";
|
|
|
13
13
|
*/
|
|
14
14
|
export const THIRDWEB_ADDRESSES = {
|
|
15
15
|
"0.6": {
|
|
16
|
-
|
|
16
|
+
"1.5.20": {
|
|
17
|
+
factoryAddress: "0x85e23b94e7F5E9cC1fF78BCe78cfb15B81f0DF00"
|
|
18
|
+
}
|
|
17
19
|
},
|
|
18
20
|
"0.7": {
|
|
19
|
-
|
|
21
|
+
"1.5.20": {
|
|
22
|
+
factoryAddress: "0x4be0ddfebca9a5a4a617dee4dece99e7c862dceb"
|
|
23
|
+
}
|
|
20
24
|
}
|
|
21
25
|
};
|
|
22
26
|
/**
|
|
@@ -32,7 +36,7 @@ export async function toThirdwebSmartAccount(parameters) {
|
|
|
32
36
|
: entryPoint07Abi,
|
|
33
37
|
version: parameters.entryPoint?.version ?? "0.7"
|
|
34
38
|
};
|
|
35
|
-
const { owner, client, salt, address, factoryAddress = THIRDWEB_ADDRESSES[entryPoint.version].factoryAddress } = parameters;
|
|
39
|
+
const { owner, client, salt, version, address, factoryAddress = THIRDWEB_ADDRESSES[entryPoint.version][version ?? "1.5.20"].factoryAddress } = parameters;
|
|
36
40
|
const admin = await toOwner({ owner });
|
|
37
41
|
let accountAddress = address;
|
|
38
42
|
let chainId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toThirdwebSmartAccount.js","sourceRoot":"","sources":["../../../accounts/thirdweb/toThirdwebSmartAccount.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAA;AAEzE,OAAO,EAIH,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,oBAAoB,EACpB,cAAc,EACjB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,EAAyB,OAAO,EAAE,MAAM,wBAAwB,CAAA;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAExD;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAC9B,KAAK,EAAE;QACH,
|
|
1
|
+
{"version":3,"file":"toThirdwebSmartAccount.js","sourceRoot":"","sources":["../../../accounts/thirdweb/toThirdwebSmartAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,10 +6,14 @@ import { type EthereumProvider } from "../../utils/toOwner.js";
|
|
|
6
6
|
*/
|
|
7
7
|
export declare const THIRDWEB_ADDRESSES: {
|
|
8
8
|
"0.6": {
|
|
9
|
-
|
|
9
|
+
"1.5.20": {
|
|
10
|
+
factoryAddress: Address;
|
|
11
|
+
};
|
|
10
12
|
};
|
|
11
13
|
"0.7": {
|
|
12
|
-
|
|
14
|
+
"1.5.20": {
|
|
15
|
+
factoryAddress: Address;
|
|
16
|
+
};
|
|
13
17
|
};
|
|
14
18
|
};
|
|
15
19
|
export type ToThirdwebSmartAccountParameters<entryPointVersion extends "0.6" | "0.7" = "0.7"> = {
|
|
@@ -20,6 +24,7 @@ export type ToThirdwebSmartAccountParameters<entryPointVersion extends "0.6" | "
|
|
|
20
24
|
address: Address;
|
|
21
25
|
version: entryPointVersion;
|
|
22
26
|
};
|
|
27
|
+
version?: "1.5.20";
|
|
23
28
|
salt?: string;
|
|
24
29
|
address?: Address;
|
|
25
30
|
secp256k1VerificationFacetAddress?: Address;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toThirdwebSmartAccount.d.ts","sourceRoot":"","sources":["../../../accounts/thirdweb/toThirdwebSmartAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,OAAO,EACP,OAAO,EACP,MAAM,EACN,KAAK,EACL,MAAM,EACN,YAAY,EACZ,KAAK,EACL,SAAS,EAET,YAAY,EACf,MAAM,MAAM,CAAA;AAIb,OAAO,EACH,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAE/B,eAAe,EACf,eAAe,EAIlB,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAAE,KAAK,gBAAgB,EAAW,MAAM,wBAAwB,CAAA;AAOvE;;GAEG;AACH,eAAO,MAAM,kBAAkB
|
|
1
|
+
{"version":3,"file":"toThirdwebSmartAccount.d.ts","sourceRoot":"","sources":["../../../accounts/thirdweb/toThirdwebSmartAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,OAAO,EACP,OAAO,EACP,MAAM,EACN,KAAK,EACL,MAAM,EACN,YAAY,EACZ,KAAK,EACL,SAAS,EAET,YAAY,EACf,MAAM,MAAM,CAAA;AAIb,OAAO,EACH,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAE/B,eAAe,EACf,eAAe,EAIlB,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAAE,KAAK,gBAAgB,EAAW,MAAM,wBAAwB,CAAA;AAOvE;;GAEG;AACH,eAAO,MAAM,kBAAkB;;;4BAIiC,OAAO;;;;;4BAMP,OAAO;;;CAGtE,CAAA;AAED,MAAM,MAAM,gCAAgC,CACxC,iBAAiB,SAAS,KAAK,GAAG,KAAK,GAAG,KAAK,IAC/C;IACA,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,KAAK,CACN,gBAAgB,GAChB,YAAY,CAAC,SAAS,EAAE,KAAK,GAAG,SAAS,EAAE,OAAO,CAAC,GACnD,YAAY,CACjB,CAAA;IACD,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,UAAU,CAAC,EAAE;QACT,OAAO,EAAE,OAAO,CAAA;QAChB,OAAO,EAAE,iBAAiB,CAAA;KAC7B,CAAA;IACD,OAAO,CAAC,EAAE,QAAQ,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,iCAAiC,CAAC,EAAE,OAAO,CAAA;IAC3C,QAAQ,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,kCAAkC,CAC1C,iBAAiB,SAAS,KAAK,GAAG,KAAK,GAAG,KAAK,IAC/C,MAAM,CACN,0BAA0B,CACtB,iBAAiB,SAAS,KAAK,GACzB,OAAO,eAAe,GACtB,OAAO,eAAe,EAC5B,iBAAiB,CACpB,EACD;IAAE,IAAI,EAAE,WAAW,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAA;CAAE,CAC5D,CAAA;AAED,MAAM,MAAM,gCAAgC,CACxC,iBAAiB,SAAS,KAAK,GAAG,KAAK,GAAG,KAAK,IAC/C,YAAY,CAAC,kCAAkC,CAAC,iBAAiB,CAAC,CAAC,CAAA;AAEvE;;;;GAIG;AACH,wBAAsB,sBAAsB,CACxC,iBAAiB,SAAS,KAAK,GAAG,KAAK,GAAG,KAAK,EAE/C,UAAU,EAAE,gCAAgC,CAAC,iBAAiB,CAAC,GAChE,OAAO,CAAC,gCAAgC,CAAC,iBAAiB,CAAC,CAAC,CAkH9D"}
|
|
@@ -97,9 +97,13 @@ export type PimlicoRpcSchema<entryPointVersion extends "0.6" | "0.7" = "0.6" | "
|
|
|
97
97
|
},
|
|
98
98
|
{
|
|
99
99
|
Method: "pimlico_getTokenQuotes";
|
|
100
|
-
Parameters: [
|
|
101
|
-
tokens:
|
|
102
|
-
|
|
100
|
+
Parameters: [
|
|
101
|
+
tokens: {
|
|
102
|
+
tokens: Address[];
|
|
103
|
+
},
|
|
104
|
+
entryPoint: Address,
|
|
105
|
+
chainId: Hex
|
|
106
|
+
];
|
|
103
107
|
ReturnType: GetTokenQuotesWithBigIntAsHex;
|
|
104
108
|
}
|
|
105
109
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pimlico.d.ts","sourceRoot":"","sources":["../../types/pimlico.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pimlico.d.ts","sourceRoot":"","sources":["../../types/pimlico.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,10 +36,16 @@ import { signTypedData } from "./utils/signTypedData.js"
|
|
|
36
36
|
*/
|
|
37
37
|
export const THIRDWEB_ADDRESSES = {
|
|
38
38
|
"0.6": {
|
|
39
|
-
|
|
39
|
+
"1.5.20": {
|
|
40
|
+
factoryAddress:
|
|
41
|
+
"0x85e23b94e7F5E9cC1fF78BCe78cfb15B81f0DF00" as Address
|
|
42
|
+
}
|
|
40
43
|
},
|
|
41
44
|
"0.7": {
|
|
42
|
-
|
|
45
|
+
"1.5.20": {
|
|
46
|
+
factoryAddress:
|
|
47
|
+
"0x4be0ddfebca9a5a4a617dee4dece99e7c862dceb" as Address
|
|
48
|
+
}
|
|
43
49
|
}
|
|
44
50
|
}
|
|
45
51
|
|
|
@@ -57,6 +63,7 @@ export type ToThirdwebSmartAccountParameters<
|
|
|
57
63
|
address: Address
|
|
58
64
|
version: entryPointVersion
|
|
59
65
|
}
|
|
66
|
+
version?: "1.5.20"
|
|
60
67
|
salt?: string
|
|
61
68
|
address?: Address
|
|
62
69
|
secp256k1VerificationFacetAddress?: Address
|
|
@@ -102,8 +109,11 @@ export async function toThirdwebSmartAccount<
|
|
|
102
109
|
owner,
|
|
103
110
|
client,
|
|
104
111
|
salt,
|
|
112
|
+
version,
|
|
105
113
|
address,
|
|
106
|
-
factoryAddress = THIRDWEB_ADDRESSES[entryPoint.version]
|
|
114
|
+
factoryAddress = THIRDWEB_ADDRESSES[entryPoint.version][
|
|
115
|
+
version ?? "1.5.20"
|
|
116
|
+
].factoryAddress
|
|
107
117
|
} = parameters
|
|
108
118
|
|
|
109
119
|
const admin = await toOwner({ owner })
|
package/package.json
CHANGED
package/types/pimlico.ts
CHANGED
|
@@ -131,7 +131,11 @@ export type PimlicoRpcSchema<
|
|
|
131
131
|
},
|
|
132
132
|
{
|
|
133
133
|
Method: "pimlico_getTokenQuotes"
|
|
134
|
-
Parameters: [
|
|
134
|
+
Parameters: [
|
|
135
|
+
tokens: { tokens: Address[] },
|
|
136
|
+
entryPoint: Address,
|
|
137
|
+
chainId: Hex
|
|
138
|
+
]
|
|
135
139
|
ReturnType: GetTokenQuotesWithBigIntAsHex
|
|
136
140
|
}
|
|
137
141
|
]
|