carbon-js-sdk 0.3.52 → 0.3.53-dev.1

package/lib/CarbonSDK.js

@@ -68,8 +68,8 @@ class CarbonSDK {
         this.chainId = (_d = (_c = opts.chainId) !== null && _c !== void 0 ? _c : constant_1.CarbonChainIDs[this.network]) !== null && _d !== void 0 ? _d : constant_1.CarbonChainIDs[constant_1.Network.MainNet];
         this.query = new clients_1.CarbonQueryClient(opts.tmClient);
         this.insights = new clients_1.InsightsQueryClient(this.networkConfig);
-        this.hydrogen = new clients_1.HydrogenClient(this.networkConfig);
         this.token = (_e = opts.token) !== null && _e !== void 0 ? _e : clients_1.TokenClient.instance(this.query, this);
+        this.hydrogen = clients_1.HydrogenClient.instance(this.networkConfig, this.token);
         this.admin = new modules_1.AdminModule(this);
         this.order = new modules_1.OrderModule(this);
         this.lp = new modules_1.LiquidityPoolModule(this);

package/lib/clients/ETHClient.d.ts

@@ -9,7 +9,7 @@ import TokenClient from "./TokenClient";
 export interface ETHClientOpts {
     configProvider: NetworkConfigProvider;
     tokenClient: TokenClient;
-    blockchain: Blockchain;
+    blockchain: typeof ETHClient.SUPPORTED_BLOCKCHAINS[number];
 }
 interface ETHTxParams {
     gasPriceGwei: BigNumber;
@@ -47,9 +47,9 @@ export interface EthersTransactionResponse extends ethers.Transaction {
 export declare const FEE_MULTIPLIER: ethers.BigNumber;
 export declare class ETHClient {
     readonly configProvider: NetworkConfigProvider;
-    readonly blockchain: Blockchain;
+    readonly blockchain: typeof ETHClient.SUPPORTED_BLOCKCHAINS[number];
     readonly tokenClient: TokenClient;
-    static SUPPORTED_BLOCKCHAINS: Blockchain[];
+    static SUPPORTED_BLOCKCHAINS: readonly [Blockchain.BinanceSmartChain, Blockchain.Ethereum, Blockchain.Arbitrum, Blockchain.Polygon, Blockchain.Okc];
     static BLOCKCHAIN_KEY: {
         bsc: string;
         eth: string;
@@ -57,9 +57,16 @@ export declare class ETHClient {
         polygon: string;
         okc: string;
     };
+    static BLOCKCHAINV2_MAPPING: {
+        bsc: string;
+        eth: string;
+        arbitrum: string;
+        polygon: string;
+        okc: string;
+    };
     private constructor();
     static instance(opts: ETHClientOpts): CarbonSDK.ETHClient;
-    getExternalBalances(api: CarbonSDK, address: string, whitelistDenoms?: string[]): Promise<TokensWithExternalBalance[]>;
+    getExternalBalances(api: CarbonSDK, address: string, whitelistDenoms?: string[], version?: string): Promise<TokensWithExternalBalance[]>;
     approveERC20(params: ApproveERC20Params): Promise<EthersTransactionResponse>;
     checkAllowanceERC20(token: Models.Token, owner: string, spender: string): Promise<BigNumber>;
     bridgeTokens(params: BridgeParams): Promise<EthersTransactionResponse>;

package/lib/clients/ETHClient.js

@@ -35,15 +35,22 @@ class ETHClient {
             throw new Error(`unsupported blockchain - ${blockchain}`);
         return new ETHClient(configProvider, blockchain, tokenClient);
     }
-    getExternalBalances(api, address, whitelistDenoms) {
+    getExternalBalances(api, address, whitelistDenoms, version = "V1") {
         return __awaiter(this, void 0, void 0, function* () {
             const tokenQueryResults = yield api.token.getAllTokens();
             const lockProxyAddress = this.getLockProxyAddress().toLowerCase();
-            const tokens = tokenQueryResults.filter((token) => blockchain_1.blockchainForChainId(token.chainId.toNumber(), api.network) == this.blockchain &&
-                token.tokenAddress.length == 40 &&
-                token.bridgeAddress.toLowerCase() == generic_1.stripHexPrefix(lockProxyAddress) &&
-                (!whitelistDenoms || whitelistDenoms.includes(token.denom)) &&
-                this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress)));
+            const tokens = tokenQueryResults.filter((token) => {
+                const isCorrectBlockchain = version === "V2"
+                    ?
+                        this.tokenClient.getBlockchainV2(token.denom) == ETHClient.BLOCKCHAINV2_MAPPING[this.blockchain]
+                    :
+                        blockchain_1.blockchainForChainId(token.chainId.toNumber(), api.network) == this.blockchain;
+                return isCorrectBlockchain &&
+                    token.tokenAddress.length == 40 &&
+                    token.bridgeAddress.toLowerCase() == generic_1.stripHexPrefix(lockProxyAddress) &&
+                    (!whitelistDenoms || whitelistDenoms.includes(token.denom)) &&
+                    this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress));
+            });
             const assetIds = tokens.map((token) => {
                 return this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress));
             });
@@ -358,4 +365,11 @@ ETHClient.BLOCKCHAIN_KEY = {
     [blockchain_1.Blockchain.Polygon]: "polygon",
     [blockchain_1.Blockchain.Okc]: "okc",
 };
+ETHClient.BLOCKCHAINV2_MAPPING = {
+    [blockchain_1.Blockchain.BinanceSmartChain]: "Binance Smart Chain",
+    [blockchain_1.Blockchain.Ethereum]: "Ethereum",
+    [blockchain_1.Blockchain.Arbitrum]: "Arbitrum",
+    [blockchain_1.Blockchain.Polygon]: "Polygon",
+    [blockchain_1.Blockchain.Okc]: "Okc",
+};
 exports.default = ETHClient;

package/lib/clients/HydrogenClient.d.ts

@@ -1,6 +1,8 @@
 import { NetworkConfig } from "../constant";
-import { GetDetailedTransfersResponse, GetRelaysRequest, GetRelaysResponse, GetStatsResponse, GetTransfersRequest, GetTransfersResponse } from "../hydrogen";
-import { GetFeeQuoteRequest, GetFeeQuoteResponse } from "../hydrogen/feeQuote";
+import { BlockchainUtils } from "../util";
+import { ChainTransaction, CrossChainTransfer, CrossChainTransferDetailed, GetDetailedTransfersResponse, GetRelaysRequest, GetRelaysResponse, GetStatsResponse, GetTransfersRequest, GetTransfersResponse, RelaysResponse } from "../hydrogen";
+import { FeeQuote, GetFeeQuoteRequest, GetFeeQuoteResponse } from "../hydrogen/feeQuote";
+import TokenClient from './TokenClient';
 export declare const HydrogenEndpoints: {
     stats: string;
     transfer_payloads: string;
@@ -10,12 +12,19 @@ export declare const HydrogenEndpoints: {
 declare class HydrogenClient {
     private config;
     private readonly apiManager;
-    constructor(config: NetworkConfig);
+    private readonly tokenClient;
+    constructor(config: NetworkConfig, tokenClient: TokenClient);
+    static instance(config: NetworkConfig, tokenClient: TokenClient): HydrogenClient;
     checkState(): void;
+    formatCrossChainTransferV2: (value: any) => CrossChainTransfer;
+    formatCrossChainTransferDetailedV2: (value: any) => CrossChainTransferDetailed;
+    formatRelaysTransfersV2: (value: any) => RelaysResponse;
+    formatChainEventV2: (value: any, blockchain: BlockchainUtils.BlockchainV2) => ChainTransaction | null;
+    formatFeeQuoteV2: (value: any, blockchain: BlockchainUtils.BlockchainV2) => FeeQuote;
     getStats(): Promise<GetStatsResponse>;
-    getTransfers(req: GetTransfersRequest): Promise<GetTransfersResponse>;
-    getDetailedTransfers(req: GetTransfersRequest): Promise<GetDetailedTransfersResponse>;
-    getRelaysTransfers(req: GetRelaysRequest): Promise<GetRelaysResponse>;
-    getFeeQuote(req: GetFeeQuoteRequest): Promise<GetFeeQuoteResponse>;
+    getTransfers(req: GetTransfersRequest, version?: string): Promise<GetTransfersResponse>;
+    getDetailedTransfers(req: GetTransfersRequest, version?: string): Promise<GetDetailedTransfersResponse>;
+    getRelaysTransfers(req: GetRelaysRequest, version?: string): Promise<GetRelaysResponse>;
+    getFeeQuote(req: GetFeeQuoteRequest, blockchain?: BlockchainUtils.Blockchain | BlockchainUtils.BlockchainV2 | undefined, version?: string): Promise<GetFeeQuoteResponse>;
 }
 export default HydrogenClient;

package/lib/clients/HydrogenClient.js

@@ -60,10 +60,56 @@ const formatFeeQuote = (value) => {
         return value;
     return Object.assign(Object.assign({}, value), { blockchain: util_1.BlockchainUtils.parseBlockchain(value.blockchain), created_at: formatDateField((_a = value.created_at) === null || _a === void 0 ? void 0 : _a.toString()), expires_at: formatDateField((_b = value.expires_at) === null || _b === void 0 ? void 0 : _b.toString()) });
 };
+const getBridgeBlockchainFromId = (bridgeId) => {
+    switch (bridgeId) {
+        case 1:
+            return 'Polynetwork';
+        case 2:
+            return 'Ibc';
+        default:
+            return 'Polynetwork';
+    }
+};
 class HydrogenClient {
-    constructor(config) {
+    constructor(config, tokenClient) {
         this.config = config;
+        this.formatCrossChainTransferV2 = (value) => {
+            var _a, _b;
+            if (typeof value !== "object")
+                return value;
+            return Object.assign(Object.assign({}, value), { created_at: formatDateField((_a = value.created_at) === null || _a === void 0 ? void 0 : _a.toString()), updated_at: formatDateField((_b = value.updated_at) === null || _b === void 0 ? void 0 : _b.toString()), source_blockchain: this.tokenClient.getBlockchainV2FromIDs(value.from_chain_id, value.bridge_id), bridging_blockchain: getBridgeBlockchainFromId(value.bridge_id), destination_blockchain: this.tokenClient.getBlockchainV2FromIDs(value.to_chain_id, value.bridge_id) });
+        };
+        this.formatCrossChainTransferDetailedV2 = (value) => {
+            if (!value || typeof value !== "object")
+                return value;
+            const source_blockchain = this.tokenClient.getBlockchainV2FromIDs(value.from_chain_id, value.bridge_id);
+            const destination_blockchain = this.tokenClient.getBlockchainV2FromIDs(value.to_chain_id, value.bridge_id);
+            const bridging_blockchain = getBridgeBlockchainFromId(value.bridge_id);
+            return Object.assign(Object.assign({}, this.formatCrossChainTransferV2(value)), { source_event: this.formatChainEventV2(value.source_event, source_blockchain !== null && source_blockchain !== void 0 ? source_blockchain : ''), bridging_event: this.formatChainEventV2(value.bridging_event, bridging_blockchain), destination_event: this.formatChainEventV2(value.destination_event, destination_blockchain !== null && destination_blockchain !== void 0 ? destination_blockchain : '') });
+        };
+        this.formatRelaysTransfersV2 = (value) => {
+            var _a, _b;
+            if (!value || typeof value !== "object")
+                return value;
+            return Object.assign(Object.assign({}, value), { created_at: formatDateField((_a = value.created_at) === null || _a === void 0 ? void 0 : _a.toString()), updated_at: formatDateField((_b = value.updated_at) === null || _b === void 0 ? void 0 : _b.toString()), source_blockchain: this.tokenClient.getBlockchainV2FromIDs(value.from_chain_id, value.bridge_id), bridging_blockchain: getBridgeBlockchainFromId(value.bridge_id), destination_blockchain: this.tokenClient.getBlockchainV2FromIDs(value.to_chain_id, value.bridge_id) });
+        };
+        this.formatChainEventV2 = (value, blockchain) => {
+            var _a, _b, _c;
+            if (!value || typeof value !== "object")
+                return value;
+            return Object.assign(Object.assign({}, value), { confirmed_at: formatDateField((_a = value.confirmed_at) === null || _a === void 0 ? void 0 : _a.toString()), created_at: formatDateField((_b = value.created_at) === null || _b === void 0 ? void 0 : _b.toString()), updated_at: formatDateField((_c = value.updated_at) === null || _c === void 0 ? void 0 : _c.toString()), blockchain });
+        };
+        this.formatFeeQuoteV2 = (value, blockchain) => {
+            var _a, _b;
+            if (typeof value !== "object")
+                return value;
+            return Object.assign(Object.assign({}, value), { blockchain, created_at: formatDateField((_a = value.created_at) === null || _a === void 0 ? void 0 : _a.toString()), expires_at: formatDateField((_b = value.expires_at) === null || _b === void 0 ? void 0 : _b.toString()) });
+        };
         this.apiManager = new util_1.APIUtils.APIManager(config.hydrogenUrl, exports.HydrogenEndpoints);
+        this.tokenClient = tokenClient;
+    }
+    static instance(config, tokenClient) {
+        return new HydrogenClient(config, tokenClient);
     }
     checkState() {
         var _a;
@@ -82,40 +128,40 @@ class HydrogenClient {
             return response.data;
         });
     }
-    getTransfers(req) {
+    getTransfers(req, version = "V1") {
         return __awaiter(this, void 0, void 0, function* () {
             this.checkState();
             const request = this.apiManager.path("transfer_payloads", {}, Object.assign(Object.assign({}, req), { include_tx: false }));
             const response = yield request.get();
             const result = response.data;
-            return Object.assign(Object.assign({}, result), { data: result.data.map(formatCrossChainTransfer) });
+            return Object.assign(Object.assign({}, result), { data: result.data.map(version === "V1" ? formatCrossChainTransfer : this.formatCrossChainTransferV2) });
         });
     }
-    getDetailedTransfers(req) {
+    getDetailedTransfers(req, version = "V1") {
         return __awaiter(this, void 0, void 0, function* () {
             this.checkState();
             const request = this.apiManager.path("transfer_payloads", {}, Object.assign(Object.assign({}, req), { include_tx: true }));
             const response = yield request.get();
             const result = response.data;
-            return Object.assign(Object.assign({}, result), { data: result.data.map(formatCrossChainTransferDetailed) });
+            return Object.assign(Object.assign({}, result), { data: result.data.map(version === "V1" ? formatCrossChainTransferDetailed : this.formatCrossChainTransferDetailedV2) });
         });
     }
-    getRelaysTransfers(req) {
+    getRelaysTransfers(req, version = "V1") {
         return __awaiter(this, void 0, void 0, function* () {
             this.checkState();
             const request = this.apiManager.path("relays", {}, Object.assign(Object.assign({}, req), { include_tx: true }));
             const response = yield request.get();
             const result = response.data;
-            return Object.assign(Object.assign({}, result), { data: result.data.map(formatRelaysTransfers) });
+            return Object.assign(Object.assign({}, result), { data: result.data.map(version === "V1" ? formatRelaysTransfers : this.formatRelaysTransfersV2) });
         });
     }
-    getFeeQuote(req) {
+    getFeeQuote(req, blockchain = undefined, version = "V1") {
         return __awaiter(this, void 0, void 0, function* () {
             this.checkState();
             const request = this.apiManager.path("fee_quote", {}, Object.assign({}, req));
             const response = yield request.get();
             const result = response.data;
-            return formatFeeQuote(result);
+            return version === "V1" ? formatFeeQuote(result) : this.formatFeeQuoteV2(result, blockchain);
         });
     }
 }

package/lib/clients/NEOClient.d.ts

@@ -36,7 +36,7 @@ export declare class NEOClient {
     private constructor();
     static instance(opts: NEOClientOpts): CarbonSDK.NEOClient;
     static parseHexNum(hex: string, exp?: number): string;
-    getExternalBalances(sdk: CarbonSDK, address: string, url: string, whitelistDenoms?: string[]): Promise<TokensWithExternalBalance[]>;
+    getExternalBalances(sdk: CarbonSDK, address: string, url: string, whitelistDenoms?: string[], version?: string): Promise<TokensWithExternalBalance[]>;
     lockDeposit(token: TokensWithExternalBalance, feeAmountInput: string, swthAddress: string, neoPrivateKey: string): Promise<false | import("@cityofzion/neon-api/lib/funcs/types").DoInvokeConfig>;
     lockO3Deposit(params: LockO3DepositParams): Promise<any>;
     lockLedgerDeposit(params: LockLedgerDepositParams): Promise<any>;

package/lib/clients/NEOClient.js

@@ -60,13 +60,18 @@ class NEOClient {
         const res = hex.length % 2 !== 0 ? `0${hex}` : hex;
         return new bignumber_js_1.default(res ? Neon.u.reverseHex(res) : "00", 16).shiftedBy(-exp).toString();
     }
-    getExternalBalances(sdk, address, url, whitelistDenoms) {
+    getExternalBalances(sdk, address, url, whitelistDenoms, version = "V1") {
         return __awaiter(this, void 0, void 0, function* () {
             const tokenQueryResults = yield sdk.token.getAllTokens();
             const account = new Neon.wallet.Account(address);
-            const tokens = tokenQueryResults.filter((token) => blockchain_1.blockchainForChainId(token.chainId.toNumber(), sdk.network) == this.blockchain &&
-                token.tokenAddress.length == 40 &&
-                token.bridgeAddress.length == 40);
+            const tokens = tokenQueryResults.filter((token) => {
+                const isCorrectBlockchain = version === "V2"
+                    ?
+                        sdk.token.getBlockchainV2(token.denom) == this.blockchain
+                    :
+                        blockchain_1.blockchainForChainId(token.chainId.toNumber(), sdk.network) == this.blockchain;
+                return isCorrectBlockchain && token.tokenAddress.length == 40 && token.bridgeAddress.length == 40;
+            });
             const client = new Neon.rpc.RPCClient(url, "2.5.2"); // TODO: should we change the RPC version??
             // NOTE: fetching of tokens is chunked in sets of 15 as we may hit
             // the gas limit on the RPC node and error out otherwise

package/lib/clients/TokenClient.d.ts

@@ -1,9 +1,10 @@
-import { Token, TokenPrice } from "../codec";
+import { Bridge, Token, TokenPrice } from "../codec";
 import { NetworkConfigProvider } from "../constant";
 import { FeeQuote } from "../hydrogen/feeQuote";
 import { BlockchainUtils, TypeUtils } from "../util";
 import BigNumber from "bignumber.js";
 import CarbonQueryClient from "./CarbonQueryClient";
+import { BlockchainV2, BridgeMap } from '../util/blockchain';
 declare class TokenClient {
     readonly query: CarbonQueryClient;
     readonly configProvider: NetworkConfigProvider;
@@ -12,6 +13,7 @@ declare class TokenClient {
     readonly wrapperMap: TypeUtils.SimpleMap<string>;
     readonly poolTokens: TypeUtils.SimpleMap<Token>;
     readonly cdpTokens: TypeUtils.SimpleMap<Token>;
+    readonly bridges: BridgeMap;
     readonly symbols: TypeUtils.SimpleMap<string>;
     readonly usdValues: TypeUtils.SimpleMap<BigNumber>;
     readonly commonAssetNames: TypeUtils.SimpleMap<string>;
@@ -23,7 +25,8 @@ declare class TokenClient {
     registerGeckoIdMap(map: TypeUtils.SimpleMap<string>): void;
     getCommonDenom(denom: string): string;
     getDecimals(denom: string): number | undefined;
-    getBlockchain(denom: string): BlockchainUtils.Blockchain | undefined;
+    getBlockchain(denom: string): BlockchainUtils.Blockchain | BlockchainUtils.BlockchainV2 | undefined;
+    getBlockchainV2(denom: string | undefined): BlockchainUtils.BlockchainV2 | undefined;
     getSymbol(denom: string): string;
     getUSDValue(denom: string): BigNumber | undefined;
     toHuman(denom: string, unitlessAmt: BigNumber): BigNumber;
@@ -42,15 +45,25 @@ declare class TokenClient {
     isWrappedToken(denom?: string): boolean;
     hasWrappedToken(denom?: string): boolean;
     getWrappedTokens(denom: string): Token[];
-    getWrappedToken(denom: string, blockchain?: BlockchainUtils.Blockchain): Token | null;
+    getWrappedToken(denom: string, blockchain?: BlockchainUtils.Blockchain | BlockchainUtils.BlockchainV2, version?: string): Token | null;
     getSourceToken(denom: string): Token | null;
     getNativeToken(): Token | undefined;
     getNativeStablecoin(): Token | undefined;
     isNativeToken(denom: string): boolean;
     isNativeStablecoin(denom: string): boolean;
-    getDepositTokenFor(tokenDenom: string, chain: BlockchainUtils.Blockchain): Token | undefined;
+    isGroupedToken(denom: string): boolean;
+    getDepositTokenFor(tokenDenom: string, chain: BlockchainUtils.Blockchain | BlockchainUtils.BlockchainV2, version?: string): Token | undefined;
     getAllTokens(): Promise<Token[]>;
     reloadTokens(): Promise<TypeUtils.SimpleMap<Token>>;
+    getBridges(): Promise<BridgeMap>;
+    getIbcBlockchainNames(): string[];
+    getPolynetworkBlockchainNames(): string[];
+    getAllBlockchainNames(): string[];
+    getBridgesFromBridgeId(bridgeId: number): Bridge[];
+    getIbcTokens(): TypeUtils.SimpleMap<Token>;
+    getPolyNetworkTokens(): TypeUtils.SimpleMap<Token>;
+    getBlockchainV2FromIDs(chainId: string, bridgeId: string): BlockchainV2 | undefined;
+    getBridgeFromToken(token: Token): Bridge | undefined;
     getCarbonIbcTokens(): Token[];
     getCdpUnderlyingToken(cdpDenom: string): Token | undefined;
     reloadWrapperMap(): Promise<TypeUtils.SimpleMap<string>>;

package/lib/clients/TokenClient.js

@@ -20,6 +20,7 @@ const util_1 = require("../util");
 const number_1 = require("../util/number");
 const long_1 = __importDefault(require("long"));
 const InsightsQueryClient_1 = __importDefault(require("./InsightsQueryClient"));
+const blockchain_1 = require("../util/blockchain");
 const SYMBOL_OVERRIDE = {
     swth: "SWTH",
     NNEO: "nNEO",
@@ -43,6 +44,7 @@ class TokenClient {
         this.wrapperMap = {};
         this.poolTokens = {};
         this.cdpTokens = {};
+        this.bridges = { polynetwork: [], ibc: [] };
         this.symbols = {};
         this.usdValues = {};
         this.commonAssetNames = constant_1.CommonAssetName;
@@ -58,6 +60,7 @@ class TokenClient {
             yield this.reloadWrapperMap();
             yield this.reloadTokens();
             yield this.reloadDenomGeckoMap();
+            yield this.getBridges();
             // non-blocking reload
             try {
                 this.reloadUSDValues();
@@ -95,6 +98,18 @@ class TokenClient {
         const blockchain = util_1.BlockchainUtils.blockchainForChainId(chainId, networkConfig.network);
         return blockchain;
     }
+    getBlockchainV2(denom) {
+        if (!denom)
+            return undefined;
+        let token = this.tokens[denom];
+        if (this.isNativeToken(denom) || this.isNativeStablecoin(denom) || TokenClient.isPoolToken(denom) || TokenClient.isCdpToken(denom) || this.isGroupedToken(denom)) {
+            // native denoms "swth" and "usc" should be native.
+            // pool and cdp tokens are on the Native blockchain, hence 0
+            return 'Native';
+        }
+        const bridge = this.getBridgeFromToken(token);
+        return bridge === null || bridge === void 0 ? void 0 : bridge.chainName;
+    }
     getSymbol(denom) {
         var _a, _b;
         if (TokenClient.isCdpToken(denom)) {
@@ -229,7 +244,7 @@ class TokenClient {
         }
         return result;
     }
-    getWrappedToken(denom, blockchain) {
+    getWrappedToken(denom, blockchain, version = 'V1') {
         const networkConfig = this.configProvider.getConfig();
         // if denom is already a wrapped denom or no blockchain was specified,
         // just return the input denom.
@@ -245,9 +260,15 @@ class TokenClient {
                 }
                 // check if wrapped denom is of correct blockchain
                 const token = this.tokens[wrappedDenom];
-                let tokenChain = util_1.BlockchainUtils.blockchainForChainId(token.chainId.toNumber(), networkConfig.network);
-                if (TokenClient.isIBCDenom(wrappedDenom)) {
-                    tokenChain = util_1.IBCUtils.BlockchainMap[wrappedDenom];
+                let tokenChain = '';
+                if (version === "V1") {
+                    tokenChain = util_1.BlockchainUtils.blockchainForChainId(token.chainId.toNumber());
+                    if (TokenClient.isIBCDenom(token.denom)) {
+                        tokenChain = util_1.IBCUtils.BlockchainMap[wrappedDenom];
+                    }
+                }
+                else {
+                    tokenChain = this.getBlockchainV2(token.denom);
                 }
                 if (!tokenChain) {
                     continue; // unknown chain! just ignore this source token
@@ -283,17 +304,27 @@ class TokenClient {
     isNativeStablecoin(denom) {
         return denom === "usc";
     }
-    getDepositTokenFor(tokenDenom, chain) {
+    isGroupedToken(denom) {
+        const groupedTokenRegex = new RegExp(/^cgt\/\d+$/);
+        return groupedTokenRegex.test(denom);
+    }
+    getDepositTokenFor(tokenDenom, chain, version = "V1") {
         const networkConfig = this.configProvider.getConfig();
         const token = this.tokenForDenom(tokenDenom);
         if (!token) {
             console.error("getDepositTokenFor token not found for", tokenDenom);
             return;
         }
+        let targetChain = "";
         // check if selected token is a source token
-        let targetChain = util_1.BlockchainUtils.blockchainForChainId(token.chainId.toNumber(), networkConfig.network);
-        if (TokenClient.isIBCDenom(token.denom)) {
-            targetChain = util_1.IBCUtils.BlockchainMap[token.denom];
+        if (version === "V1") {
+            targetChain = util_1.BlockchainUtils.blockchainForChainId(token.chainId.toNumber(), networkConfig.network);
+            if (TokenClient.isIBCDenom(token.denom)) {
+                targetChain = util_1.IBCUtils.BlockchainMap[token.denom];
+            }
+        }
+        else {
+            targetChain = this.getBlockchainV2(token.denom);
         }
         const isSourceToken = targetChain === chain && token.denom !== "swth";
         // if not source token find wrapped token for chain
@@ -363,6 +394,88 @@ class TokenClient {
             return this.tokens;
         });
     }
+    getBridges() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const allBridges = yield this.query.coin.BridgeAll({
+                pagination: {
+                    key: new Uint8Array(),
+                    limit: new long_1.default(10000),
+                    offset: long_1.default.UZERO,
+                    countTotal: true,
+                    reverse: false,
+                },
+            });
+            const ibcBridges = allBridges.bridges.filter(bridge => {
+                if (!bridge.enabled)
+                    return;
+                return bridge.bridgeId.toNumber() === blockchain_1.BRIDGE_IDS.ibc;
+            });
+            const polynetworkBridges = allBridges.bridges.filter(bridge => {
+                if (!bridge.enabled)
+                    return;
+                return bridge.bridgeId.toNumber() === blockchain_1.BRIDGE_IDS.polynetwork;
+            });
+            Object.assign(this.bridges, {
+                polynetwork: polynetworkBridges,
+                ibc: ibcBridges
+            });
+            return this.bridges;
+        });
+    }
+    getIbcBlockchainNames() {
+        return this.bridges.ibc.map(bridge => bridge.chainName);
+    }
+    getPolynetworkBlockchainNames() {
+        return this.bridges.polynetwork.map(bridge => bridge.chainName);
+    }
+    getAllBlockchainNames() {
+        return this.getIbcBlockchainNames().concat(this.getPolynetworkBlockchainNames());
+    }
+    getBridgesFromBridgeId(bridgeId) {
+        switch (bridgeId) {
+            case blockchain_1.BRIDGE_IDS.polynetwork:
+                return this.bridges.polynetwork;
+            case blockchain_1.BRIDGE_IDS.ibc:
+                return this.bridges.ibc;
+            default:
+                return this.bridges.polynetwork;
+        }
+    }
+    getIbcTokens() {
+        const ibcTokens = Object.values(this.tokens).reduce((prev, token) => {
+            const newPrev = prev;
+            if (token.bridgeId.toNumber() === blockchain_1.BRIDGE_IDS.ibc) {
+                newPrev[token.denom] = token;
+            }
+            return newPrev;
+        }, {});
+        return ibcTokens;
+    }
+    getPolyNetworkTokens() {
+        const polynetworkTokens = Object.values(this.tokens).reduce((prev, token) => {
+            const newPrev = prev;
+            if (token.bridgeId.toNumber() === blockchain_1.BRIDGE_IDS.polynetwork) {
+                newPrev[token.denom] = token;
+            }
+            return newPrev;
+        }, {});
+        return polynetworkTokens;
+    }
+    getBlockchainV2FromIDs(chainId, bridgeId) {
+        var _a, _b;
+        const chainIdNum = Number(chainId);
+        const bridgeIdNum = Number(bridgeId);
+        if ((chainIdNum === 5 && bridgeIdNum === 1) || (chainIdNum === 0 && bridgeIdNum === 2))
+            return "Carbon";
+        const bridgeList = this.getBridgesFromBridgeId(bridgeIdNum);
+        return (_b = (_a = bridgeList.find(bridge => bridge.chainId.toNumber() === chainIdNum)) === null || _a === void 0 ? void 0 : _a.chainName) !== null && _b !== void 0 ? _b : undefined;
+    }
+    getBridgeFromToken(token) {
+        if (!token.bridgeId)
+            return undefined;
+        const bridgeList = this.getBridgesFromBridgeId(token.bridgeId.toNumber());
+        return bridgeList.find(bridge => token.chainId.equals(bridge.chainId));
+    }
     getCarbonIbcTokens() {
         const swthTokens = ibc_1.swthIbcWhitelist.map((chainId) => {
             var _a, _b, _c;

package/lib/clients/ZILClient.d.ts

@@ -77,7 +77,7 @@ export declare class ZILClient {
     private walletProvider?;
     private constructor();
     static instance(opts: ZILClientOpts): CarbonSDK.ZILClient;
-    getExternalBalances(sdk: CarbonSDK, address: string, whitelistDenoms?: string[]): Promise<TokensWithExternalBalance[]>;
+    getExternalBalances(sdk: CarbonSDK, address: string, whitelistDenoms?: string[], version?: string): Promise<TokensWithExternalBalance[]>;
     formatWithdrawalAddress(bech32Address: string): Promise<string>;
     private callContract;
     approveZRC2(params: ApproveZRC2Params): Promise<Transaction>;

package/lib/clients/ZILClient.js

@@ -69,12 +69,17 @@ class ZILClient {
         }
         return new ZILClient(configProvider, blockchain);
     }
-    getExternalBalances(sdk, address, whitelistDenoms) {
+    getExternalBalances(sdk, address, whitelistDenoms, version = "V1") {
         return __awaiter(this, void 0, void 0, function* () {
             const tokenQueryResults = yield sdk.token.getAllTokens();
-            const tokens = tokenQueryResults.filter((token) => blockchain_1.blockchainForChainId(token.chainId.toNumber(), sdk.network) == this.blockchain &&
-                token.tokenAddress.length == 40 &&
-                (!whitelistDenoms || whitelistDenoms.includes(token.denom)));
+            const tokens = tokenQueryResults.filter((token) => {
+                const isCorrectBlockchain = version === "V2"
+                    ?
+                        sdk.token.getBlockchainV2(token.denom) == this.blockchain
+                    :
+                        blockchain_1.blockchainForChainId(token.chainId.toNumber(), sdk.network) == this.blockchain;
+                return isCorrectBlockchain && token.tokenAddress.length == 40 && (!whitelistDenoms || whitelistDenoms.includes(token.denom));
+            });
             const requests = tokens.map((token) => token.tokenAddress === zeroAddress
                 ? exports.balanceBatchRequest(address.replace(/^0x/i, ""))
                 : exports.tokenBalanceBatchRequest(token.tokenAddress, address));

package/lib/codec/cosmos/app/module/v1alpha1/module.d.ts

@@ -0,0 +1,18 @@
+import Long from "long";
+import _m0 from "protobufjs/minimal";
+export declare const protobufPackage = "cosmos.app.module.v1alpha1";
+/** Module is the module config object for the cosmos.app v1 app module. */
+export interface Module {
+}
+export declare const Module: {
+    encode(_: Module, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): Module;
+    fromJSON(_: any): Module;
+    toJSON(_: Module): unknown;
+    fromPartial(_: DeepPartial<Module>): Module;
+};
+declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
+export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {} ? {
+    [K in keyof T]?: DeepPartial<T[K]>;
+} : Partial<T>;
+export {};

package/lib/codec/cosmos/app/module/v1alpha1/module.js

@@ -0,0 +1,46 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Module = exports.protobufPackage = void 0;
+/* eslint-disable */
+const long_1 = __importDefault(require("long"));
+const minimal_1 = __importDefault(require("protobufjs/minimal"));
+exports.protobufPackage = "cosmos.app.module.v1alpha1";
+const baseModule = {};
+exports.Module = {
+    encode(_, writer = minimal_1.default.Writer.create()) {
+        return writer;
+    },
+    decode(input, length) {
+        const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
+        let end = length === undefined ? reader.len : reader.pos + length;
+        const message = Object.assign({}, baseModule);
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+            }
+        }
+        return message;
+    },
+    fromJSON(_) {
+        const message = Object.assign({}, baseModule);
+        return message;
+    },
+    toJSON(_) {
+        const obj = {};
+        return obj;
+    },
+    fromPartial(_) {
+        const message = Object.assign({}, baseModule);
+        return message;
+    },
+};
+if (minimal_1.default.util.Long !== long_1.default) {
+    minimal_1.default.util.Long = long_1.default;
+    minimal_1.default.configure();
+}