@cartridge/controller 0.2.19 → 0.3.1

package/lib/inject.js

@@ -31,12 +31,40 @@ 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;
-const starknet_1 = require("starknet");
-const _1 = __importStar(require("."));
-class InjectedController {
-    constructor() {
+var starknet_1 = require("starknet");
+var _1 = __importStar(require("."));
+var InjectedController = /** @class */ (function () {
+    function InjectedController(policies, options) {
+        var _this = this;
         this.id = "Cartridge";
         this.name = "Cartridge";
         this.version = "0.0.1";
@@ -44,63 +72,79 @@ class InjectedController {
         this.provider = _1.providers[starknet_1.constants.StarknetChainId.MAINNET];
         this.isConnected = false;
         this.subscriptions = [];
-        this.request = (call) => {
+        this.request = function (call) {
             throw Error("Not implemented");
         };
-        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) => {
+        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) {
             if (type === "accountsChanged") {
-                this.subscriptions.push({
-                    type,
-                    handler,
+                _this.subscriptions.push({
+                    type: type,
+                    handler: handler,
                 });
             }
             else if (type === "networkChanged") {
-                this.subscriptions.push({
-                    type,
-                    handler,
+                _this.subscriptions.push({
+                    type: type,
+                    handler: handler,
                 });
             }
             else {
-                throw new Error(`Unknwown event: ${type}`);
+                throw new Error("Unknwown event: ".concat(type));
             }
         };
-        this.off = (type, handler) => {
+        this.off = function (type, handler) {
             if (type !== "accountsChanged" && type !== "networkChanged") {
-                throw new Error(`Unknwown event: ${type}`);
+                throw new Error("Unknwown event: ".concat(type));
             }
-            const idx = this.subscriptions.findIndex((userEvent) => userEvent.type === type && userEvent.handler === handler);
+            var idx = _this.subscriptions.findIndex(function (userEvent) { return userEvent.type === type && userEvent.handler === handler; });
             if (idx >= 0) {
-                this.subscriptions.splice(idx, 1);
+                _this.subscriptions.splice(idx, 1);
             }
         };
-        this.controller = new _1.default();
-        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;
+        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;
             }
         });
     }
-}
+    return InjectedController;
+}());
 exports.InjectedController = InjectedController;
-function injectController() {
-    window.starknet_cartridge = new InjectedController();
+function injectController(policies, options) {
+    window.starknet_cartridge = new InjectedController(policies, options);
 }
 exports.injectController = injectController;
 //# sourceMappingURL=inject.js.map

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":"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"}

package/lib/signer.d.ts

@@ -0,0 +1,24 @@
+import { Signature, typedData } from "starknet";
+import { Keychain, Modal } from "./types";
+import { AsyncMethodReturns } from "@cartridge/penpal";
+export declare class Signer {
+    private keychain;
+    modal: Modal;
+    constructor(keychain: AsyncMethodReturns<Keychain>, modal: Modal);
+    /**
+     * Method to get the public key of the signer
+     *
+     * @returns public key of signer as hex string with 0x prefix
+     */
+    getPubKey(): Promise<string>;
+    /**
+     * 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
+     *
+     * @param typedData - JSON object to be signed
+     * @param accountAddress - account
+     * @returns the signature of the JSON object
+     * @throws {Error} if the JSON object is not a valid JSON
+     */
+    signMessage(typedData: typedData.TypedData, account: string): Promise<Signature>;
+}

package/lib/signer.js

@@ -8,28 +8,48 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+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;
-const query_string_1 = __importDefault(require("query-string"));
-class Signer {
-    constructor(keychain, options) {
-        this.url = "https://cartridge.gg";
+var Signer = /** @class */ (function () {
+    function Signer(keychain, modal) {
         this.keychain = keychain;
-        if (options === null || options === void 0 ? void 0 : options.url) {
-            this.url = options.url;
-        }
+        this.modal = modal;
     }
     /**
      * Method to get the public key of the signer
      *
      * @returns public key of signer as hex string with 0x prefix
      */
-    getPubKey() {
+    Signer.prototype.getPubKey = function () {
         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
@@ -39,15 +59,23 @@ class Signer {
      * @returns the signature of the JSON object
      * @throws {Error} if the JSON object is not a valid JSON
      */
-    signMessage(typedData, account) {
-        return __awaiter(this, void 0, void 0, function* () {
-            window.open(`${this.url}/sign?${query_string_1.default.stringify({
-                origin: window.origin,
-                message: JSON.stringify(typedData.message),
-            })}`, "_blank", "height=650,width=400");
-            return this.keychain.signMessage(typedData, account);
+    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];
+                }
+            });
         });
-    }
-}
+    };
+    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":";;;;;;;;;;;;;;;AAIA,gEAA8B;AAK9B,MAAa,MAAM;IAIf,YAAY,QAAsC,EAAE,OAEnD;QAJO,QAAG,GAAW,sBAAsB,CAAC;QAKzC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEzB,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,EAAE;YACd,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;SAC1B;IACL,CAAC;IAED;;;;OAIG;IACI,SAAS;QACZ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC9B,CAAC;IAED;;;;;;;;OAQG;IACU,WAAW,CAAC,SAA8B,EAAE,OAAe;;YACpE,MAAM,CAAC,IAAI,CACP,GAAG,IAAI,CAAC,GAAG,SAAS,sBAAE,CAAC,SAAS,CAAC;gBAC7B,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC;aAC7C,CAAC,EAAE,EACJ,QAAQ,EACR,sBAAsB,CACzB,CAAC;YAEF,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACzD,CAAC;KAAA;CACJ;AA5CD,wBA4CC"}
+{"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"}

package/lib/types.d.ts

@@ -20,16 +20,34 @@ export declare type Policy = {
     target: string;
     method?: string;
 };
+export declare enum ResponseCodes {
+    SUCCESS = "SUCCESS",
+    NOT_CONNECTED = "NOT_CONNECTED",
+    NOT_ALLOWED = "NOT_ALLOWED",
+    CANCELED = "CANCELED"
+}
+export declare type Error = {
+    code: ResponseCodes;
+    message: string;
+};
+export declare type ConnectReply = {
+    code: ResponseCodes.SUCCESS;
+    address: string;
+    policies: Policy[];
+};
+export declare type ExecuteReply = InvokeFunctionResponse & {
+    code: ResponseCodes.SUCCESS;
+};
+export declare type ProbeReply = {
+    code: ResponseCodes.SUCCESS;
+    address: string;
+    policies: Policy[];
+};
 export interface Keychain {
-    probe(): {
-        address: string;
-        policies: Policy[];
-    };
-    connect(policies: Policy[]): {
-        address: string;
-        policies: Policy[];
-    };
+    probe(): Promise<ProbeReply | Error>;
+    connect(policies: Policy[]): Promise<ConnectReply | Error>;
     disconnect(): void;
+    reset(): void;
     revoke(origin: string): void;
     approvals(origin: string): Promise<Session | undefined>;
     estimateDeclareFee(payload: DeclareContractPayload, details?: EstimateFeeDetails & {
@@ -40,7 +58,7 @@ export interface Keychain {
     }): Promise<EstimateFee>;
     execute(calls: Call | Call[], abis?: Abi[], transactionsDetail?: InvocationsDetails & {
         chainId?: constants.StarknetChainId;
-    }, sync?: boolean): Promise<InvokeFunctionResponse>;
+    }, sync?: boolean): Promise<ExecuteReply | Error>;
     provision(address: string, credentialId: string): Promise<string>;
     register(username: string, credentialId: string, credential: {
         x: string;
@@ -48,8 +66,7 @@ export interface Keychain {
     }): Promise<{
         address: string;
         deviceKey: string;
-    }>;
-    saveDeploy(hash: string): void;
+    } | Error>;
     login(address: string, credentialId: string, options: {
         rpId?: string;
         challengeExt?: Buffer;
@@ -61,9 +78,10 @@ export interface Keychain {
     sessions(): Promise<{
         [key: string]: Session;
     }>;
-    signMessage(typedData: typedData.TypedData, account: string): Promise<Signature>;
+    signMessage(typedData: typedData.TypedData, account: string): Promise<Signature | Error>;
 }
-export interface ModalMethods {
-    onConfirm(): void;
-    onCancel(): void;
+export interface Modal {
+    element: HTMLDivElement;
+    open: () => void;
+    close: () => void;
 }

package/lib/types.js

@@ -1,3 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ResponseCodes = void 0;
+var ResponseCodes;
+(function (ResponseCodes) {
+    ResponseCodes["SUCCESS"] = "SUCCESS";
+    ResponseCodes["NOT_CONNECTED"] = "NOT_CONNECTED";
+    ResponseCodes["NOT_ALLOWED"] = "NOT_ALLOWED";
+    ResponseCodes["CANCELED"] = "CANCELED";
+})(ResponseCodes = exports.ResponseCodes || (exports.ResponseCodes = {}));
 //# sourceMappingURL=types.js.map

package/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAqCA,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,gDAA+B,CAAA;IAC/B,4CAA2B,CAAA;IAC3B,sCAAqB,CAAA;AACvB,CAAC,EALW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAKxB"}

package/lib/utils.d.ts

@@ -0,0 +1,15 @@
+import { Policy } from "./types";
+import { GraphQLClient } from "graphql-request";
+import BN from "bn.js";
+export declare const ENDPOINT: string;
+export declare const client: GraphQLClient;
+export declare function diff(a: Policy[], b: Policy[]): Policy[];
+export declare const computeAddress: (username: string, { x0, x1, x2 }: {
+    x0: BN;
+    x1: BN;
+    x2: BN;
+}, { y0, y1, y2 }: {
+    y0: BN;
+    y1: BN;
+    y2: BN;
+}, deviceKey: string) => string;

package/lib/utils.js

@@ -1,12 +1,63 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.diff = void 0;
-const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
+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.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((prev, policyA) => b.some((policyB) => (0, fast_deep_equal_1.default)(policyB, policyA)) ? prev : [...prev, policyA], []);
+    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);
+    }, []);
 }
 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");
+};
+exports.computeAddress = computeAddress;
 //# sourceMappingURL=utils.js.map

package/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAoC;AAIpC,SAAgB,IAAI,CAAC,CAAW,EAAE,CAAW;IACzC,OAAO,CAAC,CAAC,MAAM,CACX,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CACd,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,yBAAK,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,EAC5E,EAAc,CACjB,CAAC;AACN,CAAC;AAND,oBAMC"}
+{"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"}

package/package.json

@@ -1,20 +1,24 @@
 {
   "name": "@cartridge/controller",
-  "version": "0.2.19",
+  "version": "0.3.1",
   "description": "Cartridge Controller",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "build": "tsc",
+    "build": "tsc --build tsconfig.json",
     "dev": "tsc --watch",
-    "format": "prettier --write \"src/**/*.ts\" \"tests/**/*.ts\""
+    "format": "prettier --write \"src/**/*.ts\" \"tests/**/*.ts\"",
+    "gen": "graphql-codegen --config codegen.yaml"
   },
   "files": [
     "lib"
   ],
   "devDependencies": {
+    "@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",
@@ -25,8 +29,9 @@
     "@cartridge/penpal": "^6.2.3",
     "base64url": "^3.0.1",
     "bn.js": "^5.2.1",
+    "cbor-x": "^1.5.0",
     "fast-deep-equal": "^3.1.3",
     "query-string": "^7.1.1",
-    "starknet": "^4.15.1"
+    "starknet": "^4.17.1"
   }
 }

package/lib/modal.d.ts

@@ -1,8 +0,0 @@
-export interface Modal {
-    open: (src: string) => void;
-    close: () => void;
-}
-export declare const createModal: () => {
-    open: (src: string) => void;
-    close: () => void;
-};

package/lib/modal.js

@@ -1,59 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createModal = void 0;
-const penpal_1 = require("@cartridge/penpal");
-const createModal = () => {
-    const iframe = document.createElement("iframe");
-    iframe.id = "cartridge-modal";
-    iframe.style.minHeight = "600px";
-    iframe.style.minWidth = "400px";
-    iframe.style.border = "none";
-    iframe.style.borderRadius = "8px";
-    iframe.sandbox.add("allow-forms");
-    iframe.sandbox.add("allow-popups");
-    iframe.sandbox.add("allow-scripts");
-    iframe.sandbox.add("allow-same-origin");
-    iframe.allow = "publickey-credentials-get *";
-    if (!!document.hasStorageAccess) {
-        iframe.sandbox.add("allow-storage-access-by-user-activation");
-    }
-    const container = document.createElement("div");
-    container.style.position = "fixed";
-    container.style.height = "100%";
-    container.style.width = "100%";
-    container.style.top = "0";
-    container.style.left = "0";
-    container.style.zIndex = "10000";
-    container.style.backgroundColor = "rgba(0,0,0,0.5)";
-    container.style.display = "flex";
-    container.style.alignItems = "center";
-    container.style.justifyContent = "center";
-    container.style.display = "none";
-    container.appendChild(iframe);
-    document.body.appendChild(container);
-    function open(src) {
-        container.style.display = "flex";
-        iframe.src = src;
-        (0, penpal_1.connectToChild)({
-            iframe,
-            methods: {
-                onCancel: () => {
-                    close();
-                },
-                onConfirm: () => {
-                    close();
-                },
-            },
-        });
-    }
-    function close() {
-        container.style.display = "none";
-        iframe.src = "about:blank";
-    }
-    return {
-        open,
-        close,
-    };
-};
-exports.createModal = createModal;
-//# sourceMappingURL=modal.js.map

package/lib/modal.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"modal.js","sourceRoot":"","sources":["../src/modal.ts"],"names":[],"mappings":";;;AAAA,8CAAmD;AAQ5C,MAAM,WAAW,GAAG,GAAG,EAAE;IAC9B,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChD,MAAM,CAAC,EAAE,GAAG,iBAAiB,CAAC;IAC9B,MAAM,CAAC,KAAK,CAAC,SAAS,GAAG,OAAO,CAAC;IACjC,MAAM,CAAC,KAAK,CAAC,QAAQ,GAAG,OAAO,CAAC;IAChC,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;IAC7B,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC;IAClC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAClC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACnC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACpC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACxC,MAAM,CAAC,KAAK,GAAG,6BAA6B,CAAC;IAC7C,IAAI,CAAC,CAAC,QAAQ,CAAC,gBAAgB,EAAE;QAC/B,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;KAC/D;IAED,MAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAChD,SAAS,CAAC,KAAK,CAAC,QAAQ,GAAG,OAAO,CAAC;IACnC,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;IAChC,SAAS,CAAC,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC;IAC/B,SAAS,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;IAC1B,SAAS,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,CAAC;IAC3B,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC;IACjC,SAAS,CAAC,KAAK,CAAC,eAAe,GAAG,iBAAiB,CAAC;IACpD,SAAS,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;IACjC,SAAS,CAAC,KAAK,CAAC,UAAU,GAAG,QAAQ,CAAC;IACtC,SAAS,CAAC,KAAK,CAAC,cAAc,GAAG,QAAQ,CAAC;IAC1C,SAAS,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;IACjC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC9B,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAErC,SAAS,IAAI,CAAC,GAAW;QACvB,SAAS,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;QACjC,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;QACjB,IAAA,uBAAc,EAAe;YAC3B,MAAM;YACN,OAAO,EAAE;gBACP,QAAQ,EAAE,GAAG,EAAE;oBACb,KAAK,EAAE,CAAC;gBACV,CAAC;gBACD,SAAS,EAAE,GAAG,EAAE;oBACd,KAAK,EAAE,CAAC;gBACV,CAAC;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,SAAS,KAAK;QACZ,SAAS,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;QACjC,MAAM,CAAC,GAAG,GAAG,aAAa,CAAC;IAC7B,CAAC;IAED,OAAO;QACL,IAAI;QACJ,KAAK;KACN,CAAC;AACJ,CAAC,CAAC;AAxDW,QAAA,WAAW,eAwDtB"}