carbon-js-sdk 0.4.25 → 0.4.26-beta.2

package/lib/CarbonSDK.d.ts

@@ -4,10 +4,12 @@ import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 import { CarbonQueryClient, ETHClient, HydrogenClient, InsightsQueryClient, NEOClient, TokenClient, ZILClient } from "./clients";
 import * as clients from "./clients";
 import N3Client from "./clients/N3Client";
-import { AdminModule, BankModule, BrokerModule, CDPModule, CoinModule, FeeModule, GovModule, IBCModule, LeverageModule, LiquidityPoolModule, MarketModule, OracleModule, OrderModule, PositionModule, ProfileModule, SubAccountModule, XChainModule } from "./modules";
+import { AdminModule, BankModule, BrokerModule, CDPModule, CoinModule, FeeModule, GovModule, IBCModule, LeverageModule, LiquidityPoolModule, MarketModule, OracleModule, OrderModule, PositionModule, ProfileModule, SubAccountModule, XChainModule, EvmModule, FeemarketModule, EvmMergeModule, PerpsLiquidityModule } from "./modules";
 import { StakingModule } from "./modules/staking";
 import { CosmosLedger, Keplr, LeapExtended } from "./provider";
 import { CarbonSigner, CarbonWallet, CarbonWalletGenericOpts } from "./wallet";
+import { MetaMask } from "./provider/metamask/MetaMask";
+import { ethers } from "ethers";
 export { CarbonTx } from "./util";
 export { CarbonSigner, CarbonSignerTypes, CarbonWallet, CarbonWalletGenericOpts, CarbonWalletInitOpts } from "./wallet";
 export { DenomPrefix } from "./constant";
