carbon-js-sdk 0.10.2-rc8 → 0.10.3

package/lib/clients/InsightsQueryClient.d.ts

@@ -21,7 +21,7 @@ declare class InsightsQueryClient {
     Pools(req?: Insights.QueryGetPoolsRequest): Promise<Insights.InsightsQueryResponse<Insights.QueryGetPoolsResponse>>;
     PoolHistory(query: Insights.QueryGetPoolHistoryRequest): Promise<Insights.InsightsQueryResponse<Insights.QueryGetPoolHistoryResponse>>;
     PerpPoolHistory(query: Insights.QueryGetPerpPoolHistoryRequest): Promise<Insights.InsightsQueryResponse<Insights.QueryGetPerpPoolHistoryResponse>>;
-    PerpPool7DApy(query: Insights.QueryPerpPool7DaysAPY): Promise<Insights.InsightsQueryResponse<Insights.QueryPerpPool7DaysAPYResponse>>;
+    PerpPoolApy(query: Insights.QueryPerpPoolAPY): Promise<Insights.InsightsQueryResponse<Insights.QueryPerpPoolAPYResponse>>;
     PoolVolume(req: Insights.QueryGetPoolVolumeRequest): Promise<Insights.InsightsQueryResponse<Insights.QueryGetPoolVolumeResponse>>;
     PoolsVolume(req?: Insights.QueryGetPoolsVolumeRequest): Promise<Insights.InsightsQueryResponse<Insights.QueryGetPoolsVolumeResponse>>;
     UserRewardsClaimHistory(req: Insights.QueryGetUserRewardsClaimHistoryRequest): Promise<InsightsQueryResponse<Insights.QueryGetUserRewardsClaimHistoryResponse>>;

package/lib/clients/InsightsQueryClient.js

@@ -173,7 +173,7 @@ class InsightsQueryClient {
             return response.data;
         });
     }
