@cartridge/controller 0.1.52 → 0.1.54

package/lib/account.d.ts

@@ -0,0 +1,57 @@
+import { Account, DeployContractPayload, Abi, Call, EstimateFeeDetails, DeployContractResponse as StarknetDeployContractResponse, InvocationsDetails, Signature, typedData, InvokeFunctionResponse, EstimateFee } from "starknet";
+import { Scope, Keychain } from "./types";
+import { AsyncMethodReturns } from "@cartridge/penpal";
+declare class CartridgeAccount extends Account {
+    address: string;
+    private keychain;
+    private url;
+    constructor(address: string, scopes: Scope[] | undefined, keychain: AsyncMethodReturns<Keychain>, options?: {
+        url?: string;
+    });
+    /**
+     * Deploys a given compiled contract (json) to starknet
+     *
+     * @param payload payload to be deployed containing:
+     * - compiled contract code
+     * - constructor calldata
+     * - address salt
+     * @param abi the abi of the contract
+     * @returns a confirmation of sending a transaction on the starknet contract
+     */
+    deployContract(payload: DeployContractPayload, abi?: Abi): Promise<StarknetDeployContractResponse>;
+    /**
+       * Estimate Fee for a method on starknet
+       *
+       * @param calls the invocation object containing:
+       * - contractAddress - the address of the contract
+       * - entrypoint - the entrypoint of the contract
+       * - calldata - (defaults to []) the calldata
+       * - signature - (defaults to []) the signature
+       *
+       * @returns response from addTransaction
+       */
+    estimateFee(calls: Call | Call[], details?: EstimateFeeDetails): Promise<EstimateFee>;
+    /**
+     * Invoke execute function in account contract
+     *
+     * @param calls the invocation object or an array of them, containing:
+     * - contractAddress - the address of the contract
+     * - entrypoint - the entrypoint of the contract
+     * - calldata - (defaults to []) the calldata
+     * - signature - (defaults to []) the signature
+     * @param abis (optional) the abi of the contract for better displaying
+     *
+     * @returns response from addTransaction
+     */
+    execute(calls: Call | Call[], abis?: Abi[], transactionsDetail?: InvocationsDetails): Promise<InvokeFunctionResponse>;
+    /**
+     * 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 json - JSON object to be signed
+     * @returns the signature of the JSON object
+     * @throws {Error} if the JSON object is not a valid JSON
+     */
+    signMessage(typedData: typedData.TypedData): Promise<Signature>;
+}
+export default CartridgeAccount;

package/lib/account.js

@@ -14,17 +14,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const cuid_1 = __importDefault(require("cuid"));
 const starknet_1 = require("starknet");
-const number_1 = require("starknet/utils/number");
 const query_string_1 = __importDefault(require("query-string"));
 const signer_1 = require("./signer");
