@cartridge/controller 0.1.0 → 0.1.2

package/{dist → lib}/types.d.ts

@@ -1,150 +1,149 @@
-import { DeployContractPayload, DeployContractResponse as StarknetDeployContractResponse, Abi, Call, InvocationsDetails, typedData, InvokeFunctionResponse, Signature, Invocation } from "starknet";
-import { BigNumberish } from "starknet/dist/utils/number";
-import { EstimateFee } from "starknet/types/account";
-export declare type Approvals = {
-    [origin: string]: {
-        scopes: Scope[];
-        maxFee: BigNumberish;
-    };
-};
-export declare type Scope = {
-    target: string;
-    method?: string;
-};
-export interface ProbeRequest extends RawRequest {
-    method: "probe";
-}
-export interface ProbeResponse extends RawResponse {
-    method: "probe";
-    result?: {
-        address?: string;
-        scopes?: Scope[];
-    };
-}
-export interface ConnectRequest extends RawRequest {
-    method: "connect";
-    params: {
-        id: string;
-        scopes: Scope[];
-    };
-}
-export interface ConnectResponse extends RawResponse {
-    method: "connect";
-    result?: {
-        success: boolean;
-        address?: string;
-        scopes: Scope[];
-    };
-}
-export interface DeployContractRequest extends RawRequest {
-    method: "deploy-contract";
-    params: {
-        id: string;
-        payload: DeployContractPayload;
-        abi?: Abi;
-    };
-}
-export interface DeployContractResponse extends RawResponse {
-    method: "deploy-contract";
-    result?: StarknetDeployContractResponse;
-}
-export interface EstimateFeeRequest extends RawRequest {
-    method: "estimate-fee";
-    params: {
-        invocation: Invocation;
-    };
-}
-export interface EstimateFeeResponse extends RawResponse {
-    method: "estimate-fee";
-    result?: EstimateFee;
-}
-export interface ExecuteRequest extends RawRequest {
-    method: "execute";
-    params: {
-        id?: string;
-        transactions: Call | Call[];
-        abis?: Abi[];
-        transactionsDetail?: InvocationsDetails;
-    };
-}
-export interface ExecuteResponse extends RawResponse {
-    method: "execute";
-    result?: InvokeFunctionResponse;
-    scopes?: Scope[];
-}
-export interface SignTransactionRequest extends RawRequest {
-    method: "sign-transaction";
-    params: {
-        id: string;
-        transactions: Call | Call[];
-        abis?: Abi[];
-        transactionsDetail?: InvocationsDetails;
-    };
-}
-export interface SignTransactionResponse extends RawResponse {
-    method: "sign-transaction";
-    result?: Signature;
-}
-export interface SignMessageRequest extends RawRequest {
-    method: "sign-message";
-    params: {
-        id: string;
-        account?: string;
-        typedData: typedData.TypedData;
-    };
-}
-export interface SignMessageResponse extends RawResponse {
-    method: "sign-message";
-    result?: Signature;
-}
-export interface HashMessageRequest extends RawRequest {
-    method: "hash-message";
-    params: {
-        typedData: typedData.TypedData;
-    };
-}
-export interface HashMessageResponse extends RawResponse {
-    method: "hash-message";
-    result?: string;
-}
-export interface VerifyMessageRequest extends RawRequest {
-    method: "verify-message";
-    params: {
-        typedData: typedData.TypedData;
-        signature: Signature;
-    };
-}
-export interface VerifyMessageResponse extends RawResponse {
-    method: "verify-message";
-    result?: boolean;
-}
-export interface VerifyMessageHashRequest extends RawRequest {
-    method: "verify-message-hash";
-    params: {
-        hash: BigNumberish;
-        signature: Signature;
-    };
-}
-export interface VerifyMessageHashResponse extends RawResponse {
-    method: "verify-message-hash";
-    result?: boolean;
-}
-export interface GetNonceRequest extends RawRequest {
-    method: "get-nonce";
-}
-export interface GetNonceResponse extends RawResponse {
-    method: "get-nonce";
-    result?: string;
-}
-export declare type RawRequest = {
-    origin?: string;
-    method: string;
-    params?: object | any[];
-};
-export declare type Request = RawRequest | ProbeRequest | ConnectRequest | DeployContractRequest | EstimateFeeRequest | ExecuteRequest | SignMessageRequest | HashMessageRequest | VerifyMessageHashRequest | VerifyMessageRequest | GetNonceRequest;
-export declare type RawResponse = {
-    result?: any;
-    error?: unknown;
-};
-export declare type Response = RawResponse | ProbeResponse | DeployContractResponse | EstimateFeeResponse | ConnectResponse | SignMessageResponse | HashMessageResponse | VerifyMessageHashResponse | VerifyMessageResponse | GetNonceResponse;
-//# sourceMappingURL=types.d.ts.map
+import { DeployContractPayload, DeployContractResponse as StarknetDeployContractResponse, Abi, Call, InvocationsDetails, typedData, InvokeFunctionResponse, Signature, Invocation } from "starknet";
+import { BigNumberish } from "starknet/dist/utils/number";
+import { EstimateFee } from "starknet/types/account";
+export declare type Approvals = {
+    [origin: string]: {
+        scopes: Scope[];
+        maxFee: BigNumberish;
+    };
+};
+export declare type Scope = {
+    target: string;
+    method?: string;
+};
+export interface ProbeRequest extends RawRequest {
+    method: "probe";
+}
+export interface ProbeResponse extends RawResponse {
+    method: "probe";
+    result?: {
+        address?: string;
+        scopes?: Scope[];
+    };
+}
+export interface ConnectRequest extends RawRequest {
+    method: "connect";
+    params: {
+        id: string;
+        scopes: Scope[];
+    };
+}
+export interface ConnectResponse extends RawResponse {
+    method: "connect";
+    result?: {
+        success: boolean;
+        address?: string;
+        scopes: Scope[];
+    };
+}
+export interface DeployContractRequest extends RawRequest {
+    method: "deploy-contract";
+    params: {
+        id: string;
+        payload: DeployContractPayload;
+        abi?: Abi;
+    };
+}
+export interface DeployContractResponse extends RawResponse {
+    method: "deploy-contract";
+    result?: StarknetDeployContractResponse;
+}
+export interface EstimateFeeRequest extends RawRequest {
+    method: "estimate-fee";
+    params: {
+        invocation: Invocation;
+    };
+}
+export interface EstimateFeeResponse extends RawResponse {
+    method: "estimate-fee";
+    result?: EstimateFee;
+}
+export interface ExecuteRequest extends RawRequest {
+    method: "execute";
+    params: {
+        id?: string;
+        transactions: Call | Call[];
+        abis?: Abi[];
+        transactionsDetail?: InvocationsDetails;
+    };
+}
+export interface ExecuteResponse extends RawResponse {
+    method: "execute";
+    result?: InvokeFunctionResponse;
+    scopes?: Scope[];
+}
+export interface SignTransactionRequest extends RawRequest {
+    method: "sign-transaction";
+    params: {
+        id: string;
+        transactions: Call | Call[];
+        abis?: Abi[];
+        transactionsDetail?: InvocationsDetails;
+    };
+}
+export interface SignTransactionResponse extends RawResponse {
+    method: "sign-transaction";
+    result?: Signature;
+}
+export interface SignMessageRequest extends RawRequest {
+    method: "sign-message";
+    params: {
+        id: string;
+        account?: string;
+        typedData: typedData.TypedData;
+    };
+}
+export interface SignMessageResponse extends RawResponse {
+    method: "sign-message";
+    result?: Signature;
+}
+export interface HashMessageRequest extends RawRequest {
+    method: "hash-message";
+    params: {
+        typedData: typedData.TypedData;
+    };
+}
+export interface HashMessageResponse extends RawResponse {
+    method: "hash-message";
+    result?: string;
+}
+export interface VerifyMessageRequest extends RawRequest {
+    method: "verify-message";
+    params: {
+        typedData: typedData.TypedData;
+        signature: Signature;
+    };
+}
+export interface VerifyMessageResponse extends RawResponse {
+    method: "verify-message";
+    result?: boolean;
+}
+export interface VerifyMessageHashRequest extends RawRequest {
+    method: "verify-message-hash";
+    params: {
+        hash: BigNumberish;
+        signature: Signature;
+    };
+}
+export interface VerifyMessageHashResponse extends RawResponse {
+    method: "verify-message-hash";
+    result?: boolean;
+}
+export interface GetNonceRequest extends RawRequest {
+    method: "get-nonce";
+}
+export interface GetNonceResponse extends RawResponse {
+    method: "get-nonce";
+    result?: string;
+}
+export declare type RawRequest = {
+    origin?: string;
+    method: string;
+    params?: object | any[];
+};
+export declare type Request = RawRequest | ProbeRequest | ConnectRequest | DeployContractRequest | EstimateFeeRequest | ExecuteRequest | SignMessageRequest | HashMessageRequest | VerifyMessageHashRequest | VerifyMessageRequest | GetNonceRequest;
+export declare type RawResponse = {
+    result?: any;
+    error?: unknown;
+};
+export declare type Response = RawResponse | ProbeResponse | DeployContractResponse | EstimateFeeResponse | ConnectResponse | SignMessageResponse | HashMessageResponse | VerifyMessageHashResponse | VerifyMessageResponse | GetNonceResponse;