-    PerpPool7DApy(query) {
+    PerpPoolApy(query) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const routeParams = { id: query.id };

package/lib/insights/pool.d.ts

@@ -91,18 +91,19 @@ export interface PositionHistoryEntry {
 export interface QueryGetPerpPoolHistoryRequest extends QueryByPageRequest {
     address: string;
 }
-export interface QueryPerpPool7DaysAPY extends QueryByPageRequest {
+export interface QueryPerpPoolAPY extends QueryByPageRequest {
     id: number;
 }
-export interface PerpPool7DaysAPYEntry {
-    latestPrice: number;
-    previousPrice: number;
-    apy: number;
-    from: string;
-    to: string;
-}
-export interface QueryPerpPool7DaysAPYResponse {
-    entries: PerpPool7DaysAPYEntry[];
+export interface PerpPoolAPYEntry {
+    denom: string;
+    annualizedApy1day: number | null;
+    annualizedApy7days: number | null;
+    annualizedApy14days: number | null;
+    annualizedApy30days: number | null;
+    annualizedApy90days: number | null;
+}
+export interface QueryPerpPoolAPYResponse {
+    entries: PerpPoolAPYEntry[];
     meta: PageMeta;
 }
 export interface PerpPositionHistoryEntry {

package/lib/util/tx.d.ts

@@ -3,6 +3,7 @@ import * as CosmosModels from "../codec/cosmos-models";
 import { StdFee } from "@cosmjs/amino";
 import { SignerData } from "@cosmjs/stargate";
 import { SWTHAddressOptions } from "./address";
+import { EncodeObject } from "@cosmjs/proto-signing";
 export { StdSignDoc } from "@cosmjs/amino";
 export interface TxBody extends Omit<CosmosModels.Tx.TxBody, "messages"> {
     messages: unknown[];
@@ -634,3 +635,5 @@ export declare const TxMinGasPriceTypeDefaultKey = "swth";
 export declare const TxGasCostTypeMap: {
     [x: string]: string;
 };
+export declare const useSignDirectForMetamask: (messages: readonly EncodeObject[]) => boolean;
+export declare const isLibMsg: (typeUrl: string) => boolean;

package/lib/util/tx.js

@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TxGasCostTypeMap = exports.TxMinGasPriceTypeDefaultKey = exports.TxGasCostTypeDefaultKey = exports.DEFAULT_SIGN_OPTS = exports.Types = exports.CarbonCustomError = exports.ErrorType = exports.BroadcastTxMode = exports.getSender = exports.decode = void 0;
+exports.isLibMsg = exports.useSignDirectForMetamask = exports.TxGasCostTypeMap = exports.TxMinGasPriceTypeDefaultKey = exports.TxGasCostTypeDefaultKey = exports.DEFAULT_SIGN_OPTS = exports.Types = exports.CarbonCustomError = exports.ErrorType = exports.BroadcastTxMode = exports.getSender = exports.decode = void 0;
 const codec_1 = require("../codec");
 const CosmosModels = __importStar(require("../codec/cosmos-models"));
 const constant_1 = require("../constant");
@@ -135,3 +135,23 @@ exports.TxGasCostTypeMap = {
     [codec_1.TxTypes.MsgStakePoolToken]: "stake_pool_token",
     [codec_1.TxTypes.MsgUnstakePoolToken]: "unstake_pool_token",
 };
+const LibPackages = ['ibc', 'cosmos', 'alliance'];
+const BacklistedMessages = [];
+// to use signDirect for metamask signing if messages are from libraries (cosmos-sdk, ibc, alliance).
+// Reasons:
+// 1. There is decoding issue with MsgGrantAllowance in amino
+// 2. For Ibc MsgTransfer, there is an overflow issue with timeouttimestamp overflow (from uint32) during unmarshalJSON, even though it is defined as uint64 
+// (This can be resolved from the client side by use sendIBCTransfer instead of sendIBCTransferV2) but using signDirect here fixes it too.
+// 3. Ethermint is still using legacyMsg.getSigners() to verify many amino signed eip712 txs. However, getSigners() is deprecated and not implmented in messages from cosmos-sdk anymore.
+// 4. as of comsos-sdk v0.50 --> very few messages are using legacyDec so we can safely use signDirect
+const useSignDirectForMetamask = (messages) => {
+    const typeUrls = messages.map(m => m.typeUrl);
+    return !!Object.values(codec_1.TxTypes).find(typeUrl => exports.isLibMsg(typeUrl) && typeUrls.includes(typeUrl));
+};
+exports.useSignDirectForMetamask = useSignDirectForMetamask;
+const isLibMsg = (typeUrl) => {
+    // /ibc.core.client.v1.UpgradeProposal --> ibc
+    const pkg = typeUrl.split('.')[0].substring(1);
+    return LibPackages.includes(pkg) && !BacklistedMessages.includes(typeUrl);
+};
+exports.isLibMsg = isLibMsg;

package/lib/wallet/CarbonSigningClient.js

@@ -17,6 +17,7 @@ const codec_1 = require("../codec");
 const tx_1 = require("../codec/cosmos/tx/v1beta1/tx");
 const web3_1 = require("../codec/ethermint/types/v1/web3");
 const ethermint_1 = require("../util/ethermint");
+const tx_2 = require("../util/tx");
 const amino_1 = require("@cosmjs/amino");
 const encoding_1 = require("@cosmjs/encoding");
 const math_1 = require("@cosmjs/math");
@@ -94,8 +95,11 @@ class CarbonSigningClient extends stargate_1.StargateClient {
                 if (this.signer.legacyEip712SignMode) {
                     return this.signLegacyEip712(signerAddress, messages, fee, memo, signerData);
                 }
+                // workaround to use signDirect
+                if (tx_2.useSignDirectForMetamask(messages))
+                    return this.signDirect(signerAddress, messages, fee, memo, signerData, granterAddress);
                 // Use amino sigining for metamask as there is a bug with signDirect signature verification
-                // ethermint verifies sign direct dec type  as shifted by 18dp when it should be unshifted (verified with keplr)
+                // ethermint verifies sign direct legacyDec type as shifted by 18dp when it should be unshifted (verified with keplr)
                 // therefore the alternative which works here would be to use signamino where the verification is not broken on ethermint.
                 return this.signAmino(signerAddress, messages, fee, memo, signerData, granterAddress);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-js-sdk",
-  "version": "0.10.2-rc8",
+  "version": "0.10.3",
   "description": "TypeScript SDK for Carbon blockchain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",