carbon-js-sdk 0.3.41-beta.1 → 0.3.43

package/lib/clients/ETHClient.js

@@ -39,7 +39,7 @@ 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) => blockchain_1.blockchainForChainId(token.chainId.toNumber()) == this.blockchain &&
+            const tokens = tokenQueryResults.filter((token) => blockchain_1.blockchainForChainId(token.chainId.toNumber(), api.network) == this.blockchain &&
                 token.tokenAddress.length == 40 &&
                 token.bridgeAddress.toLowerCase() == generic_1.stripHexPrefix(lockProxyAddress) &&
                 (!whitelistDenoms || whitelistDenoms.includes(token.denom)) &&
@@ -239,7 +239,7 @@ class ETHClient {
             if (!feeInfo.deposit_fee) {
                 throw new Error("unsupported token");
             }
-            if (blockchain_1.blockchainForChainId(token.chainId.toNumber()) !== 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);

package/lib/clients/NEOClient.js

@@ -64,7 +64,7 @@ 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) => blockchain_1.blockchainForChainId(token.chainId.toNumber()) == this.blockchain &&
+            const tokens = tokenQueryResults.filter((token) => blockchain_1.blockchainForChainId(token.chainId.toNumber(), sdk.network) == 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??

package/lib/clients/ZILClient.js

@@ -72,7 +72,7 @@ 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) => blockchain_1.blockchainForChainId(token.chainId.toNumber()) == this.blockchain &&
+            const tokens = tokenQueryResults.filter((token) => blockchain_1.blockchainForChainId(token.chainId.toNumber(), sdk.network) == this.blockchain &&
                 token.tokenAddress.length == 40 &&
                 (!whitelistDenoms || whitelistDenoms.includes(token.denom)));
             const requests = tokens.map((token) => token.tokenAddress === zeroAddress

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

@@ -126,12 +126,15 @@ export interface CdpPositionItem {
     healthFactor: string;
     collateralAmount: string;
     borrowAmount: string;
+    mintDenom: string;
+    mintAmount: string;
 }
 export interface CdpPosition {
     address: string;
     healthFactor: string;
     collateral: Coin[];
     borrow: Coin[];
+    mint: Coin[];
 }
 export interface QueryCdpPositionsRequest {
     pagination?: PageRequest;

package/lib/codec/cdp/query.js

@@ -1725,6 +1725,8 @@ const baseCdpPositionItem = {
     healthFactor: "",
     collateralAmount: "",
     borrowAmount: "",
+    mintDenom: "",
+    mintAmount: "",
 };
 exports.CdpPositionItem = {
     encode(message, writer = minimal_1.default.Writer.create()) {
@@ -1746,6 +1748,12 @@ exports.CdpPositionItem = {
         if (message.borrowAmount !== "") {
             writer.uint32(50).string(message.borrowAmount);
         }
+        if (message.mintDenom !== "") {
+            writer.uint32(58).string(message.mintDenom);
+        }
+        if (message.mintAmount !== "") {
+            writer.uint32(66).string(message.mintAmount);
+        }
         return writer;
     },
     decode(input, length) {
@@ -1773,6 +1781,12 @@ exports.CdpPositionItem = {
                 case 6:
                     message.borrowAmount = reader.string();
                     break;
+                case 7:
+                    message.mintDenom = reader.string();
+                    break;
+                case 8:
+                    message.mintAmount = reader.string();
+                    break;
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -1806,6 +1820,14 @@ exports.CdpPositionItem = {
             object.borrowAmount !== undefined && object.borrowAmount !== null
                 ? String(object.borrowAmount)
                 : "";
+        message.mintDenom =
+            object.mintDenom !== undefined && object.mintDenom !== null
+                ? String(object.mintDenom)
+                : "";
+        message.mintAmount =
+            object.mintAmount !== undefined && object.mintAmount !== null
+                ? String(object.mintAmount)
+                : "";
         return message;
     },
     toJSON(message) {
@@ -1819,10 +1841,12 @@ exports.CdpPositionItem = {
             (obj.collateralAmount = message.collateralAmount);
         message.borrowAmount !== undefined &&
             (obj.borrowAmount = message.borrowAmount);
+        message.mintDenom !== undefined && (obj.mintDenom = message.mintDenom);
+        message.mintAmount !== undefined && (obj.mintAmount = message.mintAmount);
         return obj;
     },
     fromPartial(object) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const message = Object.assign({}, baseCdpPositionItem);
         message.address = (_a = object.address) !== null && _a !== void 0 ? _a : "";
         message.denom = (_b = object.denom) !== null && _b !== void 0 ? _b : "";
@@ -1830,6 +1854,8 @@ exports.CdpPositionItem = {
         message.healthFactor = (_d = object.healthFactor) !== null && _d !== void 0 ? _d : "";
         message.collateralAmount = (_e = object.collateralAmount) !== null && _e !== void 0 ? _e : "";
         message.borrowAmount = (_f = object.borrowAmount) !== null && _f !== void 0 ? _f : "";
+        message.mintDenom = (_g = object.mintDenom) !== null && _g !== void 0 ? _g : "";
+        message.mintAmount = (_h = object.mintAmount) !== null && _h !== void 0 ? _h : "";
         return message;
     },
 };
@@ -1848,6 +1874,9 @@ exports.CdpPosition = {
         for (const v of message.borrow) {
             coin_1.Coin.encode(v, writer.uint32(34).fork()).ldelim();
         }
+        for (const v of message.mint) {
+            coin_1.Coin.encode(v, writer.uint32(42).fork()).ldelim();
+        }
         return writer;
     },
     decode(input, length) {
@@ -1856,6 +1885,7 @@ exports.CdpPosition = {
         const message = Object.assign({}, baseCdpPosition);
         message.collateral = [];
         message.borrow = [];
+        message.mint = [];
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
@@ -1871,6 +1901,9 @@ exports.CdpPosition = {
                 case 4:
                     message.borrow.push(coin_1.Coin.decode(reader, reader.uint32()));
                     break;
+                case 5:
+                    message.mint.push(coin_1.Coin.decode(reader, reader.uint32()));
+                    break;
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -1879,7 +1912,7 @@ exports.CdpPosition = {
         return message;
     },
     fromJSON(object) {
-        var _a, _b;
+        var _a, _b, _c;
         const message = Object.assign({}, baseCdpPosition);
         message.address =
             object.address !== undefined && object.address !== null
@@ -1891,6 +1924,7 @@ exports.CdpPosition = {
                 : "";
         message.collateral = ((_a = object.collateral) !== null && _a !== void 0 ? _a : []).map((e) => coin_1.Coin.fromJSON(e));
         message.borrow = ((_b = object.borrow) !== null && _b !== void 0 ? _b : []).map((e) => coin_1.Coin.fromJSON(e));
+        message.mint = ((_c = object.mint) !== null && _c !== void 0 ? _c : []).map((e) => coin_1.Coin.fromJSON(e));
         return message;
     },
     toJSON(message) {
@@ -1910,15 +1944,22 @@ exports.CdpPosition = {
         else {
             obj.borrow = [];
         }
+        if (message.mint) {
+            obj.mint = message.mint.map((e) => (e ? coin_1.Coin.toJSON(e) : undefined));
+        }
+        else {
+            obj.mint = [];
+        }
         return obj;
     },
     fromPartial(object) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const message = Object.assign({}, baseCdpPosition);
         message.address = (_a = object.address) !== null && _a !== void 0 ? _a : "";
         message.healthFactor = (_b = object.healthFactor) !== null && _b !== void 0 ? _b : "";
         message.collateral = ((_c = object.collateral) !== null && _c !== void 0 ? _c : []).map((e) => coin_1.Coin.fromPartial(e));
         message.borrow = ((_d = object.borrow) !== null && _d !== void 0 ? _d : []).map((e) => coin_1.Coin.fromPartial(e));
+        message.mint = ((_e = object.mint) !== null && _e !== void 0 ? _e : []).map((e) => coin_1.Coin.fromPartial(e));
         return message;
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-js-sdk",
-  "version": "0.3.41-beta.1+4f22327fb53a",
+  "version": "0.3.43",
   "description": "TypeScript SDK for Carbon blockchain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",