carbon-js-sdk 0.3.49 → 0.3.51

package/lib/provider/metamask/MetaMask.js

@@ -56,6 +56,20 @@ const CONTRACT_HASH = {
         [constant_1.Network.LocalHost]: "",
         [constant_1.Network.MainNet]: "0x43138036d1283413035b8eca403559737e8f7980",
     },
+    [blockchain_1.Blockchain.Polygon]: {
+        // use same testnet contract for all non-mainnet uses
+        [constant_1.Network.TestNet]: "",
+        [constant_1.Network.DevNet]: "",
+        [constant_1.Network.LocalHost]: "",
+        [constant_1.Network.MainNet]: "0x61B9503Fe023E1F1Dd0ab7417923cB0A41DD9E0c",
+    },
+    [blockchain_1.Blockchain.Okc]: {
+        // use same testnet contract for all non-mainnet uses
+        [constant_1.Network.TestNet]: "",
+        [constant_1.Network.DevNet]: "",
+        [constant_1.Network.LocalHost]: "",
+        [constant_1.Network.MainNet]: "0x7e8D8c98a016877Cb3103e837Fc71D41b155aF70",
+    },
 };
 const REGISTRY_CONTRACT_ABI = eth_1.ABIs.keyStorage;
 const ENCRYPTION_VERSION = "x25519-xsalsa20-poly1305";
@@ -143,6 +157,50 @@ const ARBITRUM_TESTNET = {
         symbol: "ETH",
     },
 };
+const POLYGON_MAINNET = {
+    chainId: "0x89",
+    blockExplorerUrls: ["https://polygonscan.com/"],
+    chainName: "Polygon Mainnet",
+    rpcUrls: ["https://polygon-rpc.com"],
+    nativeCurrency: {
+        decimals: 18,
+        name: "Matic",
+        symbol: "MATIC",
+    },
+};
+const POLYGON_TESTNET = {
+    chainId: "0x13881",
+    blockExplorerUrls: ["https://mumbai.polygonscan.com"],
+    chainName: "Polygon Mumbai",
+    rpcUrls: ["https://polygon-mumbai.infura.io/v3/4458cf4d1689497b9a38b1d6bbf05e78"],
+    nativeCurrency: {
+        decimals: 18,
+        name: "Matic",
+        symbol: "MATIC",
+    },
+};
+const OKC_MAINNET = {
+    chainId: "0x42",
+    blockExplorerUrls: ["https://www.oklink.com/okc"],
+    chainName: "OKC Mainnet",
+    rpcUrls: ["https://exchainrpc.okex.org"],
+    nativeCurrency: {
+        decimals: 18,
+        name: "OKT",
+        symbol: "OKT",
+    },
+};
+const OKC_TESTNET = {
+    chainId: "0x41",
+    blockExplorerUrls: ["https://www.oklink.com/okc-test"],
+    chainName: "OKC Testnet",
+    rpcUrls: ["https://exchaintestrpc.okex.org"],
+    nativeCurrency: {
+        decimals: 18,
+        name: "OKT",
+        symbol: "OKT",
+    },
+};
 /**
  * TODO: Add docs
  */