package/lib/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/lib/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}

package/{dist → lib}/utils.d.ts

@@ -1,3 +1,2 @@
-import { Scope } from "./types";
-export declare function diff(a: Scope[], b: Scope[]): Scope[];
-//# sourceMappingURL=utils.d.ts.map
+import { Scope } from "./types";
+export declare function diff(a: Scope[], b: Scope[]): Scope[];

package/lib/utils.js

@@ -0,0 +1,16 @@
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+import equal from "fast-deep-equal";
+export function diff(a, b) {
+    return a.reduce(function (prev, scope) {
+        return b.some(function (approval) { return equal(approval, scope); }) ? prev : __spreadArray(__spreadArray([], prev, true), [scope], false);
+    }, []);
+}
+//# sourceMappingURL=utils.js.map

package/lib/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,iBAAiB,CAAC;AAIpC,MAAM,UAAU,IAAI,CAAC,CAAU,EAAE,CAAU;IACvC,OAAO,CAAC,CAAC,MAAM,CACX,UAAC,IAAI,EAAE,KAAK;QACR,OAAA,CAAC,CAAC,IAAI,CAAC,UAAC,QAAQ,IAAK,OAAA,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAtB,CAAsB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,iCAAK,IAAI,UAAE,KAAK,SAAC;IAAtE,CAAsE,EAC1E,EAAa,CAChB,CAAC;AACN,CAAC"}

