carbon-js-sdk 0.2.14-dev.6 → 0.2.15

package/lib/clients/NEOClient.d.ts

@@ -35,7 +35,7 @@ export declare class NEOClient {
     };
     private constructor();
     static instance(opts: NEOClientOpts): NEOClient;
-    private parseHexNum;
+    static parseHexNum(hex: string, exp?: number): string;
     getExternalBalances(sdk: CarbonSDK, address: string, url: string, whitelistDenoms?: string[]): Promise<TokensWithExternalBalance[]>;
     lockDeposit(token: TokensWithExternalBalance, feeAmountInput: string, swthAddress: string, neoPrivateKey: string): Promise<false | import("@cityofzion/neon-api/lib/funcs/types").DoInvokeConfig>;
     lockO3Deposit(params: LockO3DepositParams): Promise<any>;

package/lib/clients/NEOClient.js

@@ -37,8 +37,8 @@ const util_1 = require("../util");
 const address_1 = require("../util/address");
 const blockchain_1 = require("../util/blockchain");
 const generic_1 = require("../util/generic");
-const Neon = __importStar(require("@cityofzion/neon-core"));
 const neon_js_1 = require("@cityofzion/neon-js");
+const Neon = __importStar(require("@cityofzion/neon-core"));
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const ethers_1 = require("ethers");
 const lodash_1 = require("lodash");
@@ -53,7 +53,7 @@ class NEOClient {
             throw new Error(`unsupported blockchain - ${blockchain}`);
         return new NEOClient(configProvider, blockchain);
     }
