carbon-js-sdk 0.11.73 → 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

@@ -265,24 +265,31 @@ class CarbonSDK {
         return new CarbonSDK(opts);
     }
     async connectWithPrivateKey(privateKey, opts) {
-        const wallet = wallet_1.CarbonWallet.withPrivateKey(privateKey, {
+        const wallet = new wallet_1.CarbonWallet({
             ...opts,
+            mode: "privateKey",
+            privateKey,
             network: this.network,
             config: this.configOverride,
         });
         return this.connect(wallet, opts);
     }
     async connectWithMnemonic(mnemonic, opts) {
-        const wallet = wallet_1.CarbonWallet.withMnemonic(mnemonic, {
+        const wallet = new wallet_1.CarbonWallet({
             ...opts,
+            mode: "mnemonic",
+            mnemonic,
             network: this.network,
             config: this.configOverride,
         });
         return this.connect(wallet, opts);
     }
     async connectWithSigner(signer, publicKeyBase64, opts) {
-        const wallet = wallet_1.CarbonWallet.withSigner(signer, publicKeyBase64, {
+        const wallet = new wallet_1.CarbonWallet({
             ...opts,
+            mode: "customSigner",
+            signer,
+            publicKeyBase64,
             network: this.network,
             config: this.configOverride,
         });
@@ -291,8 +298,12 @@ class CarbonSDK {
     async connectWithLedger(ledger, opts) {
         const publicKeyBuffer = await ledger.getPubKey();
         const publicKeyBase64 = publicKeyBuffer.toString("base64");
-        const wallet = wallet_1.CarbonWallet.withLedger(ledger, publicKeyBase64, {
+        const signer = new wallet_1.CarbonLedgerSigner(ledger);
+        const wallet = new wallet_1.CarbonWallet({
             ...opts,
+            mode: "customSigner",
+            signer,
+            publicKeyBase64,
             network: this.network,
             config: this.configOverride,
         });
@@ -304,10 +315,18 @@ class CarbonSDK {
         await keplr.experimentalSuggestChain(chainInfo);
         const keplrKey = await keplr.getKey(chainId);
         await keplr.enable(chainId);
-        const wallet = wallet_1.CarbonWallet.withKeplr(keplr, chainInfo, keplrKey, {
+        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,
         });
         return this.connect(wallet, opts);
     }
@@ -317,10 +336,16 @@ class CarbonSDK {
         await leap.experimentalSuggestChain(chainInfo);
         const leapKey = await leap.getKey(chainId);
         await leap.enable(chainId);
-        const wallet = wallet_1.CarbonWallet.withLeap(leap, chainId, leapKey, {
+        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);
     }
@@ -341,10 +366,15 @@ class CarbonSDK {
             message = result.message;
             signature = result.signature;
         }
-        const wallet = wallet_1.CarbonWallet.withMetamask(metamask, evmChainId, pubKey, addressOptions, {
+        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,
         });
         if (noJwtProvided) {
             const authRequest = {
@@ -374,10 +404,16 @@ class CarbonSDK {
             message = result.message;
             signature = result.signature;
         }
-        const wallet = wallet_1.CarbonWallet.withRainbowKit(rainbowKit, evmChainId, pubKey, addressOptions, rainbowKitWalletOpts.walletProvider, {
+        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 = {
@@ -391,8 +427,23 @@ class CarbonSDK {
         return this.connect(wallet, opts);
     }
     async connectViewOnly(bech32Address, opts) {
-        const wallet = wallet_1.CarbonWallet.withAddress(bech32Address, {
+        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,
         });

package/lib/wallet/CarbonWallet.d.ts

@@ -4,21 +4,15 @@ import { CarbonQueryClient } from "../clients";
 import GasFee from "../clients/GasFee";
 import { Network, NetworkConfig, SupportedEip6963Provider } from "../constant";
 import { ProviderAgent } from "../constant/walletProvider";
-import { ChainInfo, CosmosLedger, Keplr, MetaMask } from "../provider";
-import RainbowKitAccount from "../provider/rainbowKit/RainbowKitAccount";
 import { CarbonTx } from "../util";
-import { SWTHAddressOptions } from "../util/address";
 import { AccessTokenResponse, GrantRequest } from "../util/auth";
 import { SmartWalletBlockchain } from "../util/blockchain";
 import { BroadcastTxMode } from "../util/tx";
 import { StdSignature } from "@cosmjs/amino";
-import { EncodeObject, OfflineDirectSigner, OfflineSigner } from "@cosmjs/proto-signing";
+import { EncodeObject, OfflineDirectSigner } from "@cosmjs/proto-signing";
 import { Account, DeliverTxResponse } from "@cosmjs/stargate";
 import { Tendermint37Client } from "@cosmjs/tendermint-rpc";
 import { BroadcastTxAsyncResponse, BroadcastTxSyncResponse, TxResponse } from "@cosmjs/tendermint-rpc/build/tendermint37/responses";
-import { Key as LeapKey } from "@cosmos-kit/core";
-import { Leap } from "@cosmos-kit/leap-extension";
-import { Key } from "@keplr-wallet/types";
 import { TxRaw as StargateTxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 import { CarbonSigner, CarbonSignerTypes } from "./CarbonSigner";
 import { CarbonSigningClient } from "./CarbonSigningClient";
@@ -36,6 +30,7 @@ export interface CarbonWalletGenericOpts {
     enableJwtAuth?: boolean;
     authMessage?: string;
     jwt?: AccessTokenResponse;
+    bech32Address?: string;
     /**
      * Optional callback that will be called before signing is requested/executed.
      */
@@ -71,35 +66,30 @@ export interface EvmWalletOpts {
 export interface RainbowKitWalletOpts extends EvmWalletOpts {
     walletProvider: SupportedEip6963Provider;
 }
-export type CarbonWalletInitOpts = CarbonWalletGenericOpts & ({
+type MnemonicOpts = {
+    mode: "mnemonic";
     mnemonic: string;
-    privateKey?: string | Buffer;
-    signer?: CarbonSigner;
-    publicKeyBase64?: string;
-    bech32Address?: string;
-    customSigner?: OfflineSigner & OfflineDirectSigner;
-} | {
-    mnemonic?: string;
+};
+type PrivateKeyOpts = {
+    mode: "privateKey";
     privateKey: string | Buffer;
-    signer?: CarbonSigner;
-    publicKeyBase64?: string;
-    bech32Address?: string;
-    customSigner?: OfflineSigner & OfflineDirectSigner;
-} | {
-    mnemonic?: string;
-    privateKey?: string | Buffer;
+};
+type CustomSignerOpts = {
+    mode: "customSigner";
     signer: CarbonSigner;
     publicKeyBase64: string;
-    bech32Address?: string;
-    customSigner?: OfflineSigner & OfflineDirectSigner;
-} | {
-    mnemonic?: string;
-    privateKey?: string | Buffer;
-    signer?: CarbonSigner;
-    publicKeyBase64?: string;
+};
+type ViewOnlyOpts = {
+    mode: "viewOnly";
     bech32Address: string;
-    customSigner?: OfflineSigner & OfflineDirectSigner;
-});
+};
+type QROpts = {
+    mode: "qr";
+    mnemonic: string;
+    granter: string;
+    expiry: Date;
+};
+export type CarbonWalletInitOpts = CarbonWalletGenericOpts & (MnemonicOpts | PrivateKeyOpts | CustomSignerOpts | ViewOnlyOpts | QROpts);
 export interface AccountInfo extends Account {
     chainId: string;
 }
@@ -147,15 +137,6 @@ export declare class CarbonWallet {
     private txSignManager;
     private txDispatchManager;
     constructor(opts: CarbonWalletInitOpts);
-    static withPrivateKey(privateKey: string | Buffer, opts?: Omit<CarbonWalletInitOpts, "privateKey">): CarbonWallet;
-    static withMnemonic(mnemonic: string, opts?: Omit<CarbonWalletInitOpts, "mnemonic">): CarbonWallet;
-    static withLedger(cosmosLedger: CosmosLedger, publicKeyBase64: string, opts?: Omit<CarbonWalletInitOpts, "signer">): CarbonWallet;
-    static withSigner(signer: CarbonSigner, publicKeyBase64: string, opts?: Omit<CarbonWalletInitOpts, "signer">): CarbonWallet;
-    static withKeplr(keplr: Keplr, chainInfo: ChainInfo, keplrKey: Key, opts?: Omit<CarbonWalletInitOpts, "signer">): CarbonWallet;
-    static withLeap(leap: Leap, chainId: string, leapKey: LeapKey, opts?: Omit<CarbonWalletInitOpts, "signer">): CarbonWallet;
-    static withMetamask(metamask: MetaMask, evmChainId: string, compressedPubKeyBase64: string, addressOptions: SWTHAddressOptions, opts?: Omit<CarbonWalletInitOpts, "signer">): CarbonWallet;
-    static withRainbowKit(rainbowKit: RainbowKitAccount, evmChainId: string, compressedPubKeyBase64: string, addressOptions: SWTHAddressOptions, walletProvider: SupportedEip6963Provider, opts?: Omit<CarbonWalletInitOpts, "signer">): CarbonWallet;
-    static withAddress(bech32Address: string, opts?: Partial<CarbonWalletInitOpts>): CarbonWallet;
     initialize(queryClient: CarbonQueryClient, gasFee: GasFee, fallbackConfig?: OverrideConfig | null, opts?: CarbonWalletGenericOpts): Promise<CarbonWallet>;
     reloadJwtToken(request?: GrantRequest, authMessage?: string): Promise<void>;
     queryViewOnlyEvmHexAddress(): Promise<void>;
@@ -237,3 +218,4 @@ export declare namespace CarbonWallet {
     }
     const TxRaw: typeof StargateTxRaw;
 }
+export {};

package/lib/wallet/CarbonWallet.js

@@ -12,8 +12,6 @@ const constant_1 = require("../constant");
 const grant_1 = require("../constant/grant");
 const walletProvider_1 = require("../constant/walletProvider");
 const grant_2 = require("../modules/grant");
-const provider_1 = require("../provider");
-const RainbowKitAccount_1 = __importDefault(require("../provider/rainbowKit/RainbowKitAccount"));
 const util_1 = require("../util");
 const address_1 = require("../util/address");
 const auth_2 = require("../util/auth");
@@ -82,115 +80,79 @@ class CarbonWallet {
         this.onAuthComplete = opts.onAuthComplete;
         this.txDispatchManager = new generic_1.QueueManager(this.dispatchTx.bind(this));
         this.txSignManager = new generic_1.QueueManager(this.signTx.bind(this));
-        this.mnemonic = opts.mnemonic;
-        if (this.mnemonic) {
-            this.privateKey = util_1.AddressUtils.SWTHAddress.mnemonicToPrivateKey(this.mnemonic);
-        }
-        else if (opts.privateKey) {
-            this.privateKey = util_1.AddressUtils.stringOrBufferToBuffer(opts.privateKey);
-        }
+        // this.mnemonic = opts.mnemonic;
+        // if (this.mnemonic) {
+        //   this.privateKey = AddressUtils.SWTHAddress.mnemonicToPrivateKey(this.mnemonic);
+        // } else if ("privateKey" in opts && opts.privateKey) {
+        //   this.privateKey = AddressUtils.stringOrBufferToBuffer(opts.privateKey)!;
+        // }
         const addressOpts = {
             network,
             ...(this.configOverride.Bech32Prefix && {
                 bech32Prefix: this.configOverride.Bech32Prefix,
             }),
         };
-        if (opts.signer) {
-            this.signer = opts.signer;
-            this.publicKey = Buffer.from(opts.publicKeyBase64, "base64");
-            this.bech32Address = util_1.AddressUtils.SWTHAddress.publicKeyToAddress(this.publicKey, addressOpts);
-        }
-        else if (this.privateKey) {
-            this.publicKey = util_1.AddressUtils.SWTHAddress.privateToPublicKey(this.privateKey);
-            this.bech32Address = util_1.AddressUtils.SWTHAddress.publicKeyToAddress(this.publicKey, addressOpts);
-            let prefix = addressOpts.bech32Prefix;
-            if (!addressOpts.bech32Prefix)
-                prefix = address_1.SWTHAddress.getBech32Prefix(addressOpts?.network, addressOpts?.bech32Prefix);
-            if (!prefix)
-                throw new Error("cannot instantiate wallet signer, no prefix");
-            this.signer = new CarbonSigner_1.CarbonPrivateKeySigner((0, bytes_1.toUint8Array)(this.privateKey), prefix);
-        }
-        else if (opts.bech32Address) {
-            // read-only wallet, without private/public keys
-            this.signer = new CarbonSigner_1.CarbonNonSigner();
-            this.publicKey = Buffer.from([]);
-            this.bech32Address = opts.bech32Address;
-        }
-        else {
-            throw new Error("cannot instantiate wallet signer");
+        switch (opts.mode) {
+            case "mnemonic": {
+                this.mnemonic = opts.mnemonic;
+                this.privateKey = util_1.AddressUtils.SWTHAddress.mnemonicToPrivateKey(this.mnemonic);
+                this.publicKey = util_1.AddressUtils.SWTHAddress.privateToPublicKey(this.privateKey);
+                this.bech32Address = util_1.AddressUtils.SWTHAddress.publicKeyToAddress(this.publicKey, addressOpts);
+                let prefix = addressOpts.bech32Prefix;
+                if (!addressOpts.bech32Prefix)
+                    prefix = address_1.SWTHAddress.getBech32Prefix(addressOpts?.network, addressOpts?.bech32Prefix);
+                if (!prefix)
+                    throw new Error("cannot instantiate wallet signer, no prefix");
+                this.signer = new CarbonSigner_1.CarbonPrivateKeySigner((0, bytes_1.toUint8Array)(this.privateKey), prefix);
+                break;
+            }
+            case "privateKey": {
+                this.privateKey = util_1.AddressUtils.stringOrBufferToBuffer(opts.privateKey);
+                this.publicKey = util_1.AddressUtils.SWTHAddress.privateToPublicKey(this.privateKey);
+                this.bech32Address = util_1.AddressUtils.SWTHAddress.publicKeyToAddress(this.publicKey, addressOpts);
+                let prefix = addressOpts.bech32Prefix;
+                if (!addressOpts.bech32Prefix)
+                    prefix = address_1.SWTHAddress.getBech32Prefix(addressOpts?.network, addressOpts?.bech32Prefix);
+                if (!prefix)
+                    throw new Error("cannot instantiate wallet signer, no prefix");
+                this.signer = new CarbonSigner_1.CarbonPrivateKeySigner((0, bytes_1.toUint8Array)(this.privateKey), prefix);
+                break;
+            }
+            case "customSigner": {
+                this.signer = opts.signer;
+                this.publicKey = Buffer.from(opts.publicKeyBase64, "base64");
+                this.bech32Address = util_1.AddressUtils.SWTHAddress.publicKeyToAddress(this.publicKey, addressOpts);
+                break;
+            }
+            case "viewOnly": {
+                this.signer = new CarbonSigner_1.CarbonNonSigner();
+                this.publicKey = Buffer.from([]);
+                this.bech32Address = opts.bech32Address;
+                break;
+            }
+            case "qr": {
+                if (!opts.mnemonic || !opts.expiry || !opts.granter)
+                    throw new Error("grantor, grantee and expiry must be provided to create grantee wallet");
+                this.publicKey = Buffer.from([]);
+                this.bech32Address = opts.granter;
+                let prefix = addressOpts.bech32Prefix;
+                if (!addressOpts.bech32Prefix)
+                    prefix = address_1.SWTHAddress.getBech32Prefix(addressOpts?.network, addressOpts?.bech32Prefix);
+                if (!prefix)
+                    throw new Error("cannot instantiate wallet signer, no prefix");
+                const pkSigner = new CarbonSigner_1.CarbonPrivateKeySigner((0, bytes_1.toUint8Array)(util_1.AddressUtils.SWTHAddress.mnemonicToPrivateKey(opts.mnemonic)), prefix);
+                this.signer = pkSigner;
+                this.setGrantee({
+                    expiry: opts.expiry,
+                    signer: pkSigner,
+                });
+                break;
+            }
         }
         const addressBytes = util_1.AddressUtils.SWTHAddress.getAddressBytes(this.bech32Address, this.network);
         this.hexAddress = `0x${Buffer.from(addressBytes).toString("hex")}`;
-        this.evmHexAddress = opts.bech32Address ? '' : util_1.AddressUtils.ETHAddress.publicKeyToAddress(this.publicKey, addressOpts);
-        this.evmBech32Address = opts.bech32Address ? '' : util_1.AddressUtils.ETHAddress.publicKeyToBech32Address(this.publicKey, addressOpts);
-    }
-    static withPrivateKey(privateKey, opts = {}) {
-        return new CarbonWallet({
-            ...opts,
-            privateKey,
-        });
-    }
-    static withMnemonic(mnemonic, opts = {}) {
-        return new CarbonWallet({
-            ...opts,
-            mnemonic,
-        });
-    }
-    static withLedger(cosmosLedger, publicKeyBase64, opts = {}) {
-        const signer = new CarbonSigner_1.CarbonLedgerSigner(cosmosLedger);
-        const wallet = CarbonWallet.withSigner(signer, publicKeyBase64, {
-            providerAgent: walletProvider_1.ProviderAgent.Ledger,
-            ...opts,
-        });
-        return wallet;
-    }
-    static withSigner(signer, publicKeyBase64, opts = {}) {
-        return new CarbonWallet({
-            ...opts,
-            signer,
-            publicKeyBase64,
-        });
-    }
-    static withKeplr(keplr, chainInfo, keplrKey, opts = {}) {
-        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 = CarbonWallet.withSigner(signer, publicKeyBase64, {
-            providerAgent: walletProvider_1.ProviderAgent.KeplrExtension,
-            ...opts,
-        });
-        return wallet;
-    }
-    static withLeap(leap, chainId, leapKey, opts = {}) {
-        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 = CarbonWallet.withSigner(signer, publicKeyBase64, {
-            providerAgent: walletProvider_1.ProviderAgent.LeapExtension,
-            ...opts,
-        });
-        return wallet;
-    }
-    static withMetamask(metamask, evmChainId, compressedPubKeyBase64, addressOptions, opts = {}) {
-        const signer = provider_1.MetaMask.createMetamaskSigner(metamask, evmChainId, compressedPubKeyBase64, addressOptions);
-        const wallet = CarbonWallet.withSigner(signer, compressedPubKeyBase64, {
-            providerAgent: walletProvider_1.ProviderAgent.MetamaskExtension,
-            ...opts,
-        });
-        return wallet;
-    }
-    static withRainbowKit(rainbowKit, evmChainId, compressedPubKeyBase64, addressOptions, walletProvider, opts = {}) {
-        const signer = RainbowKitAccount_1.default.createRainbowKitSigner(rainbowKit, evmChainId, compressedPubKeyBase64, addressOptions);
-        const wallet = CarbonWallet.withSigner(signer, compressedPubKeyBase64, {
-            ...opts,
-            providerAgent: walletProvider,
-            isRainbowKit: true,
-        });
-        return wallet;
-    }
-    static withAddress(bech32Address, opts = {}) {
-        return new CarbonWallet({
-            ...opts,
-            bech32Address,
-        });
+        this.evmHexAddress = this.bech32Address ? '' : util_1.AddressUtils.ETHAddress.publicKeyToAddress(this.publicKey, addressOpts);
+        this.evmBech32Address = this.bech32Address ? '' : util_1.AddressUtils.ETHAddress.publicKeyToBech32Address(this.publicKey, addressOpts);
     }
     async initialize(queryClient, gasFee, fallbackConfig = null, opts) {
         this.query = queryClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-js-sdk",
-  "version": "0.11.73",
+  "version": "0.11.74",
   "description": "TypeScript SDK for Carbon blockchain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",