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

package/lib/clients/CarbonQueryClient.d.ts

@@ -19,6 +19,9 @@ import { QueryClientImpl as HeadersyncQueryClient } from "../codec/headersync/qu
 import { QueryClientImpl as IBCInterchainControlQueryClient } from "../codec/ibc/applications/interchain_accounts/controller/v1/query";
 import { QueryClientImpl as IBCInterchainHostQueryClient } from "../codec/ibc/applications/interchain_accounts/host/v1/query";
 import { QueryClientImpl as IBCTransferQueryClient } from "../codec/ibc/applications/transfer/v1/query";
+import { QueryClientImpl as IBCClientQueryClient } from "../codec/ibc/core/client/v1/query";
+import { QueryClientImpl as IBCConnectionQueryClient } from "../codec/ibc/core/connection/v1/query";
+import { QueryClientImpl as IBCChannelQueryClient } from "../codec/ibc/core/channel/v1/query";
 import { QueryClientImpl as InflationQueryClient } from "../codec/inflation/query";
 import { QueryClientImpl as InsuranceQueryClient } from "../codec/insurance/query";
 import { QueryClientImpl as LeverageQueryClient } from "../codec/leverage/query";
@@ -39,6 +42,9 @@ export interface IBCClientGroup {
     controller: IBCInterchainControlQueryClient;
     host: IBCInterchainHostQueryClient;
     transfer: IBCTransferQueryClient;
+    client: IBCClientQueryClient;
+    connection: IBCConnectionQueryClient;
+    channel: IBCChannelQueryClient;
 }
 declare class CarbonQueryClient {
     private readonly tmClient;

package/lib/clients/CarbonQueryClient.js

@@ -24,27 +24,30 @@ const query_18 = require("../codec/headersync/query");
 const query_19 = require("../codec/ibc/applications/interchain_accounts/controller/v1/query");
 const query_20 = require("../codec/ibc/applications/interchain_accounts/host/v1/query");
 const query_21 = require("../codec/ibc/applications/transfer/v1/query");
-const query_22 = require("../codec/inflation/query");
-const query_23 = require("../codec/insurance/query");
-const query_24 = require("../codec/leverage/query");
-const query_25 = require("../codec/liquidation/query");
-const query_26 = require("../codec/liquiditypool/query");
-const query_27 = require("../codec/market/query");
-const query_28 = require("../codec/marketstats/query");
-const query_29 = require("../codec/misc/query");
-const query_30 = require("../codec/oracle/query");
-const query_31 = require("../codec/order/query");
-const query_32 = require("../codec/position/query");
-const query_33 = require("../codec/pricing/query");
-const query_34 = require("../codec/profile/query");
-const query_35 = require("../codec/subaccount/query");
+const query_22 = require("../codec/ibc/core/client/v1/query");
+const query_23 = require("../codec/ibc/core/connection/v1/query");
+const query_24 = require("../codec/ibc/core/channel/v1/query");
+const query_25 = require("../codec/inflation/query");
+const query_26 = require("../codec/insurance/query");
+const query_27 = require("../codec/leverage/query");
+const query_28 = require("../codec/liquidation/query");
+const query_29 = require("../codec/liquiditypool/query");
+const query_30 = require("../codec/market/query");
+const query_31 = require("../codec/marketstats/query");
+const query_32 = require("../codec/misc/query");
+const query_33 = require("../codec/oracle/query");
+const query_34 = require("../codec/order/query");
+const query_35 = require("../codec/position/query");
+const query_36 = require("../codec/pricing/query");
+const query_37 = require("../codec/profile/query");
+const query_38 = require("../codec/subaccount/query");
 const stargate_1 = require("@cosmjs/stargate");
 const BlockchainClient_1 = __importDefault(require("./BlockchainClient"));
 class CarbonQueryClient {
     constructor(tmClient) {
         this.tmClient = tmClient;
         this.baseClient = new stargate_1.QueryClient(this.tmClient);
-        const rpcClient = stargate_1.createProtobufRpcClient(this.baseClient);
+        const rpcClient = (0, stargate_1.createProtobufRpcClient)(this.baseClient);
         this.chain = BlockchainClient_1.default.connectWithTm(this.tmClient);
         this.adl = new query_1.QueryClientImpl(rpcClient);
         this.book = new query_2.QueryClientImpl(rpcClient);
@@ -52,20 +55,20 @@ class CarbonQueryClient {
         this.coin = new query_5.QueryClientImpl(rpcClient);
         this.cdp = new query_4.QueryClientImpl(rpcClient);
         this.fee = new query_17.QueryClientImpl(rpcClient);
-        this.inflation = new query_22.QueryClientImpl(rpcClient);
-        this.insurance = new query_23.QueryClientImpl(rpcClient);
-        this.leverage = new query_24.QueryClientImpl(rpcClient);
-        this.liquidation = new query_25.QueryClientImpl(rpcClient);
-        this.liquiditypool = new query_26.QueryClientImpl(rpcClient);
-        this.market = new query_27.QueryClientImpl(rpcClient);
-        this.marketstats = new query_28.QueryClientImpl(rpcClient);
-        this.misc = new query_29.QueryClientImpl(rpcClient);
-        this.oracle = new query_30.QueryClientImpl(rpcClient);
-        this.order = new query_31.QueryClientImpl(rpcClient);
-        this.position = new query_32.QueryClientImpl(rpcClient);
-        this.pricing = new query_33.QueryClientImpl(rpcClient);
-        this.profile = new query_34.QueryClientImpl(rpcClient);
-        this.subaccount = new query_35.QueryClientImpl(rpcClient);
+        this.inflation = new query_25.QueryClientImpl(rpcClient);
+        this.insurance = new query_26.QueryClientImpl(rpcClient);
+        this.leverage = new query_27.QueryClientImpl(rpcClient);
+        this.liquidation = new query_28.QueryClientImpl(rpcClient);
+        this.liquiditypool = new query_29.QueryClientImpl(rpcClient);
+        this.market = new query_30.QueryClientImpl(rpcClient);
+        this.marketstats = new query_31.QueryClientImpl(rpcClient);
+        this.misc = new query_32.QueryClientImpl(rpcClient);
+        this.oracle = new query_33.QueryClientImpl(rpcClient);
+        this.order = new query_34.QueryClientImpl(rpcClient);
+        this.position = new query_35.QueryClientImpl(rpcClient);
+        this.pricing = new query_36.QueryClientImpl(rpcClient);
+        this.profile = new query_37.QueryClientImpl(rpcClient);
+        this.subaccount = new query_38.QueryClientImpl(rpcClient);
         this.headersync = new query_18.QueryClientImpl(rpcClient);
         this.auth = new query_6.QueryClientImpl(rpcClient);
         this.bank = new query_7.QueryClientImpl(rpcClient);
@@ -82,10 +85,13 @@ class CarbonQueryClient {
             controller: new query_19.QueryClientImpl(rpcClient),
             host: new query_20.QueryClientImpl(rpcClient),
             transfer: new query_21.QueryClientImpl(rpcClient),
+            client: new query_22.QueryClientImpl(rpcClient),
+            connection: new query_23.QueryClientImpl(rpcClient),
+            channel: new query_24.QueryClientImpl(rpcClient),
         };
     }
     getProtobufRpcClient() {
-        return stargate_1.createProtobufRpcClient(this.baseClient);
+        return (0, stargate_1.createProtobufRpcClient)(this.baseClient);
     }
 }
 exports.default = CarbonQueryClient;

package/lib/clients/ETHClient.js

@@ -44,15 +44,15 @@ class ETHClient {
                     ?
                         this.tokenClient.getBlockchainV2(token.denom) == ETHClient.BLOCKCHAINV2_MAPPING[this.blockchain]
                     :
-                        blockchain_1.blockchainForChainId(token.chainId.toNumber(), api.network) == this.blockchain;
+                        (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), api.network) == this.blockchain;
                 return isCorrectBlockchain &&
                     token.tokenAddress.length == 40 &&
-                    token.bridgeAddress.toLowerCase() == generic_1.stripHexPrefix(lockProxyAddress) &&
+                    token.bridgeAddress.toLowerCase() == (0, generic_1.stripHexPrefix)(lockProxyAddress) &&
                     (!whitelistDenoms || whitelistDenoms.includes(token.denom)) &&
-                    this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress));
+                    this.verifyChecksum((0, generic_1.appendHexPrefix)(token.tokenAddress));
             });
             const assetIds = tokens.map((token) => {
-                return this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress));
+                return this.verifyChecksum((0, generic_1.appendHexPrefix)(token.tokenAddress));
             });
             const provider = this.getProvider();
             const contractAddress = this.getBalanceReaderAddress();
