@injectivelabs/sdk-ts 1.0.67 → 1.0.70

package/dist/core/eip712.js

@@ -0,0 +1,415 @@
+"use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.protoTypeToAminoType = exports.objectKeysToEip712Types = exports.convertCosmosMsgToEip712 = exports.getEipTxDetails = exports.getEip712Fee = exports.getEip712FromCosmosMsg = void 0;
+const utils_1 = require("@injectivelabs/utils");
+const utils_2 = require("../utils");
+const getEip712FromCosmosMsg = ({ msgs, tx, fee, ethereumChainId, }) => {
+    const actualMsgs = Array.isArray(msgs) ? msgs : [msgs];
+    const { msgs: convertedMsgs, msgTypes } = (0, exports.convertCosmosMsgToEip712)(actualMsgs);
+    const eip712TypedData = {
+        types: Object.assign({ 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: 'sequence', type: 'string' },
+                { name: 'timeout_height', type: 'string' },
+                { name: 'msgs', type: 'Msg[]' },
+            ], Fee: [
+                { name: 'amount', type: 'Coin[]' },
+                { name: 'gas', type: 'string' },
+                Object.assign({}, ((fee === null || fee === void 0 ? void 0 : fee.feePayer) && { name: 'feePayer', type: 'string' })),
+            ], Coin: [
+                { name: 'amount', type: 'string' },
+                { name: 'denom', type: 'string' },
+            ], Msg: [
+                { name: 'type', type: 'string' },
+                { name: 'value', type: 'MsgValue' },
+            ] }, Object.fromEntries(msgTypes)),
+        primaryType: 'Tx',
+        domain: {
+            name: 'Injective Web3',
+            version: '1.0.0',
+            chainId: new utils_1.BigNumberInBase(ethereumChainId).toString(16),
+            salt: '0',
+            verifyingContract: 'cosmos',
+        },
+        message: Object.assign(Object.assign(Object.assign({}, (0, exports.getEipTxDetails)(tx)), (0, exports.getEip712Fee)(fee)), { msgs: convertedMsgs }),
+    };
+    return eip712TypedData;
+};
+exports.getEip712FromCosmosMsg = getEip712FromCosmosMsg;
+const getEip712Fee = (params) => {
+    if (!params) {
+        return {
+            fee: Object.assign(Object.assign({}, utils_2.DEFAULT_STD_FEE), { gas: utils_2.DEFAULT_GAS_LIMIT.toFixed() }),
+        };
+    }
+    const { amount, denom, gas, feePayer } = params;
+    const actualGas = new utils_1.BigNumberInBase(gas || utils_2.DEFAULT_GAS_LIMIT).toFixed();
+    if (!amount || !denom) {
+        return {
+            fee: Object.assign(Object.assign({}, utils_2.DEFAULT_STD_FEE), { gas: actualGas, feePayer }),
+        };
+    }
+    return {
+        fee: {
+            amount: [{ amount: amount, denom: denom }],
+            gas: actualGas,
+            feePayer: feePayer,
+        },
+    };
+};
+exports.getEip712Fee = getEip712Fee;
+const getEipTxDetails = ({ accountNumber, sequence, chainId, memo, }) => {
+    return {
+        account_number: accountNumber,
+        chain_id: chainId,
+        memo: memo || '',
+        sequence,
+    };
+};
+exports.getEipTxDetails = getEipTxDetails;
+const convertCosmosMsgToEip712 = (msgs) => {
+    const actualMsgs = Array.isArray(msgs) ? msgs : [msgs];
+    const [msg] = actualMsgs;
+    const types = (0, exports.objectKeysToEip712Types)(msg.toWeb3());
+    return {
+        msgs: actualMsgs.map((m) => {
+            const _a = m.toWeb3(), { ['@type']: type } = _a, value = __rest(_a, ['@type']);
+            return {
+                type: (0, exports.protoTypeToAminoType)(type),
+                value: value,
+            };
+        }),
+        msgTypes: types,
+    };
+};
+exports.convertCosmosMsgToEip712 = convertCosmosMsgToEip712;
+const objectKeysToEip712Types = (object, primaryType = 'MsgValue') => {
+    const output = new Map();
+    const types = new Array();
+    for (const property in object) {
+        if (property === '@type') {
+            continue;
+        }
+        const val = object[property];
+        const type = typeof val;
+        if (type === 'boolean') {
+            types.push({ name: property, type: 'bool' });
+        }
+        else if (type === 'number' || type === 'bigint') {
+            types.push({ name: property, type: 'uint256' });
+        }
+        else if (type === 'string') {
+            types.push({ name: property, type: 'string' });
+        }
+        else if (type === 'object') {
+            if (Array.isArray(val) && val.length === 0) {
+                throw new Error('Array with length 0 found');
+            }
+            else if (Array.isArray(val) && val.length > 0) {
+                const arrayFirstType = typeof val[0];
+                const isPrimitive = arrayFirstType === 'boolean' ||
+                    arrayFirstType === 'number' ||
+                    arrayFirstType === 'string';
+                if (isPrimitive) {
+                    for (const arrayEntry in val) {
+                        if (typeof arrayEntry !== arrayFirstType) {
+                            throw new Error('Array with different types found');
+                        }
+                    }
+                    if (arrayFirstType === 'boolean') {
+                        types.push({ name: property, type: 'bool[]' });
+                    }
+                    else if (arrayFirstType === 'number') {
+                        types.push({ name: property, type: 'number[]' });
+                    }
+                    else if (arrayFirstType === 'string') {
+                        types.push({ name: property, type: 'string[]' });
+                    }
+                }
+                else if (arrayFirstType === 'object') {
+                    const recursiveOutput = (0, exports.objectKeysToEip712Types)(val[0], primaryType);
+                    const recursiveTypes = recursiveOutput.get(primaryType);
+                    const propertyType = `Type${property.charAt(0).toUpperCase() + property.substring(1)}`;
+                    types.push({ name: property, type: `${propertyType}[]` });
+                    output.set(propertyType, recursiveTypes);
+                    for (const key in recursiveOutput) {
+                        if (key !== primaryType) {
+                            output.set(key, recursiveOutput.get(key));
+                        }
+                    }
+                }
+                else {
+                    throw new Error('Array with elements of unknown type found');
+                }
+            }
+            else {
+                const recursiveOutput = (0, exports.objectKeysToEip712Types)(val, primaryType);
+                const recursiveTypes = recursiveOutput.get(primaryType);
+                const propertyType = `Type${property.charAt(0).toUpperCase() + property.substring(1)}`;
+                types.push({ name: property, type: propertyType });
+                output.set(propertyType, recursiveTypes);
+                for (const key in recursiveOutput) {
+                    if (key !== primaryType) {
+                        output.set(key, recursiveOutput.get(key));
+                    }
+                }
+            }
+        }
+        else {
+            throw new Error(`Type ${property} not found`);
+        }
+    }
+    output.set(primaryType, types);
+    return output;
+};
+exports.objectKeysToEip712Types = objectKeysToEip712Types;
+const protoTypeToAminoType = (type) => {
+    const actualType = type.startsWith('/') ? type.substring(1) : type;
+    console.log(actualType);
+    switch (actualType) {
+        // Exchange
+        case 'injective.exchange.v1beta1.MsgDeposit':
+            return 'exchange/MsgDeposit';
+        case 'injective.exchange.v1beta1.MsgWithdraw':
+            return 'exchange/MsgWithdraw';
+        case 'injective.exchange.v1beta1.MsgInstantSpotMarketLaunch':
+            return 'exchange/MsgInstantSpotMarketLaunch';
+        case 'injective.exchange.v1beta1.MsgInstantPerpetualMarketLaunch':
+            return 'exchange/MsgInstantPerpetualMarketLaunch';
+        case 'injective.exchange.v1beta1.MsgInstantExpiryFuturesMarketLaunch':
+            return 'exchange/MsgInstantExpiryFuturesMarketLaunch';
+        case 'injective.exchange.v1beta1.MsgCreateSpotLimitOrder':
+            return 'exchange/MsgCreateSpotLimitOrder';
+        case 'injective.exchange.v1beta1.MsgBatchCreateSpotLimitOrders':
+            return 'exchange/MsgBatchCreateSpotLimitOrders';
+        case 'injective.exchange.v1beta1.MsgCreateSpotMarketOrder':
+            return 'exchange/MsgCreateSpotMarketOrder';
+        case 'injective.exchange.v1beta1.MsgCancelSpotOrder':
+            return 'exchange/MsgCancelSpotOrder';
+        case 'injective.exchange.v1beta1.MsgBatchCancelSpotOrders':
+            return 'exchange/MsgBatchCancelSpotOrders';
+        case 'injective.exchange.v1beta1.MsgCreateDerivativeLimitOrder':
+            return 'exchange/MsgCreateDerivativeLimitOrder';
+        case 'injective.exchange.v1beta1.MsgBatchCreateDerivativeLimitOrders':
+            return 'exchange/MsgBatchCreateDerivativeLimitOrders';
+        case 'injective.exchange.v1beta1.MsgCreateDerivativeMarketOrder':
+            return 'exchange/MsgCreateDerivativeMarketOrder';
+        case 'injective.exchange.v1beta1.MsgCancelDerivativeOrder':
+            return 'exchange/MsgCancelDerivativeOrder';
+        case 'injective.exchange.v1beta1.MsgBatchCancelDerivativeOrders':
+            return 'exchange/MsgBatchCancelDerivativeOrders';
+        case 'injective.exchange.v1beta1.MsgBatchCancelBinaryOptionsOrders':
+            return 'exchange/MsgBatchCancelBinaryOptionsOrders';
+        case 'injective.exchange.v1beta1.MsgSubaccountTransfer':
+            return 'exchange/MsgSubaccountTransfer';
+        case 'injective.exchange.v1beta1.MsgExternalTransfer':
+            return 'exchange/MsgExternalTransfer';
+        case 'injective.exchange.v1beta1.MsgIncreasePositionMargin':
+            return 'exchange/MsgIncreasePositionMargin';
+        case 'injective.exchange.v1beta1.MsgLiquidatePosition':
+            return 'exchange/MsgLiquidatePosition';
+        case 'injective.exchange.v1beta1.MsgBatchUpdateOrders':
+            return 'exchange/MsgBatchUpdateOrders';
+        case 'injective.exchange.v1beta1.MsgExec':
+            return 'exchange/MsgExec';
+        case 'injective.exchange.v1beta1.MsgRegisterAsDMM':
+            return 'exchange/MsgRegisterAsDMM';
+        case 'injective.exchange.v1beta1.MsgInstantBinaryOptionsMarketLaunch':
+            return 'exchange/MsgInstantBinaryOptionsMarketLaunch';
+        case 'injective.exchange.v1beta1.MsgCreateBinaryOptionsLimitOrder':
+            return 'exchange/MsgCreateBinaryOptionsLimitOrder';
+        case 'injective.exchange.v1beta1.MsgCreateBinaryOptionsMarketOrder':
+            return 'exchange/MsgCreateBinaryOptionsMarketOrder';
+        case 'injective.exchange.v1beta1.MsgCancelBinaryOptionsOrder':
+            return 'exchange/MsgCancelBinaryOptionsOrder';
+        case 'injective.exchange.v1beta1.MsgAdminUpdateBinaryOptionsMarket':
+            return 'exchange/MsgAdminUpdateBinaryOptionsMarket';
+        case 'injective.exchange.v1beta1.ExchangeEnableProposal':
+            return 'exchange/ExchangeEnableProposal';
+        case 'injective.exchange.v1beta1.BatchExchangeModificationProposal':
+            return 'exchange/BatchExchangeModificationProposal';
+        case 'injective.exchange.v1beta1.SpotMarketParamUpdateProposal':
+            return 'exchange/SpotMarketParamUpdateProposal';
+        case 'injective.exchange.v1beta1.SpotMarketLaunchProposal':
+            return 'exchange/SpotMarketLaunchProposal';
+        case 'injective.exchange.v1beta1.PerpetualMarketLaunchProposal':
+            return 'exchange/PerpetualMarketLaunchProposal';
+        case 'injective.exchange.v1beta1.ExpiryFuturesMarketLaunchProposal':
+            return 'exchange/ExpiryFuturesMarketLaunchProposal';
+        case 'injective.exchange.v1beta1.DerivativeMarketParamUpdateProposal':
+            return 'exchange/DerivativeMarketParamUpdateProposal';
+        case 'injective.exchange.v1beta1.MarketForcedSettlementProposal':
+            return 'exchange/MarketForcedSettlementProposal';
+        case 'injective.exchange.v1beta1.UpdateDenomDecimalsProposal':
+            return 'exchange/UpdateDenomDecimalsProposal';
+        case 'injective.exchange.v1beta1.TradingRewardCampaignLaunchProposal':
+            return 'exchange/TradingRewardCampaignLaunchProposal';
+        case 'injective.exchange.v1beta1.TradingRewardCampaignUpdateProposal':
+            return 'exchange/TradingRewardCampaignUpdateProposal';
+        case 'injective.exchange.v1beta1.TradingRewardPendingPointsUpdateProposal':
+            return 'exchange/TradingRewardPendingPointsUpdateProposal';
+        case 'injective.exchange.v1beta1.FeeDiscountProposal':
+            return 'exchange/FeeDiscountProposal';
+        case 'injective.exchange.v1beta1.BatchCommunityPoolSpendProposal':
+            return 'exchange/BatchCommunityPoolSpendProposal';
+        case 'injective.exchange.v1beta1.BinaryOptionsMarketParamUpdateProposal':
+            return 'exchange/BinaryOptionsMarketParamUpdateProposal';
+        case 'injective.exchange.v1beta1.BinaryOptionsMarketLaunchProposal':
+            return 'exchange/BinaryOptionsMarketLaunchProposal';
+        case 'injective.exchange.v1beta1.CreateSpotLimitOrderAuthz':
+            return 'exchange/CreateSpotLimitOrderAuthz';
+        case 'injective.exchange.v1beta1.CreateSpotMarketOrderAuthz':
+            return 'exchange/CreateSpotMarketOrderAuthz';
+        case 'injective.exchange.v1beta1.BatchCreateSpotLimitOrdersAuthz':
+            return 'exchange/BatchCreateSpotLimitOrdersAuthz';
+        case 'injective.exchange.v1beta1.CancelSpotOrderAuthz':
+            return 'exchange/CancelSpotOrderAuthz';
+        case 'injective.exchange.v1beta1.BatchCancelSpotOrdersAuthz':
+            return 'exchange/BatchCancelSpotOrdersAuthz';
+        case 'injective.exchange.v1beta1.CreateDerivativeLimitOrderAuthz':
+            return 'exchange/CreateDerivativeLimitOrderAuthz';
+        case 'injective.exchange.v1beta1.CreateDerivativeMarketOrderAuthz':
+            return 'exchange/CreateDerivativeMarketOrderAuthz';
+        case 'injective.exchange.v1beta1.BatchCreateDerivativeLimitOrdersAuthz':
+            return 'exchange/BatchCreateDerivativeLimitOrdersAuthz';
+        case 'injective.exchange.v1beta1.CancelDerivativeOrderAuthz':
+            return 'exchange/CancelDerivativeOrderAuthz';
+        case 'injective.exchange.v1beta1.BatchCancelDerivativeOrdersAuthz':
+            return 'exchange/BatchCancelDerivativeOrdersAuthz';
+        case 'injective.exchange.v1beta1.BatchUpdateOrdersAuthz':
+            return 'exchange/BatchUpdateOrdersAuthz';
+        // Auction
+        case 'injective.auction.v1beta1.MsgBid':
+            return 'auction/MsgBid';
+        // Insurance
+        case 'injective.insurance.v1beta1.MsgCreateInsuranceFund':
+            return 'insurance/MsgCreateInsuranceFund';
+        case 'injective.insurance.v1beta1.MsgUnderwrite':
+            return 'insurance/MsgUnderwrite';
+        case 'injective.insurance.v1beta1.MsgRequestRedemption':
+            return 'insurance/MsgRequestRedemption';
+        // Peggy
+        case 'injective.peggy.v1beta1.MsgSetOrchestratorAddresses':
+            return 'peggy/MsgSetOrchestratorAddresses';
+        case 'injective.peggy.v1beta1.MsgValsetConfirm':
+            return 'peggy/MsgValsetConfirm';
+        case 'injective.peggy.v1beta1.MsgSendToEth':
+            return 'peggy/MsgSendToEth';
+        case 'injective.peggy.v1beta1.MsgCancelSendToEth':
+            return 'peggy/MsgCancelSendToEth';
+        case 'injective.peggy.v1beta1.MsgRequestBatch':
+            return 'peggy/MsgRequestBatch';
+        case 'injective.peggy.v1beta1.MsgConfirmBatch':
+            return 'peggy/MsgConfirmBatch';
+        case 'injective.peggy.v1beta1.Valset':
+            return 'peggy/Valset';
+        case 'injective.peggy.v1beta1.MsgDepositClaim':
+            return 'peggy/MsgDepositClaim';
+        case 'injective.peggy.v1beta1.MsgWithdrawClaim':
+            return 'peggy/MsgWithdrawClaim';
+        case 'injective.peggy.v1beta1.MsgERC20DeployedClaim':
+            return 'peggy/MsgERC20DeployedClaim';
+        case 'injective.peggy.v1beta1.MsgValsetUpdatedClaim':
+            return 'peggy/MsgValsetUpdatedClaim';
+        case 'injective.peggy.v1beta1.OutgoingTxBatch':
+            return 'peggy/OutgoingTxBatch';
+        case 'injective.peggy.v1beta1.OutgoingTransferTx':
+            return 'peggy/OutgoingTransferTx';
+        case 'injective.peggy.v1beta1.ERC20Token':
+            return 'peggy/ERC20Token';
+        case 'injective.peggy.v1beta1.IDSet':
+            return 'peggy/IDSet';
+        case 'injective.peggy.v1beta1.Attestation':
+            return 'peggy/Attestation';
+        case 'injective.peggy.v1beta1.MsgSubmitBadSignatureEvidence':
+            return 'peggy/MsgSubmitBadSignatureEvidence';
+        case 'injective.peggy.v1beta1.BlacklistEthereumAddressesProposal':
+            return 'peggy/BlacklistEthereumAddressesProposal';
+        case 'injective.peggy.v1beta1.RevokeEthereumBlacklistProposal':
+            return 'peggy/RevokeEthereumBlacklistProposal';
+        // WasmX
+        case 'injective.wasmx.v1beta1.ContractRegistrationRequestProposal':
+            return 'wasmx/ContractRegistrationRequestProposal';
+        case 'injective.wasmx.v1beta1.BatchContractRegistrationRequestProposal':
+            return 'wasmx/BatchContractRegistrationRequestProposal';
+        // Auth
+        case 'cosmos.auth.v1beta1.MsgUpdateParams':
+            return 'cosmos-sdk/x/auth/MsgUpdateParams';
+        // Authz
+        case 'cosmos.authz.v1beta1.MsgGrant':
+            return 'cosmos-sdk/MsgGrant';
+        case 'cosmos.authz.v1beta1.MsgRevoke':
+            return 'cosmos-sdk/MsgRevoke';
+        case 'cosmos.authz.v1beta1.MsgExec':
+            return 'cosmos-sdk/MsgExec';
+        // Bank
+        case 'cosmos.bank.v1beta1.MsgSend':
+            return 'cosmos-sdk/MsgSend';
+        case 'cosmos.bank.v1beta1.MsgMultiSend':
+            return 'cosmos-sdk/MsgMultiSend';
+        case 'cosmos.bank.v1beta1.MsgUpdateParams':
+            return 'cosmos-sdk/x/bank/MsgUpdateParams';
+        // Distribution
+        case 'cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward':
+            return 'cosmos-sdk/MsgWithdrawDelegationReward';
+        case 'cosmos.distribution.v1beta1.MsgWithdrawValidatorCommission':
+            return 'cosmos-sdk/MsgWithdrawValCommission';
+        case 'cosmos.distribution.v1beta1.MsgSetWithdrawAddress':
+            return 'cosmos-sdk/MsgModifyWithdrawAddress';
+        case 'cosmos.distribution.v1beta1.MsgFundCommunityPool':
+            return 'cosmos-sdk/MsgFundCommunityPool';
+        case 'cosmos.distribution.v1beta1.MsgUpdateParams':
+            return 'cosmos-sdk/distribution/MsgUpdateParams';
+        // Gov
+        case 'cosmos.gov.v1beta1.MsgSubmitProposal':
+            return 'cosmos-sdk/MsgSubmitProposal';
+        case 'cosmos.gov.v1beta1.MsgDeposit':
+            return 'cosmos-sdk/MsgDeposit';
+        case 'cosmos.gov.v1beta1.MsgVote':
+            return 'cosmos-sdk/MsgVote';
+        case 'cosmos.gov.v1beta1.MsgVoteWeighted':
+            return 'cosmos-sdk/MsgVoteWeighted';
+        // Staking
+        case 'cosmos.staking.v1beta1.MsgCreateValidator':
+            return 'cosmos-sdk/MsgCreateValidator';
+        case 'cosmos.staking.v1beta1.MsgEditValidator':
+            return 'cosmos-sdk/MsgEditValidator';
+        case 'cosmos.staking.v1beta1.MsgDelegate':
+            return 'cosmos-sdk/MsgDelegate';
+        case 'cosmos.staking.v1beta1.MsgUndelegate':
+            return 'cosmos-sdk/MsgUndelegate';
+        case 'cosmos.staking.v1beta1.MsgBeginRedelegate':
+            return 'cosmos-sdk/MsgBeginRedelegate';
+        case 'cosmos.staking.v1beta1.MsgCancelUnbondingDelegation':
+            return 'cosmos-sdk/MsgCancelUnbondingDelegation';
+        case 'cosmos.staking.v1beta1.MsgUpdateParams':
+            return 'cosmos-sdk/x/staking/MsgUpdateParams';
+        // IBC
+        case 'ibc.applications.transfer.v1.MsgTransfer':
+            return 'cosmos-sdk/MsgTransfer';
+        default:
+            throw new Error('Unknown message type: ' + type);
+    }
+};
+exports.protoTypeToAminoType = protoTypeToAminoType;
+//# sourceMappingURL=eip712.js.map