@@ -15,6 +17,7 @@ export interface CarbonSDKOpts {
     network: Network;
     tmClient: Tendermint34Client;
     chainId?: string;
+    evmChainId?: string;
     token?: TokenClient;
     config?: Partial<NetworkConfig>;
     defaultTimeoutBlocks?: number;
@@ -41,6 +44,7 @@ declare class CarbonSDK {
     readonly query: CarbonQueryClient;
     insights: InsightsQueryClient;
     hydrogen: HydrogenClient;
+    evmJsonRpc: ethers.providers.JsonRpcProvider;
     wallet?: CarbonWallet;
     network: Network;
     configOverride: Partial<NetworkConfig>;
@@ -50,6 +54,7 @@ declare class CarbonSDK {
     admin: AdminModule;
     order: OrderModule;
     lp: LiquidityPoolModule;
+    plp: PerpsLiquidityModule;
     subaccount: SubAccountModule;
     profile: ProfileModule;
     cdp: CDPModule;
@@ -65,6 +70,9 @@ declare class CarbonSDK {
     fee: FeeModule;
     ibc: IBCModule;
     xchain: XChainModule;
+    evm: EvmModule;
+    evmmerge: EvmMergeModule;
+    feemarket: FeemarketModule;
     neo: NEOClient;
     eth: ETHClient;
     bsc: ETHClient;
@@ -74,6 +82,7 @@ declare class CarbonSDK {
     zil: ZILClient;
     n3: N3Client;
     chainId: string;
+    evmChainId: string;
     constructor(opts: CarbonSDKOpts);
     static instance(opts?: CarbonSDKInitOpts): Promise<CarbonSDK>;
     static instanceWithWallet(wallet: CarbonWallet, sdkOpts?: CarbonSDKInitOpts): Promise<ConnectedCarbonSDK>;
@@ -83,6 +92,7 @@ declare class CarbonSDK {
     static instanceWithLedger(ledger: CosmosLedger, sdkOpts?: CarbonSDKInitOpts, walletOpts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
     static instanceWithKeplr(keplr: Keplr, sdkOpts?: CarbonSDKInitOpts, walletOpts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
     static instanceWithLeap(leap: LeapExtended, sdkOpts?: CarbonSDKInitOpts, walletOpts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
+    static instanceWithMetamask(metamask: MetaMask, sdkOpts?: CarbonSDKInitOpts, walletOpts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
     static instanceViewOnly(bech32Address: string, sdkOpts?: CarbonSDKInitOpts, walletOpts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
     initialize(): Promise<CarbonSDK>;
     clone(): CarbonSDK;
@@ -95,6 +105,7 @@ declare class CarbonSDK {
     connectWithLedger(ledger: CosmosLedger, opts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
     connectWithKeplr(keplr: Keplr, opts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
     connectWithLeap(leap: LeapExtended, opts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
+    connectWithMetamask(metamask: MetaMask, opts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
     connectViewOnly(bech32Address: string, opts?: CarbonWalletGenericOpts): Promise<ConnectedCarbonSDK>;
     getConfig(): NetworkConfig;
     getTokenClient(): TokenClient;

package/lib/CarbonSDK.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -43,6 +47,7 @@ const staking_1 = require("./modules/staking");
 const provider_1 = require("./provider");
 const blockchain_1 = require("./util/blockchain");
 const wallet_1 = require("./wallet");
+const ethers_1 = require("ethers");
 var util_2 = require("./util");
 Object.defineProperty(exports, "CarbonTx", { enumerable: true, get: function () { return util_2.CarbonTx; } });
 var wallet_2 = require("./wallet");
@@ -60,19 +65,23 @@ const DEFAULT_SDK_INIT_OPTS = {
  */
 class CarbonSDK {
     constructor(opts) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         this.network = (_a = opts.network) !== null && _a !== void 0 ? _a : constant_1.DEFAULT_NETWORK;
         this.configOverride = (_b = opts.config) !== null && _b !== void 0 ? _b : {};
         this.networkConfig = util_1.GenericUtils.overrideConfig(constant_1.NetworkConfigs[this.network], this.configOverride);
         this.tmClient = opts.tmClient;
         this.chainId = (_d = (_c = opts.chainId) !== null && _c !== void 0 ? _c : constant_1.CarbonChainIDs[this.network]) !== null && _d !== void 0 ? _d : constant_1.CarbonChainIDs[constant_1.Network.MainNet];
+        this.evmChainId = (_f = (_e = opts.evmChainId) !== null && _e !== void 0 ? _e : constant_1.CarbonEvmChainIDs[this.network]) !== null && _f !== void 0 ? _f : constant_1.CarbonEvmChainIDs[constant_1.Network.MainNet];
         this.query = new clients_1.CarbonQueryClient(opts.tmClient);
         this.insights = new clients_1.InsightsQueryClient(this.networkConfig);
-        this.token = (_e = opts.token) !== null && _e !== void 0 ? _e : clients_1.TokenClient.instance(this.query, this);
+        this.token = (_g = opts.token) !== null && _g !== void 0 ? _g : clients_1.TokenClient.instance(this.query, this);
+        this.hydrogen = new clients_1.HydrogenClient(this.networkConfig, this.token);
+        this.evmJsonRpc = new ethers_1.ethers.providers.JsonRpcProvider(constant_1.NetworkConfigs[this.network].evmJsonRpcUrl);
         this.hydrogen = clients_1.HydrogenClient.instance(this.networkConfig, this.token);
         this.admin = new modules_1.AdminModule(this);
         this.order = new modules_1.OrderModule(this);
         this.lp = new modules_1.LiquidityPoolModule(this);
+        this.plp = new modules_1.PerpsLiquidityModule(this);
         this.subaccount = new modules_1.SubAccountModule(this);
         this.profile = new modules_1.ProfileModule(this);
         this.cdp = new modules_1.CDPModule(this);
@@ -88,6 +97,9 @@ class CarbonSDK {
         this.fee = new modules_1.FeeModule(this);
         this.ibc = new modules_1.IBCModule(this);
         this.xchain = new modules_1.XChainModule(this);
+        this.evm = new modules_1.EvmModule(this);
+        this.evmmerge = new modules_1.EvmMergeModule(this);
+        this.feemarket = new modules_1.FeemarketModule(this);
         this.neo = clients_1.NEOClient.instance({
             configProvider: this,
             blockchain: blockchain_1.Blockchain.Neo,
@@ -132,7 +144,8 @@ class CarbonSDK {
             const network = (_a = opts.network) !== null && _a !== void 0 ? _a : constant_1.DEFAULT_NETWORK;
             const configOverride = (_b = opts.config) !== null && _b !== void 0 ? _b : {};
             const networkConfig = util_1.GenericUtils.overrideConfig(constant_1.NetworkConfigs[network], configOverride);
-            const tmClient = (_c = opts.tmClient) !== null && _c !== void 0 ? _c : util_1.GenericUtils.modifyTmClient(yield tendermint_rpc_1.Tendermint34Client.connect(networkConfig.tmRpcUrl));
+            console.log("xx opts", opts.tmClient);
+            const tmClient = (_c = opts.tmClient) !== null && _c !== void 0 ? _c : util_1.GenericUtils.modifyTmClient(yield tendermint_rpc_1.Tendermint34Client.create(new tendermint_rpc_1.HttpBatchClient(networkConfig.tmRpcUrl)));
             const defaultTimeoutBlocks = opts.defaultTimeoutBlocks;
             const chainId = (_d = (yield tmClient.status())) === null || _d === void 0 ? void 0 : _d.nodeInfo.network;
             const sdk = new CarbonSDK({ network, config: configOverride, tmClient, defaultTimeoutBlocks, chainId });
@@ -187,6 +200,12 @@ class CarbonSDK {
             return sdk.connectWithLeap(leap, walletOpts);
         });
     }
+    static instanceWithMetamask(metamask, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sdk = yield CarbonSDK.instance(sdkOpts);
+            return sdk.connectWithMetamask(metamask, walletOpts);
+        });
+    }
     static instanceViewOnly(bech32Address, sdkOpts = DEFAULT_SDK_INIT_OPTS, walletOpts) {
         return __awaiter(this, void 0, void 0, function* () {
             const sdk = yield CarbonSDK.instance(sdkOpts);
@@ -290,6 +309,20 @@ class CarbonSDK {
             return this.connect(wallet);
         });
     }
+    connectWithMetamask(metamask, opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const evmChainId = this.evmChainId;
+            const addressOptions = {
+                network: this.networkConfig.network,
+                bech32Prefix: this.networkConfig.Bech32Prefix
+            };
+            const address = yield metamask.defaultAccount();
+            const publicKeyHex = yield metamask.getPublicKey(address);
+            const publicKeyBase64 = Buffer.from(publicKeyHex, 'hex').toString('base64');
+            const wallet = wallet_1.CarbonWallet.withMetamask(metamask, evmChainId, publicKeyBase64, addressOptions, Object.assign(Object.assign({}, opts), { network: this.network, config: this.configOverride }));
+            return this.connect(wallet);
+        });
+    }
     connectViewOnly(bech32Address, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = wallet_1.CarbonWallet.withAddress(bech32Address, Object.assign(Object.assign({}, opts), { network: this.network, config: this.configOverride }));

package/lib/clients/CarbonQueryClient.d.ts

@@ -14,6 +14,10 @@ import { QueryClientImpl as ParamsQueryClient } from "../codec/cosmos/params/v1b
 import { QueryClientImpl as SlashingQueryClient } from "../codec/cosmos/slashing/v1beta1/query";
 import { QueryClientImpl as StakingQueryClient } from "../codec/cosmos/staking/v1beta1/query";
 import { QueryClientImpl as UpgradeQueryClient } from "../codec/cosmos/upgrade/v1beta1/query";
+import { QueryClientImpl as EthermintEVMQueryClient } from "../codec/ethermint/evm/v1/query";
+import { QueryClientImpl as EvmMergeQueryClient } from "../codec/evmmerge/query";
+import { QueryClientImpl as EvmBankQueryClient } from "../codec/evmbank/query";
+import { QueryClientImpl as EthermintFeeMarketQueryClient } from "../codec/ethermint/feemarket/v1/query";
 import { QueryClientImpl as FeeQueryClient } from "../codec/fee/query";
 import { QueryClientImpl as HeadersyncQueryClient } from "../codec/headersync/query";
 import { QueryClientImpl as IBCInterchainControlQueryClient } from "../codec/ibc/applications/interchain_accounts/controller/v1/query";
@@ -27,6 +31,7 @@ import { QueryClientImpl as InsuranceQueryClient } from "../codec/insurance/quer
 import { QueryClientImpl as LeverageQueryClient } from "../codec/leverage/query";
 import { QueryClientImpl as LiquidationQueryClient } from "../codec/liquidation/query";
 import { QueryClientImpl as LiquidityPoolQueryClient } from "../codec/liquiditypool/query";
+import { QueryClientImpl as PerpLiquidityPoolQueryClient } from "../codec/perpsliquidity/query";
 import { QueryClientImpl as MarketQueryClient } from "../codec/market/query";
 import { QueryClientImpl as MarketStatsQueryClient } from "../codec/marketstats/query";
 import { QueryClientImpl as MiscQueryClient } from "../codec/misc/query";
@@ -36,6 +41,7 @@ import { QueryClientImpl as PositionQueryClient } from "../codec/position/query"
 import { QueryClientImpl as PricingQueryClient } from "../codec/pricing/query";
 import { QueryClientImpl as ProfileQueryClient } from "../codec/profile/query";
 import { QueryClientImpl as SubaccountQueryClient } from "../codec/subaccount/query";
+import { QueryClientImpl as AlliancesClient } from "../codec/alliance/query";
 import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 import BlockchainClient from "./BlockchainClient";
 export interface IBCClientGroup {
@@ -46,6 +52,10 @@ export interface IBCClientGroup {
     connection: IBCConnectionQueryClient;
     channel: IBCChannelQueryClient;
 }
+export interface EthermintClientGroup {
+    evm: EthermintEVMQueryClient;
+    feeMarket: EthermintFeeMarketQueryClient;
+}
 declare class CarbonQueryClient {
     private readonly tmClient;
     adl: ADLQueryClient;
@@ -59,6 +69,7 @@ declare class CarbonQueryClient {
     leverage: LeverageQueryClient;
     liquidation: LiquidationQueryClient;
     liquiditypool: LiquidityPoolQueryClient;
+    perpetualpool: PerpLiquidityPoolQueryClient;
     market: MarketQueryClient;
     marketstats: MarketStatsQueryClient;
     misc: MiscQueryClient;
@@ -80,8 +91,12 @@ declare class CarbonQueryClient {
     staking: StakingQueryClient;
     upgrade: UpgradeQueryClient;
     cosmosTm: CosmosTmClient;
+    alliances: AlliancesClient;
     chain: BlockchainClient;
     ibc: IBCClientGroup;
+    ethermint: EthermintClientGroup;
+    evmmerge: EvmMergeQueryClient;
+    evmbank: EvmBankQueryClient;
     private baseClient;
     constructor(tmClient: Tendermint34Client);
     getProtobufRpcClient(): import("@cosmjs/stargate").ProtobufRpcClient;

package/lib/clients/CarbonQueryClient.js

@@ -19,57 +19,66 @@ const query_13 = require("../codec/cosmos/params/v1beta1/query");
 const query_14 = require("../codec/cosmos/slashing/v1beta1/query");
 const query_15 = require("../codec/cosmos/staking/v1beta1/query");
 const query_16 = require("../codec/cosmos/upgrade/v1beta1/query");
-const query_17 = require("../codec/fee/query");
-const query_18 = require("../codec/headersync/query");
-const query_19 = require("../codec/ibc/applications/interchain_accounts/controller/v1/query");
-const query_20 = require("../codec/ibc/applications/interchain_accounts/host/v1/query");
-const query_21 = require("../codec/ibc/applications/transfer/v1/query");
-const query_22 = require("../codec/ibc/core/client/v1/query");
-const query_23 = require("../codec/ibc/core/connection/v1/query");
-const query_24 = require("../codec/ibc/core/channel/v1/query");
-const query_25 = require("../codec/inflation/query");
-const query_26 = require("../codec/insurance/query");
-const query_27 = require("../codec/leverage/query");
-const query_28 = require("../codec/liquidation/query");
-const query_29 = require("../codec/liquiditypool/query");
-const query_30 = require("../codec/market/query");
-const query_31 = require("../codec/marketstats/query");
-const query_32 = require("../codec/misc/query");
-const query_33 = require("../codec/oracle/query");
-const query_34 = require("../codec/order/query");
-const query_35 = require("../codec/position/query");
-const query_36 = require("../codec/pricing/query");
-const query_37 = require("../codec/profile/query");
-const query_38 = require("../codec/subaccount/query");
+const query_17 = require("../codec/ethermint/evm/v1/query");
+const query_18 = require("../codec/evmmerge/query");
+const query_19 = require("../codec/evmbank/query");
+const query_20 = require("../codec/ethermint/feemarket/v1/query");
+const query_21 = require("../codec/fee/query");
+const query_22 = require("../codec/headersync/query");
+const query_23 = require("../codec/ibc/applications/interchain_accounts/controller/v1/query");
+const query_24 = require("../codec/ibc/applications/interchain_accounts/host/v1/query");
+const query_25 = require("../codec/ibc/applications/transfer/v1/query");
+const query_26 = require("../codec/ibc/core/client/v1/query");
+const query_27 = require("../codec/ibc/core/connection/v1/query");
+const query_28 = require("../codec/ibc/core/channel/v1/query");
+const query_29 = require("../codec/inflation/query");
+const query_30 = require("../codec/insurance/query");
+const query_31 = require("../codec/leverage/query");
+const query_32 = require("../codec/liquidation/query");
+const query_33 = require("../codec/liquiditypool/query");
+const query_34 = require("../codec/perpsliquidity/query");
+const query_35 = require("../codec/market/query");
+const query_36 = require("../codec/marketstats/query");
+const query_37 = require("../codec/misc/query");
+const query_38 = require("../codec/oracle/query");
+const query_39 = require("../codec/order/query");
+const query_40 = require("../codec/position/query");
+const query_41 = require("../codec/pricing/query");
+const query_42 = require("../codec/profile/query");
+const query_43 = require("../codec/subaccount/query");
+const query_44 = require("../codec/alliance/query");
 const stargate_1 = require("@cosmjs/stargate");
 const BlockchainClient_1 = __importDefault(require("./BlockchainClient"));
 class CarbonQueryClient {
     constructor(tmClient) {
         this.tmClient = tmClient;
         this.baseClient = new stargate_1.QueryClient(this.tmClient);
-        const rpcClient = stargate_1.createProtobufRpcClient(this.baseClient);
+        const rpcClient = (0, stargate_1.createProtobufRpcClient)(this.baseClient);
         this.chain = BlockchainClient_1.default.connectWithTm(this.tmClient);
         this.adl = new query_1.QueryClientImpl(rpcClient);
         this.book = new query_2.QueryClientImpl(rpcClient);
         this.broker = new query_3.QueryClientImpl(rpcClient);
         this.coin = new query_5.QueryClientImpl(rpcClient);
         this.cdp = new query_4.QueryClientImpl(rpcClient);
-        this.fee = new query_17.QueryClientImpl(rpcClient);
-        this.inflation = new query_25.QueryClientImpl(rpcClient);
-        this.insurance = new query_26.QueryClientImpl(rpcClient);
-        this.leverage = new query_27.QueryClientImpl(rpcClient);
-        this.liquidation = new query_28.QueryClientImpl(rpcClient);
-        this.liquiditypool = new query_29.QueryClientImpl(rpcClient);
-        this.market = new query_30.QueryClientImpl(rpcClient);
-        this.marketstats = new query_31.QueryClientImpl(rpcClient);
-        this.misc = new query_32.QueryClientImpl(rpcClient);
-        this.oracle = new query_33.QueryClientImpl(rpcClient);
-        this.order = new query_34.QueryClientImpl(rpcClient);
-        this.position = new query_35.QueryClientImpl(rpcClient);
-        this.pricing = new query_36.QueryClientImpl(rpcClient);
-        this.profile = new query_37.QueryClientImpl(rpcClient);
-        this.subaccount = new query_38.QueryClientImpl(rpcClient);
-        this.headersync = new query_18.QueryClientImpl(rpcClient);
+        this.fee = new query_21.QueryClientImpl(rpcClient);
+        this.inflation = new query_29.QueryClientImpl(rpcClient);
+        this.insurance = new query_30.QueryClientImpl(rpcClient);
+        this.leverage = new query_31.QueryClientImpl(rpcClient);
+        this.liquidation = new query_32.QueryClientImpl(rpcClient);
+        this.liquiditypool = new query_33.QueryClientImpl(rpcClient);
+        this.perpetualpool = new query_34.QueryClientImpl(rpcClient);
+        this.market = new query_35.QueryClientImpl(rpcClient);
+        this.marketstats = new query_36.QueryClientImpl(rpcClient);
+        this.misc = new query_37.QueryClientImpl(rpcClient);
+        this.oracle = new query_38.QueryClientImpl(rpcClient);
+        this.order = new query_39.QueryClientImpl(rpcClient);
+        this.position = new query_40.QueryClientImpl(rpcClient);
+        this.pricing = new query_41.QueryClientImpl(rpcClient);
+        this.profile = new query_42.QueryClientImpl(rpcClient);
+        this.subaccount = new query_43.QueryClientImpl(rpcClient);
+        this.headersync = new query_22.QueryClientImpl(rpcClient);
+        this.evmmerge = new query_18.QueryClientImpl(rpcClient);
+        this.evmbank = new query_19.QueryClientImpl(rpcClient);
         this.auth = new query_6.QueryClientImpl(rpcClient);
         this.bank = new query_7.QueryClientImpl(rpcClient);
         this.distribution = new query_9.QueryClientImpl(rpcClient);
@@ -81,17 +90,22 @@ class CarbonQueryClient {
         this.staking = new query_15.QueryClientImpl(rpcClient);
         this.upgrade = new query_16.QueryClientImpl(rpcClient);
         this.cosmosTm = new query_8.ServiceClientImpl(rpcClient);
+        this.alliances = new query_44.QueryClientImpl(rpcClient);
         this.ibc = {
-            controller: new query_19.QueryClientImpl(rpcClient),
-            host: new query_20.QueryClientImpl(rpcClient),
-            transfer: new query_21.QueryClientImpl(rpcClient),
-            client: new query_22.QueryClientImpl(rpcClient),
-            connection: new query_23.QueryClientImpl(rpcClient),
-            channel: new query_24.QueryClientImpl(rpcClient),
+            controller: new query_23.QueryClientImpl(rpcClient),
+            host: new query_24.QueryClientImpl(rpcClient),
+            transfer: new query_25.QueryClientImpl(rpcClient),
+            client: new query_26.QueryClientImpl(rpcClient),
+            connection: new query_27.QueryClientImpl(rpcClient),
+            channel: new query_28.QueryClientImpl(rpcClient),
+        };
+        this.ethermint = {
+            evm: new query_17.QueryClientImpl(rpcClient),
+            feeMarket: new query_20.QueryClientImpl(rpcClient),
         };
     }
     getProtobufRpcClient() {
-        return stargate_1.createProtobufRpcClient(this.baseClient);
+        return (0, stargate_1.createProtobufRpcClient)(this.baseClient);
     }
 }
 exports.default = CarbonQueryClient;

package/lib/clients/ETHClient.js

@@ -44,15 +44,15 @@ class ETHClient {
                     ?
                         this.tokenClient.getBlockchainV2(token.denom) == ETHClient.BLOCKCHAINV2_MAPPING[this.blockchain]
                     :
-                        blockchain_1.blockchainForChainId(token.chainId.toNumber(), api.network) == this.blockchain;
+                        (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), api.network) == this.blockchain;
                 return isCorrectBlockchain &&
                     token.tokenAddress.length == 40 &&
-                    token.bridgeAddress.toLowerCase() == generic_1.stripHexPrefix(lockProxyAddress) &&
+                    token.bridgeAddress.toLowerCase() == (0, generic_1.stripHexPrefix)(lockProxyAddress) &&
                     (!whitelistDenoms || whitelistDenoms.includes(token.denom)) &&
-                    this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress));
+                    this.verifyChecksum((0, generic_1.appendHexPrefix)(token.tokenAddress));
             });
             const assetIds = tokens.map((token) => {
-                return this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress));
+                return this.verifyChecksum((0, generic_1.appendHexPrefix)(token.tokenAddress));
             });
             const provider = this.getProvider();
             const contractAddress = this.getBalanceReaderAddress();
@@ -99,14 +99,14 @@ class ETHClient {
             }
             const carbonNetwork = networkConfig.network;
             const fromTokenId = fromToken.id;
-            const fromTokenAddress = generic_1.appendHexPrefix(fromToken.tokenAddress);
+            const fromTokenAddress = (0, generic_1.appendHexPrefix)(fromToken.tokenAddress);
             const toTokenDenom = toToken.denom;
             const recoveryAddressHex = ethers_1.ethers.utils.hexlify(util_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, carbonNetwork));
             const fromAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(fromTokenId));
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(toTokenDenom));
             const nonce = yield this.getTxNonce(fromAddress, params.nonce, rpcProvider);
             const contract = new ethers_1.ethers.Contract(this.getBridgeEntranceAddr(), eth_1.ABIs.bridgeEntrance, rpcProvider);
-            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
+            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
             const tokenCreator = fromToken.creator;
             const targetAddressBytes = util_1.AddressUtils.SWTHAddress.getAddressBytes(tokenCreator, carbonNetwork);
             const targetProxyHash = ethers_1.ethers.utils.hexlify(targetAddressBytes);
@@ -135,9 +135,9 @@ class ETHClient {
                 throw new Error("Minimum gas required: 150,000");
             }
             const networkConfig = this.getNetworkConfig();
-            const assetId = generic_1.appendHexPrefix(token.tokenAddress);
-            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(token));
-            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
+            const assetId = (0, generic_1.appendHexPrefix)(token.tokenAddress);
+            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(token));
+            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(token.id));
             const swthAddress = ethers_1.ethers.utils.hexlify(address);
             const contractAddress = this.getLockProxyAddress();
@@ -188,16 +188,16 @@ class ETHClient {
                 return "insufficient balance";
             }
             const networkConfig = this.getNetworkConfig();
-            const assetId = generic_1.appendHexPrefix(tokenWithExternalBalances.tokenAddress);
-            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(tokenWithExternalBalances));
-            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
+            const assetId = (0, generic_1.appendHexPrefix)(tokenWithExternalBalances.tokenAddress);
+            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(tokenWithExternalBalances));
+            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(tokenWithExternalBalances.id));
             const nonce = Math.floor(Math.random() * 1000000000); // random nonce to prevent replay attacks
             const message = ethers_1.ethers.utils.solidityKeccak256(["string", "address", "bytes", "bytes", "bytes", "uint256", "uint256", "uint256"], ["sendTokens", assetId, targetProxyHash, toAssetHash, feeAddress, amount, feeAmount, nonce]);
             // logger("sendDeposit message", message)
             let signatureResult;
             const { address, signature } = yield getSignatureCallback(message);
-            const signatureBytes = ethers_1.ethers.utils.arrayify(generic_1.appendHexPrefix(signature));
+            const signatureBytes = ethers_1.ethers.utils.arrayify((0, generic_1.appendHexPrefix)(signature));
             const rsv = ethers_1.ethers.utils.splitSignature(signatureBytes);
             // logger("sign result", address, signature)
             signatureResult = {
@@ -236,7 +236,7 @@ class ETHClient {
             if (!feeInfo.deposit_fee) {
                 throw new Error("unsupported token");
             }
-            if (blockchain_1.blockchainForChainId(token.chainId.toNumber(), this.configProvider.getConfig().network) !== this.blockchain) {
+            if ((0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), this.configProvider.getConfig().network) !== this.blockchain) {
                 throw new Error("unsupported token");
             }
             let feeAmount = ethers_1.ethers.BigNumber.from(feeInfo.deposit_fee);
@@ -302,7 +302,7 @@ class ETHClient {
     getTargetProxyHash(token) {
         const networkConfig = this.getNetworkConfig();
         const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
-        const addressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
+        const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
         return addressHex;
     }
     getProvider() {

package/lib/clients/EvmIbcClient.d.ts

@@ -0,0 +1,86 @@
+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

@@ -0,0 +1,90 @@
+"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/clients/HydrogenClient.js

@@ -29,7 +29,7 @@ exports.HydrogenEndpoints = {
 const formatDateField = (value) => {
     if (typeof value !== "string")
         return null;
-    return dayjs_1.default(value);
+    return (0, dayjs_1.default)(value);
 };
 // temporary function to parse okt/okc blockchain
 // to remove when automatic deposit/withdraw feature is deployed