package/{dist → lib}/webauthn.d.ts

@@ -1,17 +1,16 @@
-import { Abi, Invocation, InvocationsSignerDetails, Signature, SignerInterface, typedData } from "starknet";
-declare type Assertion = PublicKeyCredential & {
-    response: AuthenticatorAssertionResponse;
-};
-export declare class WebauthnSigner implements SignerInterface {
-    private credentialId;
-    private publicKey;
-    constructor(credentialId: string, publicKey: string);
-    getPubKey(): Promise<string>;
-    sign(hash: string): Promise<Assertion>;
-    formatAssertion(assertion: Assertion): Signature;
-    hashTransaction(transactions: Invocation[], transactionsDetail: InvocationsSignerDetails, abis?: Abi[]): string;
-    signTransaction(transactions: Invocation[], transactionsDetail: InvocationsSignerDetails, abis?: Abi[]): Promise<Signature>;
-    signMessage(td: typedData.TypedData, accountAddress: string): Promise<Signature>;
-}
-export {};
-//# sourceMappingURL=webauthn.d.ts.map
+import { Abi, Invocation, InvocationsSignerDetails, Signature, SignerInterface, typedData } from "starknet";
+declare type Assertion = PublicKeyCredential & {
+    response: AuthenticatorAssertionResponse;
+};
+export declare class WebauthnSigner implements SignerInterface {
+    private credentialId;
+    private publicKey;
+    constructor(credentialId: string, publicKey: string);
+    getPubKey(): Promise<string>;
+    sign(hash: string): Promise<Assertion>;
+    formatAssertion(assertion: Assertion): Signature;
+    hashTransaction(transactions: Invocation[], transactionsDetail: InvocationsSignerDetails, abis?: Abi[]): string;
+    signTransaction(transactions: Invocation[], transactionsDetail: InvocationsSignerDetails, abis?: Abi[]): Promise<Signature>;
+    signMessage(td: typedData.TypedData, accountAddress: string): Promise<Signature>;
+}
+export {};

