carbon-js-sdk 0.2.16 → 0.2.18-dev.0

package/lib/wallet/CarbonSigner.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { SignDoc } from '../codec/cosmos/tx/v1beta1/tx';
 import { CosmosLedger } from '../provider';
-import { AminoSignResponse, OfflineAminoSigner, StdSignDoc } from "@cosmjs/amino";
+import { AminoSignResponse, OfflineAminoSigner, Secp256k1Wallet, StdSignDoc } from "@cosmjs/amino";
 import { AccountData, DirectSecp256k1Wallet, DirectSignResponse, OfflineDirectSigner } from '@cosmjs/proto-signing';
 export declare enum CarbonSignerTypes {
     Ledger = 0,
@@ -16,14 +16,17 @@ export declare type DirectCarbonSigner = OfflineDirectSigner & {
 export declare type AminoCarbonSigner = OfflineAminoSigner & {
     type: CarbonSignerTypes;
 };
-export declare class CarbonPrivateKeySigner implements DirectCarbonSigner {
+export declare class CarbonPrivateKeySigner implements DirectCarbonSigner, AminoCarbonSigner {
     readonly privateKey: Buffer;
     readonly prefix: string;
     type: CarbonSignerTypes;
     wallet?: DirectSecp256k1Wallet;
+    aminoWallet?: Secp256k1Wallet;
     constructor(privateKey: Buffer, prefix: string);
     initWallet(): Promise<DirectSecp256k1Wallet>;
+    initAminoWallet(): Promise<Secp256k1Wallet>;
     getAccounts(): Promise<readonly AccountData[]>;
+    signAmino(signerAddress: string, signDoc: StdSignDoc): Promise<AminoSignResponse>;
     signDirect(signerAddress: string, signDoc: SignDoc): Promise<DirectSignResponse>;
 }
 export declare class CarbonNonSigner implements DirectCarbonSigner {

package/lib/wallet/CarbonSigner.js

@@ -33,12 +33,25 @@ class CarbonPrivateKeySigner {
             return this.wallet;
         });
     }
+    initAminoWallet() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.aminoWallet)
+                this.aminoWallet = yield amino_1.Secp256k1Wallet.fromKey(this.privateKey, this.prefix);
+            return this.aminoWallet;
+        });
+    }
     getAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = yield this.initWallet();
             return wallet.getAccounts();
         });
     }
