carbon-js-sdk 0.5.5 → 0.5.6

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 = (0, rpcclient_1.hasProtocol)(endpoint) ? endpoint : "http://" + endpoint;
+            this.url = 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);
-        (0, http_1.http)("POST", this.url, this.headers, requests).then((raw) => {
+        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 = (0, json_rpc_1.parseJsonRpcResponse)(el);
-                if ((0, json_rpc_1.isJsonRpcErrorResponse)(response)) {
+                const response = json_rpc_1.parseJsonRpcResponse(el);
+                if (json_rpc_1.isJsonRpcErrorResponse(response)) {
                     reject(new Error(JSON.stringify(response.error)));
                 }
                 else {

package/lib/clients/CarbonQueryClient.js

@@ -53,7 +53,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.alliance = new query_44.QueryClientImpl(rpcClient);
@@ -106,7 +106,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

@@ -44,15 +44,15 @@ class ETHClient {
                     ?
                         this.tokenClient.getBlockchainV2(token.denom) == ETHClient.BLOCKCHAINV2_MAPPING[this.blockchain]
                     :
-                        (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), api.network) == this.blockchain;
+                        blockchain_1.blockchainForChainId(token.chainId.toNumber(), api.network) == this.blockchain;
                 return isCorrectBlockchain &&
                     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();
@@ -99,14 +99,14 @@ class ETHClient {
             }
             const carbonNetwork = networkConfig.network;
             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, 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 = (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, carbonNetwork);
             const targetProxyHash = ethers_1.ethers.utils.hexlify(targetAddressBytes);
@@ -135,9 +135,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();
@@ -188,16 +188,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 = {
@@ -236,7 +236,7 @@ class ETHClient {
             if (!feeInfo.deposit_fee) {
                 throw new Error("unsupported token");
             }
-            if ((0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), this.configProvider.getConfig().network) !== this.blockchain) {
+            if (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 +302,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/EvmIbcClient.d.ts

@@ -0,0 +1,86 @@
+import { Network } from "../constant";
+import { StdSignDoc } from "@cosmjs/amino";
+import { BlockchainUtils } from "../util";
+declare type SupportedBlockchains = BlockchainUtils.Blockchain.Canto | BlockchainUtils.Blockchain.Evmos;
+declare namespace EvmIbcClient {
+    interface TypedDomain {
+        name: string;
+        version: string;
+        chainId: number;
+        verifyingContract: string;
+        salt: string;
+    }
+    interface TypedDataV4 {
+        types: object;
+        primaryType: string;
+        message: StdSignDoc;
+        domain: TypedDomain;
+    }
+    const TYPED_DATA_REQUEST_METHOD = "eth_signTypedData_v4";
+    const DEFAULT_EIP712_TYPES: {
+        EIP712Domain: {
+            name: string;
+            type: string;
+        }[];
+        Tx: {
+            name: string;
+            type: string;
+        }[];
+        Fee: {
+            name: string;
+            type: string;
+        }[];
+        Coin: {
+            name: string;
+            type: string;
+        }[];
+        Msg: {
+            name: string;
+            type: string;
+        }[];
+    };
+    const getEvmChainId: (blockchain: SupportedBlockchains, network?: Network) => 7700 | 9001;
+    const getIbcTransferTypes: () => {
+        MsgValue: {
+            name: string;
+            type: string;
+        }[];
+        TypeToken: {
+            name: string;
+            type: string;
+        }[];
+        TypeTimeoutHeight: {
+            name: string;
+            type: string;
+        }[];
+        EIP712Domain: {
+            name: string;
+            type: string;
+        }[];
+        Tx: {
+            name: string;
+            type: string;
+        }[];
+        Fee: {
+            name: string;
+            type: string;
+        }[];
+        Coin: {
+            name: string;
+            type: string;
+        }[];
+        Msg: {
+            name: string;
+            type: string;
+        }[];
+    };
+    const getCosmosWeb3Domain: (blockchain: SupportedBlockchains) => {
+        name: string;
+        version: string;
+        chainId: number;
+        verifyingContract: string;
+        salt: string;
+    };
+    const getEIP712TypedData: (tx: StdSignDoc, blockchain: SupportedBlockchains, types?: object, domain?: EvmIbcClient.TypedDomain, primaryType?: string) => TypedDataV4;
+}
+export default EvmIbcClient;

package/lib/clients/EvmIbcClient.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const constant_1 = require("../constant");
+const util_1 = require("../util");
+const _DEFAULT_EIP712_TYPES = {
+    EIP712Domain: [
+        { name: 'name', type: 'string' },
+        { name: 'version', type: 'string' },
+        { name: 'chainId', type: 'uint256' },
+        { name: 'verifyingContract', type: 'string' },
+        { name: 'salt', type: 'string' },
+    ],
+    Tx: [
+        { name: 'account_number', type: 'string' },
+        { name: 'chain_id', type: 'string' },
+        { name: 'fee', type: 'Fee' },
+        { name: 'memo', type: 'string' },
+        { name: 'msgs', type: 'Msg[]' },
+        { name: 'sequence', type: 'string' },
+    ],
+    Fee: [
+        { name: 'feePayer', type: 'string' },
+        { name: 'amount', type: 'Coin[]' },
+        { name: 'gas', type: 'string' },
+    ],
+    Coin: [
+        { name: 'denom', type: 'string' },
+        { name: 'amount', type: 'string' },
+    ],
+    Msg: [
+        { name: 'type', type: 'string' },
+        { name: 'value', type: 'MsgValue' },
+    ],
+};
+var EvmIbcClient;
+(function (EvmIbcClient) {
+    EvmIbcClient.TYPED_DATA_REQUEST_METHOD = "eth_signTypedData_v4";
+    EvmIbcClient.DEFAULT_EIP712_TYPES = _DEFAULT_EIP712_TYPES;
+    EvmIbcClient.getEvmChainId = (blockchain, network = constant_1.Network.MainNet) => {
+        switch (network) {
+            case constant_1.Network.MainNet:
+                switch (blockchain) {
+                    case util_1.BlockchainUtils.Blockchain.Canto:
+                        return 7700;
+                    case util_1.BlockchainUtils.Blockchain.Evmos:
+                        return 9001;
+                    default:
+                        throw new Error("network not supported");
+                }
+            default:
+                throw new Error("network not supported");
+        }
+    };
+    EvmIbcClient.getIbcTransferTypes = () => {
+        return Object.assign(Object.assign({}, EvmIbcClient.DEFAULT_EIP712_TYPES), { MsgValue: [
+                { name: 'source_port', type: 'string' },
+                { name: 'source_channel', type: 'string' },
+                { name: 'token', type: 'TypeToken' },
+                { name: 'sender', type: 'string' },
+                { name: 'receiver', type: 'string' },
+                { name: 'timeout_height', type: 'TypeTimeoutHeight' },
+                { name: 'timeout_timestamp', type: 'uint64' },
+            ], TypeToken: [
+                { name: 'denom', type: 'string' },
+                { name: 'amount', type: 'string' },
+            ], TypeTimeoutHeight: [
+                { name: 'revision_number', type: 'uint64' },
+                { name: 'revision_height', type: 'uint64' },
+            ] });
+    };
+    EvmIbcClient.getCosmosWeb3Domain = (blockchain) => {
+        return {
+            name: "Cosmos Web3",
+            version: "1.0.0",
+            chainId: EvmIbcClient.getEvmChainId(blockchain),
+            verifyingContract: "cosmos",
+            salt: "0",
+        };
+    };
+    EvmIbcClient.getEIP712TypedData = (tx, blockchain, types = EvmIbcClient.getIbcTransferTypes(), domain = EvmIbcClient.getCosmosWeb3Domain(blockchain), primaryType = "Tx") => {
+        const typedData = {
+            types,
+            primaryType,
+            domain,
+            message: tx,
+        };
+        return typedData;
+    };
+})(EvmIbcClient || (EvmIbcClient = {}));
+exports.default = EvmIbcClient;

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);
 };
 // temporary function to parse okt/okc blockchain
 // to remove when automatic deposit/withdraw feature is deployed

package/lib/clients/NEOClient.js

@@ -69,13 +69,13 @@ class NEOClient {
                     ?
                         !!sdk.token.getBlockchainV2(token.denom) && (blockchain_1.BLOCKCHAIN_V2_TO_V1_MAPPING[sdk.token.getBlockchainV2(token.denom)] == this.blockchain)
                     :
-                        (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), sdk.network) == this.blockchain;
+                        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 = (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) {
@@ -117,8 +117,8 @@ class NEOClient {
             const targetProxyHash = this.getTargetProxyHash(token);
             const toAssetHash = Neon.u.str2hexstring(token.id);
             const addressBytes = address_1.SWTHAddress.getAddressBytes(swthAddress, networkConfig.network);
-            const toAddress = (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;
@@ -165,7 +165,7 @@ class NEOClient {
             const fromAddress = util_1.AddressUtils.NEOAddress.publicKeyToAddress(publicKeyOutput.publicKey);
             const targetProxyHash = this.getTargetProxyHash(token);
             const toAssetHash = Neon.u.str2hexstring(token.id);
-            const toAddress = (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");
@@ -201,7 +201,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)) {
@@ -321,7 +321,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/TokenClient.js

@@ -67,22 +67,26 @@ class TokenClient {
     initialize() {
         return __awaiter(this, void 0, void 0, function* () {
             this.setCommonAssetConfig();
-            // non-blocking reload
             try {
-                this.reloadDenomGeckoMap().finally(() => {
-                    this.reloadUSDValues();
-                    this.reloadDenomTraces();
-                });
+                yield Promise.all([
+                    this.reloadTokens(),
+                    this.reloadWrapperMap(),
+                    this.getBridges(),
+                ]);
             }
-            catch (error) {
-                console.error("failed to reload usd values");
-                console.error(error);
+            finally {
+                // non-blocking reload
+                try {
+                    this.reloadDenomGeckoMap().finally(() => {
+                        this.reloadUSDValues();
+                        this.reloadDenomTraces();
+                    });
+                }
+                catch (error) {
+                    console.error("failed to reload usd values");
+                    console.error(error);
+                }
             }
-            yield Promise.all([
-                this.reloadWrapperMap(),
-                this.reloadTokens(),
-                this.getBridges(),
-            ]);
         });
     }
     registerGeckoIdMap(map) {
@@ -565,7 +569,7 @@ class TokenClient {
         if (!token)
             return undefined;
         const bridge = this.getBridgeFromToken(token);
-        if (!bridge || !(0, blockchain_1.isIbcBridge)(bridge))
+        if (!bridge || !blockchain_1.isIbcBridge(bridge))
             return undefined;
         return bridge.chain_id_name;
     }
@@ -574,7 +578,7 @@ class TokenClient {
             // get swth on osmosis
             const osmoTmClient = yield tendermint_rpc_1.Tendermint34Client.connect(network_1.publicRpcNodes.Osmosis);
             const osmoClient = new stargate_1.QueryClient(osmoTmClient);
-            const osmosRpcClient = (0, stargate_1.createProtobufRpcClient)(osmoClient);
+            const osmosRpcClient = stargate_1.createProtobufRpcClient(osmoClient);
             const osmoIbcClient = new query_1.QueryClientImpl(osmosRpcClient);
             const osmoDenomTraces = yield osmoIbcClient.DenomTraces({
                 pagination: pagination_1.PageRequest.fromPartial({
@@ -667,7 +671,7 @@ class TokenClient {
     processTokenPrices(tokenPrices) {
         return tokenPrices.reduce((prevPrices, price) => {
             const newPrev = prevPrices;
-            newPrev[price.denom] = (0, number_1.bnOrZero)(price.twap).shiftedBy(-constant_1.decTypeDecimals);
+            newPrev[price.denom] = 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)
                     :
-                        (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), sdk.network) == this.blockchain;
+                        blockchain_1.blockchainForChainId(token.chainId.toNumber(), sdk.network) == this.blockchain;
                 return isCorrectBlockchain && token.tokenAddress.length == 40 && (!whitelistDenoms || whitelistDenoms.includes(token.denom));
             });
             const requests = tokens.map((token) => token.tokenAddress === zeroAddress
-                ? (0, exports.balanceBatchRequest)(address.replace(/^0x/i, ""))
-                : (0, exports.tokenBalanceBatchRequest)(token.tokenAddress, address));
+                ? exports.balanceBatchRequest(address.replace(/^0x/i, ""))
+                : 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 (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
@@ -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((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);
             }
@@ -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 : (0, generic_1.appendHexPrefix)(token.bridgeAddress),
+                    value: spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : 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 = (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) {
@@ -211,13 +211,13 @@ class ZILClient {
             }
             const carbonNetwork = networkConfig.network;
             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, 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 = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const feeAddress = 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((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);
             }
@@ -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 = (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());
@@ -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((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);
             }
@@ -414,7 +414,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/broker/incoming_pool_swap.d.ts

@@ -0,0 +1,23 @@
+import Long from "long";
+import _m0 from "protobufjs/minimal";
+export declare const protobufPackage = "Switcheo.carbon.broker";
+export interface IncomingPoolSwap {
+    poolId: Long;
+    market: string;
+    tokenATotalInput: string;
+    tokenATotalExpectedOutput: string;
+    tokenBTotalInput: string;
+    tokenBTotalExpectedOutput: string;
+}
+export declare const IncomingPoolSwap: {
+    encode(message: IncomingPoolSwap, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): IncomingPoolSwap;
+    fromJSON(object: any): IncomingPoolSwap;
+    toJSON(message: IncomingPoolSwap): unknown;
+    fromPartial(object: DeepPartial<IncomingPoolSwap>): IncomingPoolSwap;
+};
+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 {};