carbon-js-sdk 0.2.9 → 0.2.11-dev.1

package/lib/clients/InsightsQueryClient.d.ts

@@ -16,7 +16,9 @@ declare class InsightsQueryClient {
     PoolHistory(query: Insights.QueryGetPoolHistoryRequest): Promise<Insights.InsightsQueryResponse<Insights.QueryGetPoolHistoryResponse>>;
     PoolVolume(req: Insights.QueryGetPoolVolumeRequest): Promise<Insights.InsightsQueryResponse<Insights.QueryGetPoolVolumeResponse>>;
     PoolsVolume(req?: Insights.QueryGetPoolsVolumeRequest): Promise<Insights.InsightsQueryResponse<Insights.QueryGetPoolsVolumeResponse>>;
-    CompetitionLeaderboard(req: Insights.QueryGetCompetitionLeaderboardRequest): Promise<Insights.InsightsQueryResponse<Insights.QueryGetCompetitionLeaderboardResponse>>;
+    CompetitionList(req?: Insights.QueryGetCompetitionListRequest): Promise<Insights.InsightsQueryResponse<Insights.QueryGetCompetitionListResponse>>;
+    VolumeCompetitionLeaderboard(req: Insights.QueryGetVolumeCompetitionLeaderboardRequest): Promise<Insights.InsightsQueryResponse<Insights.QueryGetVolumeCompetitionLeaderboardResponse>>;
+    PNLCompetitionLeaderboard(req: Insights.QueryGetPNLCompetitionLeaderboardRequest): Promise<Insights.InsightsQueryResponse<Insights.QueryGetPNLCompetitionLeaderboardResponse>>;
     PoolsLiquidity(req?: Insights.QueryGetPoolsLiquidityRequest): Promise<Insights.InsightsQueryResponse<Insights.QueryGetPoolsLiquidityResponse>>;
     MarketsVolume(req?: Insights.QueryGetMarketVolumeRequest): Promise<Insights.InsightsQueryResponse<Insights.QueryGetMarketVolumeResponse>>;
     Nodes(req?: Insights.QueryGetNodesRequest): Promise<Insights.InsightsQueryResponse<Insights.QueryGetNodesResponse>>;

package/lib/clients/InsightsQueryClient.js

@@ -135,18 +135,29 @@ class InsightsQueryClient {
             return response.data;
         });
     }
-    CompetitionLeaderboard(req) {
+    CompetitionList(req = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            const queryParams = {
-                market: req.market,
-                from: req.from,
-                until: req.until,
-            };
+            const request = this.apiManager.path('competition/list', {}, req);
+            const response = yield request.get();
+            return response.data;
+        });
+    }
+    VolumeCompetitionLeaderboard(req) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const queryParams = Object.assign(Object.assign(Object.assign({ competitionId: req.competitionId }, req.from && { from: req.from }), req.until && { until: req.until }), req.market && { market: req.market });
             const request = this.apiManager.path('competition/leaderboard', {}, queryParams);
             const response = yield request.get();
             return response.data;
         });
     }
