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

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/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.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,17 +35,24 @@ 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]
+                    :
+                        (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), api.network) == this.blockchain;
+                return isCorrectBlockchain &&
+                    token.tokenAddress.length == 40 &&
+                    token.bridgeAddress.toLowerCase() == (0, generic_1.stripHexPrefix)(lockProxyAddress) &&
+                    (!whitelistDenoms || whitelistDenoms.includes(token.denom)) &&
+                    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();
@@ -96,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);
@@ -138,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();
@@ -191,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 = {
@@ -239,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);
@@ -305,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() {
@@ -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

@@ -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;
@@ -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,17 +60,22 @@ 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
+                    :
+                        (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) {
@@ -112,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;
@@ -160,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");
@@ -196,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)) {
@@ -316,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

@@ -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, ChainIdName } 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,27 @@ 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>;
+    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 | undefined): Bridge | undefined;
     getCarbonIbcTokens(): Token[];
     getCdpUnderlyingToken(cdpDenom: string): Token | undefined;
     reloadWrapperMap(): Promise<TypeUtils.SimpleMap<string>>;