carbon-js-sdk 0.3.16 → 0.3.17-beta.1

package/lib/CarbonSDK.d.ts

@@ -6,7 +6,7 @@ import * as clients from "./clients";
 import N3Client from "./clients/N3Client";
 import { AdminModule, BankModule, BrokerModule, CDPModule, CoinModule, FeeModule, GovModule, IBCModule, LeverageModule, LiquidityPoolModule, MarketModule, OracleModule, OrderModule, PositionModule, ProfileModule, SubAccountModule, XChainModule } from "./modules";
 import { StakingModule } from "./modules/staking";
-import { CosmosLedger, Keplr } from "./provider";
+import { CosmosLedger, Keplr, Leap } from "./provider";
 import { CarbonSigner, CarbonWallet, CarbonWalletGenericOpts } from "./wallet";
 export { CarbonTx } from "./util";
 export { CarbonSigner, CarbonSignerTypes, CarbonWallet, CarbonWalletGenericOpts, CarbonWalletInitOpts } from "./wallet";
@@ -14,6 +14,7 @@ export { DenomPrefix } from "./constant";
 export interface CarbonSDKOpts {
     network: Network;
     tmClient: Tendermint34Client;
+    chainId?: string;
     token?: TokenClient;
     config?: Partial<NetworkConfig>;
     defaultTimeoutBlocks?: number;
@@ -69,6 +70,7 @@ declare class CarbonSDK {
     bsc: ETHClient;
     zil: ZILClient;
     n3: N3Client;
+    chainId: string;
     constructor(opts: CarbonSDKOpts);
     static instance(opts?: CarbonSDKInitOpts): Promise<CarbonSDK>;
     static instanceWithWallet(wallet: CarbonWallet, sdkOpts?: CarbonSDKInitOpts): Promise<ConnectedCarbonSDK>;
@@ -77,6 +79,7 @@ declare class CarbonSDK {
     static instanceWithSigner(signer: CarbonSigner, publicKeyBase64: string, sdkOpts?: CarbonSDKInitOpts, walletOpts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
     static instanceWithLedger(ledger: CosmosLedger, sdkOpts?: CarbonSDKInitOpts, walletOpts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
     static instanceWithKeplr(keplr: Keplr, sdkOpts?: CarbonSDKInitOpts, walletOpts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
+    static instanceWithLeap(leap: Leap, sdkOpts?: CarbonSDKInitOpts, walletOpts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
     static instanceViewOnly(bech32Address: string, sdkOpts?: CarbonSDKInitOpts, walletOpts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
     initialize(): Promise<CarbonSDK>;
     clone(): CarbonSDK;
@@ -88,6 +91,7 @@ declare class CarbonSDK {
     connectWithSigner(signer: CarbonSigner, publicKeyBase64: string, opts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
     connectWithLedger(ledger: CosmosLedger, opts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
     connectWithKeplr(keplr: Keplr, opts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
+    connectWithLeap(leap: Leap, opts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
     connectViewOnly(bech32Address: string, opts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
     getConfig(): NetworkConfig;
     getTokenClient(): TokenClient;

package/lib/CarbonSDK.js

@@ -60,15 +60,16 @@ const DEFAULT_SDK_INIT_OPTS = {
  */
 class CarbonSDK {
     constructor(opts) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         this.network = (_a = opts.network) !== null && _a !== void 0 ? _a : constant_1.DEFAULT_NETWORK;
         this.configOverride = (_b = opts.config) !== null && _b !== void 0 ? _b : {};
         this.networkConfig = util_1.GenericUtils.overrideConfig(constant_1.NetworkConfigs[this.network], this.configOverride);
         this.tmClient = opts.tmClient;
+        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 = (_c = opts.token) !== null && _c !== void 0 ? _c : clients_1.TokenClient.instance(this.query, this);
+        this.token = (_e = opts.token) !== null && _e !== void 0 ? _e : clients_1.TokenClient.instance(this.query, this);
         this.admin = new modules_1.AdminModule(this);
         this.order = new modules_1.OrderModule(this);
         this.lp = new modules_1.LiquidityPoolModule(this);
@@ -111,14 +112,15 @@ class CarbonSDK {
         });
     }
     static instance(opts = DEFAULT_SDK_INIT_OPTS) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             const network = (_a = opts.network) !== null && _a !== void 0 ? _a : constant_1.DEFAULT_NETWORK;
             const configOverride = (_b = opts.config) !== null && _b !== void 0 ? _b : {};
             const networkConfig = util_1.GenericUtils.overrideConfig(constant_1.NetworkConfigs[network], configOverride);
             const tmClient = (_c = opts.tmClient) !== null && _c !== void 0 ? _c : util_1.GenericUtils.modifyTmClient(yield tendermint_rpc_1.Tendermint34Client.connect(networkConfig.tmRpcUrl));
             const defaultTimeoutBlocks = opts.defaultTimeoutBlocks;
-            const sdk = new CarbonSDK({ network, config: configOverride, tmClient, defaultTimeoutBlocks });
+            const chainId = (_d = (yield tmClient.status())) === null || _d === void 0 ? void 0 : _d.nodeInfo.network;
+            const sdk = new CarbonSDK({ network, config: configOverride, tmClient, defaultTimeoutBlocks, chainId });
             if (opts.wallet) {
                 yield sdk.connect(opts.wallet);
             }
@@ -164,6 +166,12 @@ class CarbonSDK {
             return sdk.connectWithKeplr(keplr, walletOpts);
         });
     }
+    static instanceWithLeap(leap, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sdk = yield CarbonSDK.instance(sdkOpts);
+            return sdk.connectWithLeap(leap, walletOpts);
+        });
+    }
     static instanceViewOnly(bech32Address, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
         return __awaiter(this, void 0, void 0, function* () {
             const sdk = yield CarbonSDK.instance(sdkOpts);
@@ -172,6 +180,8 @@ class CarbonSDK {
     }
     initialize() {
         return __awaiter(this, void 0, void 0, function* () {
+            const chainId = yield this.query.chain.getChainId();
+            this.chainId = chainId;
             yield this.token.initialize();
             if (this.wallet) {
                 yield this.wallet.initialize(this.query);
@@ -187,6 +197,7 @@ class CarbonSDK {
             network: this.network,
             config: this.configOverride,
             tmClient: this.tmClient,
+            chainId: this.chainId,
         };
     }
     connect(wallet) {
@@ -249,6 +260,15 @@ class CarbonSDK {
             return this.connect(wallet);
         });
     }
+    connectWithLeap(leap, opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const chainId = this.chainId;
+            const leapKey = yield leap.getKey(chainId);
+            yield leap.enable(chainId);
+            const wallet = wallet_1.CarbonWallet.withLeap(leap, chainId, leapKey, Object.assign(Object.assign({}, opts), { network: this.network, config: this.configOverride }));
+            return this.connect(wallet);
+        });
+    }
     connectViewOnly(bech32Address, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = wallet_1.CarbonWallet.withAddress(bech32Address, Object.assign(Object.assign({}, opts), { network: this.network, config: this.configOverride }));

package/lib/clients/CarbonQueryClient.js

@@ -44,7 +44,7 @@ class CarbonQueryClient {
     constructor(tmClient) {
         this.tmClient = tmClient;
         this.baseClient = new stargate_1.QueryClient(this.tmClient);
-        const rpcClient = (0, stargate_1.createProtobufRpcClient)(this.baseClient);
+        const rpcClient = 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);
@@ -85,7 +85,7 @@ class CarbonQueryClient {
         };
     }
     getProtobufRpcClient() {
-        return (0, stargate_1.createProtobufRpcClient)(this.baseClient);
+        return stargate_1.createProtobufRpcClient(this.baseClient);
     }
 }
 exports.default = CarbonQueryClient;

package/lib/clients/ETHClient.js

@@ -40,13 +40,13 @@ class ETHClient {
         return __awaiter(this, void 0, void 0, function* () {
             const tokenQueryResults = yield api.token.getAllTokens();
             const lockProxyAddress = this.getLockProxyAddress().toLowerCase();
-            const tokens = tokenQueryResults.filter((token) => (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber()) == this.blockchain &&
+            const tokens = tokenQueryResults.filter((token) => blockchain_1.blockchainForChainId(token.chainId.toNumber()) == this.blockchain &&
                 token.tokenAddress.length == 40 &&
-                token.bridgeAddress.toLowerCase() == (0, generic_1.stripHexPrefix)(lockProxyAddress) &&
+                token.bridgeAddress.toLowerCase() == generic_1.stripHexPrefix(lockProxyAddress) &&
                 (!whitelistDenoms || whitelistDenoms.includes(token.denom)) &&
-                this.verifyChecksum((0, generic_1.appendHexPrefix)(token.tokenAddress)));
+                this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress)));
             const assetIds = tokens.map((token) => {
-                return this.verifyChecksum((0, generic_1.appendHexPrefix)(token.tokenAddress));
+                return this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress));
             });
             const provider = this.getProvider();
             const contractAddress = this.getBalanceReaderAddress();
@@ -95,14 +95,14 @@ class ETHClient {
                 throw new Error("Invalid recovery address");
             }
             const fromTokenId = fromToken.id;
-            const fromTokenAddress = (0, generic_1.appendHexPrefix)(fromToken.tokenAddress);
+            const fromTokenAddress = generic_1.appendHexPrefix(fromToken.tokenAddress);
             const toTokenDenom = toToken.denom;
             const recoveryAddressHex = ethers_1.ethers.utils.hexlify(util_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, CarbonSDK_1.default.Network.MainNet));
             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 = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
             const tokenCreator = fromToken.creator;
             const targetAddressBytes = util_1.AddressUtils.SWTHAddress.getAddressBytes(tokenCreator, CarbonSDK_1.default.Network.MainNet);
             const targetProxyHash = ethers_1.ethers.utils.hexlify(targetAddressBytes);
@@ -137,9 +137,9 @@ class ETHClient {
                 throw new Error("Minimum gas required: 150,000");
             }
             const networkConfig = this.getNetworkConfig();
-            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 assetId = generic_1.appendHexPrefix(token.tokenAddress);
+            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(token));
+            const feeAddress = 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();
@@ -190,16 +190,16 @@ class ETHClient {
                 return "insufficient balance";
             }
             const networkConfig = this.getNetworkConfig();
-            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 assetId = generic_1.appendHexPrefix(tokenWithExternalBalances.tokenAddress);
+            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(tokenWithExternalBalances));
+            const feeAddress = 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((0, generic_1.appendHexPrefix)(signature));
+            const signatureBytes = ethers_1.ethers.utils.arrayify(generic_1.appendHexPrefix(signature));
             const rsv = ethers_1.ethers.utils.splitSignature(signatureBytes);
             // logger("sign result", address, signature)
             signatureResult = {
@@ -238,7 +238,7 @@ class ETHClient {
             if (!feeInfo.deposit_fee) {
                 throw new Error("unsupported token");
             }
-            if ((0, blockchain_1.blockchainForChainId)(token.chainId.toNumber()) !== this.blockchain) {
+            if (blockchain_1.blockchainForChainId(token.chainId.toNumber()) !== this.blockchain) {
                 throw new Error("unsupported token");
             }
             let feeAmount = ethers_1.ethers.BigNumber.from(feeInfo.deposit_fee);
@@ -304,7 +304,7 @@ class ETHClient {
     getTargetProxyHash(token) {
         const networkConfig = this.getNetworkConfig();
         const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
-        const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
+        const addressHex = 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 (0, dayjs_1.default)(value);
+    return dayjs_1.default(value);
 };
 const formatCrossChainTransfer = (value) => {
     var _a, _b;

package/lib/clients/NEOClient.js

@@ -64,13 +64,13 @@ class NEOClient {
         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 => (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber()) == this.blockchain &&
+            const tokens = tokenQueryResults.filter(token => blockchain_1.blockchainForChainId(token.chainId.toNumber()) == this.blockchain &&
                 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 = (0, lodash_1.chunk)(tokens, 75).map((partition) => __awaiter(this, void 0, void 0, function* () {
+            const promises = 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) {
@@ -111,8 +111,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 = (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 toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
+            const zeroAddressHex = 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;
@@ -159,7 +159,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 = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(address));
+            const toAddress = 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");
@@ -195,7 +195,7 @@ class NEOClient {
             const fromAddress = ledger.scriptHash;
             const targetProxyHash = this.getTargetProxyHash(token);
             const toAssetHash = Neon.u.str2hexstring(token.id);
-            const toAddress = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(address));
+            const toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(address));
             const feeAddress = networkConfig.feeAddress;
             const nonce = Math.floor(Math.random() * 1000000);
             if (amount.lt(feeAmount)) {
@@ -315,7 +315,7 @@ class NEOClient {
     getTargetProxyHash(token) {
         const networkConfig = this.getNetworkConfig();
         const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
-        const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
+        const addressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
         return addressHex;
     }
     getNetworkConfig() {

package/lib/clients/ZILClient.js

@@ -74,10 +74,10 @@ class ZILClient {
     getExternalBalances(sdk, address, whitelistDenoms) {
         return __awaiter(this, void 0, void 0, function* () {
             const tokenQueryResults = yield sdk.token.getAllTokens();
-            const tokens = tokenQueryResults.filter(token => (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber()) == this.blockchain &&
+            const tokens = tokenQueryResults.filter(token => blockchain_1.blockchainForChainId(token.chainId.toNumber()) == this.blockchain &&
                 token.tokenAddress.length == 40 &&
                 (!whitelistDenoms || whitelistDenoms.includes(token.denom)));
-            const requests = tokens.map(token => token.tokenAddress === zeroAddress ? (0, exports.balanceBatchRequest)(address.replace(/^0x/i, "")) : (0, exports.tokenBalanceBatchRequest)(token.tokenAddress, address));
+            const requests = tokens.map(token => token.tokenAddress === zeroAddress ? exports.balanceBatchRequest(address.replace(/^0x/i, "")) : exports.tokenBalanceBatchRequest(token.tokenAddress, address));
             const response = yield fetch(this.getProviderUrl(), {
                 method: "post",
                 headers: { "content-type": "application/json" },
@@ -102,7 +102,7 @@ class ZILClient {
             // if (!isValidAddress) {
             //   throw new Error("invalid address")
             // }
-            return (0, zilliqa_1.fromBech32Address)(bech32Address).toLowerCase().substr(2);
+            return zilliqa_1.fromBech32Address(bech32Address).toLowerCase().substr(2);
         });
     }
     // see examplesV2/zil_client.ts on how to confirm the transactions
@@ -148,7 +148,7 @@ class ZILClient {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             }
             const deployedContract = (this.walletProvider || zilliqa).contracts.at(contractAddress);
-            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(zilAddress));
+            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance(generic_1.stripHexPrefix(zilAddress));
             if (balanceAndNonceResp.error !== undefined) {
                 throw new Error(balanceAndNonceResp.error.message);
             }
@@ -166,7 +166,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 : (0, generic_1.appendHexPrefix)(token.bridgeAddress),
+                    value: spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : generic_1.appendHexPrefix(token.bridgeAddress),
                 },
                 {
                     vname: 'amount',
@@ -184,7 +184,7 @@ class ZILClient {
     }
     checkAllowanceZRC2(token, owner, spender) {
         return __awaiter(this, void 0, void 0, function* () {
-            const contractAddress = (0, generic_1.appendHexPrefix)(token.tokenAddress);
+            const contractAddress = 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) {
@@ -204,13 +204,13 @@ class ZILClient {
                 throw new Error("Invalid recovery address");
             }
             const fromTokenId = fromToken.id;
-            const fromTokenAddr = (0, generic_1.appendHexPrefix)(fromToken.tokenAddress);
+            const fromTokenAddr = generic_1.appendHexPrefix(fromToken.tokenAddress);
             const toTokenDenom = toToken.denom;
-            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(fromToken));
+            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(fromToken));
             const recoveryAddressHex = ethers_1.ethers.utils.hexlify(index_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, CarbonSDK_1.default.Network.MainNet));
             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 = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
             const contractAddress = this.getBridgeEntranceAddr();
             let zilliqa;
             if (typeof signer === 'string') {
@@ -225,7 +225,7 @@ class ZILClient {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             }
             const deployedContract = (this.walletProvider || zilliqa).contracts.at(contractAddress);
-            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(fromAddress));
+            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance(generic_1.stripHexPrefix(fromAddress));
             if (balanceAndNonceResp.error !== undefined) {
                 throw new Error(balanceAndNonceResp.error.message);
             }
@@ -302,13 +302,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 = (0, generic_1.appendHexPrefix)(token.tokenAddress);
-            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(token));
-            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const assetId = generic_1.appendHexPrefix(token.tokenAddress);
+            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(token));
+            const feeAddress = 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 = (0, generic_1.appendHexPrefix)(token.bridgeAddress);
+            const contractAddress = generic_1.appendHexPrefix(token.bridgeAddress);
             let zilliqa;
             if (typeof signer === 'string') {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
@@ -322,7 +322,7 @@ class ZILClient {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             }
             const deployedContract = (this.walletProvider || zilliqa).contracts.at(contractAddress);
-            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(zilAddress));
+            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance(generic_1.stripHexPrefix(zilAddress));
             if (balanceAndNonceResp.error !== undefined) {
                 throw new Error(balanceAndNonceResp.error.message);
             }
@@ -407,7 +407,7 @@ class ZILClient {
     getTargetProxyHash(token) {
         const networkConfig = this.getNetworkConfig();
         const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
-        const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
+        const addressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
         return addressHex;
     }
     getNetworkConfig() {

package/lib/codec/cdp/tx.d.ts

@@ -266,6 +266,30 @@ export interface MsgReturnStablecoinWithInterestInCdpTokens {
 }
 export interface MsgReturnStablecoinWithInterestInCdpTokensResponse {
 }
+export interface MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokens {
+    creator: string;
+    debtor: string;
+    collateralDenom: string;
+    minCollateralAmount: string;
+    debtDenom: string;
+    debtAmount: string;
+    interestCdpDenom: string;
+    interestCdpAmount: string;
+}
+export interface MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokensResponse {
+}
+export interface MsgLiquidateCollateralWithStablecoinAndInterestInCollateral {
+    creator: string;
+    debtor: string;
+    collateralDenom: string;
+    minCollateralAmount: string;
+    debtDenom: string;
+    debtAmount: string;
+    interestCdpDenom: string;
+    interestCdpAmount: string;
+}
+export interface MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse {
+}
 export declare const MsgAddRateStrategy: {
     encode(message: MsgAddRateStrategy, writer?: _m0.Writer): _m0.Writer;
     decode(input: _m0.Reader | Uint8Array, length?: number | undefined): MsgAddRateStrategy;
@@ -756,6 +780,34 @@ export declare const MsgReturnStablecoinWithInterestInCdpTokensResponse: {
     toJSON(_: MsgReturnStablecoinWithInterestInCdpTokensResponse): unknown;
     fromPartial(_: DeepPartial<MsgReturnStablecoinWithInterestInCdpTokensResponse>): MsgReturnStablecoinWithInterestInCdpTokensResponse;
 };
+export declare const MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokens: {
+    encode(message: MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokens, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokens;
+    fromJSON(object: any): MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokens;
+    toJSON(message: MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokens): unknown;
+    fromPartial(object: DeepPartial<MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokens>): MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokens;
+};
+export declare const MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokensResponse: {
+    encode(_: MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokensResponse, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokensResponse;
+    fromJSON(_: any): MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokensResponse;
+    toJSON(_: MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokensResponse): unknown;
+    fromPartial(_: DeepPartial<MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokensResponse>): MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokensResponse;
+};
+export declare const MsgLiquidateCollateralWithStablecoinAndInterestInCollateral: {
+    encode(message: MsgLiquidateCollateralWithStablecoinAndInterestInCollateral, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): MsgLiquidateCollateralWithStablecoinAndInterestInCollateral;
+    fromJSON(object: any): MsgLiquidateCollateralWithStablecoinAndInterestInCollateral;
+    toJSON(message: MsgLiquidateCollateralWithStablecoinAndInterestInCollateral): unknown;
+    fromPartial(object: DeepPartial<MsgLiquidateCollateralWithStablecoinAndInterestInCollateral>): MsgLiquidateCollateralWithStablecoinAndInterestInCollateral;
+};
+export declare const MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse: {
+    encode(_: MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse;
+    fromJSON(_: any): MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse;
+    toJSON(_: MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse): unknown;
+    fromPartial(_: DeepPartial<MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse>): MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse;
+};
 /** Msg defines the Msg service. */
 export interface Msg {
     AddRateStrategy(request: MsgAddRateStrategy): Promise<MsgAddRateStrategyResponse>;
@@ -792,8 +844,10 @@ export interface Msg {
     SetStalePriceGracePeriod(request: MsgSetStalePriceGracePeriod): Promise<MsgSetStalePriceGracePeriodResponse>;
     SetCdpPaused(request: MsgSetCdpPaused): Promise<MsgSetCdpPausedResponse>;
     ReturnStablecoinWithInterestInCdpTokens(request: MsgReturnStablecoinWithInterestInCdpTokens): Promise<MsgReturnStablecoinWithInterestInCdpTokensResponse>;
-    /** this line is used by starport scaffolding # proto/tx/rpc */
     ReturnStablecoinWithInterestInCollateral(request: MsgReturnStablecoinWithInterestInCollateral): Promise<MsgReturnStablecoinWithInterestInCollateralResponse>;
+    LiquidateCollateralWithStablecoinAndInterestInCdpTokens(request: MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokens): Promise<MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokensResponse>;
+    /** this line is used by starport scaffolding # proto/tx/rpc */
+    LiquidateCollateralWithStablecoinAndInterestInCollateral(request: MsgLiquidateCollateralWithStablecoinAndInterestInCollateral): Promise<MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse>;
 }
 export declare class MsgClientImpl implements Msg {
     private readonly rpc;
@@ -833,6 +887,8 @@ export declare class MsgClientImpl implements Msg {
     SetCdpPaused(request: MsgSetCdpPaused): Promise<MsgSetCdpPausedResponse>;
     ReturnStablecoinWithInterestInCdpTokens(request: MsgReturnStablecoinWithInterestInCdpTokens): Promise<MsgReturnStablecoinWithInterestInCdpTokensResponse>;
     ReturnStablecoinWithInterestInCollateral(request: MsgReturnStablecoinWithInterestInCollateral): Promise<MsgReturnStablecoinWithInterestInCollateralResponse>;
+    LiquidateCollateralWithStablecoinAndInterestInCdpTokens(request: MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokens): Promise<MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokensResponse>;
+    LiquidateCollateralWithStablecoinAndInterestInCollateral(request: MsgLiquidateCollateralWithStablecoinAndInterestInCollateral): Promise<MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse>;
 }
 interface Rpc {
     request(service: string, method: string, data: Uint8Array): Promise<Uint8Array>;