carbon-js-sdk 0.11.72 → 0.11.74

package/lib/CarbonSDK.d.ts

@@ -128,6 +128,7 @@ declare class CarbonSDK {
     connectWithMetamask(metamask: MetaMask, opts?: CarbonWalletGenericOpts, evmWalletOpts?: EvmWalletOpts): Promise<ConnectedCarbonSDK>;
     connectWithRainbowKit(rainbowKit: RainbowKitAccount, rainbowKitWalletOpts: RainbowKitWalletOpts, opts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
     connectViewOnly(bech32Address: string, opts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
+    connectWithQr(granteeMnemonic: string, granterAddress: string, expiry: Date, opts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
     getConfig(): NetworkConfig;
     getTokenClient(): TokenClient;
     getConnectedWallet(): CarbonWallet;

package/lib/CarbonSDK.js

@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-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 };
 };
@@ -69,23 +60,22 @@ const DEFAULT_SDK_INIT_OPTS = {
  */
 class CarbonSDK {
     constructor(opts) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         this.initialized = false;
-        this.network = (_a = opts.network) !== null && _a !== void 0 ? _a : constant_1.DEFAULT_NETWORK;
-        this.configOverride = (_b = opts.config) !== null && _b !== void 0 ? _b : {};
+        this.network = opts.network ?? constant_1.DEFAULT_NETWORK;
+        this.configOverride = opts.config ?? {};
         this.networkConfig = util_1.GenericUtils.overrideConfig(constant_1.NetworkConfigs[this.network], this.configOverride);
-        this.useTmAbciQuery = (_c = opts.useTmAbciQuery) !== null && _c !== void 0 ? _c : false;
+        this.useTmAbciQuery = opts.useTmAbciQuery ?? false;
         this.gasFee = opts.gasFee;
         this.tmClient = opts.tmClient;
         this.wallet = opts.wallet;
-        this.chainId = (_e = (_d = opts.chainId) !== null && _d !== void 0 ? _d : constant_1.CarbonChainIDs[this.network]) !== null && _e !== void 0 ? _e : constant_1.CarbonChainIDs[constant_1.Network.MainNet];
-        this.evmChainId = (_g = (_f = opts.evmChainId) !== null && _f !== void 0 ? _f : constant_1.CarbonEvmChainIDs[this.network]) !== null && _g !== void 0 ? _g : constant_1.CarbonEvmChainIDs[constant_1.Network.MainNet];
+        this.chainId = opts.chainId ?? constant_1.CarbonChainIDs[this.network] ?? constant_1.CarbonChainIDs[constant_1.Network.MainNet];
+        this.evmChainId = opts.evmChainId ?? constant_1.CarbonEvmChainIDs[this.network] ?? constant_1.CarbonEvmChainIDs[constant_1.Network.MainNet];
         let carbonQueryClient;
         if (!opts.query) {
             let grpcClient;
             if (opts.useTmAbciQuery !== true && this.networkConfig.grpcUrl) {
                 const transport = typeof window === "undefined" ? (0, grpc_web_node_http_transport_1.NodeHttpTransport)() : undefined;
-                grpcClient = (_h = opts.grpcQueryClient) !== null && _h !== void 0 ? _h : new GrpcQueryClient_1.default(this.networkConfig.restUrl, {
+                grpcClient = opts.grpcQueryClient ?? new GrpcQueryClient_1.default(this.networkConfig.restUrl, {
                     transport,
                 });
             }
@@ -94,10 +84,10 @@ class CarbonSDK {
                 grpcClient,
             });
         }
-        this.query = ((_j = opts.query) !== null && _j !== void 0 ? _j : carbonQueryClient);
-        this.insights = (_k = opts.insights) !== null && _k !== void 0 ? _k : new clients_1.InsightsQueryClient(this.networkConfig);
-        this.token = (_l = opts.token) !== null && _l !== void 0 ? _l : clients_1.TokenClient.instance(this.query, this);
-        this.hydrogen = (_m = opts.hydrogen) !== null && _m !== void 0 ? _m : new clients_1.HydrogenClient(this.networkConfig, this.token);
+        this.query = (opts.query ?? carbonQueryClient);
+        this.insights = opts.insights ?? new clients_1.InsightsQueryClient(this.networkConfig);
+        this.token = opts.token ?? clients_1.TokenClient.instance(this.query, this);
+        this.hydrogen = opts.hydrogen ?? new clients_1.HydrogenClient(this.networkConfig, this.token);
         this.admin = new modules_1.AdminModule(this);
         this.alliance = new modules_1.AllianceModule(this);
         this.order = new modules_1.OrderModule(this);
@@ -125,131 +115,104 @@ class CarbonSDK {
         this.bridge = new modules_1.BridgeModule(this);
         this.otc = new modules_1.OTCModule(this);
     }
-    static instance(opts = DEFAULT_SDK_INIT_OPTS) {
-        var _a, _b, _c, _d;
-        return __awaiter(this, void 0, void 0, function* () {
-            const network = (_a = opts.network) !== null && _a !== void 0 ? _a : constant_1.DEFAULT_NETWORK;
-            const configOverride = (_b = opts.config) !== null && _b !== void 0 ? _b : {};
-            const defaultTimeoutBlocks = opts.defaultTimeoutBlocks;
-            const networkConfig = util_1.GenericUtils.overrideConfig(constant_1.NetworkConfigs[network], configOverride);
-            const tmClient = (_c = opts.tmClient) !== null && _c !== void 0 ? _c : new tendermint_rpc_1.Tendermint37Client(new clients.BatchQueryClient(networkConfig.tmRpcUrl)); // fallback tmClient
-            let chainId = networkConfig.chainId; // fallback chain ID
-            let normalInit = true;
-            try {
-                chainId = (_d = (yield tmClient.status())) === null || _d === void 0 ? void 0 : _d.nodeInfo.network;
-            }
-            catch (error) {
-                console.warn("tm client init failed");
-                console.error(error);
-                normalInit = false;
-            }
-            const sdk = new CarbonSDK({ network, config: configOverride, tmClient, defaultTimeoutBlocks, chainId, useTmAbciQuery: opts.useTmAbciQuery });
-            if (!normalInit)
-                return sdk;
-            if (opts.wallet) {
-                yield sdk.connect(opts.wallet);
-            }
-            if (opts.skipInit !== true) {
-                yield sdk.initialize();
-            }
+    static async instance(opts = DEFAULT_SDK_INIT_OPTS) {
+        const network = opts.network ?? constant_1.DEFAULT_NETWORK;
+        const configOverride = opts.config ?? {};
+        const defaultTimeoutBlocks = opts.defaultTimeoutBlocks;
+        const networkConfig = util_1.GenericUtils.overrideConfig(constant_1.NetworkConfigs[network], configOverride);
+        const tmClient = opts.tmClient ?? new tendermint_rpc_1.Tendermint37Client(new clients.BatchQueryClient(networkConfig.tmRpcUrl)); // fallback tmClient
+        let chainId = networkConfig.chainId; // fallback chain ID
+        let normalInit = true;
+        try {
+            chainId = (await tmClient.status())?.nodeInfo.network;
+        }
+        catch (error) {
+            console.warn("tm client init failed");
+            console.error(error);
+            normalInit = false;
+        }
+        const sdk = new CarbonSDK({ network, config: configOverride, tmClient, defaultTimeoutBlocks, chainId, useTmAbciQuery: opts.useTmAbciQuery });
+        if (!normalInit)
             return sdk;
+        if (opts.wallet) {
+            await sdk.connect(opts.wallet);
+        }
+        if (opts.skipInit !== true) {
+            await sdk.initialize();
+        }
+        return sdk;
+    }
+    static async instanceWithWallet(wallet, sdkOpts = DEFAULT_SDK_INIT_OPTS) {
+        const sdk = await CarbonSDK.instance(sdkOpts);
+        return sdk.connect(wallet);
+    }
+    static async instanceWithPrivateKey(privateKey, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
+        const sdk = await CarbonSDK.instance(sdkOpts);
+        return sdk.connectWithPrivateKey(privateKey, walletOpts);
+    }
+    static async instanceWithMnemonic(mnemonic, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
+        const sdk = await CarbonSDK.instance(sdkOpts);
+        return sdk.connectWithMnemonic(mnemonic, walletOpts);
+    }
+    static async instanceWithSigner(signer, publicKeyBase64, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
+        const sdk = await CarbonSDK.instance(sdkOpts);
+        return sdk.connectWithSigner(signer, publicKeyBase64, walletOpts);
+    }
+    static async instanceWithLedger(ledger, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
+        const sdk = await CarbonSDK.instance(sdkOpts);
+        return sdk.connectWithLedger(ledger, walletOpts);
+    }
+    static async instanceWithKeplr(keplr, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
+        const sdk = await CarbonSDK.instance(sdkOpts);
+        return sdk.connectWithKeplr(keplr, walletOpts);
+    }
+    static async instanceWithLeap(leap, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
+        const sdk = await CarbonSDK.instance(sdkOpts);
+        return sdk.connectWithLeap(leap, walletOpts);
+    }
+    static async instanceWithMetamask(metamask, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
+        const sdk = await CarbonSDK.instance(sdkOpts);
+        return sdk.connectWithMetamask(metamask, walletOpts);
+    }
+    static async instanceWithRainbowKit(rainbowKit, sdkOpts = DEFAULT_SDK_INIT_OPTS, rainbowKitWalletOpts, walletOpts) {
+        const sdk = await CarbonSDK.instance(sdkOpts);
+        return sdk.connectWithRainbowKit(rainbowKit, rainbowKitWalletOpts, walletOpts);
+    }
+    static async instanceViewOnly(bech32Address, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
+        const sdk = await CarbonSDK.instance(sdkOpts);
+        return sdk.connectViewOnly(bech32Address, walletOpts);
+    }
+    async initialize() {
+        const fees = await this.getGasFee();
+        const chainId = await this.query.chain.getChainId();
+        this.chainId = chainId;
+        this.gasFee = fees;
+        await this.token.initialize();
+        if (this.wallet) {
+            await this.wallet.initialize(this.query, fees);
+        }
+        this.initialized = true;
+        return this;
+    }
+    async getGasFee() {
+        if (this.gasFee)
+            return this.gasFee;
+        const queryClient = this.query;
+        const { msgGasCosts } = await queryClient.fee.MsgGasCostAll({
+            pagination: constant_1.PAGINATE_10K,
         });
-    }
-    static instanceWithWallet(wallet, sdkOpts = DEFAULT_SDK_INIT_OPTS) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sdk = yield CarbonSDK.instance(sdkOpts);
-            return sdk.connect(wallet);
-        });
-    }
-    static instanceWithPrivateKey(privateKey, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sdk = yield CarbonSDK.instance(sdkOpts);
-            return sdk.connectWithPrivateKey(privateKey, walletOpts);
-        });
-    }
-    static instanceWithMnemonic(mnemonic, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sdk = yield CarbonSDK.instance(sdkOpts);
-            return sdk.connectWithMnemonic(mnemonic, walletOpts);
-        });
-    }
-    static instanceWithSigner(signer, publicKeyBase64, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sdk = yield CarbonSDK.instance(sdkOpts);
-            return sdk.connectWithSigner(signer, publicKeyBase64, walletOpts);
-        });
-    }
-    static instanceWithLedger(ledger, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sdk = yield CarbonSDK.instance(sdkOpts);
-            return sdk.connectWithLedger(ledger, walletOpts);
-        });
-    }
-    static instanceWithKeplr(keplr, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sdk = yield CarbonSDK.instance(sdkOpts);
-            return sdk.connectWithKeplr(keplr, walletOpts);
-        });
-    }
-    static instanceWithLeap(leap, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sdk = yield CarbonSDK.instance(sdkOpts);
-            return sdk.connectWithLeap(leap, walletOpts);
-        });
-    }
-    static instanceWithMetamask(metamask, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sdk = yield CarbonSDK.instance(sdkOpts);
-            return sdk.connectWithMetamask(metamask, walletOpts);
-        });
-    }
-    static instanceWithRainbowKit(rainbowKit, sdkOpts = DEFAULT_SDK_INIT_OPTS, rainbowKitWalletOpts, walletOpts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sdk = yield CarbonSDK.instance(sdkOpts);
-            return sdk.connectWithRainbowKit(rainbowKit, rainbowKitWalletOpts, walletOpts);
-        });
-    }
-    static instanceViewOnly(bech32Address, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sdk = yield CarbonSDK.instance(sdkOpts);
-            return sdk.connectViewOnly(bech32Address, walletOpts);
-        });
-    }
-    initialize() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const fees = yield this.getGasFee();
-            const chainId = yield this.query.chain.getChainId();
-            this.chainId = chainId;
-            this.gasFee = fees;
-            yield this.token.initialize();
-            if (this.wallet) {
-                yield this.wallet.initialize(this.query, fees);
-            }
-            this.initialized = true;
-            return this;
-        });
-    }
-    getGasFee() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.gasFee)
-                return this.gasFee;
-            const queryClient = this.query;
-            const { msgGasCosts } = yield queryClient.fee.MsgGasCostAll({
-                pagination: constant_1.PAGINATE_10K,
-            });
-            const txGasCosts = msgGasCosts.reduce((result, item) => {
-                result[item.msgType] = (0, number_1.bnOrZero)(item.gasCost);
-                return result;
-            }, {});
-            const { minGasPrices } = yield queryClient.fee.MinGasPriceAll({
-                pagination: constant_1.PAGINATE_10K,
-            });
-            const txGasPrices = minGasPrices.reduce((result, item) => {
-                result[item.denom] = (0, number_1.bnOrZero)(item.gasPrice).shiftedBy(-18); // sdk.Dec shifting
-                return result;
-            }, {});
-            return new GasFee_1.default(txGasCosts, txGasPrices);
+        const txGasCosts = msgGasCosts.reduce((result, item) => {
+            result[item.msgType] = (0, number_1.bnOrZero)(item.gasCost);
+            return result;
+        }, {});
+        const { minGasPrices } = await queryClient.fee.MinGasPriceAll({
+            pagination: constant_1.PAGINATE_10K,
         });