@@ -103,14 +103,14 @@ class ETHClient {
             }
             const carbonNetwork = networkConfig.network;
             const fromTokenId = fromToken.id;
-            const fromTokenAddress = generic_1.appendHexPrefix(fromToken.tokenAddress);
+            const fromTokenAddress = (0, generic_1.appendHexPrefix)(fromToken.tokenAddress);
             const toTokenDenom = toToken.denom;
             const recoveryAddressHex = ethers_1.ethers.utils.hexlify(util_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, carbonNetwork));
             const fromAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(fromTokenId));
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(toTokenDenom));
             const nonce = yield rpcProvider.getTransactionCount(fromAddress);
             const contract = new ethers_1.ethers.Contract(this.getBridgeEntranceAddr(), eth_1.ABIs.bridgeEntrance, rpcProvider);
-            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
+            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
             const tokenCreator = fromToken.creator;
             const targetAddressBytes = util_1.AddressUtils.SWTHAddress.getAddressBytes(tokenCreator, carbonNetwork);
             const targetProxyHash = ethers_1.ethers.utils.hexlify(targetAddressBytes);
@@ -145,9 +145,9 @@ class ETHClient {
                 throw new Error("Minimum gas required: 150,000");
             }
             const networkConfig = this.getNetworkConfig();
