carbon-js-sdk 0.4.27 → 0.4.28-beta.1

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, AllianceModule, BankModule, BrokerModule, CDPModule, CoinModule, FeeModule, GovModule, IBCModule, LeverageModule, LiquidityPoolModule, MarketModule, OracleModule, OrderModule, PositionModule, ProfileModule, SubAccountModule, XChainModule } from "./modules";
+import { AdminModule, AllianceModule, 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>;
@@ -51,6 +55,7 @@ declare class CarbonSDK {
     alliance: AllianceModule;
     order: OrderModule;
     lp: LiquidityPoolModule;
+    plp: PerpsLiquidityModule;
     subaccount: SubAccountModule;
     profile: ProfileModule;
     cdp: CDPModule;
@@ -66,6 +71,9 @@ declare class CarbonSDK {
     fee: FeeModule;
     ibc: IBCModule;
     xchain: XChainModule;
+    evm: EvmModule;
+    evmmerge: EvmMergeModule;
+    feemarket: FeemarketModule;
     neo: NEOClient;
     eth: ETHClient;
     bsc: ETHClient;
@@ -75,6 +83,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>;
@@ -84,6 +93,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;
@@ -96,6 +106,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

@@ -43,6 +43,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,20 +61,24 @@ 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.alliance = new modules_1.AllianceModule(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);
@@ -89,6 +94,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,
@@ -188,6 +196,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);
@@ -291,6 +305,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";
@@ -47,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;
@@ -60,6 +69,7 @@ declare class CarbonQueryClient {
     leverage: LeverageQueryClient;
     liquidation: LiquidationQueryClient;
     liquiditypool: LiquidityPoolQueryClient;
+    perpetualpool: PerpLiquidityPoolQueryClient;
     market: MarketQueryClient;
     marketstats: MarketStatsQueryClient;
     misc: MiscQueryClient;
@@ -84,6 +94,9 @@ declare class CarbonQueryClient {
     alliance: AllianceClient;
     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,29 +19,34 @@ 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_39 = require("../codec/alliance/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 {
@@ -51,27 +56,30 @@ class CarbonQueryClient {
         const rpcClient = stargate_1.createProtobufRpcClient(this.baseClient);
         this.chain = BlockchainClient_1.default.connectWithTm(this.tmClient);
         this.adl = new query_1.QueryClientImpl(rpcClient);
-        this.alliance = new query_39.QueryClientImpl(rpcClient);
+        this.alliance = new query_44.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);
@@ -83,13 +91,18 @@ class CarbonQueryClient {
         this.staking = new query_15.QueryClientImpl(rpcClient);
         this.upgrade = new query_16.QueryClientImpl(rpcClient);
         this.cosmosTm = new query_8.ServiceClientImpl(rpcClient);
+        this.alliance = 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() {

package/lib/codec/bank/query.d.ts

@@ -5,9 +5,15 @@ export declare const protobufPackage = "Switcheo.carbon.bank";
 export interface InternalTransfer {
     sender: string;
     receiver: string;
+    transactionHash: string;
+    coins: Coin[];
+    transactionMemo: string;
+    transactionBlockHeight: Long;
+    transactionBlockTime?: Date;
+}
+export interface Coin {
     denom: string;
     amount: string;
-    transactionHash: string;
 }
 export interface QueryInternalTransfersRequest {
     address: string;
@@ -27,6 +33,13 @@ export declare const InternalTransfer: {
     toJSON(message: InternalTransfer): unknown;
     fromPartial(object: DeepPartial<InternalTransfer>): InternalTransfer;
 };
+export declare const Coin: {
+    encode(message: Coin, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): Coin;
+    fromJSON(object: any): Coin;
+    toJSON(message: Coin): unknown;
+    fromPartial(object: DeepPartial<Coin>): Coin;
+};
 export declare const QueryInternalTransfersRequest: {
     encode(message: QueryInternalTransfersRequest, writer?: _m0.Writer): _m0.Writer;
     decode(input: _m0.Reader | Uint8Array, length?: number | undefined): QueryInternalTransfersRequest;

package/lib/codec/bank/query.js

@@ -3,18 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryClientImpl = exports.QueryInternalTransfersResponse = exports.QueryInternalTransfersRequest = exports.InternalTransfer = exports.protobufPackage = void 0;
+exports.QueryClientImpl = exports.QueryInternalTransfersResponse = exports.QueryInternalTransfersRequest = exports.Coin = exports.InternalTransfer = exports.protobufPackage = void 0;
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
 const pagination_1 = require("../cosmos/base/query/v1beta1/pagination");
+const timestamp_1 = require("../google/protobuf/timestamp");
 exports.protobufPackage = "Switcheo.carbon.bank";
 const baseInternalTransfer = {
     sender: "",
     receiver: "",
-    denom: "",
-    amount: "",
     transactionHash: "",
+    transactionMemo: "",
+    transactionBlockHeight: long_1.default.UZERO,
 };
 exports.InternalTransfer = {
     encode(message, writer = minimal_1.default.Writer.create()) {
@@ -24,21 +25,28 @@ exports.InternalTransfer = {
         if (message.receiver !== "") {
             writer.uint32(18).string(message.receiver);
         }
-        if (message.denom !== "") {
-            writer.uint32(26).string(message.denom);
-        }
-        if (message.amount !== "") {
-            writer.uint32(34).string(message.amount);
-        }
         if (message.transactionHash !== "") {
             writer.uint32(42).string(message.transactionHash);
         }
+        for (const v of message.coins) {
+            exports.Coin.encode(v, writer.uint32(50).fork()).ldelim();
+        }
+        if (message.transactionMemo !== "") {
+            writer.uint32(58).string(message.transactionMemo);
+        }
+        if (!message.transactionBlockHeight.isZero()) {
+            writer.uint32(64).uint64(message.transactionBlockHeight);
+        }
+        if (message.transactionBlockTime !== undefined) {
+            timestamp_1.Timestamp.encode(toTimestamp(message.transactionBlockTime), writer.uint32(74).fork()).ldelim();
+        }
         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({}, baseInternalTransfer);
+        message.coins = [];
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
@@ -48,15 +56,21 @@ exports.InternalTransfer = {
                 case 2:
                     message.receiver = reader.string();
                     break;
-                case 3:
-                    message.denom = reader.string();
-                    break;
-                case 4:
-                    message.amount = reader.string();
-                    break;
                 case 5:
                     message.transactionHash = reader.string();
                     break;
+                case 6:
+                    message.coins.push(exports.Coin.decode(reader, reader.uint32()));
+                    break;
+                case 7:
+                    message.transactionMemo = reader.string();
+                    break;
+                case 8:
+                    message.transactionBlockHeight = reader.uint64();
+                    break;
+                case 9:
+                    message.transactionBlockTime = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
+                    break;
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -65,6 +79,7 @@ exports.InternalTransfer = {
         return message;
     },
     fromJSON(object) {
+        var _a;
         const message = Object.assign({}, baseInternalTransfer);
         message.sender =
             object.sender !== undefined && object.sender !== null
@@ -74,38 +89,118 @@ exports.InternalTransfer = {
             object.receiver !== undefined && object.receiver !== null
                 ? String(object.receiver)
                 : "";
-        message.denom =
-            object.denom !== undefined && object.denom !== null
-                ? String(object.denom)
-                : "";
-        message.amount =
-            object.amount !== undefined && object.amount !== null
-                ? String(object.amount)
-                : "";
         message.transactionHash =
             object.transactionHash !== undefined && object.transactionHash !== null
                 ? String(object.transactionHash)
                 : "";
+        message.coins = ((_a = object.coins) !== null && _a !== void 0 ? _a : []).map((e) => exports.Coin.fromJSON(e));
+        message.transactionMemo =
+            object.transactionMemo !== undefined && object.transactionMemo !== null
+                ? String(object.transactionMemo)
+                : "";
+        message.transactionBlockHeight =
+            object.transactionBlockHeight !== undefined &&
+                object.transactionBlockHeight !== null
+                ? long_1.default.fromString(object.transactionBlockHeight)
+                : long_1.default.UZERO;
+        message.transactionBlockTime =
+            object.transactionBlockTime !== undefined &&
+                object.transactionBlockTime !== null
+                ? fromJsonTimestamp(object.transactionBlockTime)
+                : undefined;
         return message;
     },
     toJSON(message) {
         const obj = {};
         message.sender !== undefined && (obj.sender = message.sender);
         message.receiver !== undefined && (obj.receiver = message.receiver);
-        message.denom !== undefined && (obj.denom = message.denom);
-        message.amount !== undefined && (obj.amount = message.amount);
         message.transactionHash !== undefined &&
             (obj.transactionHash = message.transactionHash);
+        if (message.coins) {
+            obj.coins = message.coins.map((e) => (e ? exports.Coin.toJSON(e) : undefined));
+        }
+        else {
+            obj.coins = [];
+        }
+        message.transactionMemo !== undefined &&
+            (obj.transactionMemo = message.transactionMemo);
+        message.transactionBlockHeight !== undefined &&
+            (obj.transactionBlockHeight = (message.transactionBlockHeight || long_1.default.UZERO).toString());
+        message.transactionBlockTime !== undefined &&
+            (obj.transactionBlockTime = message.transactionBlockTime.toISOString());
         return obj;
     },
     fromPartial(object) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const message = Object.assign({}, baseInternalTransfer);
         message.sender = (_a = object.sender) !== null && _a !== void 0 ? _a : "";
         message.receiver = (_b = object.receiver) !== null && _b !== void 0 ? _b : "";
-        message.denom = (_c = object.denom) !== null && _c !== void 0 ? _c : "";
-        message.amount = (_d = object.amount) !== null && _d !== void 0 ? _d : "";
-        message.transactionHash = (_e = object.transactionHash) !== null && _e !== void 0 ? _e : "";
+        message.transactionHash = (_c = object.transactionHash) !== null && _c !== void 0 ? _c : "";
+        message.coins = ((_d = object.coins) !== null && _d !== void 0 ? _d : []).map((e) => exports.Coin.fromPartial(e));
+        message.transactionMemo = (_e = object.transactionMemo) !== null && _e !== void 0 ? _e : "";
+        message.transactionBlockHeight =
+            object.transactionBlockHeight !== undefined &&
+                object.transactionBlockHeight !== null
+                ? long_1.default.fromValue(object.transactionBlockHeight)
+                : long_1.default.UZERO;
+        message.transactionBlockTime = (_f = object.transactionBlockTime) !== null && _f !== void 0 ? _f : undefined;
+        return message;
+    },
+};
+const baseCoin = { denom: "", amount: "" };
+exports.Coin = {
+    encode(message, writer = minimal_1.default.Writer.create()) {
+        if (message.denom !== "") {
+            writer.uint32(10).string(message.denom);
+        }
+        if (message.amount !== "") {
+            writer.uint32(18).string(message.amount);
+        }
+        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({}, baseCoin);
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    message.denom = reader.string();
+                    break;
+                case 2:
+                    message.amount = reader.string();
+                    break;
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+            }
+        }
+        return message;
+    },
+    fromJSON(object) {
+        const message = Object.assign({}, baseCoin);
+        message.denom =
+            object.denom !== undefined && object.denom !== null
+                ? String(object.denom)
+                : "";
+        message.amount =
+            object.amount !== undefined && object.amount !== null
+                ? String(object.amount)
+                : "";
+        return message;
+    },
+    toJSON(message) {
+        const obj = {};
+        message.denom !== undefined && (obj.denom = message.denom);
+        message.amount !== undefined && (obj.amount = message.amount);
+        return obj;
+    },
+    fromPartial(object) {
+        var _a, _b;
+        const message = Object.assign({}, baseCoin);
+        message.denom = (_a = object.denom) !== null && _a !== void 0 ? _a : "";
+        message.amount = (_b = object.amount) !== null && _b !== void 0 ? _b : "";
         return message;
     },
 };
@@ -292,6 +387,30 @@ class QueryClientImpl {
     }
 }
 exports.QueryClientImpl = QueryClientImpl;
+function toTimestamp(date) {
+    const seconds = numberToLong(date.getTime() / 1000);
+    const nanos = (date.getTime() % 1000) * 1000000;
+    return { seconds, nanos };
+}
+function fromTimestamp(t) {
+    let millis = t.seconds.toNumber() * 1000;
+    millis += t.nanos / 1000000;
+    return new Date(millis);
+}
+function fromJsonTimestamp(o) {
+    if (o instanceof Date) {
+        return o;
+    }
+    else if (typeof o === "string") {
+        return new Date(o);
+    }
+    else {
+        return fromTimestamp(timestamp_1.Timestamp.fromJSON(o));
+    }
+}
+function numberToLong(number) {
+    return long_1.default.fromNumber(number);
+}
 if (minimal_1.default.util.Long !== long_1.default) {
     minimal_1.default.util.Long = long_1.default;
     minimal_1.default.configure();