carbon-js-sdk 0.6.2 → 0.6.4

package/lib/CarbonSDK.d.ts

@@ -49,6 +49,7 @@ declare class CarbonSDK {
         CDPToken: string;
     };
     readonly query: CarbonQueryClient;
+    readonly useTmAbciQuery: boolean;
     insights: InsightsQueryClient;
     hydrogen: HydrogenClient;
     wallet?: CarbonWallet;

package/lib/CarbonSDK.js

@@ -62,17 +62,18 @@ const DEFAULT_SDK_INIT_OPTS = {
  */
 class CarbonSDK {
     constructor(opts) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         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.useTmAbciQuery = (_c = opts.useTmAbciQuery) !== null && _c !== void 0 ? _c : false;
         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.evmChainId = (_f = (_e = opts.evmChainId) !== null && _e !== void 0 ? _e : constant_1.CarbonEvmChainIDs[this.network]) !== null && _f !== void 0 ? _f : constant_1.CarbonEvmChainIDs[constant_1.Network.MainNet];
+        this.chainId = (_e = (_d = opts.chainId) !== null && _d !== void 0 ? _d : constant_1.CarbonChainIDs[this.network]) !== null && _e !== void 0 ? _e : constant_1.CarbonChainIDs[constant_1.Network.MainNet];
+        this.evmChainId = (_g = (_f = opts.evmChainId) !== null && _f !== void 0 ? _f : constant_1.CarbonEvmChainIDs[this.network]) !== null && _g !== void 0 ? _g : constant_1.CarbonEvmChainIDs[constant_1.Network.MainNet];
         let grpcClient;
         if (opts.useTmAbciQuery !== true && this.networkConfig.grpcUrl) {
-            const transport = typeof window === "undefined" ? grpc_web_node_http_transport_1.NodeHttpTransport() : undefined;
-            grpcClient = (_g = opts.grpcQueryClient) !== null && _g !== void 0 ? _g : new GrpcQueryClient_1.default(this.networkConfig.grpcWebUrl, {
+            const transport = typeof window === "undefined" ? (0, grpc_web_node_http_transport_1.NodeHttpTransport)() : undefined;
+            grpcClient = (_h = opts.grpcQueryClient) !== null && _h !== void 0 ? _h : new GrpcQueryClient_1.default(this.networkConfig.grpcWebUrl, {
                 transport,
             });
         }
@@ -81,7 +82,7 @@ class CarbonSDK {
             grpcClient,
         });
         this.insights = new clients_1.InsightsQueryClient(this.networkConfig);
-        this.token = (_h = opts.token) !== null && _h !== void 0 ? _h : clients_1.TokenClient.instance(this.query, this);
+        this.token = (_j = opts.token) !== null && _j !== void 0 ? _j : clients_1.TokenClient.instance(this.query, this);
         this.hydrogen = new clients_1.HydrogenClient(this.networkConfig, this.token);
         this.hydrogen = clients_1.HydrogenClient.instance(this.networkConfig, this.token);
         this.admin = new modules_1.AdminModule(this);
@@ -238,6 +239,7 @@ class CarbonSDK {
             config: this.configOverride,
             tmClient: this.tmClient,
             chainId: this.chainId,
+            useTmAbciQuery: this.useTmAbciQuery,
         };
     }
     connect(wallet) {

package/lib/clients/BatchQueryClient.js

@@ -29,7 +29,7 @@ class BatchQueryClient {
         };
         if (typeof endpoint === "string") {
             // accept host.name:port and assume http protocol
-            this.url = rpcclient_1.hasProtocol(endpoint) ? endpoint : "http://" + endpoint;
+            this.url = (0, rpcclient_1.hasProtocol)(endpoint) ? endpoint : "http://" + endpoint;
         }
         else {
             this.url = endpoint.url;
@@ -71,7 +71,7 @@ class BatchQueryClient {
             return;
         const requests = batch.map((s) => s.request);
         const requestIds = requests.map((request) => request.id);
-        http_1.http("POST", this.url, this.headers, requests).then((raw) => {
+        (0, http_1.http)("POST", this.url, this.headers, requests).then((raw) => {
             // Requests with a single entry return as an object
             const arr = Array.isArray(raw) ? raw : [raw];
             arr.forEach((el, i) => {
@@ -79,8 +79,8 @@ class BatchQueryClient {
                 if (!req)
                     return;
                 const { reject, resolve } = req;
-                const response = json_rpc_1.parseJsonRpcResponse(el);
-                if (json_rpc_1.isJsonRpcErrorResponse(response)) {
+                const response = (0, json_rpc_1.parseJsonRpcResponse)(el);
+                if ((0, json_rpc_1.isJsonRpcErrorResponse)(response)) {
                     reject(new Error(JSON.stringify(response.error)));
                 }
                 else {

package/lib/clients/CarbonQueryClient.js

@@ -52,7 +52,7 @@ const BlockchainClient_1 = __importDefault(require("./BlockchainClient"));
 class CarbonQueryClient {
     constructor(opts) {
         var _a;
-        const rpcClient = (_a = opts.grpcClient) !== null && _a !== void 0 ? _a : stargate_1.createProtobufRpcClient(new stargate_1.QueryClient(opts.tmClient));
+        const rpcClient = (_a = opts.grpcClient) !== null && _a !== void 0 ? _a : (0, stargate_1.createProtobufRpcClient)(new stargate_1.QueryClient(opts.tmClient));
         this.tmClient = opts.tmClient;
         this.baseClient = rpcClient;
         this.chain = BlockchainClient_1.default.connectWithTm(opts.tmClient);

package/lib/clients/ETHClient.d.ts

@@ -41,6 +41,7 @@ export interface LockParams extends ETHTxParams {
 export interface ApproveERC20Params extends ETHTxParams {
     token: Models.Token;
     spenderAddress?: string;
+    amount?: BigNumber;
     signCompleteCallback?: () => void;
 }
 export interface EthersTransactionResponse extends ethers.Transaction {

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();
@@ -69,13 +69,15 @@ class ETHClient {
         });
     }
     approveERC20(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const { token, gasPriceGwei, gasLimit, ethAddress, spenderAddress, signer } = params;
+            const { token, gasPriceGwei, gasLimit, ethAddress, spenderAddress, signer, amount } = params;
             const contractAddress = token.tokenAddress;
             const rpcProvider = this.getProvider();
             const contract = new ethers_1.ethers.Contract(contractAddress, eth_1.ABIs.erc20, rpcProvider);
+            const approvalAmount = ethers_1.ethers.BigNumber.from((_a = amount === null || amount === void 0 ? void 0 : amount.toString(10)) !== null && _a !== void 0 ? _a : ethers_1.ethers.constants.MaxUint256);
             const nonce = yield this.getTxNonce(ethAddress, params.nonce, rpcProvider);
-            const approveResultTx = yield contract.connect(signer).approve(spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : token.bridgeAddress, ethers_1.ethers.constants.MaxUint256, Object.assign(Object.assign({ nonce }, gasPriceGwei && ({ gasPrice: gasPriceGwei.shiftedBy(9).toString(10) })), gasLimit && ({ gasLimit: gasLimit.toString(10) })));
+            const approveResultTx = yield contract.connect(signer).approve(spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : token.bridgeAddress, approvalAmount, Object.assign(Object.assign({ nonce }, gasPriceGwei && ({ gasPrice: gasPriceGwei.shiftedBy(9).toString(10) })), gasLimit && ({ gasLimit: gasLimit.toString(10) })));
             return approveResultTx;
         });
     }
@@ -99,14 +101,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 this.getTxNonce(fromAddress, params.nonce, rpcProvider);
             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);
@@ -135,9 +137,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();
@@ -188,16 +190,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 = {
@@ -236,7 +238,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);
@@ -302,7 +304,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);
 };
 // temporary function to parse okt/okc blockchain
 // to remove when automatic deposit/withdraw feature is deployed

package/lib/clients/InsightsQueryClient.js

@@ -101,12 +101,12 @@ class InsightsQueryClient {
             const meta = response.data.result.meta;
             const parsedEntries = rawEntries.map(entry => ({
                 lastHeight: entry.lastHeight,
-                time: dayjs_1.default(entry.time),
+                time: (0, dayjs_1.default)(entry.time),
                 volumeValue: new bignumber_js_1.default(entry.volumeValue)
             }));
             const parsedMeta = {
-                from: dayjs_1.default(meta.from),
-                until: dayjs_1.default(meta.until),
+                from: (0, dayjs_1.default)(meta.from),
+                until: (0, dayjs_1.default)(meta.until),
                 interval: meta.interval,
             };
             return { result: { entries: parsedEntries, meta: parsedMeta } };

package/lib/clients/NEOClient.js

@@ -68,13 +68,13 @@ class NEOClient {
                     ?
                         !!sdk.token.getBlockchainV2(token.denom) && (blockchain_1.BLOCKCHAIN_V2_TO_V1_MAPPING[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.denom === "swth") && 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) {
@@ -116,8 +116,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;
@@ -162,7 +162,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");
@@ -198,7 +198,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)) {
@@ -313,7 +313,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.js

@@ -544,7 +544,7 @@ class TokenClient {
         if (!token)
             return undefined;
         const bridge = this.getBridgeFromToken(token);
-        if (!bridge || !blockchain_1.isIbcBridge(bridge))
+        if (!bridge || !(0, blockchain_1.isIbcBridge)(bridge))
             return undefined;
         return bridge.chain_id_name;
     }
@@ -620,7 +620,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) && (blockchain_1.BLOCKCHAIN_V2_TO_V1_MAPPING[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/book/book.d.ts

@@ -13,9 +13,14 @@ export interface OrderBook {
 }
 export interface StopBook {
     market: string;
-    asks: string[];
-    bids: string[];
+    asks: StopOrder[];
+    bids: StopOrder[];
     trigger: string;
+    stopType: string;
+}
+export interface StopOrder {
+    id: string;
+    stopPrice: string;
 }
 export declare const OrderBookLevel: {
     encode(message: OrderBookLevel, writer?: _m0.Writer): _m0.Writer;
@@ -38,6 +43,13 @@ export declare const StopBook: {
     toJSON(message: StopBook): unknown;
     fromPartial(object: DeepPartial<StopBook>): StopBook;
 };
+export declare const StopOrder: {
+    encode(message: StopOrder, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): StopOrder;
+    fromJSON(object: any): StopOrder;
+    toJSON(message: StopOrder): unknown;
+    fromPartial(object: DeepPartial<StopOrder>): StopOrder;
+};
 declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
 export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {} ? {
     [K in keyof T]?: DeepPartial<T[K]>;

package/lib/codec/book/book.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StopBook = exports.OrderBook = exports.OrderBookLevel = exports.protobufPackage = void 0;
+exports.StopOrder = exports.StopBook = exports.OrderBook = exports.OrderBookLevel = exports.protobufPackage = void 0;
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
@@ -158,21 +158,24 @@ exports.OrderBook = {
         return message;
     },
 };
-const baseStopBook = { market: "", asks: "", bids: "", trigger: "" };
+const baseStopBook = { market: "", trigger: "", stopType: "" };
 exports.StopBook = {
     encode(message, writer = minimal_1.default.Writer.create()) {
         if (message.market !== "") {
             writer.uint32(10).string(message.market);
         }
         for (const v of message.asks) {
-            writer.uint32(18).string(v);
+            exports.StopOrder.encode(v, writer.uint32(18).fork()).ldelim();
         }
         for (const v of message.bids) {
-            writer.uint32(26).string(v);
+            exports.StopOrder.encode(v, writer.uint32(26).fork()).ldelim();
         }
         if (message.trigger !== "") {
             writer.uint32(34).string(message.trigger);
         }
+        if (message.stopType !== "") {
+            writer.uint32(42).string(message.stopType);
+        }
         return writer;
     },
     decode(input, length) {
@@ -188,14 +191,17 @@ exports.StopBook = {
                     message.market = reader.string();
                     break;
                 case 2:
-                    message.asks.push(reader.string());
+                    message.asks.push(exports.StopOrder.decode(reader, reader.uint32()));
                     break;
                 case 3:
-                    message.bids.push(reader.string());
+                    message.bids.push(exports.StopOrder.decode(reader, reader.uint32()));
                     break;
                 case 4:
                     message.trigger = reader.string();
                     break;
+                case 5:
+                    message.stopType = reader.string();
+                    break;
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -210,39 +216,100 @@ exports.StopBook = {
             object.market !== undefined && object.market !== null
                 ? String(object.market)
                 : "";
-        message.asks = ((_a = object.asks) !== null && _a !== void 0 ? _a : []).map((e) => String(e));
-        message.bids = ((_b = object.bids) !== null && _b !== void 0 ? _b : []).map((e) => String(e));
+        message.asks = ((_a = object.asks) !== null && _a !== void 0 ? _a : []).map((e) => exports.StopOrder.fromJSON(e));
+        message.bids = ((_b = object.bids) !== null && _b !== void 0 ? _b : []).map((e) => exports.StopOrder.fromJSON(e));
         message.trigger =
             object.trigger !== undefined && object.trigger !== null
                 ? String(object.trigger)
                 : "";
+        message.stopType =
+            object.stopType !== undefined && object.stopType !== null
+                ? String(object.stopType)
+                : "";
         return message;
     },
     toJSON(message) {
         const obj = {};
         message.market !== undefined && (obj.market = message.market);
         if (message.asks) {
-            obj.asks = message.asks.map((e) => e);
+            obj.asks = message.asks.map((e) => (e ? exports.StopOrder.toJSON(e) : undefined));
         }
         else {
             obj.asks = [];
         }
         if (message.bids) {
-            obj.bids = message.bids.map((e) => e);
+            obj.bids = message.bids.map((e) => (e ? exports.StopOrder.toJSON(e) : undefined));
         }
         else {
             obj.bids = [];
         }
         message.trigger !== undefined && (obj.trigger = message.trigger);
+        message.stopType !== undefined && (obj.stopType = message.stopType);
         return obj;
     },
     fromPartial(object) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const message = Object.assign({}, baseStopBook);
         message.market = (_a = object.market) !== null && _a !== void 0 ? _a : "";
-        message.asks = ((_b = object.asks) !== null && _b !== void 0 ? _b : []).map((e) => e);
-        message.bids = ((_c = object.bids) !== null && _c !== void 0 ? _c : []).map((e) => e);
+        message.asks = ((_b = object.asks) !== null && _b !== void 0 ? _b : []).map((e) => exports.StopOrder.fromPartial(e));
+        message.bids = ((_c = object.bids) !== null && _c !== void 0 ? _c : []).map((e) => exports.StopOrder.fromPartial(e));
         message.trigger = (_d = object.trigger) !== null && _d !== void 0 ? _d : "";
+        message.stopType = (_e = object.stopType) !== null && _e !== void 0 ? _e : "";
+        return message;
+    },
+};
+const baseStopOrder = { id: "", stopPrice: "" };
+exports.StopOrder = {
+    encode(message, writer = minimal_1.default.Writer.create()) {
+        if (message.id !== "") {
+            writer.uint32(10).string(message.id);
+        }
+        if (message.stopPrice !== "") {
+            writer.uint32(18).string(message.stopPrice);
+        }
+        return writer;
+    },
+    decode(input, length) {
+        const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
+        let end = length === undefined ? reader.len : reader.pos + length;
+        const message = Object.assign({}, baseStopOrder);
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    message.id = reader.string();
+                    break;
+                case 2:
+                    message.stopPrice = reader.string();
+                    break;
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+            }
+        }
+        return message;
+    },
+    fromJSON(object) {
+        const message = Object.assign({}, baseStopOrder);
+        message.id =
+            object.id !== undefined && object.id !== null ? String(object.id) : "";
+        message.stopPrice =
+            object.stopPrice !== undefined && object.stopPrice !== null
+                ? String(object.stopPrice)
+                : "";
+        return message;
+    },
+    toJSON(message) {
+        const obj = {};
+        message.id !== undefined && (obj.id = message.id);
+        message.stopPrice !== undefined && (obj.stopPrice = message.stopPrice);
+        return obj;
+    },
+    fromPartial(object) {
+        var _a, _b;
+        const message = Object.assign({}, baseStopOrder);
+        message.id = (_a = object.id) !== null && _a !== void 0 ? _a : "";
+        message.stopPrice = (_b = object.stopPrice) !== null && _b !== void 0 ? _b : "";
         return message;
     },
 };

package/lib/codec/book/legacy.d.ts

@@ -0,0 +1,22 @@
+import Long from "long";
+import _m0 from "protobufjs/minimal";
+export declare const protobufPackage = "Switcheo.carbon.book";
+export interface StopbookV2320 {
+    market: string;
+    asks: string[];
+    bids: string[];
+    trigger: string;
+    stopType: string;
+}
+export declare const StopbookV2320: {
+    encode(message: StopbookV2320, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): StopbookV2320;
+    fromJSON(object: any): StopbookV2320;
+    toJSON(message: StopbookV2320): unknown;
+    fromPartial(object: DeepPartial<StopbookV2320>): StopbookV2320;
+};
+declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
+export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {} ? {
+    [K in keyof T]?: DeepPartial<T[K]>;
+} : Partial<T>;
+export {};