package/dist/core/eip712.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"eip712.js","sourceRoot":"","sources":["../../src/core/eip712.ts"],"names":[],"mappings":"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"}

package/dist/core/exec-args.d.ts

@@ -1,10 +1,5 @@
 import ExecArgRegisterVault from './wasm/exec-args/ExecArgRegisterVault';
-import ExecArgsInstantiateDerivativeVault from './wasm/exec-args/ExecArgsInstantiateDerivativeVault';
-import ExecArgsInstantiateSpotVault from './wasm/exec-args/ExecArgsInstantiateSpotVault';
-import ExecArgsUpdateDerivativeVaultConfig from './wasm/exec-args/ExecArgsUpdateDerivativeVaultConfig';
-import ExecArgsUpdateSpotVaultConfig from './wasm/exec-args/ExecArgsUpdateSpotVaultConfig';
 import ExecArgVaultRedeem from './wasm/exec-args/ExecArgVaultRedeem';
 import ExecArgVaultSubscribe from './wasm/exec-args/ExecArgVaultSubscribe';
-export declare type ExecArgs = ExecArgRegisterVault | ExecArgsUpdateDerivativeVaultConfig | ExecArgsUpdateSpotVaultConfig | ExecArgVaultRedeem | ExecArgVaultSubscribe;
-export declare type InstantiateExecArgs = ExecArgsInstantiateDerivativeVault | ExecArgsInstantiateSpotVault;
+export declare type ExecArgs = ExecArgRegisterVault | ExecArgVaultRedeem | ExecArgVaultSubscribe;
 //# sourceMappingURL=exec-args.d.ts.map