+const constants_1 = require("starknet/constants");
 class CartridgeAccount extends starknet_1.Account {
-    constructor(address, scopes = [], messenger, options) {
-        super(starknet_1.defaultProvider, address, new signer_1.Signer(messenger, options));
+    constructor(address, scopes = [], keychain, options) {
+        super(starknet_1.defaultProvider, address, new signer_1.Signer(keychain, options));
         this.url = "https://x.cartridge.gg";
-        this._scopes = [];
         this.address = address;
-        this.messenger = messenger;
-        this._scopes = scopes;
+        this.keychain = keychain;
         if (options === null || options === void 0 ? void 0 : options.url) {
             this.url = options.url;
         }
@@ -43,18 +41,19 @@ class CartridgeAccount extends starknet_1.Account {
         return __awaiter(this, void 0, void 0, function* () {
             const id = (0, cuid_1.default)();
             window.open(`${this.url}/deploy?origin=${encodeURIComponent(window.origin)}&id=${id}`, "_blank", "height=650,width=400");
-            const response = yield this.messenger.send({
-                method: "deploy-contract",
-                params: {
-                    id,
-                    payload,
-                    abi,
-                },
-            });
-            if (response.error) {
-                throw new Error(response.error);
-            }
-            return response.result;
+            throw new Error("unimplemented");
+            // const response = await this.messenger.send<DeployContractResponse>({
+            //   method: "deploy-contract",
+            //   params: {
+            //     id,
+            //     payload,
+            //     abi,
+            //   },
+            // });
+            // if (response.error) {
+            //   throw new Error(response.error as string);
+            // }
+            // return response.result!;
         });
     }
     /**
@@ -68,21 +67,9 @@ class CartridgeAccount extends starknet_1.Account {
        *
        * @returns response from addTransaction
        */
-    estimateFee(calls, { nonce: providedNonce, blockIdentifier } = {}) {
+    estimateFee(calls, details) {
         return __awaiter(this, void 0, void 0, function* () {
-            const nonce = (0, number_1.toBN)(providedNonce !== null && providedNonce !== void 0 ? providedNonce : (yield this.getNonce()));
-            const response = yield this.messenger.send({
-                method: "estimate-fee",
-                params: {
-                    calls,
-                    nonce,
-                    blockIdentifier,
-                },
-            });
-            if (response.error) {
-                throw new Error(response.error);
-            }
-            return response.result;
+            return this.keychain.estimateFee(calls, details);
         });
     }
     /**
@@ -99,39 +86,42 @@ class CartridgeAccount extends starknet_1.Account {
      */
     execute(calls, abis, transactionsDetail) {
         return __awaiter(this, void 0, void 0, function* () {
-            let response = yield this.messenger.send({
-                method: "execute",
-                params: {
-                    calls,
-                    abis,
-                    transactionsDetail,
-                },
-            });
-            if (response.result) {
-                return response.result;
+            if (!transactionsDetail) {
+                transactionsDetail = {};
             }
-            if (response.error && response.error !== "missing scopes") {
-                throw new Error(response.error);
+            if (!transactionsDetail.nonce) {
+                transactionsDetail.nonce = 0; //await this.getNonce();
+            }
+            if (!transactionsDetail.version) {
+                transactionsDetail.version = 1;
+            }
+            if (!transactionsDetail.maxFee) {
+                try {
+                    transactionsDetail.maxFee = "100"; // (await this.estimateFee(calls, { nonce: transactionsDetail.nonce })).suggestedMaxFee
+                }
+                catch (e) {
+                    console.error(e);
+                    throw e;
+                }
+            }
+            try {
+                return yield this.keychain.execute(calls, abis, transactionsDetail);
+            }
+            catch (e) {
+                if (e.message !== "missing scopes") {
+                    console.error(e);
+                    throw e;
+                }
             }
-            const id = (0, cuid_1.default)();
             window.open(`${this.url}/execute?${query_string_1.default.stringify({
-                id,
                 origin: window.origin,
                 calls: JSON.stringify(calls),
+                nonce: transactionsDetail.nonce,
+                version: transactionsDetail.version,
+                maxFee: transactionsDetail.maxFee,
+                chainId: constants_1.StarknetChainId.TESTNET,
             })}`, "_blank", "height=650,width=400");
-            response = yield this.messenger.send({
-                method: "execute",
-                params: {
-                    id,
-                    calls,
-                    abis,
-                    transactionsDetail,
-                },
-            });
-            if (response.error) {
-                throw new Error(response.error);
-            }
-            return response.result;
+            return this.keychain.execute(calls, abis, transactionsDetail, true);
         });
     }
     /**
@@ -144,23 +134,10 @@ class CartridgeAccount extends starknet_1.Account {
      */
     signMessage(typedData) {
         return __awaiter(this, void 0, void 0, function* () {
-            const id = (0, cuid_1.default)();
             window.open(`${this.url}/sign?${query_string_1.default.stringify({
-                id,
-                origin: window.origin,
                 typedData: JSON.stringify(typedData),
             })}`, "_blank", "height=650,width=400");
-            const response = yield this.messenger.send({
-                method: "sign-message",
-                params: {
-                    id,
-                    typedData,
-                },
-            });
-            if (response.error) {
-                throw new Error(response.error);
-            }
-            return response.result;
+            return this.keychain.signMessage(typedData, this.address);
         });
     }
 }

package/lib/account.js.map

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

package/lib/errors.d.ts

@@ -0,0 +1,5 @@
+import { Scope } from "./types";
+export declare class MissingScopes extends Error {
+    missing: Scope[];
+    constructor(missing: Scope[]);
+}

package/lib/errors.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MissingScopes = void 0;
+class MissingScopes extends Error {
+    constructor(missing) {
+        super("missing scopes");
+        this.missing = missing;
+        // because we are extending a built-in class
+        Object.setPrototypeOf(this, MissingScopes.prototype);
+    }
+}
+exports.MissingScopes = MissingScopes;
+//# sourceMappingURL=errors.js.map

package/lib/errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":";;;AAEA,MAAa,aAAc,SAAQ,KAAK;IAGpC,YAAY,OAAgB;QACxB,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAExB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,4CAA4C;QAC5C,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IACzD,CAAC;CACJ;AAXD,sCAWC"}

package/lib/index.d.ts

@@ -1,9 +1,9 @@
 import { AccountInterface } from "starknet";
-import Messenger, { Message } from "./messenger";
 import { Scope } from "./types";
 declare class Controller {
     private selector;
-    private messenger?;
+    private connection?;
+    private keychain?;
     private scopes;
     private url;
     private loading;
@@ -14,17 +14,17 @@ declare class Controller {
         origin?: string;
     });
     ready(): Promise<boolean | undefined>;
-    probe(): Promise<AccountInterface | undefined>;
+    probe(): Promise<boolean | null>;
     register(username: string, credential: {
         x: string;
         y: string;
     }): Promise<{
         address: string;
         deviceKey: string;
-    }>;
+    } | null | undefined>;
     connect(): Promise<AccountInterface | null>;
+    disconnect(): Promise<void | null>;
 }
 export default Controller;
-export type { Message };
-export { Messenger };
 export * from "./types";
+export * from "./errors";

package/lib/index.js

@@ -26,12 +26,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Messenger = void 0;
-const cuid_1 = __importDefault(require("cuid"));
 const query_string_1 = __importDefault(require("query-string"));
+const penpal_1 = require("@cartridge/penpal");
 const account_1 = __importDefault(require("./account"));
-const messenger_1 = __importDefault(require("./messenger"));
-exports.Messenger = messenger_1.default;
 class Controller {
     constructor(scopes, options) {
         this.selector = "cartridge-messenger";
@@ -44,87 +41,83 @@ class Controller {
         if (options === null || options === void 0 ? void 0 : options.url) {
             this.url = options.url;
         }
-        if (typeof document !== "undefined") {
-            this.ready_ = new Promise((resolve, reject) => {
-                window.addEventListener("message", (e) => __awaiter(this, void 0, void 0, function* () {
-                    if (e.data.target === "cartridge" &&
-                        e.data.payload.method === "ready") {
-                        yield this.probe();
-                        this.loading = false;
-                        resolve(true);
-                    }
-                }));
-            });
+        if (typeof document === "undefined") {
+            return;
         }
-        if (typeof document !== "undefined" && !this.messenger) {
-            let iframe = document.getElementById(this.selector);
-            if (!!iframe) {
-                if (!this.messenger) {
-                    this.messenger = new messenger_1.default(iframe.contentWindow, this.url);
-                }
-            }
-            else {
-                iframe = document.createElement("iframe");
-                iframe.id = this.selector;
-                iframe.src = `${this.url}`;
-                iframe.style.opacity = "0";
-                iframe.style.height = "0";
-                iframe.style.width = "0";
-                iframe.sandbox.add("allow-scripts");
-                iframe.sandbox.add("allow-same-origin");
-                if (!!document.hasStorageAccess) {
-                    iframe.sandbox.add("allow-storage-access-by-user-activation");
-                }
+        const iframe = document.createElement("iframe");
+        iframe.id = this.selector;
+        iframe.src = this.url;
+        iframe.style.opacity = "0";
+        iframe.style.height = "0";
+        iframe.style.width = "0";
+        iframe.sandbox.add("allow-scripts");
+        iframe.sandbox.add("allow-same-origin");
+        if (!!document.hasStorageAccess) {
+            iframe.sandbox.add("allow-storage-access-by-user-activation");
+        }
+        if (document.readyState === 'complete' ||
+            document.readyState === 'interactive') {
+            document.body.appendChild(iframe);
+        }
+        else {
+            document.addEventListener('DOMContentLoaded', () => {
                 document.body.appendChild(iframe);
-                this.messenger = new messenger_1.default(iframe.contentWindow, this.url);
-            }
+            });
         }
+        this.connection = (0, penpal_1.connectToChild)({
+            iframe,
+            debug: true,
+        });
+        this.connection.promise.then((keychain) => this.keychain = keychain).then(() => this.probe());
     }
     ready() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.loading)
-                return Promise.resolve(true);
-            return this.ready_;
+            return (_a = this.connection) === null || _a === void 0 ? void 0 : _a.promise.then(() => this.probe()).then((res) => !!res, () => false);
         });
     }
     probe() {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const probe = yield ((_a = this.messenger) === null || _a === void 0 ? void 0 : _a.send({
-                method: "probe",
-            }));
-            if (this.messenger && ((_b = probe === null || probe === void 0 ? void 0 : probe.result) === null || _b === void 0 ? void 0 : _b.address)) {
-                this.account = new account_1.default(probe.result.address, probe.result.scopes, this.messenger, {
+            if (!this.keychain) {
+                console.error("not ready for connect");
+                return null;
+            }
+            try {
+                const { address, scopes } = yield this.keychain.probe();
+                this.account = new account_1.default(address, scopes, this.keychain, {
                     url: this.url,
                 });
-                return this.account;
             }
+            catch (e) {
+                console.error(e);
+            }
+            return !!this.account;
         });
     }
     // Register a new device key.
     register(username, credential) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const register = yield ((_a = this.messenger) === null || _a === void 0 ? void 0 : _a.send({
-                method: "register",
-                params: {
-                    username,
-                    credential
-                }
-            }));
-            if (!register || register.error) {
-                throw new Error("registration error");
+            if (!this.keychain) {
+                console.error("not ready for connect");
+                return null;
+            }
+            try {
+                return yield this.keychain.register(username, credential);
+            }
+            catch (e) {
+                console.error(e);
             }
-            return register.result;
         });
     }
     connect() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const id = (0, cuid_1.default)();
             if (this.account) {
                 return this.account;
             }
+            if (!this.keychain) {
+                console.error("not ready for connect");
+                return null;
+            }
             if (!!document.hasStorageAccess) {
                 const ok = yield document.hasStorageAccess();
                 if (!ok) {
@@ -132,28 +125,33 @@ class Controller {
                 }
             }
             window.open(`${this.url}/connect?${query_string_1.default.stringify({
-                id,
                 origin: window.origin,
                 scopes: JSON.stringify(this.scopes),
             })}`, "_blank", "height=650,width=400");
-            const response = yield ((_a = this.messenger) === null || _a === void 0 ? void 0 : _a.send({
-                method: "connect",
-                params: {
-                    id,
-                    scopes: this.scopes,
-                },
-            }));
-            if (!this.messenger || !response || response.error || !response.result) {
-                console.error("not ready for connect");
-                return null;
-            }
-            this.account = new account_1.default(response.result.address, response.result.scopes, this.messenger, {
+            const response = yield this.keychain.connect(this.scopes);
+            this.account = new account_1.default(response.address, response.scopes, this.keychain, {
                 url: this.url,
             });
             return this.account;
         });
     }
+    disconnect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.keychain) {
+                console.error("not ready for connect");
+                return null;
+            }
+            if (!!document.hasStorageAccess) {
+                const ok = yield document.hasStorageAccess();
+                if (!ok) {
+                    yield document.requestStorageAccess();
+                }
+            }
+            return yield this.keychain.disconnect();
+        });
+    }
 }
 exports.default = Controller;
 __exportStar(require("./types"), exports);
