@cartridge/controller 0.3.1 → 0.3.3

package/lib/inject.js

@@ -31,40 +31,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.injectController = exports.InjectedController = void 0;
-var starknet_1 = require("starknet");
-var _1 = __importStar(require("."));
-var InjectedController = /** @class */ (function () {
-    function InjectedController(policies, options) {
-        var _this = this;
+const starknet_1 = require("starknet");
+const _1 = __importStar(require("."));
+class InjectedController {
+    constructor(policies, options) {
         this.id = "Cartridge";
         this.name = "Cartridge";
         this.version = "0.0.1";
@@ -72,76 +44,63 @@ var InjectedController = /** @class */ (function () {
         this.provider = _1.providers[starknet_1.constants.StarknetChainId.MAINNET];
         this.isConnected = false;
         this.subscriptions = [];
-        this.request = function (call) {
+        this.request = (call) => {
             throw Error("Not implemented");
         };
-        this.enable = function () { return __awaiter(_this, void 0, void 0, function () {
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _a = this;
-                        return [4 /*yield*/, this.controller.connect()];
-                    case 1:
-                        _a.account = _b.sent();
-                        if (!this.account) {
-                            return [2 /*return*/, []];
-                        }
-                        this.provider = _1.providers[this.controller.chainId];
-                        this.isConnected = true;
-                        return [2 /*return*/, [this.account.address]];
-                }
-            });
-        }); };
-        this.isPreauthorized = function () { return __awaiter(_this, void 0, void 0, function () {
-            var _this = this;
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.controller
-                        .ready()
-                        .then(function () {
-                        return _this.controller.probe();
-                    })
-                        .then(function (connected) { return !!connected; })];
-            });
-        }); };
-        this.on = function (type, handler) {
+        this.enable = () => __awaiter(this, void 0, void 0, function* () {
+            this.account = yield this.controller.connect();
+            if (!this.account) {
+                return [];
+            }
+            this.provider = _1.providers[this.controller.chainId];
+            this.isConnected = true;
+            return [this.account.address];
+        });
+        this.isPreauthorized = () => __awaiter(this, void 0, void 0, function* () {
+            return this.controller
+                .ready()
+                .then(() => {
+                return this.controller.probe();
+            })
+                .then((connected) => !!connected);
+        });
+        this.on = (type, handler) => {
             if (type === "accountsChanged") {
-                _this.subscriptions.push({
-                    type: type,
-                    handler: handler,
+                this.subscriptions.push({
+                    type,
+                    handler,
                 });
             }
             else if (type === "networkChanged") {
-                _this.subscriptions.push({
-                    type: type,
-                    handler: handler,
+                this.subscriptions.push({
+                    type,
+                    handler,
                 });
             }
             else {
-                throw new Error("Unknwown event: ".concat(type));
+                throw new Error(`Unknwown event: ${type}`);
             }
         };
-        this.off = function (type, handler) {
+        this.off = (type, handler) => {
             if (type !== "accountsChanged" && type !== "networkChanged") {
-                throw new Error("Unknwown event: ".concat(type));
+                throw new Error(`Unknwown event: ${type}`);
             }
-            var idx = _this.subscriptions.findIndex(function (userEvent) { return userEvent.type === type && userEvent.handler === handler; });
+            const idx = this.subscriptions.findIndex((userEvent) => userEvent.type === type && userEvent.handler === handler);
             if (idx >= 0) {
-                _this.subscriptions.splice(idx, 1);
+                this.subscriptions.splice(idx, 1);
             }
         };
         this.controller = new _1.default(policies, options);
-        this.controller.ready().then(function (isConnected) {
-            _this.isConnected = !!isConnected;
-            if (_this.controller.account) {
-                _this.account = _this.controller.account;
-                _this.provider = _1.providers[_this.controller.chainId];
-                _this.selectedAddress = _this.account.address;
+        this.controller.ready().then(isConnected => {
+            this.isConnected = !!isConnected;
+            if (this.controller.account) {
+                this.account = this.controller.account;
+                this.provider = _1.providers[this.controller.chainId];
+                this.selectedAddress = this.account.address;
             }
         });
     }
-    return InjectedController;
-}());
+}
 exports.InjectedController = InjectedController;
 function injectController(policies, options) {
     window.starknet_cartridge = new InjectedController(policies, options);

package/lib/inject.js.map

@@ -1 +1 @@
-{"version":3,"file":"inject.js","sourceRoot":"","sources":["../src/inject.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"inject.js","sourceRoot":"","sources":["../src/inject.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAqC;AAErC,sCAA0C;AAqE1C,MAAa,kBAAkB;IAc3B,YAAY,QAAmB,EAC3B,OAGC;QAjBE,OAAE,GAAG,WAAW,CAAC;QACjB,SAAI,GAAG,WAAW,CAAC;QACnB,YAAO,GAAG,OAAO,CAAC;QAClB,SAAI,GACP,w8FAAw8F,CAAC;QACt8F,aAAQ,GAAG,YAAS,CAAC,oBAAS,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACxD,gBAAW,GAAY,KAAK,CAAC;QAG7B,kBAAa,GAAmB,EAAE,CAAC;QAoB1C,YAAO,GAAG,CAAC,IAAgC,EAAiC,EAAE;YAC1E,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;QAClC,CAAC,CAAA;QAED,WAAM,GAAG,GAA4B,EAAE;YACnC,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAA;YAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACf,OAAO,EAAE,CAAC;aACb;YAED,IAAI,CAAC,QAAQ,GAAG,YAAS,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACnD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YACxB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC,CAAA,CAAA;QAED,oBAAe,GAAG,GAA2B,EAAE;YAC3C,OAAO,IAAI,CAAC,UAAU;iBACjB,KAAK,EAAE;iBACP,IAAI,CAAC,GAAG,EAAE;gBACP,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YACnC,CAAC,CAAC;iBACD,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC1C,CAAC,CAAA,CAAC;QAEF,OAAE,GAAG,CAAC,IAAe,EAAE,OAAqB,EAAQ,EAAE;YAClD,IAAI,IAAI,KAAK,iBAAiB,EAAE;gBAC5B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;oBACpB,IAAI;oBACJ,OAAO;iBACV,CAAC,CAAC;aACN;iBAAM,IAAI,IAAI,KAAK,gBAAgB,EAAE;gBAClC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;oBACpB,IAAI;oBACJ,OAAO;iBACV,CAAC,CAAC;aACN;iBAAM;gBACH,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;aAC9C;QACL,CAAC,CAAC;QAEF,QAAG,GAAG,CAAC,IAAe,EAAE,OAAqB,EAAQ,EAAE;YACnD,IAAI,IAAI,KAAK,iBAAiB,IAAI,IAAI,KAAK,gBAAgB,EAAE;gBACzD,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;aAC9C;YAED,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CACpC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,IAAI,SAAS,CAAC,OAAO,KAAK,OAAO,CAC1E,CAAC;YAEF,IAAI,GAAG,IAAI,CAAC,EAAE;gBACV,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;aACrC;QACL,CAAC,CAAC;QA/DE,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YACvC,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,WAAW,CAAC;YACjC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE;gBACzB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;gBACvC,IAAI,CAAC,QAAQ,GAAG,YAAS,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBACnD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;aAC/C;QACL,CAAC,CAAC,CAAA;IACN,CAAC;CAuDJ;AAnFD,gDAmFC;AAED,SAAS,gBAAgB,CAAC,QAAmB,EACzC,OAGC;IACA,MAAc,CAAC,kBAAkB,GAAG,IAAI,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AACnF,CAAC;AAEQ,4CAAgB"}

package/lib/signer.js

@@ -8,37 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Signer = void 0;
-var Signer = /** @class */ (function () {
-    function Signer(keychain, modal) {
+class Signer {
+    constructor(keychain, modal) {
         this.keychain = keychain;
         this.modal = modal;
     }
@@ -47,9 +20,9 @@ var Signer = /** @class */ (function () {
      *
      * @returns public key of signer as hex string with 0x prefix
      */
-    Signer.prototype.getPubKey = function () {
+    getPubKey() {
         return Promise.resolve("");
-    };
+    }
     /**
      * Sign an JSON object for off-chain usage with the starknet private key and return the signature
      * This adds a message prefix so it cant be interchanged with transactions
@@ -59,23 +32,14 @@ var Signer = /** @class */ (function () {
      * @returns the signature of the JSON object
      * @throws {Error} if the JSON object is not a valid JSON
      */
-    Signer.prototype.signMessage = function (typedData, account) {
-        return __awaiter(this, void 0, void 0, function () {
-            var res;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        this.modal.open();
-                        return [4 /*yield*/, this.keychain.signMessage(typedData, account)];
-                    case 1:
-                        res = _a.sent();
-                        this.modal.close();
-                        return [2 /*return*/, res];
-                }
-            });
+    signMessage(typedData, account) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.modal.open();
+            const res = yield this.keychain.signMessage(typedData, account);
+            this.modal.close();
+            return res;
         });
-    };
-    return Signer;
-}());
+    }
+}
 exports.Signer = Signer;
 //# sourceMappingURL=signer.js.map

package/lib/signer.js.map

@@ -1 +1 @@
-{"version":3,"file":"signer.js","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA;IAGE,gBAAY,QAAsC,EAAE,KAAY;QAC9D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED;;;;OAIG;IACI,0BAAS,GAAhB;QACE,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC;IAED;;;;;;;;OAQG;IACU,4BAAW,GAAxB,UACE,SAA8B,EAC9B,OAAe;;;;;;wBAEf,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;wBACN,qBAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,EAAA;;wBAAzD,GAAG,GAAG,SAAmD;wBAC/D,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;wBACnB,sBAAO,GAAgB,EAAC;;;;KACzB;IACH,aAAC;AAAD,CAAC,AAnCD,IAmCC;AAnCY,wBAAM"}
+{"version":3,"file":"signer.js","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,MAAa,MAAM;IAGjB,YAAY,QAAsC,EAAE,KAAY;QAC9D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED;;;;OAIG;IACI,SAAS;QACd,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC;IAED;;;;;;;;OAQG;IACU,WAAW,CACtB,SAA8B,EAC9B,OAAe;;YAEf,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAClB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAChE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACnB,OAAO,GAAgB,CAAC;QAC1B,CAAC;KAAA;CACF;AAnCD,wBAmCC"}

package/lib/utils.d.ts

@@ -1,5 +1,6 @@
 import { Policy } from "./types";
 import { GraphQLClient } from "graphql-request";
+import { number, Signature, Provider } from "starknet";
 import BN from "bn.js";
 export declare const ENDPOINT: string;
 export declare const client: GraphQLClient;
@@ -13,3 +14,9 @@ export declare const computeAddress: (username: string, { x0, x1, x2 }: {
     y1: BN;
     y2: BN;
 }, deviceKey: string) => string;
+export declare const verifyMessageHash: (provider: Provider, address: string, messageHash: number.BigNumberish, signature: Signature) => Promise<boolean>;
+export declare function split(n: BN): {
+    x: BN;
+    y: BN;
+    z: BN;
+};

package/lib/utils.js

@@ -1,63 +1,101 @@
 "use strict";
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-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));
+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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.computeAddress = exports.diff = exports.client = exports.ENDPOINT = void 0;
-var fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
-var graphql_request_1 = require("graphql-request");
-var starknet_1 = require("starknet");
-var constants_1 = require("@cartridge/controller/src/constants");
+exports.split = exports.verifyMessageHash = exports.computeAddress = exports.diff = exports.client = exports.ENDPOINT = void 0;
+const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
+const graphql_request_1 = require("graphql-request");
+const starknet_1 = require("starknet");
+const constants_1 = require("./constants");
+const graphql_1 = require("./generated/graphql");
+const cbor_x_1 = require("cbor-x");
 exports.ENDPOINT = process.env.NEXT_PUBLIC_API_URL;
 exports.client = new graphql_request_1.GraphQLClient(exports.ENDPOINT, { credentials: "include" });
 function diff(a, b) {
-    return a.reduce(function (prev, policyA) {
-        return b.some(function (policyB) { return (0, fast_deep_equal_1.default)(policyB, policyA); }) ? prev : __spreadArray(__spreadArray([], __read(prev), false), [policyA], false);
-    }, []);
+    return a.reduce((prev, policyA) => b.some((policyB) => (0, fast_deep_equal_1.default)(policyB, policyA)) ? prev : [...prev, policyA], []);
 }
 exports.diff = diff;
-var computeAddress = function (username, _a, _b, deviceKey) {
-    var x0 = _a.x0, x1 = _a.x1, x2 = _a.x2;
-    var y0 = _b.y0, y1 = _b.y1, y2 = _b.y2;
-    return starknet_1.hash.calculateContractAddressFromHash(starknet_1.shortString.encodeShortString(username), starknet_1.number.toBN(constants_1.PROXY_CLASS), [
-        starknet_1.number.toBN(constants_1.CLASS_HASHES["0.0.1"].account),
-        starknet_1.hash.getSelectorFromName("initialize"),
-        "9",
-        starknet_1.number.toBN(constants_1.CLASS_HASHES["0.0.1"].controller),
-        "7",
-        x0,
-        x1,
-        x2,
-        y0,
-        y1,
-        y2,
-        starknet_1.number.toBN(deviceKey),
-    ], "0");
-};
+const computeAddress = (username, { x0, x1, x2 }, { y0, y1, y2 }, deviceKey) => starknet_1.hash.calculateContractAddressFromHash(starknet_1.shortString.encodeShortString(username), starknet_1.number.toBN(constants_1.PROXY_CLASS), [
+    starknet_1.number.toBN(constants_1.CLASS_HASHES["0.0.1"].account),
+    starknet_1.hash.getSelectorFromName("initialize"),
+    "9",
+    starknet_1.number.toBN(constants_1.CLASS_HASHES["0.0.1"].controller),
+    "7",
+    x0,
+    x1,
+    x2,
+    y0,
+    y1,
+    y2,
+    starknet_1.number.toBN(deviceKey),
+], "0");
 exports.computeAddress = computeAddress;
+const verifyMessageHash = (provider, address, messageHash, signature) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c;
+    const isDeployed = !!provider.getClassHashAt(address, "latest");
+    if (isDeployed) {
+        const res = yield provider.callContract({
+            contractAddress: address,
+            entrypoint: "executeOnPlugin",
+            calldata: [
+                constants_1.CLASS_HASHES["0.0.1"].controller,
+                starknet_1.hash.getSelector("is_public_key"),
+                "0x1",
+                signature[0],
+            ],
+        });
+        const isRegistered = (res === null || res === void 0 ? void 0 : res.result[0]) === "0x1";
+        if (isRegistered) {
+            const keyPair = starknet_1.ec.getKeyPairFromPublicKey(signature[0]);
+            return starknet_1.ec.verify(keyPair, starknet_1.number.toBN(messageHash).toString(), signature);
+        }
+        else {
+            const res = yield provider.callContract({
+                contractAddress: address,
+                entrypoint: "isValidSignature",
+                calldata: [messageHash, signature.length, ...signature],
+            }, "latest");
+            return (res === null || res === void 0 ? void 0 : res.result[0]) === "0x1";
+        }
+    }
+    else {
+        const res = yield exports.client.request(graphql_1.AccountDocument, {
+            address,
+        });
+        const account = (_c = (_b = (_a = res === null || res === void 0 ? void 0 : res.accounts) === null || _a === void 0 ? void 0 : _a.edges) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.node;
+        if (!account) {
+            return false;
+        }
+        const pubKeyCbor = (0, cbor_x_1.decode)(starknet_1.number.toBN(account.credential.publicKey).toBuffer())[0];
+        const x = starknet_1.number.toBN("0x" + pubKeyCbor[-2].toString("hex"));
+        const y = starknet_1.number.toBN("0x" + pubKeyCbor[-3].toString("hex"));
+        const { x: x0, y: x1, z: x2 } = split(x);
+        const { x: y0, y: y1, z: y2 } = split(y);
+        const computedAddress = (0, exports.computeAddress)(account.id, { x0, x1, x2 }, { y0, y1, y2 }, signature[0]);
+        if (computedAddress !== address) {
+            throw new Error("invalid public key");
+        }
+        const keyPair = starknet_1.ec.getKeyPairFromPublicKey(signature[0]);
+        return starknet_1.ec.verify(keyPair, starknet_1.number.toBN(messageHash).toString(), signature);
+    }
+});
+exports.verifyMessageHash = verifyMessageHash;
+const BASE = starknet_1.number.toBN(2).pow(starknet_1.number.toBN(86));
+function split(n) {
+    const x = n.mod(BASE);
+    const y = n.div(BASE).mod(BASE);
+    const z = n.div(BASE).div(BASE);
+    return { x, y, z };
+}
+exports.split = split;
 //# sourceMappingURL=utils.js.map

package/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oEAAoC;AAEpC,mDAAgD;AAChD,qCAAqD;AAErD,iEAAgF;AAEnE,QAAA,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAoB,CAAC;AAE5C,QAAA,MAAM,GAAG,IAAI,+BAAa,CAAC,gBAAQ,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC;AAE9E,SAAgB,IAAI,CAAC,CAAW,EAAE,CAAW;IAC3C,OAAO,CAAC,CAAC,MAAM,CACb,UAAC,IAAI,EAAE,OAAO;QACZ,OAAA,CAAC,CAAC,IAAI,CAAC,UAAC,OAAO,IAAK,OAAA,IAAA,yBAAK,EAAC,OAAO,EAAE,OAAO,CAAC,EAAvB,CAAuB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,wCAAK,IAAI,YAAE,OAAO,SAAC;IAAxE,CAAwE,EAC1E,EAAc,CACf,CAAC;AACJ,CAAC;AAND,oBAMC;AAEM,IAAM,cAAc,GAAG,UAC5B,QAAgB,EAChB,EAA0C,EAC1C,EAA0C,EAC1C,SAAiB;QAFf,EAAE,QAAA,EAAE,EAAE,QAAA,EAAE,EAAE,QAAA;QACV,EAAE,QAAA,EAAE,EAAE,QAAA,EAAE,EAAE,QAAA;IAGZ,OAAA,eAAI,CAAC,gCAAgC,CACnC,sBAAW,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EACvC,iBAAM,CAAC,IAAI,CAAC,uBAAW,CAAC,EACxB;QACE,iBAAM,CAAC,IAAI,CAAC,wBAAY,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;QAC1C,eAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC;QACtC,GAAG;QACH,iBAAM,CAAC,IAAI,CAAC,wBAAY,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;QAC7C,GAAG;QACH,EAAE;QACF,EAAE;QACF,EAAE;QACF,EAAE;QACF,EAAE;QACF,EAAE;QACF,iBAAM,CAAC,IAAI,CAAC,SAAS,CAAC;KACvB,EACD,GAAG,CACJ;AAlBD,CAkBC,CAAC;AAxBS,QAAA,cAAc,kBAwBvB"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cartridge/controller",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Cartridge Controller",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -17,8 +17,6 @@
     "@graphql-codegen/cli": "^2.16.4",
     "@types/jest": "^26.0.18",
     "@types/node": "^17.0.23",
-    "graphql": "^16.3.0",
-    "graphql-request": "^5.0.0",
     "jest": "^26.6.3",
     "ts-jest": "^26.5.1",
     "ts-node": "^10.4.0",
@@ -31,7 +29,10 @@
     "bn.js": "^5.2.1",
     "cbor-x": "^1.5.0",
     "fast-deep-equal": "^3.1.3",
+    "graphql": "^16.3.0",
+    "graphql-request": "^5.0.0",
     "query-string": "^7.1.1",
+    "react-query": "^3.39.2",
     "starknet": "^4.17.1"
   }
 }