+    signAmino(signerAddress, signDoc) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const aminoWallet = yield this.initAminoWallet();
+            return yield aminoWallet.signAmino(signerAddress, signDoc);
+        });
+    }
     signDirect(signerAddress, signDoc) {
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = yield this.initWallet();
@@ -93,9 +106,9 @@ class CarbonLedgerSigner {
         return __awaiter(this, void 0, void 0, function* () {
             const account = yield this.retrieveAccount();
             const { pubkey } = account;
-            const msg = JSON.stringify((0, generic_1.sortObject)(doc));
+            const msg = JSON.stringify(generic_1.sortObject(doc));
             const signBytes = yield this.ledger.sign(msg);
-            const signature = (0, amino_1.encodeSecp256k1Signature)(pubkey, signBytes);
+            const signature = amino_1.encodeSecp256k1Signature(pubkey, signBytes);
             return {
                 signed: doc,
                 signature,

package/lib/wallet/CarbonSigningClient.js

@@ -87,7 +87,7 @@ class CarbonSigningClient extends stargate_1.StargateClient {
      */
     sign(signerAddress, messages, fee, memo, signerData) {
         return __awaiter(this, void 0, void 0, function* () {
-            return (0, proto_signing_1.isOfflineDirectSigner)(this.signer)
+            return proto_signing_1.isOfflineDirectSigner(this.signer)
                 ? this.signDirect(signerAddress, messages, fee, memo, signerData)
                 : this.signAmino(signerAddress, messages, fee, memo, signerData);
         });
@@ -99,7 +99,7 @@ class CarbonSigningClient extends stargate_1.StargateClient {
             if (!accountFromSigner) {
                 throw new Error("Failed to retrieve account from signer");
             }
-            const pubkey = (0, proto_signing_1.encodePubkey)((0, amino_1.encodeSecp256k1Pubkey)(accountFromSigner.pubkey));
+            const pubkey = proto_signing_1.encodePubkey(amino_1.encodeSecp256k1Pubkey(accountFromSigner.pubkey));
             const txBodyEncodeObject = {
                 typeUrl: "/cosmos.tx.v1beta1.TxBody",
                 value: Object.assign({ messages: messages, memo: memo }, timeoutHeight && {
@@ -108,13 +108,13 @@ class CarbonSigningClient extends stargate_1.StargateClient {
             };
             const txBodyBytes = this.registry.encode(txBodyEncodeObject);
             const gasLimit = math_1.Int53.fromString(fee.gas).toNumber();
-            const authInfoBytes = (0, proto_signing_1.makeAuthInfoBytes)([{ pubkey, sequence }], fee.amount, gasLimit);
-            const signDoc = (0, proto_signing_1.makeSignDoc)(txBodyBytes, authInfoBytes, chainId, accountNumber);
+            const authInfoBytes = proto_signing_1.makeAuthInfoBytes([{ pubkey, sequence }], fee.amount, gasLimit);
+            const signDoc = proto_signing_1.makeSignDoc(txBodyBytes, authInfoBytes, chainId, accountNumber);
             const { signature, signed } = yield signer.signDirect(signerAddress, signDoc);
             return tx_1.TxRaw.fromPartial({
                 bodyBytes: signed.bodyBytes,
                 authInfoBytes: signed.authInfoBytes,
-                signatures: [(0, encoding_1.fromBase64)(signature.signature)],
+                signatures: [encoding_1.fromBase64(signature.signature)],
             });
         });
     }
@@ -125,7 +125,7 @@ class CarbonSigningClient extends stargate_1.StargateClient {
             if (!accountFromSigner) {
                 throw new Error("Failed to retrieve account from signer");
             }
-            const pubkey = (0, proto_signing_1.encodePubkey)((0, amino_1.encodeSecp256k1Pubkey)(accountFromSigner.pubkey));
+            const pubkey = proto_signing_1.encodePubkey(amino_1.encodeSecp256k1Pubkey(accountFromSigner.pubkey));
             const signMode = SignMode.SIGN_MODE_LEGACY_AMINO_JSON;
             const msgs = messages.map((msg) => this.aminoTypes.toAmino(msg));
             const signDoc = makeSignDocAmino(msgs, fee, chainId, memo, accountNumber, sequence, timeoutHeight !== null && timeoutHeight !== void 0 ? timeoutHeight : 0);
@@ -140,11 +140,11 @@ class CarbonSigningClient extends stargate_1.StargateClient {
             const signedTxBodyBytes = this.registry.encode(signedTxBodyEncodeObject);
             const signedGasLimit = math_1.Int53.fromString(signed.fee.gas).toNumber();
             const signedSequence = math_1.Int53.fromString(signed.sequence).toNumber();
-            const signedAuthInfoBytes = (0, proto_signing_1.makeAuthInfoBytes)([{ pubkey, sequence: signedSequence }], signed.fee.amount, signedGasLimit, signMode);
+            const signedAuthInfoBytes = proto_signing_1.makeAuthInfoBytes([{ pubkey, sequence: signedSequence }], signed.fee.amount, signedGasLimit, signMode);
             return tx_1.TxRaw.fromPartial({
                 bodyBytes: signedTxBodyBytes,
                 authInfoBytes: signedAuthInfoBytes,
-                signatures: [(0, encoding_1.fromBase64)(signature.signature)],
+                signatures: [encoding_1.fromBase64(signature.signature)],
             });
         });
     }

package/lib/wallet/CarbonWallet.js

@@ -148,7 +148,7 @@ class CarbonWallet {
                 const signerData = Object.assign({ accountNumber: this.accountInfo.accountNumber, chainId: this.getChainId(), sequence }, explicitSignerData);
                 const fee = (_a = opts === null || opts === void 0 ? void 0 : opts.fee) !== null && _a !== void 0 ? _a : this.estimateTxFee(messages, feeDenom);
                 const txRaw = yield signingClient.sign(signerAddress, messages, fee, memo, signerData);
-                signature = (0, amino_1.encodeSecp256k1Signature)(account.pubkey, txRaw.signatures[0]);
+                signature = amino_1.encodeSecp256k1Signature(account.pubkey, txRaw.signatures[0]);
                 return txRaw;
             }
             finally {
@@ -166,9 +166,8 @@ class CarbonWallet {
             const tx = CarbonWallet.TxRaw.encode(txRaw).finish();
             const carbonClient = this.getSigningClient();
             const response = yield carbonClient.broadcastTx(tx, timeoutMs, pollIntervalMs);
-            if ((0, stargate_1.isDeliverTxFailure)(response)) {
+            if (stargate_1.isDeliverTxFailure(response)) {
                 // tx failed
-                console.error(response);
                 throw new Error(`[${response.code}] ${response.rawLog}`);
             }
             return response;
@@ -206,9 +205,9 @@ class CarbonWallet {
             try {
                 if (!this.accountInfo || this.sequenceInvalidated)
                     yield this.reloadAccountSequence();
-                const heightResponse = yield (0, fetch_1.fetch)(`${this.networkConfig.tmRpcUrl}/blockchain?cache=${new Date().getTime()}`);
+                const heightResponse = yield fetch_1.fetch(`${this.networkConfig.tmRpcUrl}/blockchain?cache=${new Date().getTime()}`);
                 const heightRes = yield heightResponse.json();
-                const height = (0, number_1.bnOrZero)((_a = heightRes.result) === null || _a === void 0 ? void 0 : _a.last_height);
+                const height = number_1.bnOrZero((_a = heightRes.result) === null || _a === void 0 ? void 0 : _a.last_height);
                 const timeoutHeight = height.isZero() ? undefined : height.toNumber() + this.defaultTimeoutBlocks;
                 const sequence = this.accountInfo.sequence;
                 this.accountInfo = Object.assign(Object.assign({}, this.accountInfo), { sequence: sequence + 1 });
@@ -342,12 +341,12 @@ class CarbonWallet {
             const queryClient = this.getQueryClient();
             const { msgGasCosts } = yield queryClient.fee.MsgGasCostAll({});
             this.txGasCosts = msgGasCosts.reduce((result, item) => {
-                result[item.msgType] = (0, number_1.bnOrZero)(item.gasCost);
+                result[item.msgType] = number_1.bnOrZero(item.gasCost);
                 return result;
             }, {});
             const { minGasPrices } = yield queryClient.fee.MinGasPriceAll({});
             this.txGasPrices = minGasPrices.reduce((result, item) => {
-                result[item.denom] = (0, number_1.bnOrZero)(item.gasPrice).shiftedBy(-18); // sdk.Dec shifting
+                result[item.denom] = number_1.bnOrZero(item.gasPrice).shiftedBy(-18); // sdk.Dec shifting
                 return result;
             }, {});
             if (!this.txGasPrices[this.defaultFeeDenom]) {

package/lib/websocket/channel.js

@@ -68,60 +68,104 @@ const generateChannelId = (params) => {
             const { channel, id } = params;
             return [channel, id].join(':');
         }
+        case types_1.WSChannel.token_prices: {
+            const { channel } = params;
+            return [channel].join(':');
+        }
+        case types_1.WSChannel.token_prices_by_denom: {
+            const { channel, denom } = params;
+            return [channel, denom].join(':');
+        }
         case types_1.WSChannel.commitments: {
             const { channel, address } = params;
             return [channel, address].join(':');
         }
+        case types_1.WSChannel.cdp_borrows: {
+            const { channel, address } = params;
+            return [channel, address].join(':');
+        }
+        case types_1.WSChannel.cdp_collaterals: {
+            const { channel, address } = params;
+            return [channel, address].join(':');
+        }
+        case types_1.WSChannel.cdp_liquidate_collaterals: {
+            const { channel } = params;
+            return [channel].join(':');
+        }
+        case types_1.WSChannel.cdp_token_debts: {
+            const { channel } = params;
+            return [channel].join(':');
+        }
+        case types_1.WSChannel.cdp_token_debts_by_denom: {
+            const { channel, denom } = params;
+            return [channel, denom].join(':');
+        }
+        case types_1.WSChannel.cdp_reward_schemes: {
+            const { channel } = params;
+            return [channel].join(':');
+        }
+        case types_1.WSChannel.cdp_reward_debts: {
+            const { channel, address } = params;
+            return [channel, address].join(':');
+        }
+        case types_1.WSChannel.cdp_token_supply: {
+            const { channel } = params;
+            return [channel].join(':');
+        }
+        case types_1.WSChannel.cdp_token_supply_by_denom: {
+            const { channel, denom } = params;
+            return [channel, denom].join(':');
+        }
         default:
             throw new Error(`invalid subscription channel: ${params.channel}`);
     }
 };
 exports.generateChannelId = generateChannelId;
 const parseChannelId = (rawChannelId) => {
-    const [channel, market, resolution, address, id] = rawChannelId.split(':');
+    const [channel, param0, param1] = rawChannelId.split(':');
     switch (channel) {
         case types_1.WSChannel.candlesticks:
             return {
                 channel,
-                market,
-                resolution,
+                market: param0,
+                resolution: param1,
             };
         case types_1.WSChannel.books:
             return {
                 channel,
-                market,
+                market: param0,
             };
         case types_1.WSChannel.recent_trades:
             return {
                 channel,
-                market,
+                market: param0,
             };
         case types_1.WSChannel.orders:
             return {
                 channel,
-                address,
+                address: param0,
             };
         case types_1.WSChannel.orders_by_market:
             return {
                 channel,
-                market,
-                address,
+                market: param0,
+                address: param1,
             };
         case types_1.WSChannel.balances:
             return {
                 channel,
-                address,
+                address: param0,
             };
         case types_1.WSChannel.account_trades:
             return {
                 channel,
-                address,
+                address: param0,
             };
         case types_1.WSChannel.account_trades_by_market:
             return {
                 channel,
-                market,
-                address,
+                market: param0,
+                address: param1,
             };
         case types_1.WSChannel.market_stats:
             return {
@@ -130,29 +174,29 @@ const parseChannelId = (rawChannelId) => {
         case types_1.WSChannel.market_stats_by_market:
             return {
                 channel,
-                market,
+                market: param0,
             };
         case types_1.WSChannel.leverages:
             return {
                 channel,
-                address,
+                address: param0,
             };
         case types_1.WSChannel.leverages_by_market:
             return {
                 channel,
-                market,
-                address,
+                market: param0,
+                address: param1,
             };
         case types_1.WSChannel.positions:
             return {
                 channel,
-                address,
+                address: param0,
             };
         case types_1.WSChannel.positions_by_market:
             return {
                 channel,
-                market,
-                address,
+                market: param0,
+                address: param1,
             };
         case types_1.WSChannel.pools:
             return {
@@ -161,12 +205,62 @@ const parseChannelId = (rawChannelId) => {
         case types_1.WSChannel.pools_by_id:
             return {
                 channel,
-                id,
+                id: param0,
             };
         case types_1.WSChannel.commitments:
             return {
                 channel,
-                address,
+                address: param0,
+            };
+        case types_1.WSChannel.token_prices:
+            return {
+                channel,
+            };
+        case types_1.WSChannel.token_prices:
+            return {
+                channel,
+                denom: param0,
+            };
+        case types_1.WSChannel.cdp_borrows:
+            return {
+                channel,
+                address: param0,
+            };
+        case types_1.WSChannel.cdp_collaterals:
+            return {
+                channel,
+                address: param0,
+            };
+        case types_1.WSChannel.cdp_liquidate_collaterals:
+            return {
+                channel,
+            };
+        case types_1.WSChannel.cdp_token_debts:
+            return {
+                channel,
+            };
+        case types_1.WSChannel.cdp_token_debts_by_denom:
+            return {
+                channel,
+                denom: param0,
+            };
+        case types_1.WSChannel.cdp_reward_schemes:
+            return {
+                channel,
+            };
+        case types_1.WSChannel.cdp_reward_debts:
+            return {
+                channel,
+                address: param0,
+            };
+        case types_1.WSChannel.cdp_token_supply:
+            return {
+                channel,
+            };
+        case types_1.WSChannel.cdp_token_supply_by_denom:
+            return {
+                channel,
+                denom: param0,
             };
         default:
             throw new Error('Error parsing channelId');

package/lib/websocket/connector.js

@@ -171,7 +171,7 @@ class WSConnector {
             params = [params]; // eslint-disable-line no-param-reassign
         }
         for (const param of params) {
-            const channelId = (0, channel_1.generateChannelId)(param);
+            const channelId = channel_1.generateChannelId(param);
             const shouldSubscribe = this.channelHandlers[channelId] === undefined;
             this.channelHandlers[channelId] = handler;
             if (shouldSubscribe) {
@@ -193,7 +193,7 @@ class WSConnector {
         }
         const channelIds = [];
         for (const param of params) {
-            const channelId = (0, channel_1.generateChannelId)(param);
+            const channelId = channel_1.generateChannelId(param);
             delete this.channelHandlers[channelId];
         }
         this.send('unsubscribe', {
@@ -279,7 +279,7 @@ class WSConnector {
             if (!channelHandler) {
                 this.debugLog(`handler not found for channel: ${message.channel}`);
                 try {
-                    const params = (0, channel_1.parseChannelId)(message.channel);
+                    const params = channel_1.parseChannelId(message.channel);
                     this.unsubscribe({ channel: params.channel });
                 }
                 catch (error) {

package/lib/websocket/models.d.ts

@@ -143,6 +143,9 @@ export interface Pool {
         num_quotes: number;
         shares_amount: string;
         market: string;
+        amp_bps: string;
+        v_amount_a: string;
+        v_amount_b: string;
     };
     rewards_weight: string;
     total_commitment: string;
@@ -160,3 +163,156 @@ export interface Commitment {
 export interface CommitmentEvent extends Commitment {
     Type?: string;
 }
+export interface TokenPrice {
+    denom: string;
+    index: string;
+    index_updated_at: string;
+    twap: string;
+}
+export interface CDPParams {
+    interest_fee: string;
+    liquidation_fee: string;
+    stablecoin_interest_rate: string;
+    complete_liquidation_threshold: string;
+    minimum_close_factor: string;
+    small_liquidation_size: string;
+}
+export interface RateStrategy {
+    name: string;
+    optimal_usage: string;
+    base_variable_borrow_rate: string;
+    variable_rate_slope_1: string;
+    variable_rate_slope_2: string;
+    base_stable_borrow_rate: string;
+    stable_rate_slope_1: string;
+    stable_rate_slope_2: string;
+    optimal_stable_to_total_debt_ratio: string;
+}
+/**
+ * @deprecated old websocket response struct for get_cdp_assets_all
+ * use AssetParams instead
+*/
+export interface Asset {
+    asset_params: {
+        denom: string;
+        oracle_id: string;
+        rate_strategy_name: string;
+        loan_to_value: string;
+        liquidation_threshold: string;
+        liquidation_bonus: string;
+        supply_cap: string;
+        borrow_cap: string;
+    };
+    asset_utilization: {
+        denom: string;
+        total_borrowed: string;
+        total_amount: string;
+        utilization_rate: string;
+    };
+}
+export interface AssetParams {
+    denom: string;
+    oracle_id: string;
+    rate_strategy_name: string;
+    allow_repay_stablecoin_interest_debt: boolean;
+    loan_to_value: string;
+    liquidation_threshold: string;
+    liquidation_discount: string;
+    supply_cap: string;
+    borrow_cap: string;
+}
+export interface Collateral {
+    cdp_denom: string;
+    denom: string;
+    collateral_amount: string;
+}
+export interface Debt {
+    denom: string;
+    principal_debt: string;
+    initial_cumulative_interest_multiplier: string;
+}
+export interface AccountData {
+    total_collaterals_usd: string;
+    total_debts_usd: string;
+    available_borrows_usd: string;
+    curr_liquidation_threshold: string;
+    health_factor: string;
+}
+export interface CDPAccountStablecoin {
+    principal_debt: string;
+    interest_debt: string;
+    initial_cumulative_interest_multiplier: string;
+}
+/**
+ * Response for get_cdp_total_borrows and get_cdp_borrows
+ * Do not confuse with Debt
+*/
+export interface CDPBorrow {
+    address: string;
+    amount: string;
+    denom: string;
+    type: string;
+    initial_cumulative_interest_multiplier?: string;
+}
+/**
+ * Response for get_cdp_total_collaterals and get_cdp_collaterals
+ * Do not confuse with Collateral
+*/
+export interface CDPCollateral {
+    address: string;
+    amount: string;
+    denom: string;
+}
+export interface CDPDebtInfo {
+    denom: string;
+    last_updated_time: string;
+    total_principal: string;
+    cumulative_interest_multiplier: string;
+    total_accumulated_interest: string;
+    utilization_rate: string;
+}
+export interface CDPStableCoinDebtInfo {
+    denom: string;
+    last_updated_time: string;
+    total_principal: string;
+    cumulative_interest_multiplier: string;
+    total_accumulated_interest: string;
+}
+export interface CDPLiquidation {
+    liquidator: string;
+    debtor: string;
+    collateral_denom: string;
+    collateral_amount_liquidated: string;
+    collateral_amount_liquidator: string;
+    collateral_amount_fee: string;
+    liquidation_price: string;
+    market_price: string;
+    discount: string;
+    debt_denom: string;
+    debt_amount: string;
+    block_height: number;
+    block_time: string;
+    transaction_hash: string;
+}
+export interface RewardScheme {
+    id: number;
+    creator: string;
+    reward_denom: string;
+    asset_denom: string;
+    reward_type: string;
+    reward_amount_per_second: string;
+    start_time: string;
+    end_time: string;
+    reward_per_share_last_updated_at: string;
+    reward_per_share: string;
+}
+export interface RewardDebt {
+    user_address: string;
+    reward_scheme_id: number;
+    reward_debt: string;
+    last_updated_at: string;
+}
+export interface CDPTokenSupply {
+    cdp_denom: string;
+    amount: string;
+}