+__exportStar(require("./errors"), exports);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

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

package/lib/signer.d.ts

@@ -0,0 +1,39 @@
+import { Abi, InvocationsSignerDetails, SignerInterface, Signature, typedData, Call } from "starknet";
+import { Keychain } from "./types";
+import { AsyncMethodReturns } from "@cartridge/penpal";
+export declare class Signer implements SignerInterface {
+    private keychain;
+    private url;
+    constructor(keychain: AsyncMethodReturns<Keychain>, options?: {
+        url?: string;
+    });
+    /**
+   * 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>;
+    /**
+     * Signs a transaction with the starknet private key and returns the signature
+     *
+     * @param invocation the invocation object containing:
+     * - contractAddress - the address of the contract
+     * - entrypoint - the entrypoint of the contract
+     * - calldata - (defaults to []) the calldata
+     * - signature - (defaults to []) the signature
+     * @param abi (optional) the abi of the contract for better displaying
+     *
+     * @returns signature
+     */
+    signTransaction(calls: Call[], transactionsDetail: InvocationsSignerDetails, abis?: Abi[]): Promise<Signature>;
+}

package/lib/signer.js

@@ -16,9 +16,9 @@ exports.Signer = void 0;
 const query_string_1 = __importDefault(require("query-string"));
 const cuid_1 = __importDefault(require("cuid"));
 class Signer {
-    constructor(messenger, options) {
+    constructor(keychain, options) {
         this.url = "https://cartridge.gg";
-        this.messenger = messenger;
+        this.keychain = keychain;
         if (options === null || options === void 0 ? void 0 : options.url) {
             this.url = options.url;
         }
@@ -48,18 +48,7 @@ class Signer {
                 origin: window.origin,
                 message: JSON.stringify(typedData.message),
             })}`, "_blank", "height=650,width=400");
-            const response = yield this.messenger.send({
-                method: "sign-message",
-                params: {
-                    id,
-                    account,
-                    typedData,
-                },
-            });
-            if (response.error) {
-                throw new Error(response.error);
-            }
-            return response.result;
+            return this.keychain.signMessage(typedData, account);
         });
     }
     /**
@@ -74,28 +63,13 @@ class Signer {
      *
      * @returns signature
      */
-    signTransaction(transactions, transactionsDetail, abis) {
+    signTransaction(calls, transactionsDetail, abis) {
         return __awaiter(this, void 0, void 0, function* () {
-            const id = (0, cuid_1.default)();
-            const calls = Array.isArray(transactions) ? transactions : [transactions];
             window.open(`${this.url}/sign?${query_string_1.default.stringify({
-                id,
                 origin: window.origin,
                 calls: JSON.stringify(calls),
             })}`, "_blank", "height=650,width=400");
-            const response = yield this.messenger.send({
-                method: "sign-transaction",
-                params: {
-                    id,
-                    transactions,
-                    abis,
-                    transactionsDetail,
-                },
-            });
-            if (response.error) {
-                throw new Error(response.error);
-            }
-            return response.result;
+            return this.keychain.signTransaction(calls, transactionsDetail, abis);
         });
     }
 }

package/lib/signer.js.map

@@ -1 +1 @@
-{"version":3,"file":"signer.js","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAQA,gEAA8B;AAC9B,gDAAwB;AAQxB,MAAa,MAAM;IAIf,YAAY,SAAoB,EAAE,OAEjC;QAJO,QAAG,GAAW,sBAAsB,CAAC;QAKzC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAE3B,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,EAAE;YACd,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;SAC1B;IACL,CAAC;IAED;;;;KAIC;IACM,SAAS;QACZ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC9B,CAAC;IAED;;;;;;;;OAQG;IACU,WAAW,CAAC,SAA8B,EAAE,OAAe;;YACpE,MAAM,EAAE,GAAG,IAAA,cAAI,GAAE,CAAA;YAEjB,MAAM,CAAC,IAAI,CACP,GAAG,IAAI,CAAC,GAAG,SAAS,sBAAE,CAAC,SAAS,CAAC;gBAC7B,EAAE;gBACF,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,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAsB;gBAC5D,MAAM,EAAE,cAAc;gBACtB,MAAM,EAAE;oBACJ,EAAE;oBACF,OAAO;oBACP,SAAS;iBACZ;aACJ,CAAC,CAAC;YAEH,IAAI,QAAQ,CAAC,KAAK,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAe,CAAC,CAAC;aAC7C;YAED,OAAO,QAAQ,CAAC,MAAO,CAAC;QAC5B,CAAC;KAAA;IAED;;;;;;;;;;;OAWG;IACU,eAAe,CACxB,YAA0B,EAC1B,kBAA4C,EAC5C,IAAY;;YAEZ,MAAM,EAAE,GAAG,IAAA,cAAI,GAAE,CAAA;YACjB,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;YAE1E,MAAM,CAAC,IAAI,CACP,GAAG,IAAI,CAAC,GAAG,SAAS,sBAAE,CAAC,SAAS,CAAC;gBAC7B,EAAE;gBACF,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;aAC/B,CAAC,EAAE,EACJ,QAAQ,EACR,sBAAsB,CACzB,CAAC;YAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAA0B;gBAChE,MAAM,EAAE,kBAAkB;gBAC1B,MAAM,EAAE;oBACJ,EAAE;oBACF,YAAY;oBACZ,IAAI;oBACJ,kBAAkB;iBACrB;aACJ,CAAC,CAAC;YAEH,IAAI,QAAQ,CAAC,KAAK,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAe,CAAC,CAAC;aAC7C;YAED,OAAO,QAAQ,CAAC,MAAO,CAAC;QAC5B,CAAC;KAAA;CACJ;AA3GD,wBA2GC"}
+{"version":3,"file":"signer.js","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAQA,gEAA8B;AAC9B,gDAAwB;AAKxB,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;;;;KAIC;IACM,SAAS;QACZ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC9B,CAAC;IAED;;;;;;;;OAQG;IACU,WAAW,CAAC,SAA8B,EAAE,OAAe;;YACpE,MAAM,EAAE,GAAG,IAAA,cAAI,GAAE,CAAA;YAEjB,MAAM,CAAC,IAAI,CACP,GAAG,IAAI,CAAC,GAAG,SAAS,sBAAE,CAAC,SAAS,CAAC;gBAC7B,EAAE;gBACF,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;IAED;;;;;;;;;;;OAWG;IACU,eAAe,CACxB,KAAa,EACb,kBAA4C,EAC5C,IAAY;;YAEZ,MAAM,CAAC,IAAI,CACP,GAAG,IAAI,CAAC,GAAG,SAAS,sBAAE,CAAC,SAAS,CAAC;gBAC7B,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;aAC/B,CAAC,EAAE,EACJ,QAAQ,EACR,sBAAsB,CACzB,CAAC;YAEF,OAAO,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC;QAC1E,CAAC;KAAA;CACJ;AA5ED,wBA4EC"}

package/lib/types.d.ts

@@ -1,130 +1,32 @@
-import { DeployContractPayload, DeployContractResponse as StarknetDeployContractResponse, Abi, Call, InvocationsDetails, typedData, InvokeFunctionResponse, Signature } from "starknet";
+import { Abi, Call, InvocationsDetails, typedData, InvokeFunctionResponse, Signature, InvocationsSignerDetails, EstimateFeeDetails, EstimateFee } from "starknet";
 import { BigNumberish } from "starknet/dist/utils/number";
-import { BlockIdentifier } from "starknet/provider/utils";
-import { EstimateFee } from "starknet/types/account";
 export declare type Approvals = {
-    [origin: string]: {
-        scopes: Scope[];
-        maxFee: BigNumberish;
-    };
+    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;
+export interface Keychain {
+    probe(): {
+        address: string;
         scopes: Scope[];
     };
-}
-export interface ConnectResponse extends RawResponse {
-    method: "connect";
-    result?: {
-        success: boolean;
-        address?: string;
+    connect(scopes: Scope[]): {
+        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: {
-        calls: Call | Call[];
-        nonce: BigNumberish;
-        blockIdentifier?: BlockIdentifier;
-    };
-}
-export interface EstimateFeeResponse extends RawResponse {
-    method: "estimate-fee";
-    result?: EstimateFee;
-}
-export interface ExecuteRequest extends RawRequest {
-    method: "execute";
-    params: {
-        id?: string;
-        calls: 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;
-        calls: 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 RegisterRequest extends RawRequest {
-    method: "register";
-    params: {
-        username: string;
-        credential: {
-            x: string;
-            y: string;
-        };
-    };
-}
-export interface RegisterResponse extends RawResponse {
-    method: "register";
-    result: {
+    disconnect(): void;
+    estimateFee(calls: Call | Call[], estimateFeeDetails?: EstimateFeeDetails): Promise<EstimateFee>;
+    execute(calls: Call | Call[], abis?: Abi[], transactionsDetail?: InvocationsDetails, sync?: boolean): Promise<InvokeFunctionResponse>;
+    register(username: string, credential: {
+        x: string;
+        y: string;
+    }): Promise<{
         address: string;
         deviceKey: string;
-    };
+    }>;
+    signMessage(typedData: typedData.TypedData, account: string): Promise<Signature>;
+    signTransaction(transactions: Call[], transactionsDetail: InvocationsSignerDetails, abis?: Abi[]): Promise<Signature>;
 }
-export declare type RawRequest = {
-    origin?: string;
-    method: string;
-    params?: object | any[];
-};
-export declare type Request = RawRequest | ProbeRequest | ConnectRequest | DeployContractRequest | EstimateFeeRequest | ExecuteRequest | SignMessageRequest | RegisterRequest;
-export declare type RawResponse = {
-    result?: any;
-    error?: unknown;
-};
-export declare type Response = RawResponse | ProbeResponse | DeployContractResponse | EstimateFeeResponse | ConnectResponse | SignMessageResponse | RegisterResponse;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cartridge/controller",
-  "version": "0.1.52",
+  "version": "0.1.54",
   "description": "Cartridge Controller",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -22,10 +22,11 @@
     "typescript": "4.8.2"
   },
   "dependencies": {
+    "@cartridge/penpal": "^6.2.3",
     "base64url": "^3.0.1",
     "cuid": "^2.1.8",
     "fast-deep-equal": "^3.1.3",
     "query-string": "^7.1.1",
-    "starknet": "^4.3.0"
+    "starknet": "^4.7.0"
   }
 }