carbon-js-sdk 0.4.16-beta.1 → 0.4.16-beta.2

package/lib/clients/CarbonQueryClient.d.ts

@@ -15,6 +15,8 @@ import { QueryClientImpl as SlashingQueryClient } from "../codec/cosmos/slashing
 import { QueryClientImpl as StakingQueryClient } from "../codec/cosmos/staking/v1beta1/query";
 import { QueryClientImpl as UpgradeQueryClient } from "../codec/cosmos/upgrade/v1beta1/query";
 import { QueryClientImpl as EthermintEVMQueryClient } from "../codec/ethermint/evm/v1/query";
+import { QueryClientImpl as EvmMergeQueryClient } from "../codec/evmmerge/query";
+import { QueryClientImpl as EvmBankQueryClient } from "../codec/evmbank/query";
 import { QueryClientImpl as EthermintFeeMarketQueryClient } from "../codec/ethermint/feemarket/v1/query";
 import { QueryClientImpl as FeeQueryClient } from "../codec/fee/query";
 import { QueryClientImpl as HeadersyncQueryClient } from "../codec/headersync/query";
@@ -89,6 +91,8 @@ declare class CarbonQueryClient {
     chain: BlockchainClient;
     ibc: IBCClientGroup;
     ethermint: EthermintClientGroup;
+    evmmerge: EvmMergeQueryClient;
+    evmbank: EvmBankQueryClient;
     private baseClient;
     constructor(tmClient: Tendermint34Client);
     getProtobufRpcClient(): import("@cosmjs/stargate").ProtobufRpcClient;

package/lib/clients/CarbonQueryClient.js

@@ -20,29 +20,31 @@ const query_14 = require("../codec/cosmos/slashing/v1beta1/query");
 const query_15 = require("../codec/cosmos/staking/v1beta1/query");
 const query_16 = require("../codec/cosmos/upgrade/v1beta1/query");
 const query_17 = require("../codec/ethermint/evm/v1/query");
-const query_18 = require("../codec/ethermint/feemarket/v1/query");
-const query_19 = require("../codec/fee/query");
-const query_20 = require("../codec/headersync/query");
-const query_21 = require("../codec/ibc/applications/interchain_accounts/controller/v1/query");
-const query_22 = require("../codec/ibc/applications/interchain_accounts/host/v1/query");
-const query_23 = require("../codec/ibc/applications/transfer/v1/query");
-const query_24 = require("../codec/ibc/core/client/v1/query");
-const query_25 = require("../codec/ibc/core/connection/v1/query");
-const query_26 = require("../codec/ibc/core/channel/v1/query");
-const query_27 = require("../codec/inflation/query");
-const query_28 = require("../codec/insurance/query");
-const query_29 = require("../codec/leverage/query");
-const query_30 = require("../codec/liquidation/query");
-const query_31 = require("../codec/liquiditypool/query");
-const query_32 = require("../codec/market/query");
-const query_33 = require("../codec/marketstats/query");
-const query_34 = require("../codec/misc/query");
-const query_35 = require("../codec/oracle/query");
-const query_36 = require("../codec/order/query");
-const query_37 = require("../codec/position/query");
-const query_38 = require("../codec/pricing/query");
-const query_39 = require("../codec/profile/query");
-const query_40 = require("../codec/subaccount/query");
+const query_18 = require("../codec/evmmerge/query");
+const query_19 = require("../codec/evmbank/query");
+const query_20 = require("../codec/ethermint/feemarket/v1/query");
+const query_21 = require("../codec/fee/query");
+const query_22 = require("../codec/headersync/query");
+const query_23 = require("../codec/ibc/applications/interchain_accounts/controller/v1/query");
+const query_24 = require("../codec/ibc/applications/interchain_accounts/host/v1/query");
+const query_25 = require("../codec/ibc/applications/transfer/v1/query");
+const query_26 = require("../codec/ibc/core/client/v1/query");
+const query_27 = require("../codec/ibc/core/connection/v1/query");
+const query_28 = require("../codec/ibc/core/channel/v1/query");
+const query_29 = require("../codec/inflation/query");
+const query_30 = require("../codec/insurance/query");
+const query_31 = require("../codec/leverage/query");
+const query_32 = require("../codec/liquidation/query");
+const query_33 = require("../codec/liquiditypool/query");
+const query_34 = require("../codec/market/query");
+const query_35 = require("../codec/marketstats/query");
+const query_36 = require("../codec/misc/query");
+const query_37 = require("../codec/oracle/query");
+const query_38 = require("../codec/order/query");
+const query_39 = require("../codec/position/query");
+const query_40 = require("../codec/pricing/query");
+const query_41 = require("../codec/profile/query");
+const query_42 = require("../codec/subaccount/query");
 const stargate_1 = require("@cosmjs/stargate");
 const BlockchainClient_1 = __importDefault(require("./BlockchainClient"));
 class CarbonQueryClient {
@@ -56,22 +58,24 @@ class CarbonQueryClient {
         this.broker = new query_3.QueryClientImpl(rpcClient);
         this.coin = new query_5.QueryClientImpl(rpcClient);
         this.cdp = new query_4.QueryClientImpl(rpcClient);
-        this.fee = new query_19.QueryClientImpl(rpcClient);
-        this.inflation = new query_27.QueryClientImpl(rpcClient);
-        this.insurance = new query_28.QueryClientImpl(rpcClient);
-        this.leverage = new query_29.QueryClientImpl(rpcClient);
-        this.liquidation = new query_30.QueryClientImpl(rpcClient);
-        this.liquiditypool = new query_31.QueryClientImpl(rpcClient);
-        this.market = new query_32.QueryClientImpl(rpcClient);
-        this.marketstats = new query_33.QueryClientImpl(rpcClient);
-        this.misc = new query_34.QueryClientImpl(rpcClient);
-        this.oracle = new query_35.QueryClientImpl(rpcClient);
-        this.order = new query_36.QueryClientImpl(rpcClient);
-        this.position = new query_37.QueryClientImpl(rpcClient);
-        this.pricing = new query_38.QueryClientImpl(rpcClient);
-        this.profile = new query_39.QueryClientImpl(rpcClient);
-        this.subaccount = new query_40.QueryClientImpl(rpcClient);
-        this.headersync = new query_20.QueryClientImpl(rpcClient);
+        this.fee = new query_21.QueryClientImpl(rpcClient);
+        this.inflation = new query_29.QueryClientImpl(rpcClient);
+        this.insurance = new query_30.QueryClientImpl(rpcClient);
+        this.leverage = new query_31.QueryClientImpl(rpcClient);
+        this.liquidation = new query_32.QueryClientImpl(rpcClient);
+        this.liquiditypool = new query_33.QueryClientImpl(rpcClient);
+        this.market = new query_34.QueryClientImpl(rpcClient);
+        this.marketstats = new query_35.QueryClientImpl(rpcClient);
+        this.misc = new query_36.QueryClientImpl(rpcClient);
+        this.oracle = new query_37.QueryClientImpl(rpcClient);
+        this.order = new query_38.QueryClientImpl(rpcClient);
+        this.position = new query_39.QueryClientImpl(rpcClient);
+        this.pricing = new query_40.QueryClientImpl(rpcClient);
+        this.profile = new query_41.QueryClientImpl(rpcClient);
+        this.subaccount = new query_42.QueryClientImpl(rpcClient);
+        this.headersync = new query_22.QueryClientImpl(rpcClient);
+        this.evmmerge = new query_18.QueryClientImpl(rpcClient);
+        this.evmbank = new query_19.QueryClientImpl(rpcClient);
         this.auth = new query_6.QueryClientImpl(rpcClient);
         this.bank = new query_7.QueryClientImpl(rpcClient);
         this.distribution = new query_9.QueryClientImpl(rpcClient);
@@ -84,16 +88,16 @@ class CarbonQueryClient {
         this.upgrade = new query_16.QueryClientImpl(rpcClient);
         this.cosmosTm = new query_8.ServiceClientImpl(rpcClient);
         this.ibc = {
-            controller: new query_21.QueryClientImpl(rpcClient),
-            host: new query_22.QueryClientImpl(rpcClient),
-            transfer: new query_23.QueryClientImpl(rpcClient),
-            client: new query_24.QueryClientImpl(rpcClient),
-            connection: new query_25.QueryClientImpl(rpcClient),
-            channel: new query_26.QueryClientImpl(rpcClient),
+            controller: new query_23.QueryClientImpl(rpcClient),
+            host: new query_24.QueryClientImpl(rpcClient),
+            transfer: new query_25.QueryClientImpl(rpcClient),
+            client: new query_26.QueryClientImpl(rpcClient),
+            connection: new query_27.QueryClientImpl(rpcClient),
+            channel: new query_28.QueryClientImpl(rpcClient),
         };
         this.ethermint = {
             evm: new query_17.QueryClientImpl(rpcClient),
-            feeMarket: new query_18.QueryClientImpl(rpcClient),
+            feeMarket: new query_20.QueryClientImpl(rpcClient),
         };
     }
     getProtobufRpcClient() {

package/lib/constant/network.js

@@ -127,7 +127,7 @@ exports.NetworkConfigs = {
             byteCodeHash: "0xeb1f732f12a0448d8692018a6d6d381cc7afc84d7e0729007931d966c0c9dc6d",
         },
         bsc: {
-            rpcURL: "https://data-seed-prebsc-2-s3.binance.org:8545/",
+            rpcURL: "https://data-seed-prebsc-1-s2.binance.org:8545/",
             wsURL: "",
             payerURL: `https://test-payer.carbon.network`,
             bridgeEntranceAddr: "",
@@ -195,7 +195,7 @@ exports.NetworkConfigs = {
         feeURL: `https://dev-fees.carbon.network`,
         feeAddress: "989761fb0c0eb0c05605e849cae77d239f98ac7f",
         eth: {
-            rpcURL: "https://eth-rinkeby.alchemyapi.io/v2/2KD9F3mFPNMfflSqZsPuTKmK_w7fFfut",
+            rpcURL: "https://eth-goerli.g.alchemy.com/v2/OTTRiEhTje49mmrrm4WbuPbZmuZMivEu",
             wsURL: "",
             payerURL: `https://dev-payer.carbon.network`,
             lockProxyAddr: "0x7f7317167e90afa38972e46b031bb4da0b1f6f73",
@@ -204,7 +204,7 @@ exports.NetworkConfigs = {
             byteCodeHash: "0xeb1f732f12a0448d8692018a6d6d381cc7afc84d7e0729007931d966c0c9dc6d",
         },
         bsc: {
-            rpcURL: "https://data-seed-prebsc-2-s3.binance.org:8545/",
+            rpcURL: "https://data-seed-prebsc-1-s2.binance.org:8545/",
             wsURL: "",
             payerURL: `https://dev-payer.carbon.network`,
             bridgeEntranceAddr: "",
@@ -272,7 +272,7 @@ exports.NetworkConfigs = {
         feeURL: `http://localhost:9001`,
         feeAddress: "989761fb0c0eb0c05605e849cae77d239f98ac7f",
         eth: {
-            rpcURL: "https://ropsten.infura.io/v3/e4dd457b33124bbda7e17500e6efbc27",
+            rpcURL: "https://eth-goerli.g.alchemy.com/v2/OTTRiEhTje49mmrrm4WbuPbZmuZMivEu",
             wsURL: "wss://ropsten.dagger.matic.network",
             payerURL: `http://localhost:8001`,
             bridgeEntranceAddr: "",
@@ -281,7 +281,7 @@ exports.NetworkConfigs = {
             byteCodeHash: "",
         },
         bsc: {
-            rpcURL: "https://data-seed-prebsc-2-s3.binance.org:8545/",
+            rpcURL: "https://data-seed-prebsc-1-s2.binance.org:8545/",
             wsURL: "",
             payerURL: `http://localhost:8001`,
             bridgeEntranceAddr: "",

package/lib/constant/walletProvider.d.ts

@@ -6,4 +6,3 @@ export declare enum ProviderAgent {
     MetamaskExtension = "metamask-extension",
     Metamask = "metamask"
 }
-export declare function isEvmWallet(providerAgent?: string): boolean;

package/lib/constant/walletProvider.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEvmWallet = exports.ProviderAgent = void 0;
+exports.ProviderAgent = void 0;
 var ProviderAgent;
 (function (ProviderAgent) {
     ProviderAgent["Ledger"] = "ledger";
@@ -11,7 +11,3 @@ var ProviderAgent;
     // For legacy metamask
     ProviderAgent["Metamask"] = "metamask";
 })(ProviderAgent = exports.ProviderAgent || (exports.ProviderAgent = {}));
-function isEvmWallet(providerAgent) {
-    return ProviderAgent.MetamaskExtension.toString() === providerAgent;
-}
-exports.isEvmWallet = isEvmWallet;

package/lib/provider/metamask/MetaMask.d.ts

@@ -38,6 +38,10 @@ export interface MetaMaskSyncResult {
     blockchain?: Blockchain | BlockchainV2;
     chainId?: number;
 }
+export interface StoredMnemonicInfo {
+    chain: EVMChainV2;
+    mnemonics: string;
+}
 /**
  * TODO: Add docs
  */
@@ -45,10 +49,11 @@ export declare class MetaMask {
     readonly network: Network;
     readonly legacyEip712SignMode: boolean;
     private blockchain;
+    private legacyEncryptedLogin;
     static createMetamaskSigner(metamask: MetaMask, evmChainId: string, pubKeyBase64: string, addressOptions: SWTHAddressOptions): CarbonSigner;
     static getNetworkParams(network: Network, blockchain?: EVMChain): MetaMaskChangeNetworkParam;
     static getCarbonEvmNetworkParams(network: Network): MetaMaskChangeNetworkParam;
-    static getRequiredChainId(network: Network, blockchain?: BlockchainV2): number;
+    static getRequiredChainId(network: Network, blockchain?: BlockchainV2): 1 | 5 | 66 | 56 | 137 | 42161 | 97 | 65 | 80001 | 421611;
     constructor(network: Network, legacyEip712SignMode?: boolean);
     private checkProvider;
     getBlockchain(): BlockchainV2;
@@ -58,6 +63,8 @@ export declare class MetaMask {
     getConnectedAPI(): Promise<MetaMaskAPI>;
     connect(): Promise<MetaMaskAPI>;
     defaultAccount(): Promise<string>;
+    getEncryptedLegacyAccount(connectedBlockchain?: EVMChainV2): Promise<StoredMnemonicInfo | undefined>;
+    getMnemonicInfo(connectedBlockchain: EVMChainV2): Promise<StoredMnemonicInfo | undefined>;
     getStoredMnemonicCipher(account: string, blockchain?: EVMChain): Promise<string | undefined>;
     encryptMnemonic(mnemonic: string): Promise<string>;
     signPublicKeyMergeAccount(publicKey: string, address: string, metamaskAPI?: MetaMaskAPI): Promise<string>;
@@ -70,5 +77,6 @@ export declare class MetaMask {
     login(blockchain?: EVMChain): Promise<string | null>;
     private getRequiredChain;
     private getContractHash;
+    isLegacyEncryptedLogin(): boolean;
 }
 export {};

package/lib/provider/metamask/MetaMask.js

@@ -86,7 +86,7 @@ const CONTRACT_HASH = {
         [constant_1.Network.MainNet]: "0x7e8D8c98a016877Cb3103e837Fc71D41b155aF70",
     },
     Carbon: {
-        //Carbon does not support Metamask legacy mnemonic sign in 
+        //Carbon does not support Metamask legacy mnemonic sign in
         [constant_1.Network.TestNet]: "",
         [constant_1.Network.DevNet]: "",
         [constant_1.Network.LocalHost]: "",
@@ -264,6 +264,7 @@ class MetaMask {
         this.network = network;
         this.legacyEip712SignMode = legacyEip712SignMode;
         this.blockchain = 'Ethereum';
+        this.legacyEncryptedLogin = false;
     }
     static createMetamaskSigner(metamask, evmChainId, pubKeyBase64, addressOptions) {
         const signDirect = (_, doc) => __awaiter(this, void 0, void 0, function* () {
@@ -403,9 +404,6 @@ class MetaMask {
         }
     }
     static getRequiredChainId(network, blockchain = 'Ethereum') {
-        if (blockchain === 'Carbon') {
-            return Number(ethermint_1.parseChainId(constant_1.CarbonEvmChainIDs[network]));
-        }
         if (network === constant_1.Network.MainNet) {
             switch (blockchain) {
                 case 'Binance Smart Chain':
@@ -494,6 +492,43 @@ class MetaMask {
             return defaultAccount;
         });
     }
+    getEncryptedLegacyAccount(connectedBlockchain) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (connectedBlockchain && connectedBlockchain !== 'Carbon') {
+                const mnemonicInfo = yield this.getMnemonicInfo(connectedBlockchain);
+                if (mnemonicInfo) {
+                    return mnemonicInfo;
+                }
+            }
+            const chainMnemonicSearch = blockchain_1.EvmChains.map((blockchain) => __awaiter(this, void 0, void 0, function* () {
+                if (blockchain !== 'Carbon' && CONTRACT_HASH[blockchain][this.network]) {
+                    return yield this.getMnemonicInfo(blockchain);
+                }
+            }));
+            const results = yield Promise.all(chainMnemonicSearch);
+            return results.find(result => !result);
+        });
+    }
+    getMnemonicInfo(connectedBlockchain) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const defaultAccount = yield this.defaultAccount();
+            let result;
+            if (connectedBlockchain !== 'Carbon' && connectedBlockchain) {
+                yield this.getStoredMnemonicCipher(defaultAccount, connectedBlockchain).then(mnemonics => {
+                    if (mnemonics) {
+                        result = {
+                            chain: connectedBlockchain,
+                            mnemonics
+                        };
+                    }
+                }).catch(err => {
+                    console.error('Unable to retrieve stored mnemonic cipher from ', connectedBlockchain);
+                    console.error(err);
+                }).finally(() => { return result; });
+            }
+            return result;
+        });
+    }
     getStoredMnemonicCipher(account, blockchain) {
         return __awaiter(this, void 0, void 0, function* () {
             const contractHash = this.getContractHash(blockchain);
@@ -661,6 +696,7 @@ class MetaMask {
                 console.error(decryptedCipherText);
                 throw new Error("Retrieved invalid account on blockchain, please check console for more information.");
             }
+            this.legacyEncryptedLogin = true;
             return (_b = match[1]) === null || _b === void 0 ? void 0 : _b.trim();
         });
     }
@@ -722,5 +758,8 @@ class MetaMask {
         }
         return contractHash;
     }
+    isLegacyEncryptedLogin() {
+        return this.legacyEncryptedLogin;
+    }
 }
 exports.MetaMask = MetaMask;

package/lib/util/blockchain.d.ts

@@ -86,7 +86,6 @@ export declare const getBlockchainFromChain: (chainId?: number | undefined) => B
 export declare const blockchainForChainId: (chainId?: number | undefined, network?: Network) => Blockchain | undefined;
 export declare const getBlockchainFromChainV2: (chainId?: number | undefined) => "Carbon" | "Ethereum" | "Binance Smart Chain" | "Arbitrum" | "Polygon" | "Okc" | "Zilliqa" | undefined;
 export declare const blockchainForChainIdV2: (chainId?: number | undefined, network?: Network) => Blockchain | BlockchainV2 | undefined;
-declare const evmChains: readonly ["Ethereum", "Binance Smart Chain", "Arbitrum", "Polygon", "OKC", "Carbon"];
-export declare type EVMChain = (typeof evmChains)[number];
+export declare const EvmChains: readonly ["Ethereum", "Binance Smart Chain", "Arbitrum", "Polygon", "OKC", "Carbon"];
+export declare type EVMChain = (typeof EvmChains)[number];
 export declare const isEvmChain: (chain: string) => chain is "Carbon" | "Ethereum" | "Binance Smart Chain" | "Arbitrum" | "Polygon" | "OKC";
-export {};

package/lib/util/blockchain.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEvmChain = exports.blockchainForChainIdV2 = exports.getBlockchainFromChainV2 = exports.blockchainForChainId = exports.getBlockchainFromChain = exports.getChainFromID = exports.parseBlockchain = exports.chainIdsByBlockchain = exports.CHAIN_IDS_TEST = exports.CHAIN_IDS_DEV = exports.CHAIN_IDS = exports.ChainNames = exports.isIbcBridge = exports.BRIDGE_IDS = exports.BLOCKCHAIN_V2_TO_V1_MAPPING = exports.Blockchain = void 0;
+exports.isEvmChain = exports.EvmChains = exports.blockchainForChainIdV2 = exports.getBlockchainFromChainV2 = exports.blockchainForChainId = exports.getBlockchainFromChain = exports.getChainFromID = exports.parseBlockchain = exports.chainIdsByBlockchain = exports.CHAIN_IDS_TEST = exports.CHAIN_IDS_DEV = exports.CHAIN_IDS = exports.ChainNames = exports.isIbcBridge = exports.BRIDGE_IDS = exports.BLOCKCHAIN_V2_TO_V1_MAPPING = exports.Blockchain = void 0;
 const network_1 = require("../constant/network");
 const ethermint_1 = require("./ethermint");
 var Blockchain;
@@ -422,6 +422,6 @@ const blockchainForChainIdV2 = (chainId, network = network_1.Network.MainNet) =>
     }
 };
 exports.blockchainForChainIdV2 = blockchainForChainIdV2;
-const evmChains = ['Ethereum', 'Binance Smart Chain', 'Arbitrum', 'Polygon', 'OKC', 'Carbon'];
-const isEvmChain = (chain) => evmChains.includes(chain);
+exports.EvmChains = ['Ethereum', 'Binance Smart Chain', 'Arbitrum', 'Polygon', 'OKC', 'Carbon'];
+const isEvmChain = (chain) => exports.EvmChains.includes(chain);
 exports.isEvmChain = isEvmChain;

package/lib/util/tx.d.ts

@@ -25,6 +25,7 @@ export interface SignTxOpts {
     feeDenom?: string;
     memo?: string;
     sequence?: number;
+    accountNumber?: number;
     explicitSignerData?: Partial<CarbonSignerData>;
 }
 export interface BroadcastTxOpts {

package/lib/wallet/CarbonWallet.d.ts

@@ -80,6 +80,7 @@ export declare class CarbonWallet {
     evmBech32Address: string;
     hexAddress: string;
     evmHexAddress: string;
+    accountMerged: boolean;
     publicKey: Buffer;
     query?: CarbonQueryClient;
     /**
@@ -127,6 +128,7 @@ export declare class CarbonWallet {
     private signTx;
     private dispatchTx;
     sendTxs(msgs: EncodeObject[], opts?: CarbonTx.SignTxOpts): Promise<CarbonWallet.SendTxResponse>;
+    sendInitialMergeAccountTx(opts?: CarbonTx.SignTxOpts): Promise<void>;
     sendTxsWithoutConfirm(msgs: EncodeObject[], opts?: CarbonTx.SignTxOpts): Promise<CarbonWallet.SendTxWithoutConfirmResponse>;
     sendTx(msg: EncodeObject, opts?: CarbonTx.SignTxOpts): Promise<CarbonWallet.SendTxResponse>;
     getSigningClient(): CarbonSigningClient;
@@ -142,10 +144,12 @@ export declare class CarbonWallet {
     getFee(msgTypeUrl: string, denom?: string): BigNumber;
     reconnectTmClient(): Promise<void>;
     reloadTxFees(): Promise<void>;
+    private reloadAccountInfo;
+    private getAccount;
     reloadAccountSequence(): Promise<void>;
+    reloadMergeAccountStatus(): Promise<void>;
     private estimateTxFee;
-    private isNewAccountError;
-    private EthPublicKeyError;
+    private isAccountNotFoundError;
     private isNonceMismatchError;
     private getQueryClient;
 }

package/lib/wallet/CarbonWallet.js

@@ -28,19 +28,17 @@ const CarbonSigningClient_1 = require("./CarbonSigningClient");
 const ethermint_1 = require("../util/ethermint");
 const web3_1 = require("../codec/ethermint/types/v1/web3");
 const auth_1 = require("../codec/cosmos/auth/v1beta1/auth");
+const codec_1 = require("../codec");
 class CarbonWallet {
     constructor(opts) {
         var _a, _b, _c, _d;
+        this.accountMerged = false;
         this.defaultFeeDenom = constant_1.DEFAULT_FEE_DENOM;
         this.initialized = false;
         this.sequenceInvalidated = false;
-        this.isNewAccountError = (error) => {
+        this.isAccountNotFoundError = (error, address) => {
             var _a;
-            return (_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.includes("Account does not exist on chain. Send some tokens there before trying to query sequence.");
-        };
-        this.EthPublicKeyError = (error) => {
-            var _a;
-            return (_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.includes("Pubkey type_url /ethermint.crypto.v1.ethsecp256k1.PubKey not recognized");
+            return (_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.includes(`account ${address} not found: key not found`);
         };
         this.isNonceMismatchError = (error) => {
             const regex = /^Broadcasting transaction failed with code 32 \(codespace: sdk\)\. Log: account sequence mismatch, expected (\d+), got (\d+): incorrect account sequence/;
@@ -142,7 +140,7 @@ class CarbonWallet {
     initialize(queryClient) {
         return __awaiter(this, void 0, void 0, function* () {
             this.query = queryClient;
-            yield Promise.all([this.reconnectTmClient(), this.reloadTxFees(), this.reloadAccountSequence()]);
+            yield Promise.all([this.reconnectTmClient(), this.reloadTxFees(), this.reloadAccountSequence(), this.reloadMergeAccountStatus()]);
             this.initialized = true;
             return this;
         });
@@ -156,14 +154,14 @@ class CarbonWallet {
     getSignedTx(signerAddress, messages, sequence, opts) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const { memo = "", explicitSignerData, feeDenom } = opts;
+            const { memo = "", accountNumber, explicitSignerData, feeDenom } = opts;
             const signingClient = this.getSigningClient();
             const [account] = yield this.signer.getAccounts();
             let signature = null;
             const evmChainId = this.evmChainId;
             try {
                 yield util_1.GenericUtils.callIgnoreError(() => { var _a; return (_a = this.onRequestSign) === null || _a === void 0 ? void 0 : _a.call(this, messages); });
-                const signerData = Object.assign(Object.assign({ accountNumber: this.accountInfo.accountNumber, chainId: this.getChainId(), sequence }, explicitSignerData), { evmChainId });
+                const signerData = Object.assign(Object.assign({ accountNumber: accountNumber !== null && accountNumber !== void 0 ? accountNumber : this.accountInfo.accountNumber, chainId: this.getChainId(), sequence }, explicitSignerData), { evmChainId });
                 const fee = (_a = opts === null || opts === void 0 ? void 0 : opts.fee) !== null && _a !== void 0 ? _a : this.estimateTxFee(messages, feeDenom);
                 const txRaw = yield signingClient.sign(signerAddress, messages, fee, memo, signerData);
                 let sig;
@@ -230,7 +228,7 @@ class CarbonWallet {
         });
     }
     signTx(txRequest) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const { reattempts, signerAddress, signOpts, messages, broadcastOpts, handler: { resolve, reject }, } = txRequest;
             try {
@@ -244,8 +242,14 @@ class CarbonWallet {
                 if (!CarbonSigner_1.isCarbonEIP712Signer(this.signer)) {
                     timeoutHeight = height.isZero() ? undefined : height.toNumber() + this.defaultTimeoutBlocks;
                 }
-                const sequence = this.accountInfo.sequence;
-                this.accountInfo = Object.assign(Object.assign({}, this.accountInfo), { sequence: sequence + 1 });
+                let sequence;
+                if (!this.accountInfo) {
+                    sequence = (_b = signOpts === null || signOpts === void 0 ? void 0 : signOpts.sequence) !== null && _b !== void 0 ? _b : 0;
+                }
+                else {
+                    sequence = this.accountInfo.sequence;
+                    this.accountInfo = Object.assign(Object.assign({}, this.accountInfo), { sequence: sequence + 1 });
+                }
                 const _signOpts = Object.assign(Object.assign({}, signOpts), { explicitSignerData: Object.assign({ timeoutHeight }, signOpts === null || signOpts === void 0 ? void 0 : signOpts.explicitSignerData) });
                 const signedTx = yield this.getSignedTx(signerAddress, messages, sequence, _signOpts);
                 this.txDispatchManager.enqueue({
@@ -296,10 +300,39 @@ class CarbonWallet {
     }
     sendTxs(msgs, opts) {
         return __awaiter(this, void 0, void 0, function* () {
+            yield this.reloadMergeAccountStatus();
+            if (!this.accountMerged && msgs[0].typeUrl !== util_1.CarbonTx.Types.MsgMergeAccount) {
+                yield this.sendInitialMergeAccountTx(opts);
+                // refresh accountInfo after merging is done
+                yield this.reloadAccountSequence();
+            }
             const result = yield this.signAndBroadcast(msgs, opts, { mode: tx_1.BroadcastTxMode.BroadcastTxBlock });
+            yield this.reloadMergeAccountStatus();
             return result;
         });
     }
+    sendInitialMergeAccountTx(opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const account = yield this.getQueryClient().auth.Account({ address: this.bech32Address }).then(res => res.account).catch((err) => __awaiter(this, void 0, void 0, function* () {
+                    return (yield this.getQueryClient().auth.Account({ address: this.evmBech32Address })).account;
+                }));
+                const { address, sequence, accountNumber } = auth_1.BaseAccount.decode(account.value);
+                const msg = {
+                    typeUrl: util_1.CarbonTx.Types.MsgMergeAccount,
+                    value: codec_1.MsgMergeAccount.fromPartial({
+                        creator: address,
+                        pubKey: this.publicKey.toString('hex')
+                    })
+                };
+                const modifiedOpts = Object.assign(Object.assign({}, opts), { sequence: sequence.toNumber(), accountNumber: accountNumber.toNumber() });
+                yield this.signAndBroadcast([msg], modifiedOpts, { mode: tx_1.BroadcastTxMode.BroadcastTxBlock });
+            }
+            catch (error) {
+                throw error;
+            }
+        });
+    }
     sendTxsWithoutConfirm(msgs, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             const result = yield this.signAndBroadcast(msgs, opts, { mode: tx_1.BroadcastTxMode.BroadcastTxSync });
@@ -399,42 +432,76 @@ class CarbonWallet {
             }
         });
     }
+    reloadAccountInfo() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                //carbon account always takes priority
+                const accountAny = (_a = yield this.getAccount(this.bech32Address)) !== null && _a !== void 0 ? _a : yield this.getAccount(this.evmBech32Address);
+                if (!accountAny)
+                    return undefined;
+                const { accountNumber, sequence, address } = auth_1.BaseAccount.decode(accountAny.value);
+                return {
+                    address,
+                    accountNumber: accountNumber.toNumber(),
+                    sequence: sequence.toNumber()
+                };
+            }
+            catch (error) {
+                throw error;
+            }
+        });
+    }
+    getAccount(address) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let account;
+            try {
+                account = (yield this.getQueryClient().auth.Account({ address })).account;
+            }
+            catch (error) {
+                if (!this.isAccountNotFoundError(error, address))
+                    throw error;
+            }
+            finally {
+                return account;
+            }
+        });
+    }
     reloadAccountSequence() {
         var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.sequenceInvalidated)
                 this.sequenceInvalidated = false;
             try {
-                const evmWallet = walletProvider_1.isEvmWallet(this.providerAgent);
-                const address = evmWallet ? this.evmBech32Address : this.bech32Address;
-                // Alternative way to get account info since cosmjs dont support eth pub key for now
-                const info = yield this.getQueryClient().chain.getSequence(address).then(res => res).catch((err) => __awaiter(this, void 0, void 0, function* () {
-                    if (this.EthPublicKeyError(err)) {
-                        const accountAny = (yield this.getQueryClient().auth.Account({ address })).account;
-                        if (!accountAny) {
-                            throw new Error("Account does not exist on chain. Send some tokens there before trying to query sequence.");
-                        }
-                        const { accountNumber, sequence } = auth_1.BaseAccount.decode(accountAny.value);
-                        const sequenceResponse = {
-                            accountNumber: accountNumber.toNumber(),
-                            sequence: sequence.toNumber()
-                        };
-                        return sequenceResponse;
-                    }
-                    throw err;
-                }));
+                const info = yield this.reloadAccountInfo();
                 const pubkey = (_b = (_a = this.accountInfo) === null || _a === void 0 ? void 0 : _a.pubkey) !== null && _b !== void 0 ? _b : {
                     type: "tendermint/PubKeySecp256k1",
                     value: this.publicKey.toString("base64"),
                 };
                 const chainId = (_e = (_d = (_c = this.accountInfo) === null || _c === void 0 ? void 0 : _c.chainId) !== null && _d !== void 0 ? _d : this.chainId) !== null && _e !== void 0 ? _e : (yield this.getQueryClient().chain.getChainId());
-                this.accountInfo = Object.assign(Object.assign({}, info), { address,
-                    pubkey,
-                    chainId });
+                if (info) {
+                    this.accountInfo = Object.assign(Object.assign({}, info), { pubkey,
+                        chainId });
+                }
             }
             catch (error) {
-                if (!this.isNewAccountError(error))
-                    throw error;
+                throw error;
+            }
+        });
+    }
+    reloadMergeAccountStatus() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.accountMerged)
+                    return;
+                const queryClient = this.getQueryClient();
+                const response = yield queryClient.evmmerge.MappedAddress({ address: this.bech32Address });
+                if (response && response.mappedAddress) {
+                    this.accountMerged = true;
+                }
+            }
+            catch (error) {
+                throw error;
             }
         });
     }

package/package.json

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