package/dist/core/exec-args.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exec-args.d.ts","sourceRoot":"","sources":["../../src/core/exec-args.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,MAAM,uCAAuC,CAAA;AACxE,OAAO,kCAAkC,MAAM,qDAAqD,CAAA;AACpG,OAAO,4BAA4B,MAAM,+CAA+C,CAAA;AACxF,OAAO,mCAAmC,MAAM,sDAAsD,CAAA;AACtG,OAAO,6BAA6B,MAAM,gDAAgD,CAAA;AAC1F,OAAO,kBAAkB,MAAM,qCAAqC,CAAA;AACpE,OAAO,qBAAqB,MAAM,wCAAwC,CAAA;AAE1E,oBAAY,QAAQ,GAChB,oBAAoB,GACpB,mCAAmC,GACnC,6BAA6B,GAC7B,kBAAkB,GAClB,qBAAqB,CAAA;AAEzB,oBAAY,mBAAmB,GAC3B,kCAAkC,GAClC,4BAA4B,CAAA"}
+{"version":3,"file":"exec-args.d.ts","sourceRoot":"","sources":["../../src/core/exec-args.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,MAAM,uCAAuC,CAAA;AACxE,OAAO,kBAAkB,MAAM,qCAAqC,CAAA;AACpE,OAAO,qBAAqB,MAAM,wCAAwC,CAAA;AAE1E,oBAAY,QAAQ,GAChB,oBAAoB,GACpB,kBAAkB,GAClB,qBAAqB,CAAA"}

package/dist/core/wasm/index.d.ts

@@ -1,11 +1,7 @@
 export { default as MsgExec } from './msgs/MsgExec';
 export { default as MsgExecuteContract } from './msgs/MsgExecuteContract';
 export { default as MsgInstantiateContract } from './msgs/MsgInstantiateContract';
-export { default as ExecArgsInstantiateSpotVault } from './exec-args/ExecArgsInstantiateSpotVault';
-export { default as ExecArgsInstantiateDerivativeVault } from './exec-args/ExecArgsInstantiateDerivativeVault';
 export { default as ExecArgRegisterVault } from './exec-args/ExecArgRegisterVault';
-export { default as ExecArgsUpdateDerivativeVaultConfig } from './exec-args/ExecArgsUpdateDerivativeVaultConfig';
-export { default as ExecArgsUpdateSpotVaultConfig } from './exec-args/ExecArgsUpdateSpotVaultConfig';
 export { default as ExecArgVaultRedeem } from './exec-args/ExecArgVaultRedeem';
 export { default as ExecArgVaultSubscribe } from './exec-args/ExecArgVaultSubscribe';
 //# sourceMappingURL=index.d.ts.map

package/dist/core/wasm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/wasm/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AACzE,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AAEjF,OAAO,EAAE,OAAO,IAAI,4BAA4B,EAAE,MAAM,0CAA0C,CAAA;AAClG,OAAO,EAAE,OAAO,IAAI,kCAAkC,EAAE,MAAM,gDAAgD,CAAA;AAC9G,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,kCAAkC,CAAA;AAClF,OAAO,EAAE,OAAO,IAAI,mCAAmC,EAAE,MAAM,iDAAiD,CAAA;AAChH,OAAO,EAAE,OAAO,IAAI,6BAA6B,EAAE,MAAM,2CAA2C,CAAA;AACpG,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AAC9E,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,mCAAmC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/wasm/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AACzE,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AAEjF,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,kCAAkC,CAAA;AAClF,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AAC9E,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,mCAAmC,CAAA"}

package/dist/core/wasm/index.js

@@ -3,23 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExecArgVaultSubscribe = exports.ExecArgVaultRedeem = exports.ExecArgsUpdateSpotVaultConfig = exports.ExecArgsUpdateDerivativeVaultConfig = exports.ExecArgRegisterVault = exports.ExecArgsInstantiateDerivativeVault = exports.ExecArgsInstantiateSpotVault = exports.MsgInstantiateContract = exports.MsgExecuteContract = exports.MsgExec = void 0;
+exports.ExecArgVaultSubscribe = exports.ExecArgVaultRedeem = exports.ExecArgRegisterVault = exports.MsgInstantiateContract = exports.MsgExecuteContract = exports.MsgExec = void 0;
 var MsgExec_1 = require("./msgs/MsgExec");
 Object.defineProperty(exports, "MsgExec", { enumerable: true, get: function () { return __importDefault(MsgExec_1).default; } });
 var MsgExecuteContract_1 = require("./msgs/MsgExecuteContract");
 Object.defineProperty(exports, "MsgExecuteContract", { enumerable: true, get: function () { return __importDefault(MsgExecuteContract_1).default; } });
 var MsgInstantiateContract_1 = require("./msgs/MsgInstantiateContract");
 Object.defineProperty(exports, "MsgInstantiateContract", { enumerable: true, get: function () { return __importDefault(MsgInstantiateContract_1).default; } });
-var ExecArgsInstantiateSpotVault_1 = require("./exec-args/ExecArgsInstantiateSpotVault");
-Object.defineProperty(exports, "ExecArgsInstantiateSpotVault", { enumerable: true, get: function () { return __importDefault(ExecArgsInstantiateSpotVault_1).default; } });
-var ExecArgsInstantiateDerivativeVault_1 = require("./exec-args/ExecArgsInstantiateDerivativeVault");
-Object.defineProperty(exports, "ExecArgsInstantiateDerivativeVault", { enumerable: true, get: function () { return __importDefault(ExecArgsInstantiateDerivativeVault_1).default; } });
 var ExecArgRegisterVault_1 = require("./exec-args/ExecArgRegisterVault");
 Object.defineProperty(exports, "ExecArgRegisterVault", { enumerable: true, get: function () { return __importDefault(ExecArgRegisterVault_1).default; } });
-var ExecArgsUpdateDerivativeVaultConfig_1 = require("./exec-args/ExecArgsUpdateDerivativeVaultConfig");
-Object.defineProperty(exports, "ExecArgsUpdateDerivativeVaultConfig", { enumerable: true, get: function () { return __importDefault(ExecArgsUpdateDerivativeVaultConfig_1).default; } });
-var ExecArgsUpdateSpotVaultConfig_1 = require("./exec-args/ExecArgsUpdateSpotVaultConfig");
-Object.defineProperty(exports, "ExecArgsUpdateSpotVaultConfig", { enumerable: true, get: function () { return __importDefault(ExecArgsUpdateSpotVaultConfig_1).default; } });
 var ExecArgVaultRedeem_1 = require("./exec-args/ExecArgVaultRedeem");
 Object.defineProperty(exports, "ExecArgVaultRedeem", { enumerable: true, get: function () { return __importDefault(ExecArgVaultRedeem_1).default; } });
 var ExecArgVaultSubscribe_1 = require("./exec-args/ExecArgVaultSubscribe");

package/dist/core/wasm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/wasm/index.ts"],"names":[],"mappings":";;;;;;AAAA,0CAAmD;AAA1C,mHAAA,OAAO,OAAW;AAC3B,gEAAyE;AAAhE,yIAAA,OAAO,OAAsB;AACtC,wEAAiF;AAAxE,iJAAA,OAAO,OAA0B;AAE1C,yFAAkG;AAAzF,6JAAA,OAAO,OAAgC;AAChD,qGAA8G;AAArG,yKAAA,OAAO,OAAsC;AACtD,yEAAkF;AAAzE,6IAAA,OAAO,OAAwB;AACxC,uGAAgH;AAAvG,2KAAA,OAAO,OAAuC;AACvD,2FAAoG;AAA3F,+JAAA,OAAO,OAAiC;AACjD,qEAA8E;AAArE,yIAAA,OAAO,OAAsB;AACtC,2EAAoF;AAA3E,+IAAA,OAAO,OAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/wasm/index.ts"],"names":[],"mappings":";;;;;;AAAA,0CAAmD;AAA1C,mHAAA,OAAO,OAAW;AAC3B,gEAAyE;AAAhE,yIAAA,OAAO,OAAsB;AACtC,wEAAiF;AAAxE,iJAAA,OAAO,OAA0B;AAE1C,yEAAkF;AAAzE,6IAAA,OAAO,OAAwB;AACxC,qEAA8E;AAArE,yIAAA,OAAO,OAAsB;AACtC,2EAAoF;AAA3E,+IAAA,OAAO,OAAyB"}

package/dist/core/wasm/msgs/MsgExec.js

@@ -47,11 +47,11 @@ class MsgExec extends MsgBase_1.MsgBase {
         const message = Object.assign({}, (0, snakecase_keys_1.default)(proto.toObject()));
         if (params.subaccountDeposits) {
             // @ts-ignore
-            message['deposit_funds'] = params.subaccountDeposits;
+            message['deposit_funds'] = [params.subaccountDeposits];
         }
         if (params.bankFunds) {
             // @ts-ignore
-            message['bank_funds'] = params.bankFunds;
+            message['bank_funds'] = [params.bankFunds];
         }
         // @ts-ignore
         delete message.bank_funds_list;

package/dist/core/wasm/msgs/MsgExec.js.map

@@ -1 +1 @@
-{"version":3,"file":"MsgExec.js","sourceRoot":"","sources":["../../../../src/core/wasm/msgs/MsgExec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MsgExec.js","sourceRoot":"","sources":["../../../../src/core/wasm/msgs/MsgExec.ts"],"names":[],"mappings":"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"}

package/dist/core/wasm/msgs/MsgExecuteContract.d.ts

@@ -6,6 +6,7 @@ export declare namespace MsgExecuteContract {
             denom: string;
             amount: string;
         };
+        action: string;
         sender: string;
         contractAddress: string;
         msg: Object;

package/dist/core/wasm/msgs/MsgExecuteContract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MsgExecuteContract.d.ts","sourceRoot":"","sources":["../../../../src/core/wasm/msgs/MsgExecuteContract.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,IAAI,sBAAsB,EAAE,MAAM,iDAAiD,CAAA;AAE9G,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC,MAAM,CAAC,OAAO,WAAW,kBAAkB,CAAC;IAC1C,UAAiB,MAAM;QACrB,MAAM,CAAC,EAAE;YACP,KAAK,EAAE,MAAM,CAAA;YACb,MAAM,EAAE,MAAM,CAAA;SACf,CAAA;QACD,MAAM,EAAE,MAAM,CAAA;QACd,eAAe,EAAE,MAAM,CAAA;QACvB,GAAG,EAAE,MAAM,CAAA;KACZ;IAED,UAAiB,UAAU;QACzB,IAAI,EAAE,sCAAsC,CAAA;QAC5C,OAAO,EAAE,sBAAsB,CAAA;KAChC;IAED,UAAiB,IAAK,SAAQ,sBAAsB,CAAC,QAAQ;QAC3D,OAAO,EAAE,sCAAsC,CAAA;KAChD;IAED,UAAiB,IAAK,SAAQ,sBAAsB,CAAC,QAAQ;QAC3D,OAAO,EAAE,sCAAsC,CAAA;KAChD;IAED,KAAY,KAAK,GAAG,sBAAsB,CAAA;CAC3C;AAED,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,OAAO,CACrD,kBAAkB,CAAC,MAAM,EACzB,kBAAkB,CAAC,IAAI,EACvB,kBAAkB,CAAC,KAAK,EACxB,kBAAkB,CAAC,IAAI,EACvB,kBAAkB,CAAC,UAAU,CAC9B;IACC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC,MAAM,GAAG,kBAAkB;IAItE,OAAO,IAAI,kBAAkB,CAAC,KAAK;IAoBnC,MAAM,IAAI,kBAAkB,CAAC,IAAI;IASjC,MAAM,IAAI,kBAAkB,CAAC,IAAI;IASjC,YAAY,IAAI,kBAAkB,CAAC,UAAU;CAQ9C"}
+{"version":3,"file":"MsgExecuteContract.d.ts","sourceRoot":"","sources":["../../../../src/core/wasm/msgs/MsgExecuteContract.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,IAAI,sBAAsB,EAAE,MAAM,iDAAiD,CAAA;AAE9G,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC,MAAM,CAAC,OAAO,WAAW,kBAAkB,CAAC;IAC1C,UAAiB,MAAM;QACrB,MAAM,CAAC,EAAE;YACP,KAAK,EAAE,MAAM,CAAA;YACb,MAAM,EAAE,MAAM,CAAA;SACf,CAAA;QACD,MAAM,EAAE,MAAM,CAAA;QACd,MAAM,EAAE,MAAM,CAAA;QACd,eAAe,EAAE,MAAM,CAAA;QACvB,GAAG,EAAE,MAAM,CAAA;KACZ;IAED,UAAiB,UAAU;QACzB,IAAI,EAAE,sCAAsC,CAAA;QAC5C,OAAO,EAAE,sBAAsB,CAAA;KAChC;IAED,UAAiB,IAAK,SAAQ,sBAAsB,CAAC,QAAQ;QAC3D,OAAO,EAAE,sCAAsC,CAAA;KAChD;IAED,UAAiB,IAAK,SAAQ,sBAAsB,CAAC,QAAQ;QAC3D,OAAO,EAAE,sCAAsC,CAAA;KAChD;IAED,KAAY,KAAK,GAAG,sBAAsB,CAAA;CAC3C;AAED,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,OAAO,CACrD,kBAAkB,CAAC,MAAM,EACzB,kBAAkB,CAAC,IAAI,EACvB,kBAAkB,CAAC,KAAK,EACxB,kBAAkB,CAAC,IAAI,EACvB,kBAAkB,CAAC,UAAU,CAC9B;IACC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC,MAAM,GAAG,kBAAkB;IAItE,OAAO,IAAI,kBAAkB,CAAC,KAAK;IAsBnC,MAAM,IAAI,kBAAkB,CAAC,IAAI;IASjC,MAAM,IAAI,kBAAkB,CAAC,IAAI;IASjC,YAAY,IAAI,kBAAkB,CAAC,UAAU;CAQ9C"}

package/dist/core/wasm/msgs/MsgExecuteContract.js

@@ -11,7 +11,8 @@ class MsgExecuteContract extends MsgBase_1.MsgBase {
     toProto() {
         const { params } = this;
         const message = new tx_pb_1.MsgExecuteContract();
-        message.setMsg((0, utils_1.toUtf8)(JSON.stringify(params.msg)));
+        const msg = { [params.action]: params.msg };
+        message.setMsg((0, utils_1.toUtf8)(JSON.stringify(msg)));
         message.setSender(params.sender);
         message.setContract(params.contractAddress);
         if (params.amount) {

package/dist/core/wasm/msgs/MsgExecuteContract.js.map

@@ -1 +1 @@
-{"version":3,"file":"MsgExecuteContract.js","sourceRoot":"","sources":["../../../../src/core/wasm/msgs/MsgExecuteContract.ts"],"names":[],"mappings":";;AAAA,kFAA2E;AAC3E,2EAA8G;AAC9G,0CAAuC;AACvC,2CAAuC;AA6BvC,MAAqB,kBAAmB,SAAQ,iBAM/C;IACC,MAAM,CAAC,QAAQ,CAAC,MAAiC;QAC/C,OAAO,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAA;IACvC,CAAC;IAED,OAAO;QACL,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;QAEvB,MAAM,OAAO,GAAG,IAAI,0BAAsB,EAAE,CAAA;QAC5C,OAAO,CAAC,MAAM,CAAC,IAAA,cAAM,EAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QAClD,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAChC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;QAE3C,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,MAAM,KAAK,GAAG,IAAI,cAAI,EAAE,CAAA;YAExB,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YACrC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAEnC,OAAO,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA;SAC9B;QAED,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,MAAM;QACJ,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAE5B,uBACE,OAAO,EAAE,sCAAsC,IAC5C,KAAK,CAAC,QAAQ,EAAE,EACpB;IACH,CAAC;IAED,MAAM;QACJ,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAE5B,uBACE,OAAO,EAAE,sCAAsC,IAC5C,KAAK,CAAC,QAAQ,EAAE,EACpB;IACH,CAAC;IAED,YAAY;QACV,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAE5B,OAAO;YACL,IAAI,EAAE,sCAAsC;YAC5C,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC;CACF;AAzDD,qCAyDC"}
+{"version":3,"file":"MsgExecuteContract.js","sourceRoot":"","sources":["../../../../src/core/wasm/msgs/MsgExecuteContract.ts"],"names":[],"mappings":";;AAAA,kFAA2E;AAC3E,2EAA8G;AAC9G,0CAAuC;AACvC,2CAAuC;AA8BvC,MAAqB,kBAAmB,SAAQ,iBAM/C;IACC,MAAM,CAAC,QAAQ,CAAC,MAAiC;QAC/C,OAAO,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAA;IACvC,CAAC;IAED,OAAO;QACL,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;QAEvB,MAAM,OAAO,GAAG,IAAI,0BAAsB,EAAE,CAAA;QAC5C,MAAM,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,EAAE,CAAA;QAE3C,OAAO,CAAC,MAAM,CAAC,IAAA,cAAM,EAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QAC3C,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAChC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;QAE3C,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,MAAM,KAAK,GAAG,IAAI,cAAI,EAAE,CAAA;YAExB,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YACrC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAEnC,OAAO,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA;SAC9B;QAED,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,MAAM;QACJ,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAE5B,uBACE,OAAO,EAAE,sCAAsC,IAC5C,KAAK,CAAC,QAAQ,EAAE,EACpB;IACH,CAAC;IAED,MAAM;QACJ,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAE5B,uBACE,OAAO,EAAE,sCAAsC,IAC5C,KAAK,CAAC,QAAQ,EAAE,EACpB;IACH,CAAC;IAED,YAAY;QACV,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAE5B,OAAO;YACL,IAAI,EAAE,sCAAsC;YAC5C,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC;CACF;AA3DD,qCA2DC"}

package/dist/core/wasm/msgs/MsgInstantiateContract.d.ts

@@ -1,13 +1,12 @@
 import { MsgInstantiateContract as BaseMsgInstantiateContract } from '@injectivelabs/chain-api/cosmwasm/wasm/v1/tx_pb';
-import { InstantiateExecArgs } from '../../exec-args';
 import { MsgBase } from '../../MsgBase';
 export declare namespace MsgInstantiateContract {
     interface Params {
         sender: string;
         admin: string;
-        codeId: string;
+        codeId: number;
         label: string;
-        data: InstantiateExecArgs;
+        msg: Object;
         amount?: {
             denom: string;
             amount: string;

package/dist/core/wasm/msgs/MsgInstantiateContract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MsgInstantiateContract.d.ts","sourceRoot":"","sources":["../../../../src/core/wasm/msgs/MsgInstantiateContract.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,IAAI,0BAA0B,EAAE,MAAM,iDAAiD,CAAA;AAEtH,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAGvC,MAAM,CAAC,OAAO,WAAW,sBAAsB,CAAC;IAC9C,UAAiB,MAAM;QACrB,MAAM,EAAE,MAAM,CAAA;QACd,KAAK,EAAE,MAAM,CAAA;QACb,MAAM,EAAE,MAAM,CAAA;QACd,KAAK,EAAE,MAAM,CAAA;QACb,IAAI,EAAE,mBAAmB,CAAA;QACzB,MAAM,CAAC,EAAE;YACP,KAAK,EAAE,MAAM,CAAA;YACb,MAAM,EAAE,MAAM,CAAA;SACf,CAAA;KACF;IAED,UAAiB,UAAU;QACzB,IAAI,EAAE,0CAA0C,CAAA;QAChD,OAAO,EAAE,0BAA0B,CAAA;KACpC;IAED,UAAiB,IAAK,SAAQ,0BAA0B,CAAC,QAAQ;QAC/D,OAAO,EAAE,0CAA0C,CAAA;KACpD;IAED,UAAiB,IAAK,SAAQ,0BAA0B,CAAC,QAAQ;QAC/D,OAAO,EAAE,0CAA0C,CAAA;KACpD;IAED,KAAY,KAAK,GAAG,0BAA0B,CAAA;CAC/C;AAED,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,OAAO,CACzD,sBAAsB,CAAC,MAAM,EAC7B,sBAAsB,CAAC,IAAI,EAC3B,sBAAsB,CAAC,KAAK,EAC5B,sBAAsB,CAAC,IAAI,EAC3B,sBAAsB,CAAC,UAAU,CAClC;IACC,MAAM,CAAC,QAAQ,CACb,MAAM,EAAE,sBAAsB,CAAC,MAAM,GACpC,sBAAsB;IAIzB,OAAO,IAAI,sBAAsB,CAAC,KAAK;IAuBvC,MAAM,IAAI,sBAAsB,CAAC,IAAI;IASrC,MAAM,IAAI,sBAAsB,CAAC,IAAI;IAiBrC,YAAY,IAAI,sBAAsB,CAAC,UAAU;CAQlD"}
+{"version":3,"file":"MsgInstantiateContract.d.ts","sourceRoot":"","sources":["../../../../src/core/wasm/msgs/MsgInstantiateContract.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,IAAI,0BAA0B,EAAE,MAAM,iDAAiD,CAAA;AAEtH,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAGvC,MAAM,CAAC,OAAO,WAAW,sBAAsB,CAAC;IAC9C,UAAiB,MAAM;QACrB,MAAM,EAAE,MAAM,CAAA;QACd,KAAK,EAAE,MAAM,CAAA;QACb,MAAM,EAAE,MAAM,CAAA;QACd,KAAK,EAAE,MAAM,CAAA;QACb,GAAG,EAAE,MAAM,CAAA;QACX,MAAM,CAAC,EAAE;YACP,KAAK,EAAE,MAAM,CAAA;YACb,MAAM,EAAE,MAAM,CAAA;SACf,CAAA;KACF;IAED,UAAiB,UAAU;QACzB,IAAI,EAAE,0CAA0C,CAAA;QAChD,OAAO,EAAE,0BAA0B,CAAA;KACpC;IAED,UAAiB,IAAK,SAAQ,0BAA0B,CAAC,QAAQ;QAC/D,OAAO,EAAE,0CAA0C,CAAA;KACpD;IAED,UAAiB,IAAK,SAAQ,0BAA0B,CAAC,QAAQ;QAC/D,OAAO,EAAE,0CAA0C,CAAA;KACpD;IAED,KAAY,KAAK,GAAG,0BAA0B,CAAA;CAC/C;AAED,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,OAAO,CACzD,sBAAsB,CAAC,MAAM,EAC7B,sBAAsB,CAAC,IAAI,EAC3B,sBAAsB,CAAC,KAAK,EAC5B,sBAAsB,CAAC,IAAI,EAC3B,sBAAsB,CAAC,UAAU,CAClC;IACC,MAAM,CAAC,QAAQ,CACb,MAAM,EAAE,sBAAsB,CAAC,MAAM,GACpC,sBAAsB;IAIzB,OAAO,IAAI,sBAAsB,CAAC,KAAK;IAuBvC,MAAM,IAAI,sBAAsB,CAAC,IAAI;IASrC,MAAM,IAAI,sBAAsB,CAAC,IAAI;IAiBrC,YAAY,IAAI,sBAAsB,CAAC,UAAU;CAQlD"}

package/dist/core/wasm/msgs/MsgInstantiateContract.js

@@ -15,10 +15,10 @@ class MsgInstantiateContract extends MsgBase_1.MsgBase {
     toProto() {
         const { params } = this;
         const message = new tx_pb_1.MsgInstantiateContract();
-        message.setMsg((0, utils_1.toUtf8)(JSON.stringify(params.data.toJSON())));
+        message.setMsg((0, utils_1.toUtf8)(JSON.stringify(params.msg)));
         message.setSender(params.sender);
         message.setAdmin(params.admin);
-        message.setCodeId(Number(params.codeId));
+        message.setCodeId(params.codeId);
         message.setLabel(params.label);
         if (params.amount) {
             const funds = new coin_pb_1.Coin();

package/dist/core/wasm/msgs/MsgInstantiateContract.js.map

@@ -1 +1 @@
-{"version":3,"file":"MsgInstantiateContract.js","sourceRoot":"","sources":["../../../../src/core/wasm/msgs/MsgInstantiateContract.ts"],"names":[],"mappings":";;;;;AAAA,kFAA2E;AAC3E,2EAAsH;AACtH,0CAAuC;AAEvC,2CAAuC;AACvC,oEAA0C;AA+B1C,MAAqB,sBAAuB,SAAQ,iBAMnD;IACC,MAAM,CAAC,QAAQ,CACb,MAAqC;QAErC,OAAO,IAAI,sBAAsB,CAAC,MAAM,CAAC,CAAA;IAC3C,CAAC;IAED,OAAO;QACL,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;QAEvB,MAAM,OAAO,GAAG,IAAI,8BAA0B,EAAE,CAAA;QAEhD,OAAO,CAAC,MAAM,CAAC,IAAA,cAAM,EAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAA;QAC5D,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC9B,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;QACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAE9B,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,MAAM,KAAK,GAAG,IAAI,cAAI,EAAE,CAAA;YAExB,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YACrC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAEnC,OAAO,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA;SAC9B;QAED,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,MAAM;QACJ,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAE5B,uBACE,OAAO,EAAE,0CAA0C,IAChD,KAAK,CAAC,QAAQ,EAAE,EACpB;IACH,CAAC;IAED,MAAM;QACJ,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAC5B,MAAM,OAAO,qBACR,IAAA,wBAAa,EAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CACnC,CAAA;QAED,aAAa;QACb,OAAO,OAAO,CAAC,UAAU,CAAA;QAEzB,MAAM,qBAAqB,GAAG,IAAA,wBAAa,EAAC,OAAO,CAAC,CAAA;QAEpD,OAAO,gBACL,OAAO,EAAE,0CAA0C,IAChD,qBAAqB,CACiB,CAAA;IAC7C,CAAC;IAED,YAAY;QACV,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAE5B,OAAO;YACL,IAAI,EAAE,0CAA0C;YAChD,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC;CACF;AAtED,yCAsEC"}
+{"version":3,"file":"MsgInstantiateContract.js","sourceRoot":"","sources":["../../../../src/core/wasm/msgs/MsgInstantiateContract.ts"],"names":[],"mappings":";;;;;AAAA,kFAA2E;AAC3E,2EAAsH;AACtH,0CAAuC;AACvC,2CAAuC;AACvC,oEAA0C;AA+B1C,MAAqB,sBAAuB,SAAQ,iBAMnD;IACC,MAAM,CAAC,QAAQ,CACb,MAAqC;QAErC,OAAO,IAAI,sBAAsB,CAAC,MAAM,CAAC,CAAA;IAC3C,CAAC;IAED,OAAO;QACL,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;QAEvB,MAAM,OAAO,GAAG,IAAI,8BAA0B,EAAE,CAAA;QAEhD,OAAO,CAAC,MAAM,CAAC,IAAA,cAAM,EAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QAClD,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC9B,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAE9B,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,MAAM,KAAK,GAAG,IAAI,cAAI,EAAE,CAAA;YAExB,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YACrC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAEnC,OAAO,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA;SAC9B;QAED,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,MAAM;QACJ,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAE5B,uBACE,OAAO,EAAE,0CAA0C,IAChD,KAAK,CAAC,QAAQ,EAAE,EACpB;IACH,CAAC;IAED,MAAM;QACJ,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAC5B,MAAM,OAAO,qBACR,IAAA,wBAAa,EAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CACnC,CAAA;QAED,aAAa;QACb,OAAO,OAAO,CAAC,UAAU,CAAA;QAEzB,MAAM,qBAAqB,GAAG,IAAA,wBAAa,EAAC,OAAO,CAAC,CAAA;QAEpD,OAAO,gBACL,OAAO,EAAE,0CAA0C,IAChD,qBAAqB,CACiB,CAAA;IAC7C,CAAC;IAED,YAAY;QACV,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAE5B,OAAO;YACL,IAAI,EAAE,0CAA0C;YAChD,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC;CACF;AAtED,yCAsEC"}