-            const assetId = generic_1.appendHexPrefix(token.tokenAddress);
-            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(token));
-            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
+            const assetId = (0, generic_1.appendHexPrefix)(token.tokenAddress);
+            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(token));
+            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(token.id));
             const swthAddress = ethers_1.ethers.utils.hexlify(address);
             const contractAddress = this.getLockProxyAddress();
@@ -198,16 +198,16 @@ class ETHClient {
                 return "insufficient balance";
             }
             const networkConfig = this.getNetworkConfig();
-            const assetId = generic_1.appendHexPrefix(tokenWithExternalBalances.tokenAddress);
-            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(tokenWithExternalBalances));
-            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
+            const assetId = (0, generic_1.appendHexPrefix)(tokenWithExternalBalances.tokenAddress);
+            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(tokenWithExternalBalances));
+            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(tokenWithExternalBalances.id));
             const nonce = Math.floor(Math.random() * 1000000000); // random nonce to prevent replay attacks
             const message = ethers_1.ethers.utils.solidityKeccak256(["string", "address", "bytes", "bytes", "bytes", "uint256", "uint256", "uint256"], ["sendTokens", assetId, targetProxyHash, toAssetHash, feeAddress, amount, feeAmount, nonce]);
             // logger("sendDeposit message", message)
             let signatureResult;
             const { address, signature } = yield getSignatureCallback(message);