@@ -158,6 +216,10 @@ class MetaMask {
                     return BSC_MAINNET;
                 case blockchain_1.Blockchain.Arbitrum:
                     return ARBITRUM_MAINNET;
+                case blockchain_1.Blockchain.Polygon:
+                    return POLYGON_MAINNET;
+                case blockchain_1.Blockchain.Okc:
+                    return OKC_MAINNET;
                 default:
                     // metamask should come with Ethereum configs
                     return ETH_MAINNET;
@@ -168,6 +230,10 @@ class MetaMask {
                 return BSC_TESTNET;
             case blockchain_1.Blockchain.Arbitrum:
                 return ARBITRUM_TESTNET;
+            case blockchain_1.Blockchain.Polygon:
+                return POLYGON_TESTNET;
+            case blockchain_1.Blockchain.Okc:
+                return OKC_TESTNET;
             default:
                 // metamask should come with Ethereum configs
                 return ETH_TESTNET;
@@ -180,6 +246,10 @@ class MetaMask {
                     return 56;
                 case blockchain_1.Blockchain.Arbitrum:
                     return 42161;
+                case blockchain_1.Blockchain.Polygon:
+                    return 137;
+                case blockchain_1.Blockchain.Okc:
+                    return 66;
                 default:
                     return 1;
             }
@@ -189,6 +259,10 @@ class MetaMask {
                 return 97;
             case blockchain_1.Blockchain.Arbitrum:
                 return 421611;
+            case blockchain_1.Blockchain.Polygon:
+                return 80001;
+            case blockchain_1.Blockchain.Okc:
+                return 65;
             default:
                 return 5;
         }
@@ -363,6 +437,14 @@ class MetaMask {
                 this.blockchain = blockchain_1.Blockchain.Arbitrum;
                 return currentChainId;
             }
+            if (currentChainId === 137) {
+                this.blockchain = blockchain_1.Blockchain.Polygon;
+                return currentChainId;
+            }
+            if (currentChainId === 66) {
+                this.blockchain = blockchain_1.Blockchain.Okc;
+                return currentChainId;
+            }
             return 1;
         }
         if (currentChainId === 5) {
@@ -377,6 +459,14 @@ class MetaMask {
             this.blockchain = blockchain_1.Blockchain.Arbitrum;
             return currentChainId;
         }
+        if (currentChainId === 80001) {
+            this.blockchain = blockchain_1.Blockchain.Polygon;
+            return currentChainId;
+        }
+        if (currentChainId === 65) {
+            this.blockchain = blockchain_1.Blockchain.Okc;
+            return currentChainId;
+        }
         // Deal with cases where users are logging in to devnet using mainnet chains
         if (currentChainId === 56) {
             return 97;

package/lib/util/blockchain.d.ts

@@ -6,6 +6,8 @@ export declare enum Blockchain {
     BinanceSmartChain = "bsc",
     Zilliqa = "zil",
     Arbitrum = "arbitrum",
+    Polygon = "polygon",
+    Okc = "okc",
     Native = "native",
     Btc = "btc",
     Carbon = "carbon",
@@ -46,6 +48,10 @@ export declare const ChainNames: {
     readonly 97: "BSC TestNet";
     readonly 110: "ZIL DevNet";
     readonly 111: "ZIL TestNet";
+    readonly 65: "Okc TestNet";
+    readonly 66: "Okc MainNet";
+    readonly 137: "Polygon MainNet";
+    readonly 80001: "Polygon Mumbai";
     readonly 42161: "Arbitrum MainNet";
     readonly 421611: "Arbitrum TestNet";
 };
@@ -55,5 +61,5 @@ export declare const CHAIN_IDS_TEST: ChainIds;
 export declare const chainIdsByBlockchain: SimpleMap<ChainIds>;
 export declare function parseBlockchain(value: string | null): Blockchain | null;
 export declare function getChainFromID(id: number): string | undefined;
-export declare const getBlockchainFromChain: (chainId?: number | undefined) => Blockchain.Ethereum | Blockchain.BinanceSmartChain | Blockchain.Zilliqa | Blockchain.Arbitrum | undefined;
+export declare const getBlockchainFromChain: (chainId?: number | undefined) => Blockchain.Ethereum | Blockchain.BinanceSmartChain | Blockchain.Zilliqa | Blockchain.Arbitrum | Blockchain.Polygon | Blockchain.Okc | undefined;
 export declare const blockchainForChainId: (chainId?: number | undefined, network?: Network) => Blockchain | undefined;

package/lib/util/blockchain.js

@@ -9,6 +9,8 @@ var Blockchain;
     Blockchain["BinanceSmartChain"] = "bsc";
     Blockchain["Zilliqa"] = "zil";
     Blockchain["Arbitrum"] = "arbitrum";
+    Blockchain["Polygon"] = "polygon";
+    Blockchain["Okc"] = "okc";
     Blockchain["Native"] = "native";
     Blockchain["Btc"] = "btc";
     Blockchain["Carbon"] = "carbon";
@@ -48,6 +50,10 @@ exports.ChainNames = {
     97: "BSC TestNet",
     110: "ZIL DevNet",
     111: "ZIL TestNet",
+    65: "Okc TestNet",
+    66: "Okc MainNet",
+    137: "Polygon MainNet",
+    80001: "Polygon Mumbai",
     42161: "Arbitrum MainNet",
     421611: "Arbitrum TestNet",
 };
@@ -60,6 +66,8 @@ exports.CHAIN_IDS = {
     neo3: 14,
     zil: 18,
     arbitrum: 19,
+    okc: 66,
+    polygon: 137,
     osmosis: 244,
     terra: 245,
     cosmoshub: 246,
@@ -119,6 +127,12 @@ const getBlockchainFromChain = (chainId) => {
         case 56:
         case 97:
             return Blockchain.BinanceSmartChain;
+        case 65:
+        case 66:
+            return Blockchain.Okc;
+        case 137:
+        case 80001:
+            return Blockchain.Polygon;
         case 110:
         case 111:
             return Blockchain.Zilliqa;
@@ -148,6 +162,12 @@ const blockchainForChainId = (chainId, network = network_1.Network.MainNet) => {
                 case 9: /* FALLTHROUGH */
                 case 18:
                     return Blockchain.Zilliqa;
+                case 12: /* FALLTHROUGH */
+                case 66:
+                    return Blockchain.Okc;
+                case 17: /* FALLTHROUGH */
+                case 137:
+                    return Blockchain.Polygon;
                 case 244:
                     return Blockchain.Osmosis;
                 case 13: /* FALLTHROUGH */

package/lib/websocket/models.d.ts

@@ -77,6 +77,24 @@ export interface AccountTrade {
     quantity: string;
     side: string;
     trade_id: number;
+    id?: string;
+    liquidation?: string;
+    taker_id?: string;
+    taker_side?: string;
+    taker_address?: string;
+    taker_fee_amount?: string;
+    taker_fee_denom?: string;
+    taker_fee_kickback?: string;
+    taker_fee_commission?: string;
+    taker_fee_commission_address?: string;
+    maker_id?: string;
+    maker_side?: string;
+    maker_address?: string;
+    maker_fee_amount?: string;
+    maker_fee_denom?: string;
+    maker_fee_kickback?: string;
+    maker_fee_commission?: string;
+    maker_fee_commission_address?: string;
 }
 export interface Position {
     market: string;

package/package.json

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

package/lib/clients/EvmIbcClient.d.ts

@@ -1,86 +0,0 @@
-import { Network } from "../constant";
-import { StdSignDoc } from "@cosmjs/amino";
-import { BlockchainUtils } from "../util";
-declare type SupportedBlockchains = BlockchainUtils.Blockchain.Canto | BlockchainUtils.Blockchain.Evmos;
-declare namespace EvmIbcClient {
-    interface TypedDomain {
-        name: string;
-        version: string;
-        chainId: number;
-        verifyingContract: string;
-        salt: string;
-    }
-    interface TypedDataV4 {
-        types: object;
-        primaryType: string;
-        message: StdSignDoc;
-        domain: TypedDomain;
-    }
-    const TYPED_DATA_REQUEST_METHOD = "eth_signTypedData_v4";
-    const DEFAULT_EIP712_TYPES: {
-        EIP712Domain: {
-            name: string;
-            type: string;
-        }[];
-        Tx: {
-            name: string;
-            type: string;
-        }[];
-        Fee: {
-            name: string;
-            type: string;
-        }[];
-        Coin: {
-            name: string;
-            type: string;
-        }[];
-        Msg: {
-            name: string;
-            type: string;
-        }[];
-    };
-    const getEvmChainId: (blockchain: SupportedBlockchains, network?: Network) => 7700 | 9001;
-    const getIbcTransferTypes: () => {
-        MsgValue: {
-            name: string;
-            type: string;
-        }[];
-        TypeToken: {
-            name: string;
-            type: string;
-        }[];
-        TypeTimeoutHeight: {
-            name: string;
-            type: string;
-        }[];
-        EIP712Domain: {
-            name: string;
-            type: string;
-        }[];
-        Tx: {
-            name: string;
-            type: string;
-        }[];
-        Fee: {
-            name: string;
-            type: string;
-        }[];
-        Coin: {
-            name: string;
-            type: string;
-        }[];
-        Msg: {
-            name: string;
-            type: string;
-        }[];
-    };
-    const getCosmosWeb3Domain: (blockchain: SupportedBlockchains) => {
-        name: string;
-        version: string;
-        chainId: number;
-        verifyingContract: string;
-        salt: string;
-    };
-    const getEIP712TypedData: (tx: StdSignDoc, blockchain: SupportedBlockchains, types?: object, domain?: EvmIbcClient.TypedDomain, primaryType?: string) => TypedDataV4;
-}
-export default EvmIbcClient;

package/lib/clients/EvmIbcClient.js

@@ -1,90 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const constant_1 = require("../constant");
-const util_1 = require("../util");
-const _DEFAULT_EIP712_TYPES = {
-    EIP712Domain: [
-        { name: 'name', type: 'string' },
-        { name: 'version', type: 'string' },
-        { name: 'chainId', type: 'uint256' },
-        { name: 'verifyingContract', type: 'string' },
-        { name: 'salt', type: 'string' },
-    ],
-    Tx: [
-        { name: 'account_number', type: 'string' },
-        { name: 'chain_id', type: 'string' },
-        { name: 'fee', type: 'Fee' },
-        { name: 'memo', type: 'string' },
-        { name: 'msgs', type: 'Msg[]' },
-        { name: 'sequence', type: 'string' },
-    ],
-    Fee: [
-        { name: 'feePayer', type: 'string' },
-        { name: 'amount', type: 'Coin[]' },
-        { name: 'gas', type: 'string' },
-    ],
-    Coin: [
-        { name: 'denom', type: 'string' },
-        { name: 'amount', type: 'string' },
-    ],
-    Msg: [
-        { name: 'type', type: 'string' },
-        { name: 'value', type: 'MsgValue' },
-    ],
-};
-var EvmIbcClient;
-(function (EvmIbcClient) {
-    EvmIbcClient.TYPED_DATA_REQUEST_METHOD = "eth_signTypedData_v4";
-    EvmIbcClient.DEFAULT_EIP712_TYPES = _DEFAULT_EIP712_TYPES;
-    EvmIbcClient.getEvmChainId = (blockchain, network = constant_1.Network.MainNet) => {
-        switch (network) {
-            case constant_1.Network.MainNet:
-                switch (blockchain) {
-                    case util_1.BlockchainUtils.Blockchain.Canto:
-                        return 7700;
-                    case util_1.BlockchainUtils.Blockchain.Evmos:
-                        return 9001;
-                    default:
-                        throw new Error("network not supported");
-                }
-            default:
-                throw new Error("network not supported");
-        }
-    };
-    EvmIbcClient.getIbcTransferTypes = () => {
-        return Object.assign(Object.assign({}, EvmIbcClient.DEFAULT_EIP712_TYPES), { MsgValue: [
-                { name: 'source_port', type: 'string' },
-                { name: 'source_channel', type: 'string' },
-                { name: 'token', type: 'TypeToken' },
-                { name: 'sender', type: 'string' },
-                { name: 'receiver', type: 'string' },
-                { name: 'timeout_height', type: 'TypeTimeoutHeight' },
-                { name: 'timeout_timestamp', type: 'uint64' },
-            ], TypeToken: [
-                { name: 'denom', type: 'string' },
-                { name: 'amount', type: 'string' },
-            ], TypeTimeoutHeight: [
-                { name: 'revision_number', type: 'uint64' },
-                { name: 'revision_height', type: 'uint64' },
-            ] });
-    };
-    EvmIbcClient.getCosmosWeb3Domain = (blockchain) => {
-        return {
-            name: "Cosmos Web3",
-            version: "1.0.0",
-            chainId: EvmIbcClient.getEvmChainId(blockchain),
-            verifyingContract: "cosmos",
-            salt: "0",
-        };
-    };
-    EvmIbcClient.getEIP712TypedData = (tx, blockchain, types = EvmIbcClient.getIbcTransferTypes(), domain = EvmIbcClient.getCosmosWeb3Domain(blockchain), primaryType = "Tx") => {
-        const typedData = {
-            types,
-            primaryType,
-            domain,
-            message: tx,
-        };
-        return typedData;
-    };
-})(EvmIbcClient || (EvmIbcClient = {}));
-exports.default = EvmIbcClient;

package/lib/codec/ethermint/crypto/v1/ethsecp256k1/keys.d.ts

@@ -1,39 +0,0 @@
-import Long from "long";
-import _m0 from "protobufjs/minimal";
-export declare const protobufPackage = "ethermint.crypto.v1.ethsecp256k1";
-/**
- * PubKey defines a type alias for an ecdsa.PublicKey that implements
- * Tendermint's PubKey interface. It represents the 33-byte compressed public
- * key format.
- */
-export interface PubKey {
-    /** key is the public key in byte form */
-    key: Uint8Array;
-}
-/**
- * PrivKey defines a type alias for an ecdsa.PrivateKey that implements
- * Tendermint's PrivateKey interface.
- */
-export interface PrivKey {
-    /** key is the private key in byte form */
-    key: Uint8Array;
-}
-export declare const PubKey: {
-    encode(message: PubKey, writer?: _m0.Writer): _m0.Writer;
-    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): PubKey;
-    fromJSON(object: any): PubKey;
-    toJSON(message: PubKey): unknown;
-    fromPartial(object: DeepPartial<PubKey>): PubKey;
-};
-export declare const PrivKey: {
-    encode(message: PrivKey, writer?: _m0.Writer): _m0.Writer;
-    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): PrivKey;
-    fromJSON(object: any): PrivKey;
-    toJSON(message: PrivKey): unknown;
-    fromPartial(object: DeepPartial<PrivKey>): PrivKey;
-};
-declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {} ? {
-    [K in keyof T]?: DeepPartial<T[K]>;
-} : Partial<T>;
-export {};

package/lib/codec/ethermint/crypto/v1/ethsecp256k1/keys.js

@@ -1,138 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PrivKey = exports.PubKey = exports.protobufPackage = void 0;
-/* eslint-disable */
-const long_1 = __importDefault(require("long"));
-const minimal_1 = __importDefault(require("protobufjs/minimal"));
-exports.protobufPackage = "ethermint.crypto.v1.ethsecp256k1";
-const basePubKey = {};
-exports.PubKey = {
-    encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.key.length !== 0) {
-            writer.uint32(10).bytes(message.key);
-        }
-        return writer;
-    },
-    decode(input, length) {
-        const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
-        let end = length === undefined ? reader.len : reader.pos + length;
-        const message = Object.assign({}, basePubKey);
-        message.key = new Uint8Array();
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1:
-                    message.key = reader.bytes();
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
-            }
-        }
-        return message;
-    },
-    fromJSON(object) {
-        const message = Object.assign({}, basePubKey);
-        message.key =
-            object.key !== undefined && object.key !== null
-                ? bytesFromBase64(object.key)
-                : new Uint8Array();
-        return message;
-    },
-    toJSON(message) {
-        const obj = {};
-        message.key !== undefined &&
-            (obj.key = base64FromBytes(message.key !== undefined ? message.key : new Uint8Array()));
-        return obj;
-    },
-    fromPartial(object) {
-        var _a;
-        const message = Object.assign({}, basePubKey);
-        message.key = (_a = object.key) !== null && _a !== void 0 ? _a : new Uint8Array();
-        return message;
-    },
-};
-const basePrivKey = {};
-exports.PrivKey = {
-    encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.key.length !== 0) {
-            writer.uint32(10).bytes(message.key);
-        }
-        return writer;
-    },
-    decode(input, length) {
-        const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
-        let end = length === undefined ? reader.len : reader.pos + length;
-        const message = Object.assign({}, basePrivKey);
-        message.key = new Uint8Array();
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1:
-                    message.key = reader.bytes();
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
-            }
-        }
-        return message;
-    },
-    fromJSON(object) {
-        const message = Object.assign({}, basePrivKey);
-        message.key =
-            object.key !== undefined && object.key !== null
-                ? bytesFromBase64(object.key)
-                : new Uint8Array();
-        return message;
-    },
-    toJSON(message) {
-        const obj = {};
-        message.key !== undefined &&
-            (obj.key = base64FromBytes(message.key !== undefined ? message.key : new Uint8Array()));
-        return obj;
-    },
-    fromPartial(object) {
-        var _a;
-        const message = Object.assign({}, basePrivKey);
-        message.key = (_a = object.key) !== null && _a !== void 0 ? _a : new Uint8Array();
-        return message;
-    },
-};
-var globalThis = (() => {
-    if (typeof globalThis !== "undefined")
-        return globalThis;
-    if (typeof self !== "undefined")
-        return self;
-    if (typeof window !== "undefined")
-        return window;
-    if (typeof global !== "undefined")
-        return global;
-    throw "Unable to locate global object";
-})();
-const atob = globalThis.atob ||
-    ((b64) => globalThis.Buffer.from(b64, "base64").toString("binary"));
-function bytesFromBase64(b64) {
-    const bin = atob(b64);
-    const arr = new Uint8Array(bin.length);
-    for (let i = 0; i < bin.length; ++i) {
-        arr[i] = bin.charCodeAt(i);
-    }
-    return arr;
-}
-const btoa = globalThis.btoa ||
-    ((bin) => globalThis.Buffer.from(bin, "binary").toString("base64"));
-function base64FromBytes(arr) {
-    const bin = [];
-    for (const byte of arr) {
-        bin.push(String.fromCharCode(byte));
-    }
-    return btoa(bin.join(""));
-}
-if (minimal_1.default.util.Long !== long_1.default) {
-    minimal_1.default.util.Long = long_1.default;
-    minimal_1.default.configure();
-}