@zerodev/permissions 5.5.5 → 5.5.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/deserializePermissionAccount.js +3 -2
- package/_cjs/deserializePermissionAccount.js.map +1 -1
- package/_cjs/utils.js +9 -1
- package/_cjs/utils.js.map +1 -1
- package/_esm/deserializePermissionAccount.js +3 -2
- package/_esm/deserializePermissionAccount.js.map +1 -1
- package/_esm/utils.js +7 -0
- package/_esm/utils.js.map +1 -1
- package/_types/deserializePermissionAccount.d.ts.map +1 -1
- package/_types/utils.d.ts +1 -0
- package/_types/utils.d.ts.map +1 -1
- package/deserializePermissionAccount.ts +3 -2
- package/package.json +2 -2
- package/utils.ts +10 -0
|
@@ -9,6 +9,7 @@ const index_js_1 = require("./policies/index.js");
|
|
|
9
9
|
const toECDSASigner_js_1 = require("./signers/toECDSASigner.js");
|
|
10
10
|
const toPermissionValidator_js_1 = require("./toPermissionValidator.js");
|
|
11
11
|
const utils_js_1 = require("./utils.js");
|
|
12
|
+
const utils_js_2 = require("./utils.js");
|
|
12
13
|
const deserializePermissionAccount = async (client, entryPoint, kernelVersion, modularPermissionAccountParams, modularSigner) => {
|
|
13
14
|
if (entryPoint.version !== "0.7") {
|
|
14
15
|
throw new Error("Only EntryPoint 0.7 is supported");
|
|
@@ -110,7 +111,7 @@ const decodeParamsFromInitCode = (initCode, kernelVersion) => {
|
|
|
110
111
|
validatorAddress: initializeFunctionData.args[0],
|
|
111
112
|
identifier: initializeFunctionData.args[0],
|
|
112
113
|
enableData: initializeFunctionData.args[2],
|
|
113
|
-
initConfig: kernelVersion
|
|
114
|
+
initConfig: (0, utils_js_2.isKernelVersionAfter)(kernelVersion, "0.3.1") &&
|
|
114
115
|
Array.isArray(initializeFunctionData.args[4])
|
|
115
116
|
? [...initializeFunctionData.args[4]]
|
|
116
117
|
: undefined
|
|
@@ -139,7 +140,7 @@ const decodeParamsFromInitCode = (initCode, kernelVersion) => {
|
|
|
139
140
|
validatorAddress: initializeFunctionData.args[0],
|
|
140
141
|
identifier: initializeFunctionData.args[0],
|
|
141
142
|
enableData: initializeFunctionData.args[2],
|
|
142
|
-
initConfig: kernelVersion
|
|
143
|
+
initConfig: (0, utils_js_2.isKernelVersionAfter)(kernelVersion, "0.3.1") &&
|
|
143
144
|
Array.isArray(initializeFunctionData.args[4])
|
|
144
145
|
? [...initializeFunctionData.args[4]]
|
|
145
146
|
: undefined
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deserializePermissionAccount.js","sourceRoot":"","sources":["../deserializePermissionAccount.ts"],"names":[],"mappings":";;;AAAA,sCAMqB;AACrB,oDAG8B;AAQ9B,+BAAyC;AAEzC,4CAAmD;AAEnD,kDAO4B;AAC5B,iEAA0D;AAC1D,yEAAkE;AAGlE,yCAA+D;
|
|
1
|
+
{"version":3,"file":"deserializePermissionAccount.js","sourceRoot":"","sources":["../deserializePermissionAccount.ts"],"names":[],"mappings":"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"}
|
package/_cjs/utils.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.deserializePermissionAccountParams = exports.serializePermissionAccountParams = exports.isPermissionValidatorPlugin = exports.bytesToBase64 = exports.base64ToBytes = void 0;
|
|
3
|
+
exports.isKernelVersionAfter = exports.deserializePermissionAccountParams = exports.serializePermissionAccountParams = exports.isPermissionValidatorPlugin = exports.bytesToBase64 = exports.base64ToBytes = void 0;
|
|
4
|
+
const semver_1 = require("semver");
|
|
4
5
|
function base64ToBytes(base64) {
|
|
5
6
|
const binString = atob(base64);
|
|
6
7
|
return Uint8Array.from(binString, (m) => m.codePointAt(0));
|
|
@@ -34,4 +35,11 @@ const deserializePermissionAccountParams = (params) => {
|
|
|
34
35
|
return JSON.parse(jsonString);
|
|
35
36
|
};
|
|
36
37
|
exports.deserializePermissionAccountParams = deserializePermissionAccountParams;
|
|
38
|
+
const isKernelVersionAfter = (kernelVersion, version) => {
|
|
39
|
+
const coercedKernelVersion = (0, semver_1.coerce)(kernelVersion);
|
|
40
|
+
if (!coercedKernelVersion)
|
|
41
|
+
return false;
|
|
42
|
+
return (0, semver_1.gt)(coercedKernelVersion, version);
|
|
43
|
+
};
|
|
44
|
+
exports.isKernelVersionAfter = isKernelVersionAfter;
|
|
37
45
|
//# sourceMappingURL=utils.js.map
|
package/_cjs/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../utils.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAGnC,SAAgB,aAAa,CAAC,MAAc;IACxC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAA;IAC9B,OAAO,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAW,CAAC,CAAA;AACxE,CAAC;AAHD,sCAGC;AAED,SAAgB,aAAa,CAAC,KAAiB;IAC3C,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAC5E,OAAO,IAAI,CAAC,SAAS,CAAC,CAAA;AAC1B,CAAC;AAHD,sCAGC;AAED,SAAgB,2BAA2B,CAEvC,MAAW;IAEX,OAAO,MAAM,EAAE,4BAA4B,KAAK,SAAS,CAAA;AAC7D,CAAC;AALD,kEAKC;AAEM,MAAM,gCAAgC,GAAG,CAC5C,MAA+B,EACjC,EAAE;IAEA,MAAM,QAAQ,GAAG,CAAC,CAAS,EAAE,KAAU,EAAE,EAAE;QACvC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAA;QAC3B,CAAC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC,CAAA;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IACnD,MAAM,UAAU,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IACvD,MAAM,YAAY,GAAG,aAAa,CAAC,UAAU,CAAC,CAAA;IAC9C,OAAO,YAAY,CAAA;AACvB,CAAC,CAAA;AAfY,QAAA,gCAAgC,oCAe5C;AAEM,MAAM,kCAAkC,GAAG,CAAC,MAAc,EAAE,EAAE;IACjE,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,CAAA;IACxC,MAAM,UAAU,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IACvD,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAA4B,CAAA;AAC5D,CAAC,CAAA;AAJY,QAAA,kCAAkC,sCAI9C;AAEM,MAAM,oBAAoB,GAAG,CAChC,aAAqB,EACrB,OAAe,EACR,EAAE;IACT,MAAM,oBAAoB,GAAG,IAAA,eAAM,EAAC,aAAa,CAAC,CAAA;IAClD,IAAI,CAAC,oBAAoB;QAAE,OAAO,KAAK,CAAA;IACvC,OAAO,IAAA,WAAE,EAAC,oBAAoB,EAAE,OAAO,CAAC,CAAA;AAC5C,CAAC,CAAA;AAPY,QAAA,oBAAoB,wBAOhC"}
|
|
@@ -6,6 +6,7 @@ import { toCallPolicy, toGasPolicy, toRateLimitPolicy, toSignatureCallerPolicy,
|
|
|
6
6
|
import { toECDSASigner } from "./signers/toECDSASigner.js";
|
|
7
7
|
import { toPermissionValidator } from "./toPermissionValidator.js";
|
|
8
8
|
import { deserializePermissionAccountParams } from "./utils.js";
|
|
9
|
+
import { isKernelVersionAfter } from "./utils.js";
|
|
9
10
|
export const deserializePermissionAccount = async (client, entryPoint, kernelVersion, modularPermissionAccountParams, modularSigner) => {
|
|
10
11
|
if (entryPoint.version !== "0.7") {
|
|
11
12
|
throw new Error("Only EntryPoint 0.7 is supported");
|
|
@@ -105,7 +106,7 @@ export const decodeParamsFromInitCode = (initCode, kernelVersion) => {
|
|
|
105
106
|
validatorAddress: initializeFunctionData.args[0],
|
|
106
107
|
identifier: initializeFunctionData.args[0],
|
|
107
108
|
enableData: initializeFunctionData.args[2],
|
|
108
|
-
initConfig: kernelVersion
|
|
109
|
+
initConfig: isKernelVersionAfter(kernelVersion, "0.3.1") &&
|
|
109
110
|
Array.isArray(initializeFunctionData.args[4])
|
|
110
111
|
? [...initializeFunctionData.args[4]]
|
|
111
112
|
: undefined
|
|
@@ -134,7 +135,7 @@ export const decodeParamsFromInitCode = (initCode, kernelVersion) => {
|
|
|
134
135
|
validatorAddress: initializeFunctionData.args[0],
|
|
135
136
|
identifier: initializeFunctionData.args[0],
|
|
136
137
|
enableData: initializeFunctionData.args[2],
|
|
137
|
-
initConfig: kernelVersion
|
|
138
|
+
initConfig: isKernelVersionAfter(kernelVersion, "0.3.1") &&
|
|
138
139
|
Array.isArray(initializeFunctionData.args[4])
|
|
139
140
|
? [...initializeFunctionData.args[4]]
|
|
140
141
|
: undefined
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deserializePermissionAccount.js","sourceRoot":"","sources":["../deserializePermissionAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,sBAAsB,EACtB,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACtB,MAAM,cAAc,CAAA;AACrB,OAAO,EAEH,qBAAqB,EACxB,MAAM,uBAAuB,CAAA;AAQ9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,MAAM,CAAA;AAEzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA;AAEnD,OAAO,EACH,YAAY,EACZ,WAAW,EACX,iBAAiB,EACjB,uBAAuB,EACvB,YAAY,EACZ,iBAAiB,EACpB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAGlE,OAAO,EAAE,kCAAkC,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"deserializePermissionAccount.js","sourceRoot":"","sources":["../deserializePermissionAccount.ts"],"names":[],"mappings":"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"}
|
package/_esm/utils.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { coerce, gt } from "semver";
|
|
1
2
|
export function base64ToBytes(base64) {
|
|
2
3
|
const binString = atob(base64);
|
|
3
4
|
return Uint8Array.from(binString, (m) => m.codePointAt(0));
|
|
@@ -29,4 +30,10 @@ export const deserializePermissionAccountParams = (params) => {
|
|
|
29
30
|
const jsonString = new TextDecoder().decode(uint8Array);
|
|
30
31
|
return JSON.parse(jsonString);
|
|
31
32
|
};
|
|
33
|
+
export const isKernelVersionAfter = (kernelVersion, version) => {
|
|
34
|
+
const coercedKernelVersion = coerce(kernelVersion);
|
|
35
|
+
if (!coercedKernelVersion)
|
|
36
|
+
return false;
|
|
37
|
+
return gt(coercedKernelVersion, version);
|
|
38
|
+
};
|
|
32
39
|
//# sourceMappingURL=utils.js.map
|
package/_esm/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAGnC,MAAM,UAAU,aAAa,CAAC,MAAc;IACxC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAA;IAC9B,OAAO,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAW,CAAC,CAAA;AACxE,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,KAAiB;IAC3C,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAC5E,OAAO,IAAI,CAAC,SAAS,CAAC,CAAA;AAC1B,CAAC;AAED,MAAM,UAAU,2BAA2B;AACvC,4DAA4D;AAC5D,MAAW;IAEX,OAAO,MAAM,EAAE,4BAA4B,KAAK,SAAS,CAAA;AAC7D,CAAC;AAED,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAC5C,MAA+B,EACjC,EAAE;IACA,4DAA4D;IAC5D,MAAM,QAAQ,GAAG,CAAC,CAAS,EAAE,KAAU,EAAE,EAAE;QACvC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAA;QAC3B,CAAC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC,CAAA;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IACnD,MAAM,UAAU,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IACvD,MAAM,YAAY,GAAG,aAAa,CAAC,UAAU,CAAC,CAAA;IAC9C,OAAO,YAAY,CAAA;AACvB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAAC,MAAc,EAAE,EAAE;IACjE,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,CAAA;IACxC,MAAM,UAAU,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IACvD,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAA4B,CAAA;AAC5D,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAChC,aAAqB,EACrB,OAAe,EACR,EAAE;IACT,MAAM,oBAAoB,GAAG,MAAM,CAAC,aAAa,CAAC,CAAA;IAClD,IAAI,CAAC,oBAAoB;QAAE,OAAO,KAAK,CAAA;IACvC,OAAO,EAAE,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAA;AAC5C,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deserializePermissionAccount.d.ts","sourceRoot":"","sources":["../deserializePermissionAccount.ts"],"names":[],"mappings":"AAOA,OAAO,EACH,KAAK,gCAAgC,EAExC,MAAM,uBAAuB,CAAA;AAC9B,OAAO,KAAK,EACR,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,EACpB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAE/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAajE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"deserializePermissionAccount.d.ts","sourceRoot":"","sources":["../deserializePermissionAccount.ts"],"names":[],"mappings":"AAOA,OAAO,EACH,KAAK,gCAAgC,EAExC,MAAM,uBAAuB,CAAA;AAC9B,OAAO,KAAK,EACR,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,EACpB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAE/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAajE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAI/C,eAAO,MAAM,4BAA4B,wDAG7B,gCAAgC,CAAC,QAAQ,CAAC,qIAGlB,MAAM,kBACtB,aAAa,qFAgDhC,CAAA;AAED,eAAO,MAAM,sBAAsB,WAAkB,MAAM,oBAiB1D,CAAA;AAED,eAAO,MAAM,wBAAwB,aACvB,GAAG,iBACE,mBAAmB;;;;CAmFrC,CAAA"}
|
package/_types/utils.d.ts
CHANGED
|
@@ -4,4 +4,5 @@ export declare function bytesToBase64(bytes: Uint8Array): string;
|
|
|
4
4
|
export declare function isPermissionValidatorPlugin(plugin: any): plugin is PermissionPlugin;
|
|
5
5
|
export declare const serializePermissionAccountParams: (params: PermissionAccountParams) => string;
|
|
6
6
|
export declare const deserializePermissionAccountParams: (params: string) => PermissionAccountParams;
|
|
7
|
+
export declare const isKernelVersionAfter: (kernelVersion: string, version: string) => boolean;
|
|
7
8
|
//# sourceMappingURL=utils.d.ts.map
|
package/_types/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE3E,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,cAG3C;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,UAAU,UAG9C;AAED,wBAAgB,2BAA2B,CAEvC,MAAM,EAAE,GAAG,GACZ,MAAM,IAAI,gBAAgB,CAE5B;AAED,eAAO,MAAM,gCAAgC,WACjC,uBAAuB,WAclC,CAAA;AAED,eAAO,MAAM,kCAAkC,WAAY,MAAM,4BAIhE,CAAA;AAED,eAAO,MAAM,oBAAoB,kBACd,MAAM,WACZ,MAAM,KAChB,OAIF,CAAA"}
|
|
@@ -33,6 +33,7 @@ import { toPermissionValidator } from "./toPermissionValidator.js"
|
|
|
33
33
|
import type { Policy } from "./types.js"
|
|
34
34
|
import type { ModularSigner } from "./types.js"
|
|
35
35
|
import { deserializePermissionAccountParams } from "./utils.js"
|
|
36
|
+
import { isKernelVersionAfter } from "./utils.js"
|
|
36
37
|
|
|
37
38
|
export const deserializePermissionAccount = async <
|
|
38
39
|
entryPointVersion extends EntryPointVersion
|
|
@@ -156,7 +157,7 @@ export const decodeParamsFromInitCode = (
|
|
|
156
157
|
identifier: initializeFunctionData.args[0],
|
|
157
158
|
enableData: initializeFunctionData.args[2],
|
|
158
159
|
initConfig:
|
|
159
|
-
kernelVersion
|
|
160
|
+
isKernelVersionAfter(kernelVersion, "0.3.1") &&
|
|
160
161
|
Array.isArray(initializeFunctionData.args[4])
|
|
161
162
|
? [...initializeFunctionData.args[4]]
|
|
162
163
|
: undefined
|
|
@@ -185,7 +186,7 @@ export const decodeParamsFromInitCode = (
|
|
|
185
186
|
identifier: initializeFunctionData.args[0],
|
|
186
187
|
enableData: initializeFunctionData.args[2],
|
|
187
188
|
initConfig:
|
|
188
|
-
kernelVersion
|
|
189
|
+
isKernelVersionAfter(kernelVersion, "0.3.1") &&
|
|
189
190
|
Array.isArray(initializeFunctionData.args[4])
|
|
190
191
|
? [...initializeFunctionData.args[4]]
|
|
191
192
|
: undefined
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zerodev/permissions",
|
|
3
|
-
"version": "5.5.
|
|
3
|
+
"version": "5.5.7",
|
|
4
4
|
"author": "ZeroDev",
|
|
5
5
|
"main": "./_cjs/index.js",
|
|
6
6
|
"module": "./_esm/index.js",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"changeset:version": "changeset version && bun install --lockfile-only",
|
|
32
32
|
"format": "biome format . --write",
|
|
33
33
|
"lint": "biome check .",
|
|
34
|
-
"lint:fix": "bun run lint --
|
|
34
|
+
"lint:fix": "bun run lint --write"
|
|
35
35
|
},
|
|
36
36
|
"exports": {
|
|
37
37
|
".": {
|
package/utils.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { coerce, gt } from "semver"
|
|
1
2
|
import type { PermissionAccountParams, PermissionPlugin } from "./types.js"
|
|
2
3
|
|
|
3
4
|
export function base64ToBytes(base64: string) {
|
|
@@ -39,3 +40,12 @@ export const deserializePermissionAccountParams = (params: string) => {
|
|
|
39
40
|
const jsonString = new TextDecoder().decode(uint8Array)
|
|
40
41
|
return JSON.parse(jsonString) as PermissionAccountParams
|
|
41
42
|
}
|
|
43
|
+
|
|
44
|
+
export const isKernelVersionAfter = (
|
|
45
|
+
kernelVersion: string,
|
|
46
|
+
version: string
|
|
47
|
+
): boolean => {
|
|
48
|
+
const coercedKernelVersion = coerce(kernelVersion)
|
|
49
|
+
if (!coercedKernelVersion) return false
|
|
50
|
+
return gt(coercedKernelVersion, version)
|
|
51
|
+
}
|