package/lib/webauthn.js

@@ -0,0 +1,191 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+import { transaction, hash, typedData, number } from "starknet";
+import base64url from "base64url";
+var BASE = number.toBN(2).pow(86);
+function split(n) {
+    var x = n.mod(BASE);
+    var y = n.div(BASE).mod(BASE);
+    var z = n.div(BASE).div(BASE);
+    return { x: x, y: y, z: z };
+}
+function convertUint8ArrayToWordArray(u8Array) {
+    var words = [], i = 0, len = u8Array.length;
+    while (i < len) {
+        words.push(((u8Array[i++] << 24) |
+            (u8Array[i++] << 16) |
+            (u8Array[i++] << 8) |
+            u8Array[i++]) >>>
+            0);
+    }
+    return {
+        sigBytes: words.length * 4,
+        words: words,
+    };
+}
+var WebauthnSigner = /** @class */ (function () {
+    function WebauthnSigner(credentialId, publicKey) {
+        this.credentialId = credentialId;
+        this.publicKey = publicKey;
+    }
+    WebauthnSigner.prototype.getPubKey = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.publicKey];
+            });
+        });
+    };
+    WebauthnSigner.prototype.sign = function (hash) {
+        return __awaiter(this, void 0, void 0, function () {
+            var challenge;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        challenge = Buffer.from(hash.slice(2).padStart(64, "0").slice(0, 64), "hex");
+                        return [4 /*yield*/, navigator.credentials.get({
+                                publicKey: {
+                                    challenge: challenge,
+                                    timeout: 60000,
+                                    rpId: "cartridge.gg",
+                                    allowCredentials: [
+                                        {
+                                            type: "public-key",
+                                            id: base64url.toBuffer(this.credentialId),
+                                        },
+                                    ],
+                                    userVerification: "required",
+                                },
+                            })];
+                    case 1: return [2 /*return*/, (_a.sent())];
+                }
+            });
+        });
+    };
+    WebauthnSigner.prototype.formatAssertion = function (assertion) {
+        var authenticatorDataBytes = new Uint8Array(assertion.response.authenticatorData);
+        var authenticatorDataRem = 4 - (authenticatorDataBytes.length % 4);
+        if (authenticatorDataRem == 4) {
+            authenticatorDataRem = 0;
+        }
+        var authenticatorDataWords = convertUint8ArrayToWordArray(authenticatorDataBytes).words;
+        var clientDataJSONBytes = new Uint8Array(assertion.response.clientDataJSON);
+        var clientDataJSONRem = 4 - (clientDataJSONBytes.length % 4);
+        if (clientDataJSONRem == 4) {
+            clientDataJSONRem = 0;
+        }
+        var clientDataWords = convertUint8ArrayToWordArray(clientDataJSONBytes).words;
+        // Convert signature from ASN.1 sequence to "raw" format
+        var usignature = new Uint8Array(assertion.response.signature);
+        var rStart = usignature[4] === 0 ? 5 : 4;
+        var rEnd = rStart + 32;
+        var sStart = usignature[rEnd + 2] === 0 ? rEnd + 3 : rEnd + 2;
+        var r = number.toBN("0x" + Buffer.from(usignature.slice(rStart, rEnd)).toString("hex"));
+        var s = number.toBN("0x" + Buffer.from(usignature.slice(sStart)).toString("hex"));
+        var _a = split(r), r0 = _a.x, r1 = _a.y, r2 = _a.z;
+        var _b = split(s), s0 = _b.x, s1 = _b.y, s2 = _b.z;
+        return __spreadArray(__spreadArray(__spreadArray([
+            "0",
+            r0.toString(),
+            r1.toString(),
+            r2.toString(),
+            s0.toString(),
+            s1.toString(),
+            s2.toString(),
+            "9",
+            "0",
+            "".concat(clientDataWords.length),
+            "".concat(clientDataJSONRem)
+        ], clientDataWords.map(function (word) { return "".concat(word); }), true), [
+            "".concat(authenticatorDataWords.length),
+            "".concat(authenticatorDataRem)
+        ], false), authenticatorDataWords.map(function (word) { return "".concat(word); }), true);
+    };
+    WebauthnSigner.prototype.hashTransaction = function (transactions, transactionsDetail, abis) {
+        if (abis && abis.length !== transactions.length) {
+            throw new Error("ABI must be provided for each transaction or no transaction");
+        }
+        // now use abi to display decoded data somewhere, but as this signer is headless, we can't do that
+        var calldata = transaction.fromCallsToExecuteCalldataWithNonce(transactions, transactionsDetail.nonce);
+        return hash.calculcateTransactionHash(transactionsDetail.walletAddress, transactionsDetail.version, hash.getSelectorFromName("__execute__"), calldata, transactionsDetail.maxFee, transactionsDetail.chainId);
+    };
+    WebauthnSigner.prototype.signTransaction = function (transactions, transactionsDetail, abis) {
+        return __awaiter(this, void 0, void 0, function () {
+            var calldata, msgHash, assertion;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (abis && abis.length !== transactions.length) {
+                            throw new Error("ABI must be provided for each transaction or no transaction");
+                        }
+                        calldata = transaction.fromCallsToExecuteCalldataWithNonce(transactions, transactionsDetail.nonce);
+                        msgHash = hash.calculcateTransactionHash(transactionsDetail.walletAddress, transactionsDetail.version, hash.getSelectorFromName("__execute__"), calldata, transactionsDetail.maxFee, transactionsDetail.chainId);
+                        return [4 /*yield*/, this.sign(msgHash)];
+                    case 1:
+                        assertion = _a.sent();
+                        return [2 /*return*/, this.formatAssertion(assertion)];
+                }
+            });
+        });
+    };
+    WebauthnSigner.prototype.signMessage = function (td, accountAddress) {
+        return __awaiter(this, void 0, void 0, function () {
+            var msgHash, assertion;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        msgHash = typedData.getMessageHash(td, accountAddress);
+                        return [4 /*yield*/, this.sign(msgHash)];
+                    case 1:
+                        assertion = _a.sent();
+                        return [2 /*return*/, this.formatAssertion(assertion)];
+                }
+            });
+        });
+    };
+    return WebauthnSigner;
+}());
+export { WebauthnSigner };
+//# sourceMappingURL=webauthn.js.map