+        const txGasPrices = minGasPrices.reduce((result, item) => {
+            result[item.denom] = (0, number_1.bnOrZero)(item.gasPrice).shiftedBy(-18); // sdk.Dec shifting
+            return result;
+        }, {});
+        return new GasFee_1.default(txGasCosts, txGasPrices);
     }
     clone() {
         return new CarbonSDK(this.generateOpts());
@@ -270,155 +233,221 @@ class CarbonSDK {
             insights: this.insights,
         };
     }
-    connect(wallet, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!wallet.initialized) {
-                try {
-                    // Perform initialize function as per normal, but add try-catch statement to check err message
-                    const overrideConfig = {
-                        chainId: this.chainId,
-                        evmChainId: this.evmChainId,
-                    };
-                    const gasFee = yield this.getGasFee();
-                    yield wallet.initialize(this.query, gasFee, overrideConfig, opts);
-                }
-                catch (err) {
-                    const errorTyped = err;
-                    // In the case where account does not exist on chain, still allow wallet connection.
-                    // Else, throw an error as per normal
-                    if (!errorTyped.message.includes("Account does not exist on chain. Send some tokens there before trying to query sequence.")) {
-                        throw new Error(errorTyped.message);
-                    }
+    async connect(wallet, opts) {
+        if (!wallet.initialized) {
+            try {
+                // Perform initialize function as per normal, but add try-catch statement to check err message
+                const overrideConfig = {
+                    chainId: this.chainId,
+                    evmChainId: this.evmChainId,
+                };
+                const gasFee = await this.getGasFee();
+                await wallet.initialize(this.query, gasFee, overrideConfig, opts);
+            }
+            catch (err) {
+                const errorTyped = err;
+                // In the case where account does not exist on chain, still allow wallet connection.
+                // Else, throw an error as per normal
+                if (!errorTyped.message.includes("Account does not exist on chain. Send some tokens there before trying to query sequence.")) {
+                    throw new Error(errorTyped.message);
                 }
             }
-            this.wallet = wallet;
-            return this;
-        });
+        }
+        this.wallet = wallet;
+        return this;
     }
     disconnect() {
-        var _a;
-        if ((_a = this.wallet) === null || _a === void 0 ? void 0 : _a.isSigner(wallet_1.CarbonSignerTypes.Ledger)) {
+        if (this.wallet?.isSigner(wallet_1.CarbonSignerTypes.Ledger)) {
             this.wallet.signer.ledger.disconnect();
         }
         const opts = this.generateOpts();
         delete opts.wallet;
         return new CarbonSDK(opts);
     }
-    connectWithPrivateKey(privateKey, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const wallet = wallet_1.CarbonWallet.withPrivateKey(privateKey, Object.assign(Object.assign({}, opts), { network: this.network, config: this.configOverride }));
-            return this.connect(wallet, opts);
+    async connectWithPrivateKey(privateKey, opts) {
+        const wallet = new wallet_1.CarbonWallet({
+            ...opts,
+            mode: "privateKey",
+            privateKey,
+            network: this.network,
+            config: this.configOverride,
         });
+        return this.connect(wallet, opts);
     }
-    connectWithMnemonic(mnemonic, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const wallet = wallet_1.CarbonWallet.withMnemonic(mnemonic, Object.assign(Object.assign({}, opts), { network: this.network, config: this.configOverride }));
-            return this.connect(wallet, opts);
+    async connectWithMnemonic(mnemonic, opts) {
+        const wallet = new wallet_1.CarbonWallet({
+            ...opts,
+            mode: "mnemonic",
+            mnemonic,
+            network: this.network,
+            config: this.configOverride,
         });
-    }
-    connectWithSigner(signer, publicKeyBase64, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const wallet = wallet_1.CarbonWallet.withSigner(signer, publicKeyBase64, Object.assign(Object.assign({}, opts), { network: this.network, config: this.configOverride }));
-            return this.connect(wallet, opts);
+        return this.connect(wallet, opts);
+    }
+    async connectWithSigner(signer, publicKeyBase64, opts) {
+        const wallet = new wallet_1.CarbonWallet({
+            ...opts,
+            mode: "customSigner",
+            signer,
+            publicKeyBase64,
+            network: this.network,
+            config: this.configOverride,
         });
-    }
-    connectWithLedger(ledger, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const publicKeyBuffer = yield ledger.getPubKey();
-            const publicKeyBase64 = publicKeyBuffer.toString("base64");
-            const wallet = wallet_1.CarbonWallet.withLedger(ledger, publicKeyBase64, Object.assign(Object.assign({}, opts), { network: this.network, config: this.configOverride }));
-            return this.connect(wallet, opts);
+        return this.connect(wallet, opts);
+    }
+    async connectWithLedger(ledger, opts) {
+        const publicKeyBuffer = await ledger.getPubKey();
+        const publicKeyBase64 = publicKeyBuffer.toString("base64");
+        const signer = new wallet_1.CarbonLedgerSigner(ledger);
+        const wallet = new wallet_1.CarbonWallet({
+            ...opts,
+            mode: "customSigner",
+            signer,
+            publicKeyBase64,
+            network: this.network,
+            config: this.configOverride,
         });
-    }
-    connectWithKeplr(keplr, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const chainInfo = yield provider_1.KeplrAccount.getChainInfo(this);
-            const chainId = chainInfo.chainId;
-            yield keplr.experimentalSuggestChain(chainInfo);
-            const keplrKey = yield keplr.getKey(chainId);
-            yield keplr.enable(chainId);
-            const wallet = wallet_1.CarbonWallet.withKeplr(keplr, chainInfo, keplrKey, Object.assign(Object.assign({}, opts), { network: this.network, config: this.configOverride }));
-            return this.connect(wallet, opts);
+        return this.connect(wallet, opts);
+    }
+    async connectWithKeplr(keplr, opts) {
+        const chainInfo = await provider_1.KeplrAccount.getChainInfo(this);
+        const chainId = chainInfo.chainId;
+        await keplr.experimentalSuggestChain(chainInfo);
+        const keplrKey = await keplr.getKey(chainId);
+        await keplr.enable(chainId);
+        const signer = keplrKey.isNanoLedger
+            ? provider_1.KeplrAccount.createKeplrSignerAmino(keplr, chainInfo, keplrKey)
+            : provider_1.KeplrAccount.createKeplrSigner(keplr, chainInfo, keplrKey);
+        const publicKeyBase64 = Buffer.from(keplrKey.pubKey).toString("base64");
+        const wallet = new wallet_1.CarbonWallet({
+            ...opts,
+            mode: "customSigner",
+            signer,
+            publicKeyBase64,
+            network: this.network,
+            config: this.configOverride,
+            providerAgent: constant_1.ProviderAgent.KeplrExtension,
         });
-    }
-    connectWithLeap(leap, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const chainId = this.chainId;
-            const chainInfo = yield provider_1.LeapAccount.getChainInfo(this);
-            yield leap.experimentalSuggestChain(chainInfo);
-            const leapKey = yield leap.getKey(chainId);
-            yield leap.enable(chainId);
-            const wallet = wallet_1.CarbonWallet.withLeap(leap, chainId, leapKey, Object.assign(Object.assign({}, opts), { network: this.network, config: this.configOverride }));
-            return this.connect(wallet, opts);
+        return this.connect(wallet, opts);
+    }
+    async connectWithLeap(leap, opts) {
+        const chainId = this.chainId;
+        const chainInfo = await provider_1.LeapAccount.getChainInfo(this);
+        await leap.experimentalSuggestChain(chainInfo);
+        const leapKey = await leap.getKey(chainId);
+        await leap.enable(chainId);
+        const signer = leapKey.isNanoLedger ? provider_1.LeapAccount.createLeapSignerAmino(leap, chainId) : provider_1.LeapAccount.createLeapSigner(leap, chainId);
+        const publicKeyBase64 = Buffer.from(leapKey.pubKey).toString("base64");
+        const wallet = new wallet_1.CarbonWallet({
+            ...opts,
+            mode: "customSigner",
+            signer,
+            publicKeyBase64,
+            network: this.network,
+            config: this.configOverride,
+            providerAgent: constant_1.ProviderAgent.LeapExtension,
         });
+        return this.connect(wallet, opts);
     }
-    connectWithMetamask(metamask, opts, evmWalletOpts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const evmChainId = this.evmChainId;
-            const addressOptions = {
-                network: this.networkConfig.network,
-                bech32Prefix: this.networkConfig.Bech32Prefix,
-            };
-            const noJwtProvided = (opts === null || opts === void 0 ? void 0 : opts.enableJwtAuth) && !(opts === null || opts === void 0 ? void 0 : opts.jwt);
-            const signMessageRequired = !(evmWalletOpts === null || evmWalletOpts === void 0 ? void 0 : evmWalletOpts.publicKeyBase64) || noJwtProvided;
-            let pubKey = evmWalletOpts === null || evmWalletOpts === void 0 ? void 0 : evmWalletOpts.publicKeyBase64;
-            let message;
-            let signature;
-            if (signMessageRequired) {
-                const result = yield MetaMask_1.MetaMask.signAndRecoverPubKey(metamask, opts === null || opts === void 0 ? void 0 : opts.enableJwtAuth, opts === null || opts === void 0 ? void 0 : opts.authMessage);
-                pubKey = result.publicKey;
-                message = result.message;
-                signature = result.signature;
-            }
-            const wallet = wallet_1.CarbonWallet.withMetamask(metamask, evmChainId, pubKey, addressOptions, Object.assign(Object.assign({}, opts), { network: this.network, config: this.configOverride }));
-            if (noJwtProvided) {
-                const authRequest = {
-                    grant_type: auth_1.GrantType.SignatureEth,
-                    message: message,
-                    public_key: Buffer.from(pubKey, 'base64').toString('hex'),
-                    signature: signature,
-                };
-                yield wallet.reloadJwtToken(authRequest, opts === null || opts === void 0 ? void 0 : opts.authMessage);
-            }
-            return this.connect(wallet, opts);
+    async connectWithMetamask(metamask, opts, evmWalletOpts) {
+        const evmChainId = this.evmChainId;
+        const addressOptions = {
+            network: this.networkConfig.network,
+            bech32Prefix: this.networkConfig.Bech32Prefix,
+        };
+        const noJwtProvided = opts?.enableJwtAuth && !opts?.jwt;
+        const signMessageRequired = !evmWalletOpts?.publicKeyBase64 || noJwtProvided;
+        let pubKey = evmWalletOpts?.publicKeyBase64;
+        let message;
+        let signature;
+        if (signMessageRequired) {
+            const result = await MetaMask_1.MetaMask.signAndRecoverPubKey(metamask, opts?.enableJwtAuth, opts?.authMessage);
+            pubKey = result.publicKey;
+            message = result.message;
+            signature = result.signature;
+        }
+        const signer = MetaMask_1.MetaMask.createMetamaskSigner(metamask, evmChainId, pubKey, addressOptions);
+        const wallet = new wallet_1.CarbonWallet({
+            ...opts,
+            mode: "customSigner",
+            signer,
+            publicKeyBase64: pubKey,
+            network: this.network,
+            config: this.configOverride,
+            providerAgent: constant_1.ProviderAgent.MetamaskExtension,
         });
-    }
-    connectWithRainbowKit(rainbowKit, rainbowKitWalletOpts, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const evmChainId = this.evmChainId;
-            const addressOptions = {
-                network: this.networkConfig.network,
-                bech32Prefix: this.networkConfig.Bech32Prefix,
+        if (noJwtProvided) {
+            const authRequest = {
+                grant_type: auth_1.GrantType.SignatureEth,
+                message: message,
+                public_key: Buffer.from(pubKey, 'base64').toString('hex'),
+                signature: signature,
             };
-            const noJwtProvided = (opts === null || opts === void 0 ? void 0 : opts.enableJwtAuth) && !(opts === null || opts === void 0 ? void 0 : opts.jwt);
-            const signMessageRequired = !(rainbowKitWalletOpts === null || rainbowKitWalletOpts === void 0 ? void 0 : rainbowKitWalletOpts.publicKeyBase64) || noJwtProvided;
-            let pubKey = rainbowKitWalletOpts === null || rainbowKitWalletOpts === void 0 ? void 0 : rainbowKitWalletOpts.publicKeyBase64;
-            let message;
-            let signature;
-            if (signMessageRequired) {
-                const result = yield RainbowKitAccount_1.default.signAndRecoverPubKey(rainbowKit, opts === null || opts === void 0 ? void 0 : opts.enableJwtAuth, opts === null || opts === void 0 ? void 0 : opts.authMessage);
-                pubKey = result.publicKey;
-                message = result.message;
-                signature = result.signature;
-            }
-            const wallet = wallet_1.CarbonWallet.withRainbowKit(rainbowKit, evmChainId, pubKey, addressOptions, rainbowKitWalletOpts.walletProvider, Object.assign(Object.assign({}, opts), { network: this.network, config: this.configOverride }));
-            if (noJwtProvided) {
-                const authRequest = {
-                    grant_type: auth_1.GrantType.SignatureEth,
-                    message: message,
-                    public_key: Buffer.from(pubKey, 'base64').toString('hex'),
-                    signature: signature,
-                };
-                yield wallet.reloadJwtToken(authRequest, opts === null || opts === void 0 ? void 0 : opts.authMessage);
-            }
-            return this.connect(wallet, opts);
+            await wallet.reloadJwtToken(authRequest, opts?.authMessage);
+        }
+        return this.connect(wallet, opts);
+    }
+    async connectWithRainbowKit(rainbowKit, rainbowKitWalletOpts, opts) {
+        const evmChainId = this.evmChainId;
+        const addressOptions = {
+            network: this.networkConfig.network,
+            bech32Prefix: this.networkConfig.Bech32Prefix,
+        };
+        const noJwtProvided = opts?.enableJwtAuth && !opts?.jwt;
+        const signMessageRequired = !rainbowKitWalletOpts?.publicKeyBase64 || noJwtProvided;
+        let pubKey = rainbowKitWalletOpts?.publicKeyBase64;
+        let message;
+        let signature;
+        if (signMessageRequired) {
+            const result = await RainbowKitAccount_1.default.signAndRecoverPubKey(rainbowKit, opts?.enableJwtAuth, opts?.authMessage);
+            pubKey = result.publicKey;
+            message = result.message;
+            signature = result.signature;
+        }
+        const signer = RainbowKitAccount_1.default.createRainbowKitSigner(rainbowKit, evmChainId, pubKey, addressOptions);
+        const wallet = new wallet_1.CarbonWallet({
+            ...opts,
+            mode: "customSigner",
+            signer,
+            publicKeyBase64: pubKey,
+            network: this.network,
+            config: this.configOverride,
+            providerAgent: rainbowKitWalletOpts.walletProvider,
+            isRainbowKit: true,
         });
+        if (noJwtProvided) {
+            const authRequest = {
+                grant_type: auth_1.GrantType.SignatureEth,
+                message: message,
+                public_key: Buffer.from(pubKey, 'base64').toString('hex'),
+                signature: signature,
+            };
+            await wallet.reloadJwtToken(authRequest, opts?.authMessage);
+        }
+        return this.connect(wallet, opts);
     }
-    connectViewOnly(bech32Address, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const wallet = wallet_1.CarbonWallet.withAddress(bech32Address, Object.assign(Object.assign({}, opts), { network: this.network, config: this.configOverride }));
-            return this.connect(wallet, opts);
+    async connectViewOnly(bech32Address, opts) {
+        const wallet = new wallet_1.CarbonWallet({
+            ...opts,
+            mode: "viewOnly",
+            bech32Address,
+            network: this.network,
+            config: this.configOverride,
+        });
+        return this.connect(wallet, opts);
+    }
+    async connectWithQr(granteeMnemonic, granterAddress, expiry, opts) {
+        const wallet = new wallet_1.CarbonWallet({
+            ...opts,
+            mode: "qr",
+            mnemonic: granteeMnemonic,
+            granter: granterAddress,
+            bech32Address: granterAddress,
+            expiry,
+            network: this.network,
+            config: this.configOverride,
         });
+        return this.connect(wallet, opts);
     }
     getConfig() {
         return this.networkConfig;