-            const signatureBytes = ethers_1.ethers.utils.arrayify(generic_1.appendHexPrefix(signature));
+            const signatureBytes = ethers_1.ethers.utils.arrayify((0, generic_1.appendHexPrefix)(signature));
             const rsv = ethers_1.ethers.utils.splitSignature(signatureBytes);
             // logger("sign result", address, signature)
             signatureResult = {
@@ -246,7 +246,7 @@ class ETHClient {
             if (!feeInfo.deposit_fee) {
                 throw new Error("unsupported token");
             }
-            if (blockchain_1.blockchainForChainId(token.chainId.toNumber(), this.configProvider.getConfig().network) !== this.blockchain) {
+            if ((0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), this.configProvider.getConfig().network) !== this.blockchain) {
                 throw new Error("unsupported token");
             }
             let feeAmount = ethers_1.ethers.BigNumber.from(feeInfo.deposit_fee);
@@ -312,7 +312,7 @@ class ETHClient {
     getTargetProxyHash(token) {
         const networkConfig = this.getNetworkConfig();
         const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
-        const addressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
+        const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
         return addressHex;
     }
     getProvider() {

package/lib/clients/HydrogenClient.js

@@ -29,7 +29,7 @@ exports.HydrogenEndpoints = {
 const formatDateField = (value) => {
     if (typeof value !== "string")
         return null;
-    return dayjs_1.default(value);
+    return (0, dayjs_1.default)(value);
 };
 const formatCrossChainTransfer = (value) => {
     var _a, _b;

package/lib/clients/NEOClient.js

@@ -69,13 +69,13 @@ class NEOClient {
                     ?
                         sdk.token.getBlockchainV2(token.denom) == this.blockchain
                     :
-                        blockchain_1.blockchainForChainId(token.chainId.toNumber(), sdk.network) == this.blockchain;
+                        (0, 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
-            const promises = lodash_1.chunk(tokens, 75).map((partition) => __awaiter(this, void 0, void 0, function* () {
+            const promises = (0, lodash_1.chunk)(tokens, 75).map((partition) => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b, _c;
                 let acc = {};
                 for (const token of partition) {
@@ -117,8 +117,8 @@ class NEOClient {
             const targetProxyHash = this.getTargetProxyHash(token);
             const toAssetHash = Neon.u.str2hexstring(token.id);
             const addressBytes = address_1.SWTHAddress.getAddressBytes(swthAddress, networkConfig.network);
-            const toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
-            const zeroAddressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(constant_1.ZeroAddress));
+            const toAddress = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
+            const zeroAddressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(constant_1.ZeroAddress));
             const amount = ethers_1.ethers.BigNumber.from(token.externalBalance);
             const feeAmount = ethers_1.ethers.BigNumber.from(feeAmountInput !== null && feeAmountInput !== void 0 ? feeAmountInput : "100000000");
             const feeAddress = feeAmount.isZero() ? zeroAddressHex : networkConfig.feeAddress;
@@ -165,7 +165,7 @@ class NEOClient {
             const fromAddress = util_1.AddressUtils.NEOAddress.publicKeyToAddress(publicKeyOutput.publicKey);
             const targetProxyHash = this.getTargetProxyHash(token);
             const toAssetHash = Neon.u.str2hexstring(token.id);
-            const toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(address));
+            const toAddress = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(address));
             const nonce = Math.floor(Math.random() * 1000000);
             if (amount.lt(feeAmount)) {
                 throw new Error("Invalid amount");
@@ -201,7 +201,7 @@ class NEOClient {
             const fromAddress = ledger.scriptHash;
             const targetProxyHash = this.getTargetProxyHash(token);
             const toAssetHash = Neon.u.str2hexstring(token.id);
-            const toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(address));
+            const toAddress = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(address));
             const feeAddress = networkConfig.feeAddress;
             const nonce = Math.floor(Math.random() * 1000000);
             if (amount.lt(feeAmount)) {
@@ -321,7 +321,7 @@ class NEOClient {
     getTargetProxyHash(token) {
         const networkConfig = this.getNetworkConfig();
         const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
-        const addressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
+        const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
         return addressHex;
     }
     getNetworkConfig() {

package/lib/clients/TokenClient.d.ts

@@ -4,7 +4,7 @@ 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';
+import { BlockchainV2, BridgeMap, ChainIdName } from '../util/blockchain';
 declare class TokenClient {
     readonly query: CarbonQueryClient;
     readonly configProvider: NetworkConfigProvider;
@@ -56,14 +56,16 @@ declare class TokenClient {
     getAllTokens(): Promise<Token[]>;
     reloadTokens(): Promise<TypeUtils.SimpleMap<Token>>;
     getBridges(): Promise<BridgeMap>;
+    matchChainsWithDifferentChainIds(bridges: Bridge[]): Promise<(Bridge & ChainIdName)[]>;
     getIbcBlockchainNames(): string[];
+    getIbcChainFromBlockchainV2: (blockchain: BlockchainV2 | undefined) => string | undefined;
     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;
+    getBridgeFromToken(token: Token | undefined): Bridge | undefined;
     getCarbonIbcTokens(): Token[];
     getCdpUnderlyingToken(cdpDenom: string): Token | undefined;
     reloadWrapperMap(): Promise<TypeUtils.SimpleMap<string>>;

package/lib/clients/TokenClient.js

@@ -21,6 +21,8 @@ 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 pagination_1 = require("../codec/cosmos/base/query/v1beta1/pagination");
+const tendermint_1 = require("../codec/ibc/lightclients/tendermint/v1/tendermint");
 const SYMBOL_OVERRIDE = {
     swth: "SWTH",
     NNEO: "nNEO",
@@ -50,6 +52,10 @@ class TokenClient {
         this.commonAssetNames = constant_1.CommonAssetName;
         this.geckoTokenNames = constant_1.CoinGeckoTokenNames;
         this.additionalGeckoDenoms = {};
+        this.getIbcChainFromBlockchainV2 = (blockchain) => {
+            const ibcBridge = this.bridges.ibc.find(bridge => (bridge.chainName === blockchain || bridge.chainName.toLowerCase() === blockchain));
+            return ibcBridge === null || ibcBridge === void 0 ? void 0 : ibcBridge.chain_id_name;
+        };
     }
     static instance(query, configProvider) {
         return new TokenClient(query, configProvider);
@@ -328,7 +334,7 @@ class TokenClient {
         }
         const isSourceToken = targetChain === chain && token.denom !== "swth";
         // if not source token find wrapped token for chain
-        const depositToken = isSourceToken ? token : this.getWrappedToken(token.denom, chain);
+        const depositToken = isSourceToken ? token : this.getWrappedToken(token.denom, chain, version);
         if (!depositToken) {
             console.error(`getDepositTokenFor wrapped token not found for "${token.denom}"`);
             return;
@@ -405,11 +411,12 @@ class TokenClient {
                     reverse: false,
                 },
             });
-            const ibcBridges = allBridges.bridges.filter(bridge => {
+            const unmatchedIbcBridgeList = allBridges.bridges.filter(bridge => {
                 if (!bridge.enabled)
                     return;
                 return bridge.bridgeId.toNumber() === blockchain_1.BRIDGE_IDS.ibc;
             });
+            const ibcBridges = yield this.matchChainsWithDifferentChainIds(unmatchedIbcBridgeList);
             const polynetworkBridges = allBridges.bridges.filter(bridge => {
                 if (!bridge.enabled)
                     return;
@@ -422,6 +429,63 @@ class TokenClient {
             return this.bridges;
         });
     }
+    matchChainsWithDifferentChainIds(bridges) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let newBridges = [];
+            try {
+                const channels_to_connection = yield this.query.ibc.channel.Channels({
+                    pagination: pagination_1.PageRequest.fromPartial({
+                        limit: new long_1.default(1000000)
+                    })
+                });
+                const connection_to_clientId = yield this.query.ibc.connection.Connections({
+                    pagination: pagination_1.PageRequest.fromPartial({
+                        limit: new long_1.default(1000000)
+                    })
+                });
+                const clientId_to_chainIdName = yield this.query.ibc.client.ClientStates({
+                    pagination: pagination_1.PageRequest.fromPartial({
+                        limit: new long_1.default(1000000)
+                    })
+                });
+                const clientStates = clientId_to_chainIdName.clientStates.map(s => ({
+                    clientState: Object.assign({}, tendermint_1.ClientState.decode(s.clientState.value)),
+                    clientId: s.clientId,
+                }));
+                newBridges = bridges.map(bridge => {
+                    var _a, _b, _c, _d;
+                    const connectionId = (_a = channels_to_connection.channels.find(channel => channel.channelId === ("channel-" + (bridge.chainId.toNumber() - 1)))) === null || _a === void 0 ? void 0 : _a.connectionHops[0];
+                    const clientId = (_b = connection_to_clientId.connections.find(connection => connection.id === connectionId)) === null || _b === void 0 ? void 0 : _b.clientId;
+                    const chainIdName = (_d = ((_c = clientStates.find(client => client.clientId === clientId)) === null || _c === void 0 ? void 0 : _c.clientState)) === null || _d === void 0 ? void 0 : _d.chainId;
+                    return Object.assign(Object.assign({}, bridge), { chain_id_name: chainIdName !== null && chainIdName !== void 0 ? chainIdName : "" });
+                });
+            }
+            finally {
+                const checkedBefore = new Array(newBridges.length).fill(false);
+                const chainMap = {};
+                for (let i = 0; i < newBridges.length; i++) {
+                    if (checkedBefore[i])
+                        continue;
+                    const bridge = newBridges[i];
+                    const chainId = bridge.chain_id_name;
+                    if (chainMap[chainId]) {
+                        const chainName = chainMap[chainId];
+                        for (let j = i; j < newBridges.length; j++) {
+                            const subBridge = newBridges[j];
+                            if (subBridge.chain_id_name === chainId) {
+                                subBridge.chainName = chainName;
+                                checkedBefore[j] = true;
+                            }
+                        }
+                    }
+                    else {
+                        chainMap[chainId] = bridge.chainName;
+                    }
+                }
+                return newBridges;
+            }
+        });
+    }
     getIbcBlockchainNames() {
         return this.bridges.ibc.map(bridge => bridge.chainName);
     }
@@ -471,7 +535,7 @@ class TokenClient {
         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)
+        if (!token || !token.bridgeId)
             return undefined;
         const bridgeList = this.getBridgesFromBridgeId(token.bridgeId.toNumber());
         return bridgeList.find(bridge => token.chainId.equals(bridge.chainId));
@@ -569,7 +633,7 @@ class TokenClient {
     processTokenPrices(tokenPrices) {
         return tokenPrices.reduce((prevPrices, price) => {
             const newPrev = prevPrices;
-            newPrev[price.denom] = number_1.bnOrZero(price.twap).shiftedBy(-constant_1.decTypeDecimals);
+            newPrev[price.denom] = (0, number_1.bnOrZero)(price.twap).shiftedBy(-constant_1.decTypeDecimals);
             return newPrev;
         }, {});
     }

package/lib/clients/ZILClient.js

@@ -77,12 +77,12 @@ class ZILClient {
                     ?
                         sdk.token.getBlockchainV2(token.denom) == this.blockchain
                     :
-                        blockchain_1.blockchainForChainId(token.chainId.toNumber(), sdk.network) == this.blockchain;
+                        (0, 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));
+                ? (0, exports.balanceBatchRequest)(address.replace(/^0x/i, ""))
+                : (0, exports.tokenBalanceBatchRequest)(token.tokenAddress, address));
             const response = yield fetch(this.getProviderUrl(), {
                 method: "post",
                 headers: { "content-type": "application/json" },
@@ -107,7 +107,7 @@ class ZILClient {
             // if (!isValidAddress) {
             //   throw new Error("invalid address")
             // }
-            return zilliqa_1.fromBech32Address(bech32Address).toLowerCase().substr(2);
+            return (0, zilliqa_1.fromBech32Address)(bech32Address).toLowerCase().substr(2);
         });
     }
     // see examplesV2/zil_client.ts on how to confirm the transactions
@@ -153,7 +153,7 @@ class ZILClient {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             }
             const deployedContract = (this.walletProvider || zilliqa).contracts.at(contractAddress);
-            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance(generic_1.stripHexPrefix(zilAddress));
+            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(zilAddress));
             if (balanceAndNonceResp.error !== undefined) {
                 throw new Error(balanceAndNonceResp.error.message);
             }
@@ -171,7 +171,7 @@ class ZILClient {
                     vname: "spender",
                     type: "ByStr20",
                     // TODO: Check if bridgeAddress corresponds to carbon token lock_proxy_hash
-                    value: spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : generic_1.appendHexPrefix(token.bridgeAddress),
+                    value: spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : (0, generic_1.appendHexPrefix)(token.bridgeAddress),
                 },
                 {
                     vname: "amount",
@@ -189,7 +189,7 @@ class ZILClient {
     }
     checkAllowanceZRC2(token, owner, spender) {
         return __awaiter(this, void 0, void 0, function* () {
-            const contractAddress = generic_1.appendHexPrefix(token.tokenAddress);
+            const contractAddress = (0, generic_1.appendHexPrefix)(token.tokenAddress);
             const zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             const resp = yield zilliqa.blockchain.getSmartContractSubState(contractAddress, "allowances", [owner, spender]);
             if (resp.error !== undefined) {
@@ -211,13 +211,13 @@ class ZILClient {
             }
             const carbonNetwork = networkConfig.network;
             const fromTokenId = fromToken.id;
-            const fromTokenAddr = generic_1.appendHexPrefix(fromToken.tokenAddress);
+            const fromTokenAddr = (0, generic_1.appendHexPrefix)(fromToken.tokenAddress);
             const toTokenDenom = toToken.denom;
-            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(fromToken));
+            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(fromToken));
             const recoveryAddressHex = ethers_1.ethers.utils.hexlify(index_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, carbonNetwork));
             const fromAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(fromTokenId));
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(toTokenDenom));
-            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
+            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
             const contractAddress = this.getBridgeEntranceAddr();
             let zilliqa;
             if (typeof signer === "string") {
@@ -232,7 +232,7 @@ class ZILClient {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             }
             const deployedContract = (this.walletProvider || zilliqa).contracts.at(contractAddress);
-            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance(generic_1.stripHexPrefix(fromAddress));
+            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(fromAddress));
             if (balanceAndNonceResp.error !== undefined) {
                 throw new Error(balanceAndNonceResp.error.message);
             }
@@ -309,13 +309,13 @@ class ZILClient {
         return __awaiter(this, void 0, void 0, function* () {
             const { address, amount, token, gasPrice, gasLimit, zilAddress, signer } = params;
             const networkConfig = this.getNetworkConfig();
-            const assetId = generic_1.appendHexPrefix(token.tokenAddress);
-            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(token));
-            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
+            const assetId = (0, generic_1.appendHexPrefix)(token.tokenAddress);
+            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(token));
+            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(token.id));
             const swthAddress = ethers_1.ethers.utils.hexlify(address);
             // TODO: Check if bridgeAddress corresponds to carbon token lock_proxy_hash
-            const contractAddress = generic_1.appendHexPrefix(token.bridgeAddress);
+            const contractAddress = (0, generic_1.appendHexPrefix)(token.bridgeAddress);
             let zilliqa;
             if (typeof signer === "string") {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
@@ -329,7 +329,7 @@ class ZILClient {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             }
             const deployedContract = (this.walletProvider || zilliqa).contracts.at(contractAddress);
-            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance(generic_1.stripHexPrefix(zilAddress));
+            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(zilAddress));
             if (balanceAndNonceResp.error !== undefined) {
                 throw new Error(balanceAndNonceResp.error.message);
             }
@@ -414,7 +414,7 @@ class ZILClient {
     getTargetProxyHash(token) {
         const networkConfig = this.getNetworkConfig();
         const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
-        const addressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
+        const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
         return addressHex;
     }
     getNetworkConfig() {

package/lib/codec/broker/amm.d.ts

@@ -6,6 +6,7 @@ export interface Amm {
     market: string;
     reservesHash: Uint8Array;
     orders: string[];
+    poolRoute: Uint8Array;
 }
 export declare const Amm: {
     encode(message: Amm, writer?: _m0.Writer): _m0.Writer;

package/lib/codec/broker/amm.js

@@ -23,6 +23,9 @@ exports.Amm = {
         for (const v of message.orders) {
             writer.uint32(34).string(v);
         }
+        if (message.poolRoute.length !== 0) {
+            writer.uint32(42).bytes(message.poolRoute);
+        }
         return writer;
     },
     decode(input, length) {
@@ -31,6 +34,7 @@ exports.Amm = {
         const message = Object.assign({}, baseAmm);
         message.orders = [];
         message.reservesHash = new Uint8Array();
+        message.poolRoute = new Uint8Array();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
@@ -46,6 +50,9 @@ exports.Amm = {
                 case 4:
                     message.orders.push(reader.string());
                     break;
+                case 5:
+                    message.poolRoute = reader.bytes();
+                    break;
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -69,6 +76,10 @@ exports.Amm = {
                 ? bytesFromBase64(object.reservesHash)
                 : new Uint8Array();
         message.orders = ((_a = object.orders) !== null && _a !== void 0 ? _a : []).map((e) => String(e));
+        message.poolRoute =
+            object.poolRoute !== undefined && object.poolRoute !== null
+                ? bytesFromBase64(object.poolRoute)
+                : new Uint8Array();
         return message;
     },
     toJSON(message) {
@@ -86,10 +97,12 @@ exports.Amm = {
         else {
             obj.orders = [];
         }
+        message.poolRoute !== undefined &&
+            (obj.poolRoute = base64FromBytes(message.poolRoute !== undefined ? message.poolRoute : new Uint8Array()));
         return obj;
     },
     fromPartial(object) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const message = Object.assign({}, baseAmm);
         message.poolId =
             object.poolId !== undefined && object.poolId !== null
@@ -98,6 +111,7 @@ exports.Amm = {
         message.market = (_a = object.market) !== null && _a !== void 0 ? _a : "";
         message.reservesHash = (_b = object.reservesHash) !== null && _b !== void 0 ? _b : new Uint8Array();
         message.orders = ((_c = object.orders) !== null && _c !== void 0 ? _c : []).map((e) => e);
+        message.poolRoute = (_d = object.poolRoute) !== null && _d !== void 0 ? _d : new Uint8Array();
         return message;
     },
 };

package/lib/codec/cosmos/gov/v1beta1/query.js

@@ -159,7 +159,7 @@ exports.QueryProposalsRequest = {
         const message = Object.assign({}, baseQueryProposalsRequest);
         message.proposalStatus =
             object.proposalStatus !== undefined && object.proposalStatus !== null
-                ? gov_1.proposalStatusFromJSON(object.proposalStatus)
+                ? (0, gov_1.proposalStatusFromJSON)(object.proposalStatus)
                 : 0;
         message.voter =
             object.voter !== undefined && object.voter !== null
@@ -178,7 +178,7 @@ exports.QueryProposalsRequest = {
     toJSON(message) {
         const obj = {};
         message.proposalStatus !== undefined &&
-            (obj.proposalStatus = gov_1.proposalStatusToJSON(message.proposalStatus));
+            (obj.proposalStatus = (0, gov_1.proposalStatusToJSON)(message.proposalStatus));
         message.voter !== undefined && (obj.voter = message.voter);
         message.depositor !== undefined && (obj.depositor = message.depositor);
         message.pagination !== undefined &&

package/lib/codec/cosmos/gov/v1beta1/tx.js

@@ -185,7 +185,7 @@ exports.MsgVote = {
                 : "";
         message.option =
             object.option !== undefined && object.option !== null
-                ? gov_1.voteOptionFromJSON(object.option)
+                ? (0, gov_1.voteOptionFromJSON)(object.option)
                 : 0;
         return message;
     },
@@ -195,7 +195,7 @@ exports.MsgVote = {
             (obj.proposalId = (message.proposalId || long_1.default.UZERO).toString());
         message.voter !== undefined && (obj.voter = message.voter);
         message.option !== undefined &&
-            (obj.option = gov_1.voteOptionToJSON(message.option));
+            (obj.option = (0, gov_1.voteOptionToJSON)(message.option));
         return obj;
     },
     fromPartial(object) {