@zerodev/permissions 5.2.7-alpha-4 → 5.2.7
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/_cjs/serializeMultiChainPermissionAccounts.js +19 -10
- package/_cjs/serializeMultiChainPermissionAccounts.js.map +1 -1
- package/_esm/serializeMultiChainPermissionAccounts.js +20 -11
- package/_esm/serializeMultiChainPermissionAccounts.js.map +1 -1
- package/_types/serializeMultiChainPermissionAccounts.d.ts.map +1 -1
- package/package.json +1 -1
- package/serializeMultiChainPermissionAccounts.ts +33 -14
|
@@ -25,14 +25,7 @@ const serializeMultiChainPermissionAccounts = async (params) => {
|
|
|
25
25
|
sortPairs: true
|
|
26
26
|
});
|
|
27
27
|
const merkleRoot = merkleTree.getHexRoot();
|
|
28
|
-
const
|
|
29
|
-
message: {
|
|
30
|
-
raw: merkleRoot
|
|
31
|
-
}
|
|
32
|
-
});
|
|
33
|
-
if (!signature) {
|
|
34
|
-
throw new Error("No enable signature, check if the sudo validator is multi-chain validator");
|
|
35
|
-
}
|
|
28
|
+
const toEthSignedMessageHash = (0, viem_1.hashMessage)({ raw: merkleRoot });
|
|
36
29
|
const enableSignatures = await Promise.all(params.map(async (param, index) => {
|
|
37
30
|
if (!param.account.kernelPluginManager.sudoValidator) {
|
|
38
31
|
throw new Error("No sudo validator found, check if sudo validator is multi-chain validator");
|
|
@@ -41,10 +34,26 @@ const serializeMultiChainPermissionAccounts = async (params) => {
|
|
|
41
34
|
const encodedMerkleProof = (0, viem_1.encodeAbiParameters)([{ name: "proof", type: "bytes32[]" }], [merkleProof]);
|
|
42
35
|
if (param.account.kernelPluginManager.sudoValidator.source ===
|
|
43
36
|
"MultiChainECDSAValidator") {
|
|
44
|
-
|
|
37
|
+
const ecdsaSig = await params[0].account.kernelPluginManager.sudoValidator?.signMessage({
|
|
38
|
+
message: {
|
|
39
|
+
raw: merkleRoot
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
if (!ecdsaSig) {
|
|
43
|
+
throw new Error("No enable signature, check if the sudo validator is MultiChainECDSAValidator");
|
|
44
|
+
}
|
|
45
|
+
return (0, viem_1.concatHex)([ecdsaSig, merkleRoot, encodedMerkleProof]);
|
|
45
46
|
}
|
|
46
47
|
if (param.account.kernelPluginManager.sudoValidator.source ===
|
|
47
48
|
"MultiChainWebAuthnValidator") {
|
|
49
|
+
const webauthnSig = await params[0].account.kernelPluginManager.sudoValidator?.signMessage({
|
|
50
|
+
message: {
|
|
51
|
+
raw: toEthSignedMessageHash
|
|
52
|
+
}
|
|
53
|
+
});
|
|
54
|
+
if (!webauthnSig) {
|
|
55
|
+
throw new Error("No enable signature, check if the sudo validator is MultiChainWebAuthnValidator");
|
|
56
|
+
}
|
|
48
57
|
const merkleData = (0, viem_1.concatHex)([merkleRoot, encodedMerkleProof]);
|
|
49
58
|
return (0, viem_1.encodeAbiParameters)([
|
|
50
59
|
{
|
|
@@ -55,7 +64,7 @@ const serializeMultiChainPermissionAccounts = async (params) => {
|
|
|
55
64
|
name: "signature",
|
|
56
65
|
type: "bytes"
|
|
57
66
|
}
|
|
58
|
-
], [merkleData,
|
|
67
|
+
], [merkleData, webauthnSig]);
|
|
59
68
|
}
|
|
60
69
|
throw new Error("Unknown multi-chain validator");
|
|
61
70
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializeMultiChainPermissionAccounts.js","sourceRoot":"","sources":["../serializeMultiChainPermissionAccounts.ts"],"names":[],"mappings":";;;AACA,+CAAyC;AAEzC,+
|
|
1
|
+
{"version":3,"file":"serializeMultiChainPermissionAccounts.js","sourceRoot":"","sources":["../serializeMultiChainPermissionAccounts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { MerkleTree } from "merkletreejs";
|
|
2
|
-
import { concatHex, encodeAbiParameters, hashTypedData, keccak256 } from "viem";
|
|
2
|
+
import { concatHex, encodeAbiParameters, hashMessage, hashTypedData, keccak256 } from "viem";
|
|
3
3
|
import { isPermissionValidatorPlugin, serializePermissionAccountParams } from "./utils.js";
|
|
4
4
|
export const serializeMultiChainPermissionAccounts = async (params) => {
|
|
5
5
|
if (params.length === 0)
|
|
@@ -23,14 +23,7 @@ export const serializeMultiChainPermissionAccounts = async (params) => {
|
|
|
23
23
|
sortPairs: true
|
|
24
24
|
});
|
|
25
25
|
const merkleRoot = merkleTree.getHexRoot();
|
|
26
|
-
const
|
|
27
|
-
message: {
|
|
28
|
-
raw: merkleRoot
|
|
29
|
-
}
|
|
30
|
-
});
|
|
31
|
-
if (!signature) {
|
|
32
|
-
throw new Error("No enable signature, check if the sudo validator is multi-chain validator");
|
|
33
|
-
}
|
|
26
|
+
const toEthSignedMessageHash = hashMessage({ raw: merkleRoot });
|
|
34
27
|
// get enable signatures for multi-chain validator
|
|
35
28
|
const enableSignatures = await Promise.all(params.map(async (param, index) => {
|
|
36
29
|
if (!param.account.kernelPluginManager.sudoValidator) {
|
|
@@ -40,10 +33,26 @@ export const serializeMultiChainPermissionAccounts = async (params) => {
|
|
|
40
33
|
const encodedMerkleProof = encodeAbiParameters([{ name: "proof", type: "bytes32[]" }], [merkleProof]);
|
|
41
34
|
if (param.account.kernelPluginManager.sudoValidator.source ===
|
|
42
35
|
"MultiChainECDSAValidator") {
|
|
43
|
-
|
|
36
|
+
const ecdsaSig = await params[0].account.kernelPluginManager.sudoValidator?.signMessage({
|
|
37
|
+
message: {
|
|
38
|
+
raw: merkleRoot
|
|
39
|
+
}
|
|
40
|
+
});
|
|
41
|
+
if (!ecdsaSig) {
|
|
42
|
+
throw new Error("No enable signature, check if the sudo validator is MultiChainECDSAValidator");
|
|
43
|
+
}
|
|
44
|
+
return concatHex([ecdsaSig, merkleRoot, encodedMerkleProof]);
|
|
44
45
|
}
|
|
45
46
|
if (param.account.kernelPluginManager.sudoValidator.source ===
|
|
46
47
|
"MultiChainWebAuthnValidator") {
|
|
48
|
+
const webauthnSig = await params[0].account.kernelPluginManager.sudoValidator?.signMessage({
|
|
49
|
+
message: {
|
|
50
|
+
raw: toEthSignedMessageHash
|
|
51
|
+
}
|
|
52
|
+
});
|
|
53
|
+
if (!webauthnSig) {
|
|
54
|
+
throw new Error("No enable signature, check if the sudo validator is MultiChainWebAuthnValidator");
|
|
55
|
+
}
|
|
47
56
|
const merkleData = concatHex([merkleRoot, encodedMerkleProof]);
|
|
48
57
|
return encodeAbiParameters([
|
|
49
58
|
{
|
|
@@ -54,7 +63,7 @@ export const serializeMultiChainPermissionAccounts = async (params) => {
|
|
|
54
63
|
name: "signature",
|
|
55
64
|
type: "bytes"
|
|
56
65
|
}
|
|
57
|
-
], [merkleData,
|
|
66
|
+
], [merkleData, webauthnSig]);
|
|
58
67
|
}
|
|
59
68
|
throw new Error("Unknown multi-chain validator");
|
|
60
69
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializeMultiChainPermissionAccounts.js","sourceRoot":"","sources":["../serializeMultiChainPermissionAccounts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,OAAO,EAEH,SAAS,EACT,mBAAmB,EACnB,aAAa,EACb,SAAS,EACZ,MAAM,MAAM,CAAA;AAEb,OAAO,EACH,2BAA2B,EAC3B,gCAAgC,EACnC,MAAM,YAAY,CAAA;AAQnB,MAAM,CAAC,MAAM,qCAAqC,GAAG,KAAK,EAGtD,MAAwD,EACvC,EAAE;IACnB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAA;IAElC,MAAM,2BAA2B,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACrD,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAClE,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;QACnE,CAAC;QACD,OACI,KAAK,CAAC,OAAO,CAAC,mBACjB,CAAC,4BAA4B,EAAE,CAAA;IACpC,CAAC,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACjC,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC,SAAS,EAAE,CAChD,CAAA;IAED,MAAM,uBAAuB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACjD,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC,eAAe,EAAE,CACtD,CAAA;IAED,MAAM,sBAAsB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC5C,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACvB,OAAO,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC,yBAAyB,CAC9D,KAAK,CAAC,OAAO,CAAC,OAAO,CACxB,CAAA;IACL,CAAC,CAAC,CACL,CAAA;IAED,0CAA0C;IAC1C,MAAM,MAAM,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;QACpD,OAAO,aAAa,CAAC,SAAS,CAAC,CAAA;IACnC,CAAC,CAAC,CAAA;IAEF,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,MAAM,EAAE,SAAS,EAAE;QACjD,SAAS,EAAE,IAAI;KAClB,CAAC,CAAA;IAEF,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,EAAS,CAAA;IAEjD,MAAM,
|
|
1
|
+
{"version":3,"file":"serializeMultiChainPermissionAccounts.js","sourceRoot":"","sources":["../serializeMultiChainPermissionAccounts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializeMultiChainPermissionAccounts.d.ts","sourceRoot":"","sources":["../serializeMultiChainPermissionAccounts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAEtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EACH,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"serializeMultiChainPermissionAccounts.d.ts","sourceRoot":"","sources":["../serializeMultiChainPermissionAccounts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAEtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EACH,KAAK,GAAG,EAMX,MAAM,MAAM,CAAA;AAOb,MAAM,MAAM,kCAAkC,CAAC,UAAU,SAAS,UAAU,IACxE;IACI,OAAO,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAA;IACvC,UAAU,CAAC,EAAE,GAAG,CAAA;CACnB,CAAA;AAEL,eAAO,MAAM,qCAAqC,+FAI/C,QAAQ,MAAM,EAAE,CAqIlB,CAAA"}
|
package/package.json
CHANGED
|
@@ -5,6 +5,7 @@ import {
|
|
|
5
5
|
type Hex,
|
|
6
6
|
concatHex,
|
|
7
7
|
encodeAbiParameters,
|
|
8
|
+
hashMessage,
|
|
8
9
|
hashTypedData,
|
|
9
10
|
keccak256
|
|
10
11
|
} from "viem"
|
|
@@ -63,18 +64,7 @@ export const serializeMultiChainPermissionAccounts = async <
|
|
|
63
64
|
|
|
64
65
|
const merkleRoot = merkleTree.getHexRoot() as Hex
|
|
65
66
|
|
|
66
|
-
const
|
|
67
|
-
await params[0].account.kernelPluginManager.sudoValidator?.signMessage({
|
|
68
|
-
message: {
|
|
69
|
-
raw: merkleRoot
|
|
70
|
-
}
|
|
71
|
-
})
|
|
72
|
-
|
|
73
|
-
if (!signature) {
|
|
74
|
-
throw new Error(
|
|
75
|
-
"No enable signature, check if the sudo validator is multi-chain validator"
|
|
76
|
-
)
|
|
77
|
-
}
|
|
67
|
+
const toEthSignedMessageHash = hashMessage({ raw: merkleRoot })
|
|
78
68
|
|
|
79
69
|
// get enable signatures for multi-chain validator
|
|
80
70
|
const enableSignatures = await Promise.all(
|
|
@@ -93,12 +83,41 @@ export const serializeMultiChainPermissionAccounts = async <
|
|
|
93
83
|
param.account.kernelPluginManager.sudoValidator.source ===
|
|
94
84
|
"MultiChainECDSAValidator"
|
|
95
85
|
) {
|
|
96
|
-
|
|
86
|
+
const ecdsaSig =
|
|
87
|
+
await params[0].account.kernelPluginManager.sudoValidator?.signMessage(
|
|
88
|
+
{
|
|
89
|
+
message: {
|
|
90
|
+
raw: merkleRoot
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
)
|
|
94
|
+
|
|
95
|
+
if (!ecdsaSig) {
|
|
96
|
+
throw new Error(
|
|
97
|
+
"No enable signature, check if the sudo validator is MultiChainECDSAValidator"
|
|
98
|
+
)
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
return concatHex([ecdsaSig, merkleRoot, encodedMerkleProof])
|
|
97
102
|
}
|
|
98
103
|
if (
|
|
99
104
|
param.account.kernelPluginManager.sudoValidator.source ===
|
|
100
105
|
"MultiChainWebAuthnValidator"
|
|
101
106
|
) {
|
|
107
|
+
const webauthnSig =
|
|
108
|
+
await params[0].account.kernelPluginManager.sudoValidator?.signMessage(
|
|
109
|
+
{
|
|
110
|
+
message: {
|
|
111
|
+
raw: toEthSignedMessageHash
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
)
|
|
115
|
+
|
|
116
|
+
if (!webauthnSig) {
|
|
117
|
+
throw new Error(
|
|
118
|
+
"No enable signature, check if the sudo validator is MultiChainWebAuthnValidator"
|
|
119
|
+
)
|
|
120
|
+
}
|
|
102
121
|
const merkleData = concatHex([merkleRoot, encodedMerkleProof])
|
|
103
122
|
return encodeAbiParameters(
|
|
104
123
|
[
|
|
@@ -111,7 +130,7 @@ export const serializeMultiChainPermissionAccounts = async <
|
|
|
111
130
|
type: "bytes"
|
|
112
131
|
}
|
|
113
132
|
],
|
|
114
|
-
[merkleData,
|
|
133
|
+
[merkleData, webauthnSig]
|
|
115
134
|
)
|
|
116
135
|
}
|
|
117
136
|
throw new Error("Unknown multi-chain validator")
|