package/lib/webauthn.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webauthn.js","sourceRoot":"","sources":["../src/webauthn.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,19 +1,16 @@
 {
   "name": "@cartridge/controller",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Cartridge Controller",
-  "main": "dist/index.js",
-  "module": "dist/index.es.js",
-  "types": "dist/index.d.ts",
+  "main": "lib",
+  "types": "lib",
+  "type": "module",
   "scripts": {
-    "build": "rimraf ./dist && rollup -c",
-    "dev": "rollup -c -w",
-    "format": "prettier --write \"src/**/*.ts\" \"tests/**/*.ts\"",
-    "test:watch": "jest --watchAll",
-    "test": "jest --ci --runInBand"
+    "build": "tsc",
+    "format": "prettier --write \"src/**/*.ts\" \"tests/**/*.ts\""
   },
   "files": [
-    "dist"
+    "lib"
   ],
   "devDependencies": {
     "@rollup/plugin-replace": "^4.0.0",
@@ -26,24 +23,7 @@
     "ts-jest": "^26.5.1",
     "ts-node": "^10.4.0",
     "tslib": "^2.3.1",
-    "typescript": "^4.5.4"
-  },
-  "jest": {
-    "setupFiles": [],
-    "moduleFileExtensions": [
-      "ts",
-      "js",
-      "json"
-    ],
-    "roots": [
-      "src",
-      "tests"
-    ],
-    "transform": {
-      "^.+\\.tsx?$": "ts-jest"
-    },
-    "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
-    "moduleNameMapper": {}
+    "typescript": "4.8.2"
   },
   "dependencies": {
     "base64url": "^3.0.1",

package/dist/account.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,GAAG,EACH,IAAI,EACJ,sBAAsB,IAAI,8BAA8B,EACxD,kBAAkB,EAClB,SAAS,EACT,SAAS,EACT,MAAM,EACN,QAAQ,EACR,UAAU,EACV,eAAe,EACf,sBAAsB,EACvB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAIpD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EACL,KAAK,EAUN,MAAM,SAAS,CAAC;AAGjB,qBAAa,OAAQ,SAAQ,QAAS,YAAW,gBAAgB;IAC/D,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,GAAG,CAAkC;IAC7C,OAAO,CAAC,OAAO,CAAe;IAEvB,MAAM,EAAE,eAAe,CAAC;gBAG7B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,KAAK,EAAO,EACpB,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE;QACR,GAAG,CAAC,EAAE,MAAM,CAAC;KACd;IAaH;;;;;;;;;OASG;IACG,cAAc,CAClB,OAAO,EAAE,qBAAqB,EAC9B,GAAG,CAAC,EAAE,GAAG,GACR,OAAO,CAAC,8BAA8B,CAAC;IA2B1C;;;;;;;;;;OAUG;IACG,WAAW,CACf,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,WAAW,CAAC;IAevB;;;;;;;;;;;OAWG;IACG,OAAO,CACX,YAAY,EAAE,IAAI,GAAG,IAAI,EAAE,EAC3B,IAAI,CAAC,EAAE,GAAG,EAAE,EACZ,kBAAkB,CAAC,EAAE,kBAAkB,GACtC,OAAO,CAAC,sBAAsB,CAAC;IAgDlC;;;;;;;OAOG;IACG,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IA4BrE;;;;;;;OAOG;IACG,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAelE;;;;;;;OAOG;IACG,aAAa,CACjB,SAAS,EAAE,SAAS,CAAC,SAAS,EAC9B,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,OAAO,CAAC;IAgBnB;;;;;;;;OAQG;IACG,iBAAiB,CACrB,IAAI,EAAE,MAAM,CAAC,YAAY,EACzB,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,OAAO,CAAC;IAgBb,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;CAWlC"}

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAkD,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhF,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAyB;IACzC,OAAO,CAAC,SAAS,CAAC,CAAY;IAC9B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,GAAG,CAAkC;IAC7C,OAAO,CAAC,MAAM,CAAkC;IAChD,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,OAAO,CAAmB;gBAGhC,MAAM,CAAC,EAAE,KAAK,EAAE,EAChB,OAAO,CAAC,EAAE;QACR,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB;IAuDG,KAAK;IAKL,KAAK;IAmBL,OAAO;CA2Cd;AAED,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AAC9B,cAAc,SAAS,CAAC"}