+    PNLCompetitionLeaderboard(req) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const queryParams = Object.assign({ competitionId: req.competitionId }, req.market && { market: req.market });
+            const request = this.apiManager.path('competition/leaderboardpnl', {}, queryParams);
+            const response = yield request.get();
+            return response.data;
+        });
+    }
     PoolsLiquidity(req = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const queryParams = {

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 plugin_1 = __importDefault(require("@cityofzion/neon-api/lib/plugin"));
 const Neon = __importStar(require("@cityofzion/neon-core"));
+const neon_js_1 = require("@cityofzion/neon-js");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const ethers_1 = require("ethers");
 const lodash_1 = require("lodash");
@@ -132,9 +132,9 @@ class NEOClient {
             ]);
             const rpcUrl = yield this.getProviderUrl();
             const apiProvider = networkConfig.network === CarbonSDK_1.default.Network.MainNet
-                ? new plugin_1.default.neonDB.instance("https://api.switcheo.network")
-                : new plugin_1.default.neoCli.instance(rpcUrl);
-            return plugin_1.default.doInvoke({
+                ? new neon_js_1.api.neonDB.instance("https://api.switcheo.network")
+                : new neon_js_1.api.neoCli.instance(rpcUrl);
+            return neon_js_1.api.doInvoke({
                 api: apiProvider,
                 url: rpcUrl,
                 account,
@@ -214,8 +214,8 @@ class NEOClient {
             sb.emitAppCall(scriptHash, "lock", data);
             const rpcUrl = yield this.getProviderUrl();
             const apiProvider = networkConfig.network === CarbonSDK_1.default.Network.MainNet
-                ? new plugin_1.default.neonDB.instance("https://api.switcheo.network")
-                : new plugin_1.default.neoCli.instance(rpcUrl);
+                ? new neon_js_1.api.neonDB.instance("https://api.switcheo.network")
+                : new neon_js_1.api.neoCli.instance(rpcUrl);
             let invokeTxConfig = {
                 account: Object.assign(Object.assign({}, new Neon.wallet.Account("")), { 
                     // overwrite the address and public key to values provided by the ledger.
@@ -233,16 +233,16 @@ class NEOClient {
             };
             // similar to Neon.doInvoke(invokeTxConfig), but
             // separates out sendTx to broadcast to several nodes
-            invokeTxConfig = yield plugin_1.default.fillBalance(invokeTxConfig);
-            invokeTxConfig = yield plugin_1.default.createInvocationTx(invokeTxConfig);
-            invokeTxConfig = yield plugin_1.default.modifyTransactionForEmptyTransaction(invokeTxConfig);
-            invokeTxConfig = yield plugin_1.default.signTx(invokeTxConfig);
+            invokeTxConfig = yield neon_js_1.api.fillBalance(invokeTxConfig);
+            invokeTxConfig = yield neon_js_1.api.createInvocationTx(invokeTxConfig);
+            invokeTxConfig = yield neon_js_1.api.modifyTransactionForEmptyTransaction(invokeTxConfig);
+            invokeTxConfig = yield neon_js_1.api.signTx(invokeTxConfig);
             // provide notification to caller that signature is
             // done and proceeding to broadcasting tx
             if (signCompleteCallback) {
                 signCompleteCallback();
             }
-            yield plugin_1.default.sendTx(Object.assign(Object.assign({}, invokeTxConfig), { rpcUrl }));
+            yield neon_js_1.api.sendTx(Object.assign(Object.assign({}, invokeTxConfig), { rpcUrl }));
             return (_a = invokeTxConfig.tx) === null || _a === void 0 ? void 0 : _a.hash;
         });
     }
@@ -270,7 +270,7 @@ class NEOClient {
             const wrapperContractScriptHash = this.getConfig().wrapperScriptHash;
             const wrapperContractAddress = Neon.wallet.getAddressFromScriptHash(wrapperContractScriptHash);
             // Build config
-            const intent = plugin_1.default.makeIntent({ NEO: neoAmount.toNumber() }, wrapperContractAddress);
+            const intent = neon_js_1.api.makeIntent({ NEO: neoAmount.toNumber() }, wrapperContractAddress);
             const props = {
                 scriptHash: wrapperContractScriptHash,
                 operation: "mintTokens",
@@ -279,8 +279,8 @@ class NEOClient {
             const script = Neon.sc.createScript(props);
             const networkConfig = this.getNetworkConfig();
             const apiProvider = networkConfig.network === CarbonSDK_1.default.Network.MainNet
-                ? new plugin_1.default.neonDB.instance("https://api.switcheo.network")
-                : new plugin_1.default.neoCli.instance(rpcUrl);
+                ? new neon_js_1.api.neonDB.instance("https://api.switcheo.network")
+                : new neon_js_1.api.neoCli.instance(rpcUrl);
             const config = {
                 api: apiProvider,
                 url: rpcUrl,
@@ -289,7 +289,7 @@ class NEOClient {
                 script: script
             };
             // Neon API
-            const response = yield plugin_1.default.doInvoke(config);
+            const response = yield neon_js_1.api.doInvoke(config);
             return response;
         });
     }

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/book";
+import { OrderBook, StopBook } from "./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/book");
+const book_1 = require("./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/book";
+import { OrderBook } from "./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/book");
+const book_1 = require("./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 "../broker/amm";
+import { Amm } from "./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("../broker/amm");
+const amm_1 = require("./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 "../broker/pagination";
-import { Candlestick } from "../broker/candlestick";
-import { TradeEvent } from "../broker/event";
+import { MinMaxBoundary } from "./pagination";
+import { Candlestick } from "./candlestick";
+import { TradeEvent } from "./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("../broker/pagination");
-const candlestick_1 = require("../broker/candlestick");
-const event_1 = require("../broker/event");
+const pagination_2 = require("./pagination");
+const candlestick_1 = require("./candlestick");
+const event_1 = require("./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 "../btcx/denom_info";
+import { DenomInfo } from "./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("../btcx/denom_info");
+const denom_info_1 = require("./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 "../btcx/denom_info";
+import { DenomInfo } from "./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("../btcx/denom_info");
+const denom_info_1 = require("./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/ccm";
+import { Params } from "./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/ccm");
+const ccm_1 = require("./ccm");
 exports.protobufPackage = "Switcheo.carbon.ccm";
 const baseGenesisState = { createdTxCount: "" };
 exports.GenesisState = {

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

@@ -5,6 +5,7 @@ export interface AssetParams {
     denom: string;
     oracleId: string;
     rateStrategyName: string;
+    repayStablecoinInterestDebt: boolean;
     loanToValue: string;
     liquidationThreshold: string;
     liquidationBonus: string;

package/lib/codec/cdp/asset_params.js

@@ -12,6 +12,7 @@ const baseAssetParams = {
     denom: "",
     oracleId: "",
     rateStrategyName: "",
+    repayStablecoinInterestDebt: false,
     loanToValue: "",
     liquidationThreshold: "",
     liquidationBonus: "",
@@ -29,20 +30,23 @@ exports.AssetParams = {
         if (message.rateStrategyName !== "") {
             writer.uint32(26).string(message.rateStrategyName);
         }
+        if (message.repayStablecoinInterestDebt === true) {
+            writer.uint32(32).bool(message.repayStablecoinInterestDebt);
+        }
         if (message.loanToValue !== "") {
-            writer.uint32(34).string(message.loanToValue);
+            writer.uint32(42).string(message.loanToValue);
         }
         if (message.liquidationThreshold !== "") {
-            writer.uint32(42).string(message.liquidationThreshold);
+            writer.uint32(50).string(message.liquidationThreshold);
         }
         if (message.liquidationBonus !== "") {
-            writer.uint32(50).string(message.liquidationBonus);
+            writer.uint32(58).string(message.liquidationBonus);
         }
         if (message.supplyCap !== "") {
-            writer.uint32(58).string(message.supplyCap);
+            writer.uint32(66).string(message.supplyCap);
         }
         if (message.borrowCap !== "") {
-            writer.uint32(66).string(message.borrowCap);
+            writer.uint32(74).string(message.borrowCap);
         }
         return writer;
     },
@@ -63,18 +67,21 @@ exports.AssetParams = {
                     message.rateStrategyName = reader.string();
                     break;
                 case 4:
-                    message.loanToValue = reader.string();
+                    message.repayStablecoinInterestDebt = reader.bool();
                     break;
                 case 5:
-                    message.liquidationThreshold = reader.string();
+                    message.loanToValue = reader.string();
                     break;
                 case 6:
-                    message.liquidationBonus = reader.string();
+                    message.liquidationThreshold = reader.string();
                     break;
                 case 7:
-                    message.supplyCap = reader.string();
+                    message.liquidationBonus = reader.string();
                     break;
                 case 8:
+                    message.supplyCap = reader.string();
+                    break;
+                case 9:
                     message.borrowCap = reader.string();
                     break;
                 default:
@@ -98,6 +105,11 @@ exports.AssetParams = {
             object.rateStrategyName !== undefined && object.rateStrategyName !== null
                 ? String(object.rateStrategyName)
                 : "";
+        message.repayStablecoinInterestDebt =
+            object.repayStablecoinInterestDebt !== undefined &&
+                object.repayStablecoinInterestDebt !== null
+                ? Boolean(object.repayStablecoinInterestDebt)
+                : false;
         message.loanToValue =
             object.loanToValue !== undefined && object.loanToValue !== null
                 ? String(object.loanToValue)
@@ -127,6 +139,8 @@ exports.AssetParams = {
         message.oracleId !== undefined && (obj.oracleId = message.oracleId);
         message.rateStrategyName !== undefined &&
             (obj.rateStrategyName = message.rateStrategyName);
+        message.repayStablecoinInterestDebt !== undefined &&
+            (obj.repayStablecoinInterestDebt = message.repayStablecoinInterestDebt);
         message.loanToValue !== undefined &&
             (obj.loanToValue = message.loanToValue);
         message.liquidationThreshold !== undefined &&
@@ -138,16 +152,18 @@ exports.AssetParams = {
         return obj;
     },
     fromPartial(object) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const message = Object.assign({}, baseAssetParams);
         message.denom = (_a = object.denom) !== null && _a !== void 0 ? _a : "";
         message.oracleId = (_b = object.oracleId) !== null && _b !== void 0 ? _b : "";
         message.rateStrategyName = (_c = object.rateStrategyName) !== null && _c !== void 0 ? _c : "";
-        message.loanToValue = (_d = object.loanToValue) !== null && _d !== void 0 ? _d : "";
-        message.liquidationThreshold = (_e = object.liquidationThreshold) !== null && _e !== void 0 ? _e : "";
-        message.liquidationBonus = (_f = object.liquidationBonus) !== null && _f !== void 0 ? _f : "";
-        message.supplyCap = (_g = object.supplyCap) !== null && _g !== void 0 ? _g : "";
-        message.borrowCap = (_h = object.borrowCap) !== null && _h !== void 0 ? _h : "";
+        message.repayStablecoinInterestDebt =
+            (_d = object.repayStablecoinInterestDebt) !== 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.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;
     },
 };