-    parseHexNum(hex, exp = 0) {
+    static parseHexNum(hex, exp = 0) {
         if (!hex || typeof (hex) !== "string")
             return "0";
         const res = hex.length % 2 !== 0 ? `0${hex}` : hex;
@@ -81,7 +81,7 @@ class NEOClient {
                         const response = yield client.invokeScript(sb.str);
                         acc[token.denom.toUpperCase()] = ((_a = response.stack[0]) === null || _a === void 0 ? void 0 : _a.type) === "Integer" // Happens on polychain devnet
                             ? (_b = response.stack[0]) === null || _b === void 0 ? void 0 : _b.value
-                            : this.parseHexNum((_c = response.stack[0]) === null || _c === void 0 ? void 0 : _c.value);
+                            : NEOClient.parseHexNum((_c = response.stack[0]) === null || _c === void 0 ? void 0 : _c.value);
                     }
                     catch (err) {
                         console.error("Could not retrieve external balance for ", token.denom);

package/lib/clients/TokenClient.d.ts

@@ -11,7 +11,6 @@ declare class TokenClient {
     readonly tokens: TypeUtils.SimpleMap<Token>;
     readonly wrapperMap: TypeUtils.SimpleMap<string>;
     readonly poolTokens: TypeUtils.SimpleMap<Token>;
-    readonly cdpTokens: TypeUtils.SimpleMap<Token>;
     readonly symbols: TypeUtils.SimpleMap<string>;
     readonly usdValues: TypeUtils.SimpleMap<BigNumber>;
     readonly commonAssetNames: TypeUtils.SimpleMap<string>;
@@ -36,7 +35,6 @@ declare class TokenClient {
     static isPoolTokenNew(denom: string): boolean;
     static isPoolTokenLegacy(denom: string): boolean;
     static isPoolToken(denom: string): boolean;
-    static isCdpToken(denom: string): boolean;
     static isIBCDenom(denom: string): boolean;
     isWrappedToken(denom?: string): boolean;
     hasWrappedToken(denom?: string): boolean;
@@ -44,14 +42,11 @@ declare class TokenClient {
     getWrappedToken(denom: string, blockchain?: BlockchainUtils.Blockchain): Token | null;
     getSourceToken(denom: string): Token | null;
     getNativeToken(): Token | undefined;
-    getNativeStablecoin(): Token | undefined;
     isNativeToken(denom: string): boolean;
-    isNativeStablecoin(denom: string): boolean;
     getDepositTokenFor(tokenDenom: string, chain: BlockchainUtils.Blockchain): Token | undefined;
     getAllTokens(): Promise<Token[]>;
     reloadTokens(): Promise<TypeUtils.SimpleMap<Token>>;
     getCarbonIbcTokens(): Token[];
-    getCdpUnderlyingToken(cdpDenom: string): Token | undefined;
     reloadWrapperMap(): Promise<TypeUtils.SimpleMap<string>>;
     reloadDenomGeckoMap(): Promise<void>;
     reloadUSDValues(denoms?: string[]): Promise<TypeUtils.SimpleMap<BigNumber>>;

package/lib/clients/TokenClient.js

@@ -39,7 +39,6 @@ class TokenClient {
         this.tokens = {};
         this.wrapperMap = {};
         this.poolTokens = {};
-        this.cdpTokens = {};
         this.symbols = {};
         this.usdValues = {};
         this.commonAssetNames = constant_1.CommonAssetName;
@@ -73,16 +72,16 @@ class TokenClient {
         return (_a = this.commonAssetNames[denom]) !== null && _a !== void 0 ? _a : denom;
     }
     getDecimals(denom) {
-        var _a, _b, _c;
-        return (_c = ((_b = (_a = this.tokens[denom]) !== null && _a !== void 0 ? _a : this.poolTokens[denom]) !== null && _b !== void 0 ? _b : this.cdpTokens[denom])) === null || _c === void 0 ? void 0 : _c.decimals.toNumber();
+        var _a, _b;
+        return (_b = ((_a = this.tokens[denom]) !== null && _a !== void 0 ? _a : this.poolTokens[denom])) === null || _b === void 0 ? void 0 : _b.decimals.toNumber();
     }
     getBlockchain(denom) {
         var _a, _b, _c;
         // chainId defaults to 3 so that blockchain will be undefined
         let chainId = (_c = (_b = (_a = this.tokens[denom]) === null || _a === void 0 ? void 0 : _a.chainId) === null || _b === void 0 ? void 0 : _b.toNumber()) !== null && _c !== void 0 ? _c : 3;
-        if (this.isNativeToken(denom) || this.isNativeStablecoin(denom) || TokenClient.isPoolToken(denom) || TokenClient.isCdpToken(denom)) {
-            // native denoms "swth" and "usc" should be native.
-            // pool and cdp tokens are on the Native blockchain, hence 0
+        if (this.isNativeToken(denom) || TokenClient.isPoolToken(denom)) {
+            // native denom "swth" should be native.
+            // pool tokens are on the Native blockchain, hence 0
             chainId = 0;
         }
         if (TokenClient.isIBCDenom(denom)) {
@@ -156,7 +155,7 @@ class TokenClient {
         return symbol;
     }
     getTokenDesc(denom) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         if (typeof denom !== 'string')
             return '';
         denom = denom.toLowerCase();
@@ -173,10 +172,7 @@ class TokenClient {
             const symbolB = this.getTokenName(denomB);
             return `${weightA}% ${symbolA} / ${weightB}% ${symbolB}`;
         }
-        if (TokenClient.isCdpToken(denom)) {
-            return (_b = (_a = this.cdpTokens[denom]) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : this.getSymbol(denom);
-        }
-        return (_d = (_c = this.tokens[denom]) === null || _c === void 0 ? void 0 : _c.name) !== null && _d !== void 0 ? _d : this.getSymbol(denom);
+        return (_b = (_a = this.tokens[denom]) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : this.getSymbol(denom);
     }
     static isPoolTokenNew(denom) {
         return denom.match(/^clpt\/(\d+)$/i) !== null;
@@ -187,9 +183,6 @@ class TokenClient {
     static isPoolToken(denom) {
         return this.isPoolTokenNew(denom) || this.isPoolTokenLegacy(denom);
     }
-    static isCdpToken(denom) {
-        return denom.includes('cdp/');
-    }
     static isIBCDenom(denom) {
         return denom.match(ibc_1.ibcTokenRegex) !== null;
     }
@@ -259,15 +252,9 @@ class TokenClient {
     getNativeToken() {
         return this.tokenForId("swth");
     }
-    getNativeStablecoin() {
-        return this.tokenForId("usc");
-    }
     isNativeToken(denom) {
         return denom === "swth";
     }
-    isNativeStablecoin(denom) {
-        return denom === "usc";
-    }
     getDepositTokenFor(tokenDenom, chain) {
         const token = this.tokenForDenom(tokenDenom);
         if (!token) {
@@ -313,9 +300,6 @@ class TokenClient {
                 if (TokenClient.isPoolToken(token.denom)) {
                     this.poolTokens[token.denom] = token;
                 }
-                else if (TokenClient.isCdpToken(token.denom)) {
-                    this.cdpTokens[token.denom] = token;
-                }
                 else {
                     if (this.isNativeToken(token.denom)) {
                         // Change token name to Carbon
@@ -372,12 +356,6 @@ class TokenClient {
         });
         return swthTokens;
     }
-    getCdpUnderlyingToken(cdpDenom) {
-        if (!this.cdpTokens[cdpDenom])
-            throw new Error("not a CDP denom");
-        const tokenDenom = cdpDenom.replace(/^cdp\//i, "");
-        return this.tokenForDenom(tokenDenom);
-    }
     reloadWrapperMap() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -1,6 +1,6 @@
 import Long from "long";
 import _m0 from "protobufjs/minimal";
-import { OrderBook, StopBook } from "./book";
+import { OrderBook, StopBook } from "../book/book";
 export declare const protobufPackage = "Switcheo.carbon.book";
 /** GenesisState defines the book module's genesis state. */
 export interface GenesisState {

package/lib/codec/book/genesis.js

@@ -7,7 +7,7 @@ exports.GenesisState = exports.protobufPackage = void 0;
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
-const book_1 = require("./book");
+const book_1 = require("../book/book");
 exports.protobufPackage = "Switcheo.carbon.book";
 const baseGenesisState = {};
 exports.GenesisState = {

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

@@ -1,6 +1,6 @@
 import Long from "long";
 import _m0 from "protobufjs/minimal";
-import { OrderBook } from "./book";
+import { OrderBook } from "../book/book";
 import { PageRequest, PageResponse } from "../cosmos/base/query/v1beta1/pagination";
 export declare const protobufPackage = "Switcheo.carbon.book";
 /** this line is used by starport scaffolding # 3 */

package/lib/codec/book/query.js

@@ -7,7 +7,7 @@ exports.QueryClientImpl = exports.QueryAllBookResponse = exports.QueryAllBookReq
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
-const book_1 = require("./book");
+const book_1 = require("../book/book");
 const pagination_1 = require("../cosmos/base/query/v1beta1/pagination");
 exports.protobufPackage = "Switcheo.carbon.book";
 const baseQueryGetBookRequest = { market: "" };

package/lib/codec/broker/genesis.d.ts

@@ -1,6 +1,6 @@
 import Long from "long";
 import _m0 from "protobufjs/minimal";
-import { Amm } from "./amm";
+import { Amm } from "../broker/amm";
 export declare const protobufPackage = "Switcheo.carbon.broker";
 /** GenesisState defines the broker module's genesis state. */
 export interface GenesisState {

package/lib/codec/broker/genesis.js

@@ -7,7 +7,7 @@ exports.GenesisState = exports.protobufPackage = void 0;
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
-const amm_1 = require("./amm");
+const amm_1 = require("../broker/amm");
 exports.protobufPackage = "Switcheo.carbon.broker";
 const baseGenesisState = {};
 exports.GenesisState = {

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

@@ -1,9 +1,9 @@
 import Long from "long";
 import _m0 from "protobufjs/minimal";
 import { PageRequest, PageResponse } from "../query/pagination";
-import { MinMaxBoundary } from "./pagination";
-import { Candlestick } from "./candlestick";
-import { TradeEvent } from "./event";
+import { MinMaxBoundary } from "../broker/pagination";
+import { Candlestick } from "../broker/candlestick";
+import { TradeEvent } from "../broker/event";
 export declare const protobufPackage = "Switcheo.carbon.broker";
 export interface QueryCandlesticksRequest {
     market: string;

package/lib/codec/broker/query.js

@@ -8,9 +8,9 @@ exports.QueryClientImpl = exports.QueryTradesForPositionResponse = exports.Query
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
 const pagination_1 = require("../query/pagination");
-const pagination_2 = require("./pagination");
-const candlestick_1 = require("./candlestick");
-const event_1 = require("./event");
+const pagination_2 = require("../broker/pagination");
+const candlestick_1 = require("../broker/candlestick");
+const event_1 = require("../broker/event");
 exports.protobufPackage = "Switcheo.carbon.broker";
 const baseQueryCandlesticksRequest = {
     market: "",

package/lib/codec/btcx/denom_cross_chain_info.d.ts

@@ -1,6 +1,6 @@
 import Long from "long";
 import _m0 from "protobufjs/minimal";
-import { DenomInfo } from "./denom_info";
+import { DenomInfo } from "../btcx/denom_info";
 export declare const protobufPackage = "Switcheo.carbon.btcx";
 export interface DenomCrossChainInfo {
     denomInfo?: DenomInfo;

package/lib/codec/btcx/denom_cross_chain_info.js

@@ -7,7 +7,7 @@ exports.DenomCrossChainInfo = exports.protobufPackage = void 0;
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
-const denom_info_1 = require("./denom_info");
+const denom_info_1 = require("../btcx/denom_info");
 exports.protobufPackage = "Switcheo.carbon.btcx";
 const baseDenomCrossChainInfo = {
     toChainId: long_1.default.UZERO,

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

@@ -1,6 +1,6 @@
 import Long from "long";
 import _m0 from "protobufjs/minimal";
-import { DenomInfo } from "./denom_info";
+import { DenomInfo } from "../btcx/denom_info";
 export declare const protobufPackage = "Switcheo.carbon.btcx";
 /** this line is used by starport scaffolding # 3 */
 export interface QueryGetDenomInfoRequest {

package/lib/codec/btcx/query.js

@@ -7,7 +7,7 @@ exports.QueryClientImpl = exports.QueryGetDenomCrossChainInfoResponse = exports.
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
-const denom_info_1 = require("./denom_info");
+const denom_info_1 = require("../btcx/denom_info");
 exports.protobufPackage = "Switcheo.carbon.btcx";
 const baseQueryGetDenomInfoRequest = { denom: "" };
 exports.QueryGetDenomInfoRequest = {

package/lib/codec/ccm/genesis.d.ts

@@ -1,6 +1,6 @@
 import Long from "long";
 import _m0 from "protobufjs/minimal";
-import { Params } from "./ccm";
+import { Params } from "../ccm/ccm";
 export declare const protobufPackage = "Switcheo.carbon.ccm";
 /** GenesisState defines the ccm module's genesis state. */
 export interface GenesisState {

package/lib/codec/ccm/genesis.js

@@ -7,7 +7,7 @@ exports.GenesisState_ZionCreatedTxDetailsEntry = exports.GenesisState_DenomCreat
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
-const ccm_1 = require("./ccm");
+const ccm_1 = require("../ccm/ccm");
 exports.protobufPackage = "Switcheo.carbon.ccm";
 const baseGenesisState = { createdTxCount: "" };
 exports.GenesisState = {

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

@@ -8,7 +8,7 @@ export interface AssetParams {
     allowRepayStablecoinInterestDebt: boolean;
     loanToValue: string;
     liquidationThreshold: string;
-    liquidationDiscount: string;
+    liquidationBonus: string;
     supplyCap: string;
     borrowCap: string;
 }

package/lib/codec/cdp/asset_params.js

@@ -15,7 +15,7 @@ const baseAssetParams = {
     allowRepayStablecoinInterestDebt: false,
     loanToValue: "",
     liquidationThreshold: "",
-    liquidationDiscount: "",
+    liquidationBonus: "",
     supplyCap: "",
     borrowCap: "",
 };
@@ -39,8 +39,8 @@ exports.AssetParams = {
         if (message.liquidationThreshold !== "") {
             writer.uint32(50).string(message.liquidationThreshold);
         }
-        if (message.liquidationDiscount !== "") {
-            writer.uint32(58).string(message.liquidationDiscount);
+        if (message.liquidationBonus !== "") {
+            writer.uint32(58).string(message.liquidationBonus);
         }
         if (message.supplyCap !== "") {
             writer.uint32(66).string(message.supplyCap);
@@ -76,7 +76,7 @@ exports.AssetParams = {
                     message.liquidationThreshold = reader.string();
                     break;
                 case 7:
-                    message.liquidationDiscount = reader.string();
+                    message.liquidationBonus = reader.string();
                     break;
                 case 8:
                     message.supplyCap = reader.string();
@@ -119,10 +119,9 @@ exports.AssetParams = {
                 object.liquidationThreshold !== null
                 ? String(object.liquidationThreshold)
                 : "";
-        message.liquidationDiscount =
-            object.liquidationDiscount !== undefined &&
-                object.liquidationDiscount !== null
-                ? String(object.liquidationDiscount)
+        message.liquidationBonus =
+            object.liquidationBonus !== undefined && object.liquidationBonus !== null
+                ? String(object.liquidationBonus)
                 : "";
         message.supplyCap =
             object.supplyCap !== undefined && object.supplyCap !== null
@@ -147,8 +146,8 @@ exports.AssetParams = {
             (obj.loanToValue = message.loanToValue);
         message.liquidationThreshold !== undefined &&
             (obj.liquidationThreshold = message.liquidationThreshold);
-        message.liquidationDiscount !== undefined &&
-            (obj.liquidationDiscount = message.liquidationDiscount);
+        message.liquidationBonus !== undefined &&
+            (obj.liquidationBonus = message.liquidationBonus);
         message.supplyCap !== undefined && (obj.supplyCap = message.supplyCap);
         message.borrowCap !== undefined && (obj.borrowCap = message.borrowCap);
         return obj;
@@ -163,7 +162,7 @@ exports.AssetParams = {
             (_d = object.allowRepayStablecoinInterestDebt) !== null && _d !== void 0 ? _d : false;
         message.loanToValue = (_e = object.loanToValue) !== null && _e !== void 0 ? _e : "";
         message.liquidationThreshold = (_f = object.liquidationThreshold) !== null && _f !== void 0 ? _f : "";
-        message.liquidationDiscount = (_g = object.liquidationDiscount) !== null && _g !== void 0 ? _g : "";
+        message.liquidationBonus = (_g = object.liquidationBonus) !== null && _g !== void 0 ? _g : "";
         message.supplyCap = (_h = object.supplyCap) !== null && _h !== void 0 ? _h : "";
         message.borrowCap = (_j = object.borrowCap) !== null && _j !== void 0 ? _j : "";
         return message;