@injectivelabs/sdk-ts 1.0.17 → 1.0.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/client/exchange/grpc/ExchangeGrpcTransactionApi.d.ts +4 -2
- package/dist/client/exchange/grpc/ExchangeGrpcTransactionApi.d.ts.map +1 -1
- package/dist/client/exchange/grpc/ExchangeGrpcTransactionApi.js +8 -2
- package/dist/client/exchange/grpc/ExchangeGrpcTransactionApi.js.map +1 -1
- package/dist/core/exchange/msgs/MsgBatchCancelBinaryOptionsOrders.d.ts +31 -0
- package/dist/core/exchange/msgs/MsgBatchCancelBinaryOptionsOrders.d.ts.map +1 -0
- package/dist/core/exchange/msgs/MsgBatchCancelBinaryOptionsOrders.js +50 -0
- package/dist/core/exchange/msgs/MsgBatchCancelBinaryOptionsOrders.js.map +1 -0
- package/dist/core/msgs.d.ts +6 -2
- package/dist/core/msgs.d.ts.map +1 -1
- package/dist/core/msgs.js +0 -1
- package/dist/core/msgs.js.map +1 -1
- package/package.json +3 -3
- package/dist/client/chain/grpc/ChainGrpcTransactionApi.d.ts +0 -35
- package/dist/client/chain/grpc/ChainGrpcTransactionApi.d.ts.map +0 -1
- package/dist/client/chain/grpc/ChainGrpcTransactionApi.js +0 -122
- package/dist/client/chain/grpc/ChainGrpcTransactionApi.js.map +0 -1
|
@@ -2,7 +2,7 @@ import { PrepareTxResponse, BroadcastTxResponse } from '@injectivelabs/exchange-
|
|
|
2
2
|
import { AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
|
|
3
3
|
import BaseConsumer from '../../BaseGrpcConsumer';
|
|
4
4
|
export declare class ExchangeGrpcTransactionApi extends BaseConsumer {
|
|
5
|
-
prepareTxRequest({ address, chainId, message, memo, estimateGas, gasLimit, feeDenom, feePrice, timeoutHeight, }: {
|
|
5
|
+
prepareTxRequest({ address, chainId, message, memo, estimateGas, gasLimit, feeDenom, feePrice, timeoutHeight, useCorrectEIP712Hash, }: {
|
|
6
6
|
address: AccountAddress;
|
|
7
7
|
chainId: EthereumChainId;
|
|
8
8
|
message: any;
|
|
@@ -12,8 +12,9 @@ export declare class ExchangeGrpcTransactionApi extends BaseConsumer {
|
|
|
12
12
|
timeoutHeight?: number;
|
|
13
13
|
feeDenom?: string;
|
|
14
14
|
feePrice?: string;
|
|
15
|
+
useCorrectEIP712Hash?: boolean;
|
|
15
16
|
}): Promise<PrepareTxResponse>;
|
|
16
|
-
prepareExchangeTxRequest({ address, chainId, message, memo, estimateGas, gasLimit, feeDenom, feePrice, timeoutHeight, delegatedFee, }: {
|
|
17
|
+
prepareExchangeTxRequest({ address, chainId, message, memo, estimateGas, gasLimit, feeDenom, feePrice, useCorrectEIP712Hash, timeoutHeight, delegatedFee, }: {
|
|
17
18
|
address: AccountAddress;
|
|
18
19
|
chainId: EthereumChainId;
|
|
19
20
|
message: any;
|
|
@@ -24,6 +25,7 @@ export declare class ExchangeGrpcTransactionApi extends BaseConsumer {
|
|
|
24
25
|
feePrice?: string;
|
|
25
26
|
timeoutHeight?: number;
|
|
26
27
|
delegatedFee?: boolean;
|
|
28
|
+
useCorrectEIP712Hash?: boolean;
|
|
27
29
|
}): Promise<PrepareTxResponse>;
|
|
28
30
|
broadcastTxRequest({ signature, chainId, message, txResponse, }: {
|
|
29
31
|
signature: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExchangeGrpcTransactionApi.d.ts","sourceRoot":"","sources":["../../../../src/client/exchange/grpc/ExchangeGrpcTransactionApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAEjB,mBAAmB,EAGpB,MAAM,uDAAuD,CAAA;AAG9D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAOzE,OAAO,YAAY,MAAM,wBAAwB,CAAA;AAGjD,qBAAa,0BAA2B,SAAQ,YAAY;IACpD,gBAAgB,CAAC,EACrB,OAAO,EACP,OAAO,EACP,OAAO,EACP,IAAI,EACJ,WAAkB,EAClB,QAA4B,EAC5B,QAAmC,EACnC,QAAmC,EACnC,aAAa,
|
|
1
|
+
{"version":3,"file":"ExchangeGrpcTransactionApi.d.ts","sourceRoot":"","sources":["../../../../src/client/exchange/grpc/ExchangeGrpcTransactionApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAEjB,mBAAmB,EAGpB,MAAM,uDAAuD,CAAA;AAG9D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAOzE,OAAO,YAAY,MAAM,wBAAwB,CAAA;AAGjD,qBAAa,0BAA2B,SAAQ,YAAY;IACpD,gBAAgB,CAAC,EACrB,OAAO,EACP,OAAO,EACP,OAAO,EACP,IAAI,EACJ,WAAkB,EAClB,QAA4B,EAC5B,QAAmC,EACnC,QAAmC,EACnC,aAAa,EACb,oBAA4B,GAC7B,EAAE;QACD,OAAO,EAAE,cAAc,CAAA;QACvB,OAAO,EAAE,eAAe,CAAA;QACxB,OAAO,EAAE,GAAG,CAAA;QACZ,WAAW,CAAC,EAAE,OAAO,CAAA;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,aAAa,CAAC,EAAE,MAAM,CAAA;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,oBAAoB,CAAC,EAAE,OAAO,CAAA;KAC/B;IA+CK,wBAAwB,CAAC,EAC7B,OAAO,EACP,OAAO,EACP,OAAO,EACP,IAAI,EACJ,WAAkB,EAClB,QAAiC,EACjC,QAAmC,EACnC,QAAmC,EACnC,oBAA4B,EAC5B,aAAa,EACb,YAAY,GACb,EAAE;QACD,OAAO,EAAE,cAAc,CAAA;QACvB,OAAO,EAAE,eAAe,CAAA;QACxB,OAAO,EAAE,GAAG,CAAA;QACZ,WAAW,CAAC,EAAE,OAAO,CAAA;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,aAAa,CAAC,EAAE,MAAM,CAAA;QACtB,YAAY,CAAC,EAAE,OAAO,CAAA;QACtB,oBAAoB,CAAC,EAAE,OAAO,CAAA;KAC/B;IAmDK,kBAAkB,CAAC,EACvB,SAAS,EACT,OAAO,EACP,OAAO,EACP,UAAU,GACX,EAAE;QACD,SAAS,EAAE,MAAM,CAAA;QACjB,OAAO,EAAE,eAAe,CAAA;QACxB,UAAU,EAAE,iBAAiB,CAAA;QAC7B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAC7B;CAuCF"}
|
|
@@ -20,7 +20,7 @@ const utils_1 = require("@injectivelabs/utils");
|
|
|
20
20
|
const BaseGrpcConsumer_1 = __importDefault(require("../../BaseGrpcConsumer"));
|
|
21
21
|
const transaction_1 = require("../../../utils/transaction");
|
|
22
22
|
class ExchangeGrpcTransactionApi extends BaseGrpcConsumer_1.default {
|
|
23
|
-
prepareTxRequest({ address, chainId, message, memo, estimateGas = true, gasLimit = utils_1.DEFAULT_GAS_LIMIT, feeDenom = utils_1.DEFAULT_BRIDGE_FEE_DENOM, feePrice = utils_1.DEFAULT_BRIDGE_FEE_PRICE, timeoutHeight, }) {
|
|
23
|
+
prepareTxRequest({ address, chainId, message, memo, estimateGas = true, gasLimit = utils_1.DEFAULT_GAS_LIMIT, feeDenom = utils_1.DEFAULT_BRIDGE_FEE_DENOM, feePrice = utils_1.DEFAULT_BRIDGE_FEE_PRICE, timeoutHeight, useCorrectEIP712Hash = false, }) {
|
|
24
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
25
25
|
const txFeeAmount = new coin_pb_1.Coin();
|
|
26
26
|
txFeeAmount.setDenom(feeDenom);
|
|
@@ -44,6 +44,9 @@ class ExchangeGrpcTransactionApi extends BaseGrpcConsumer_1.default {
|
|
|
44
44
|
if (memo) {
|
|
45
45
|
prepareTxRequest.setMemo(memo);
|
|
46
46
|
}
|
|
47
|
+
if (useCorrectEIP712Hash !== undefined) {
|
|
48
|
+
prepareTxRequest.setUseCorrectHash(useCorrectEIP712Hash);
|
|
49
|
+
}
|
|
47
50
|
try {
|
|
48
51
|
const response = yield this.request(prepareTxRequest, injective_exchange_rpc_pb_service_1.InjectiveExchangeRPC.PrepareTx);
|
|
49
52
|
return response;
|
|
@@ -53,7 +56,7 @@ class ExchangeGrpcTransactionApi extends BaseGrpcConsumer_1.default {
|
|
|
53
56
|
}
|
|
54
57
|
});
|
|
55
58
|
}
|
|
56
|
-
prepareExchangeTxRequest({ address, chainId, message, memo, estimateGas = true, gasLimit = utils_1.DEFAULT_EXCHANGE_LIMIT, feeDenom = utils_1.DEFAULT_BRIDGE_FEE_DENOM, feePrice = utils_1.DEFAULT_BRIDGE_FEE_PRICE, timeoutHeight, delegatedFee, }) {
|
|
59
|
+
prepareExchangeTxRequest({ address, chainId, message, memo, estimateGas = true, gasLimit = utils_1.DEFAULT_EXCHANGE_LIMIT, feeDenom = utils_1.DEFAULT_BRIDGE_FEE_DENOM, feePrice = utils_1.DEFAULT_BRIDGE_FEE_PRICE, useCorrectEIP712Hash = false, timeoutHeight, delegatedFee, }) {
|
|
57
60
|
return __awaiter(this, void 0, void 0, function* () {
|
|
58
61
|
const txFeeAmount = new coin_pb_1.Coin();
|
|
59
62
|
txFeeAmount.setDenom(feeDenom);
|
|
@@ -80,6 +83,9 @@ class ExchangeGrpcTransactionApi extends BaseGrpcConsumer_1.default {
|
|
|
80
83
|
if (memo) {
|
|
81
84
|
prepareTxRequest.setMemo(memo);
|
|
82
85
|
}
|
|
86
|
+
if (useCorrectEIP712Hash !== undefined) {
|
|
87
|
+
prepareTxRequest.setUseCorrectHash(useCorrectEIP712Hash);
|
|
88
|
+
}
|
|
83
89
|
try {
|
|
84
90
|
const response = yield this.request(prepareTxRequest, injective_exchange_rpc_pb_service_1.InjectiveExchangeRPC.PrepareTx);
|
|
85
91
|
return response;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExchangeGrpcTransactionApi.js","sourceRoot":"","sources":["../../../../src/client/exchange/grpc/ExchangeGrpcTransactionApi.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qGAO8D;AAC9D,qHAAoG;AACpG,kFAA2E;AAE3E,gDAK6B;AAC7B,8EAAiD;AACjD,4DAAwE;AAExE,MAAa,0BAA2B,SAAQ,0BAAY;IACpD,gBAAgB,CAAC,EACrB,OAAO,EACP,OAAO,EACP,OAAO,EACP,IAAI,EACJ,WAAW,GAAG,IAAI,EAClB,QAAQ,GAAG,yBAAiB,EAC5B,QAAQ,GAAG,gCAAwB,EACnC,QAAQ,GAAG,gCAAwB,EACnC,aAAa,
|
|
1
|
+
{"version":3,"file":"ExchangeGrpcTransactionApi.js","sourceRoot":"","sources":["../../../../src/client/exchange/grpc/ExchangeGrpcTransactionApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { MsgBatchCancelDerivativeOrders as BaseMsgBatchCancelDerivativeOrders } from '@injectivelabs/chain-api/injective/exchange/v1beta1/tx_pb';
|
|
2
|
+
import { MsgBase } from '../../MsgBase';
|
|
3
|
+
export declare namespace MsgBatchCancelDerivativeOrders {
|
|
4
|
+
interface Params {
|
|
5
|
+
injectiveAddress: string;
|
|
6
|
+
orders: {
|
|
7
|
+
marketId: string;
|
|
8
|
+
subaccountId: string;
|
|
9
|
+
orderHash: string;
|
|
10
|
+
}[];
|
|
11
|
+
}
|
|
12
|
+
interface DirectSign {
|
|
13
|
+
type: '/injective.exchange.v1beta1.MsgBatchCancelDerivativeOrders';
|
|
14
|
+
message: BaseMsgBatchCancelDerivativeOrders;
|
|
15
|
+
}
|
|
16
|
+
interface Data extends BaseMsgBatchCancelDerivativeOrders.AsObject {
|
|
17
|
+
'@type': '/injective.exchange.v1beta1.MsgBatchCancelDerivativeOrders';
|
|
18
|
+
}
|
|
19
|
+
interface Web3 extends BaseMsgBatchCancelDerivativeOrders.AsObject {
|
|
20
|
+
'@type': '/injective.exchange.v1beta1.MsgBatchCancelDerivativeOrders';
|
|
21
|
+
}
|
|
22
|
+
type Proto = BaseMsgBatchCancelDerivativeOrders;
|
|
23
|
+
}
|
|
24
|
+
export default class MsgBatchCancelDerivativeOrders extends MsgBase<MsgBatchCancelDerivativeOrders.Params, MsgBatchCancelDerivativeOrders.Data, MsgBatchCancelDerivativeOrders.Proto, MsgBatchCancelDerivativeOrders.Web3, MsgBatchCancelDerivativeOrders.DirectSign> {
|
|
25
|
+
static fromJSON(params: MsgBatchCancelDerivativeOrders.Params): MsgBatchCancelDerivativeOrders;
|
|
26
|
+
toProto(): MsgBatchCancelDerivativeOrders.Proto;
|
|
27
|
+
toData(): MsgBatchCancelDerivativeOrders.Data;
|
|
28
|
+
toWeb3(): MsgBatchCancelDerivativeOrders.Web3;
|
|
29
|
+
toDirectSign(): MsgBatchCancelDerivativeOrders.DirectSign;
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=MsgBatchCancelBinaryOptionsOrders.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MsgBatchCancelBinaryOptionsOrders.d.ts","sourceRoot":"","sources":["../../../../src/core/exchange/msgs/MsgBatchCancelBinaryOptionsOrders.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,8BAA8B,IAAI,kCAAkC,EAErE,MAAM,2DAA2D,CAAA;AAElE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC,MAAM,CAAC,OAAO,WAAW,8BAA8B,CAAC;IACtD,UAAiB,MAAM;QACrB,gBAAgB,EAAE,MAAM,CAAA;QACxB,MAAM,EAAE;YACN,QAAQ,EAAE,MAAM,CAAA;YAChB,YAAY,EAAE,MAAM,CAAA;YACpB,SAAS,EAAE,MAAM,CAAA;SAClB,EAAE,CAAA;KACJ;IAED,UAAiB,UAAU;QACzB,IAAI,EAAE,4DAA4D,CAAA;QAClE,OAAO,EAAE,kCAAkC,CAAA;KAC5C;IAED,UAAiB,IAAK,SAAQ,kCAAkC,CAAC,QAAQ;QACvE,OAAO,EAAE,4DAA4D,CAAA;KACtE;IAED,UAAiB,IAAK,SAAQ,kCAAkC,CAAC,QAAQ;QACvE,OAAO,EAAE,4DAA4D,CAAA;KACtE;IAED,KAAY,KAAK,GAAG,kCAAkC,CAAA;CACvD;AAED,MAAM,CAAC,OAAO,OAAO,8BAA+B,SAAQ,OAAO,CACjE,8BAA8B,CAAC,MAAM,EACrC,8BAA8B,CAAC,IAAI,EACnC,8BAA8B,CAAC,KAAK,EACpC,8BAA8B,CAAC,IAAI,EACnC,8BAA8B,CAAC,UAAU,CAC1C;IACC,MAAM,CAAC,QAAQ,CACb,MAAM,EAAE,8BAA8B,CAAC,MAAM,GAC5C,8BAA8B;IAIjC,OAAO,IAAI,8BAA8B,CAAC,KAAK;IAmB/C,MAAM,IAAI,8BAA8B,CAAC,IAAI;IAS7C,MAAM,IAAI,8BAA8B,CAAC,IAAI;IAe7C,YAAY,IAAI,8BAA8B,CAAC,UAAU;CAQ1D"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const tx_pb_1 = require("@injectivelabs/chain-api/injective/exchange/v1beta1/tx_pb");
|
|
7
|
+
const snakecase_keys_1 = __importDefault(require("snakecase-keys"));
|
|
8
|
+
const MsgBase_1 = require("../../MsgBase");
|
|
9
|
+
class MsgBatchCancelDerivativeOrders extends MsgBase_1.MsgBase {
|
|
10
|
+
static fromJSON(params) {
|
|
11
|
+
return new MsgBatchCancelDerivativeOrders(params);
|
|
12
|
+
}
|
|
13
|
+
toProto() {
|
|
14
|
+
const { params } = this;
|
|
15
|
+
const orderDataList = params.orders.map((order) => {
|
|
16
|
+
const orderData = new tx_pb_1.OrderData();
|
|
17
|
+
orderData.setMarketId(order.marketId);
|
|
18
|
+
orderData.setOrderHash(order.orderHash);
|
|
19
|
+
orderData.setSubaccountId(order.subaccountId);
|
|
20
|
+
return orderData;
|
|
21
|
+
});
|
|
22
|
+
const message = new tx_pb_1.MsgBatchCancelDerivativeOrders();
|
|
23
|
+
message.setSender(params.injectiveAddress);
|
|
24
|
+
message.setDataList(orderDataList.map((o) => o));
|
|
25
|
+
return message;
|
|
26
|
+
}
|
|
27
|
+
toData() {
|
|
28
|
+
const proto = this.toProto();
|
|
29
|
+
return Object.assign({ '@type': '/injective.exchange.v1beta1.MsgBatchCancelDerivativeOrders' }, proto.toObject());
|
|
30
|
+
}
|
|
31
|
+
toWeb3() {
|
|
32
|
+
const proto = this.toProto();
|
|
33
|
+
const orderData = proto
|
|
34
|
+
.getDataList()
|
|
35
|
+
.map((orderData) => (0, snakecase_keys_1.default)(orderData.toObject()));
|
|
36
|
+
return Object.assign({ '@type': '/injective.exchange.v1beta1.MsgBatchCancelDerivativeOrders' }, (0, snakecase_keys_1.default)({
|
|
37
|
+
sender: proto.getSender(),
|
|
38
|
+
data: [...orderData],
|
|
39
|
+
}));
|
|
40
|
+
}
|
|
41
|
+
toDirectSign() {
|
|
42
|
+
const proto = this.toProto();
|
|
43
|
+
return {
|
|
44
|
+
type: '/injective.exchange.v1beta1.MsgBatchCancelDerivativeOrders',
|
|
45
|
+
message: proto,
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
exports.default = MsgBatchCancelDerivativeOrders;
|
|
50
|
+
//# sourceMappingURL=MsgBatchCancelBinaryOptionsOrders.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MsgBatchCancelBinaryOptionsOrders.js","sourceRoot":"","sources":["../../../../src/core/exchange/msgs/MsgBatchCancelBinaryOptionsOrders.ts"],"names":[],"mappings":";;;;;AAAA,qFAGkE;AAClE,oEAA0C;AAC1C,2CAAuC;AA4BvC,MAAqB,8BAA+B,SAAQ,iBAM3D;IACC,MAAM,CAAC,QAAQ,CACb,MAA6C;QAE7C,OAAO,IAAI,8BAA8B,CAAC,MAAM,CAAC,CAAA;IACnD,CAAC;IAED,OAAO;QACL,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;QAEvB,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAChD,MAAM,SAAS,GAAG,IAAI,iBAAS,EAAE,CAAA;YACjC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YACrC,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;YACvC,SAAS,CAAC,eAAe,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;YAE7C,OAAO,SAAS,CAAA;QAClB,CAAC,CAAC,CAAA;QAEF,MAAM,OAAO,GAAG,IAAI,sCAAkC,EAAE,CAAA;QACxD,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;QAC1C,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QAEhD,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,MAAM;QACJ,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAE5B,uBACE,OAAO,EAAE,4DAA4D,IAClE,KAAK,CAAC,QAAQ,EAAE,EACpB;IACH,CAAC;IAED,MAAM;QACJ,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAC5B,MAAM,SAAS,GAAG,KAAK;aACpB,WAAW,EAAE;aACb,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAA,wBAAa,EAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;QAE1D,OAAO,gBACL,OAAO,EAAE,4DAA4D,IAClE,IAAA,wBAAa,EAAC;YACf,MAAM,EAAE,KAAK,CAAC,SAAS,EAAE;YACzB,IAAI,EAAE,CAAC,GAAG,SAAS,CAAC;SACrB,CAAC,CAC+C,CAAA;IACrD,CAAC;IAED,YAAY;QACV,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAE5B,OAAO;YACL,IAAI,EAAE,4DAA4D;YAClE,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC;CACF;AAhED,iDAgEC"}
|
package/dist/core/msgs.d.ts
CHANGED
|
@@ -7,10 +7,14 @@ import MsgBatchCancelDerivativeOrders from './exchange/msgs/MsgBatchCancelDeriva
|
|
|
7
7
|
import MsgBatchCancelSpotOrders from './exchange/msgs/MsgBatchCancelSpotOrders';
|
|
8
8
|
import MsgCancelDerivativeOrder from './exchange/msgs/MsgCancelDerivativeOrder';
|
|
9
9
|
import MsgCancelSpotOrder from './exchange/msgs/MsgCancelSpotOrder';
|
|
10
|
+
import MsgCancelBinaryOptionsOrder from './exchange/msgs/MsgCancelBinaryOptionsOrder';
|
|
10
11
|
import MsgCreateDerivativeLimitOrder from './exchange/msgs/MsgCreateDerivativeLimitOrder';
|
|
11
12
|
import MsgCreateDerivativeMarketOrder from './exchange/msgs/MsgCreateDerivativeMarketOrder';
|
|
13
|
+
import MsgCreateBinaryOptionsLimitOrder from './exchange/msgs/MsgCreateBinaryOptionsLimitOrder';
|
|
14
|
+
import MsgCreateBinaryOptionsMarketOrder from './exchange/msgs/MsgCreateBinaryOptionsMarketOrder';
|
|
12
15
|
import MsgCreateSpotLimitOrder from './exchange/msgs/MsgCreateSpotLimitOrder';
|
|
13
16
|
import MsgCreateSpotMarketOrder from './exchange/msgs/MsgCreateSpotMarketOrder';
|
|
17
|
+
import MsgBatchUpdateOrders from './exchange/msgs/MsgBatchUpdateOrders';
|
|
14
18
|
import MsgDeposit from './exchange/msgs/MsgDeposit';
|
|
15
19
|
import MsgIncreasePositionMargin from './exchange/msgs/MsgIncreasePositionMargin';
|
|
16
20
|
import MsgInstantSpotMarketLaunch from './exchange/msgs/MsgInstantSpotMarketLaunch';
|
|
@@ -28,6 +32,6 @@ import MsgBeginRedelegate from './staking/msgs/MsgBeginRedelegate';
|
|
|
28
32
|
import MsgExecuteContract from './wasm/msgs/MsgExecuteContract';
|
|
29
33
|
import MsgExec from './wasm/msgs/MsgExec';
|
|
30
34
|
import { MsgSubmitProposal } from './gov';
|
|
31
|
-
export declare type Msgs = MsgBid | MsgGrant | MsgRevoke | MsgSend | MsgWithdrawDelegatorReward | MsgBatchCancelDerivativeOrders | MsgBatchCancelSpotOrders | MsgCancelDerivativeOrder | MsgCancelSpotOrder | MsgCreateDerivativeLimitOrder | MsgCreateDerivativeMarketOrder | MsgCreateSpotLimitOrder | MsgCreateSpotMarketOrder | MsgDeposit | MsgIncreasePositionMargin | MsgInstantSpotMarketLaunch | MsgWithdraw | MsgGovDeposit | MsgSubmitProposal | MsgVote | MsgTransfer | MsgCreateInsuranceFund | MsgRequestRedemption | MsgUnderwrite | MsgSendToEth | MsgDelegate | MsgUndelegate | MsgBeginRedelegate | MsgExecuteContract | MsgExec;
|
|
32
|
-
export declare type ExchangeMsgs = MsgBatchCancelDerivativeOrders | MsgBatchCancelSpotOrders | MsgCancelDerivativeOrder | MsgCancelSpotOrder | MsgCreateDerivativeLimitOrder | MsgCreateDerivativeMarketOrder | MsgCreateSpotLimitOrder | MsgCreateSpotMarketOrder | MsgDeposit | MsgIncreasePositionMargin | MsgInstantSpotMarketLaunch | MsgWithdraw | MsgExec;
|
|
35
|
+
export declare type Msgs = MsgBid | MsgGrant | MsgRevoke | MsgSend | MsgBatchUpdateOrders | MsgWithdrawDelegatorReward | MsgBatchCancelDerivativeOrders | MsgBatchCancelSpotOrders | MsgCancelDerivativeOrder | MsgCancelSpotOrder | MsgCreateDerivativeLimitOrder | MsgCreateDerivativeMarketOrder | MsgCreateSpotLimitOrder | MsgCreateSpotMarketOrder | MsgDeposit | MsgIncreasePositionMargin | MsgInstantSpotMarketLaunch | MsgWithdraw | MsgGovDeposit | MsgSubmitProposal | MsgVote | MsgTransfer | MsgCreateInsuranceFund | MsgRequestRedemption | MsgUnderwrite | MsgSendToEth | MsgDelegate | MsgUndelegate | MsgBeginRedelegate | MsgExecuteContract | MsgExec | MsgCreateBinaryOptionsLimitOrder | MsgCreateBinaryOptionsMarketOrder | MsgCancelBinaryOptionsOrder;
|
|
36
|
+
export declare type ExchangeMsgs = MsgBatchCancelDerivativeOrders | MsgBatchCancelSpotOrders | MsgCancelDerivativeOrder | MsgCancelSpotOrder | MsgCreateDerivativeLimitOrder | MsgCreateDerivativeMarketOrder | MsgCreateSpotLimitOrder | MsgCreateSpotMarketOrder | MsgDeposit | MsgIncreasePositionMargin | MsgInstantSpotMarketLaunch | MsgWithdraw | MsgExec | MsgBatchUpdateOrders | MsgCreateBinaryOptionsLimitOrder | MsgCreateBinaryOptionsMarketOrder | MsgCancelBinaryOptionsOrder;
|
|
33
37
|
//# sourceMappingURL=msgs.d.ts.map
|
package/dist/core/msgs.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"msgs.d.ts","sourceRoot":"","sources":["../../src/core/msgs.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,uBAAuB,CAAA;AAC1C,OAAO,QAAQ,MAAM,uBAAuB,CAAA;AAC5C,OAAO,SAAS,MAAM,wBAAwB,CAAA;AAC9C,OAAO,OAAO,MAAM,qBAAqB,CAAA;AACzC,OAAO,0BAA0B,MAAM,gDAAgD,CAAA;AACvF,OAAO,8BAA8B,MAAM,gDAAgD,CAAA;AAC3F,OAAO,wBAAwB,MAAM,0CAA0C,CAAA;AAC/E,OAAO,wBAAwB,MAAM,0CAA0C,CAAA;AAC/E,OAAO,kBAAkB,MAAM,oCAAoC,CAAA;AACnE,OAAO,6BAA6B,MAAM,+CAA+C,CAAA;AACzF,OAAO,8BAA8B,MAAM,gDAAgD,CAAA;AAC3F,OAAO,uBAAuB,MAAM,yCAAyC,CAAA;AAC7E,OAAO,wBAAwB,MAAM,0CAA0C,CAAA;
|
|
1
|
+
{"version":3,"file":"msgs.d.ts","sourceRoot":"","sources":["../../src/core/msgs.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,uBAAuB,CAAA;AAC1C,OAAO,QAAQ,MAAM,uBAAuB,CAAA;AAC5C,OAAO,SAAS,MAAM,wBAAwB,CAAA;AAC9C,OAAO,OAAO,MAAM,qBAAqB,CAAA;AACzC,OAAO,0BAA0B,MAAM,gDAAgD,CAAA;AACvF,OAAO,8BAA8B,MAAM,gDAAgD,CAAA;AAC3F,OAAO,wBAAwB,MAAM,0CAA0C,CAAA;AAC/E,OAAO,wBAAwB,MAAM,0CAA0C,CAAA;AAC/E,OAAO,kBAAkB,MAAM,oCAAoC,CAAA;AACnE,OAAO,2BAA2B,MAAM,6CAA6C,CAAA;AACrF,OAAO,6BAA6B,MAAM,+CAA+C,CAAA;AACzF,OAAO,8BAA8B,MAAM,gDAAgD,CAAA;AAC3F,OAAO,gCAAgC,MAAM,kDAAkD,CAAA;AAC/F,OAAO,iCAAiC,MAAM,mDAAmD,CAAA;AACjG,OAAO,uBAAuB,MAAM,yCAAyC,CAAA;AAC7E,OAAO,wBAAwB,MAAM,0CAA0C,CAAA;AAC/E,OAAO,oBAAoB,MAAM,sCAAsC,CAAA;AACvE,OAAO,UAAU,MAAM,4BAA4B,CAAA;AACnD,OAAO,yBAAyB,MAAM,2CAA2C,CAAA;AACjF,OAAO,0BAA0B,MAAM,4CAA4C,CAAA;AACnF,OAAO,WAAW,MAAM,6BAA6B,CAAA;AACrD,OAAO,aAAa,MAAM,uBAAuB,CAAA;AACjD,OAAO,OAAO,MAAM,oBAAoB,CAAA;AACxC,OAAO,WAAW,MAAM,wBAAwB,CAAA;AAChD,OAAO,sBAAsB,MAAM,yCAAyC,CAAA;AAC5E,OAAO,oBAAoB,MAAM,uCAAuC,CAAA;AACxE,OAAO,aAAa,MAAM,gCAAgC,CAAA;AAC1D,OAAO,YAAY,MAAM,2BAA2B,CAAA;AACpD,OAAO,WAAW,MAAM,4BAA4B,CAAA;AACpD,OAAO,aAAa,MAAM,8BAA8B,CAAA;AACxD,OAAO,kBAAkB,MAAM,mCAAmC,CAAA;AAClE,OAAO,kBAAkB,MAAM,gCAAgC,CAAA;AAC/D,OAAO,OAAO,MAAM,qBAAqB,CAAA;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAEzC,oBAAY,IAAI,GACZ,MAAM,GACN,QAAQ,GACR,SAAS,GACT,OAAO,GACP,oBAAoB,GACpB,0BAA0B,GAC1B,8BAA8B,GAC9B,wBAAwB,GACxB,wBAAwB,GACxB,kBAAkB,GAClB,6BAA6B,GAC7B,8BAA8B,GAC9B,uBAAuB,GACvB,wBAAwB,GACxB,UAAU,GACV,yBAAyB,GACzB,0BAA0B,GAC1B,WAAW,GACX,aAAa,GACb,iBAAiB,GACjB,OAAO,GACP,WAAW,GACX,sBAAsB,GACtB,oBAAoB,GACpB,aAAa,GACb,YAAY,GACZ,WAAW,GACX,aAAa,GACb,kBAAkB,GAClB,kBAAkB,GAClB,OAAO,GACP,gCAAgC,GAChC,iCAAiC,GACjC,2BAA2B,CAAA;AAE/B,oBAAY,YAAY,GACpB,8BAA8B,GAC9B,wBAAwB,GACxB,wBAAwB,GACxB,kBAAkB,GAClB,6BAA6B,GAC7B,8BAA8B,GAC9B,uBAAuB,GACvB,wBAAwB,GACxB,UAAU,GACV,yBAAyB,GACzB,0BAA0B,GAC1B,WAAW,GACX,OAAO,GACP,oBAAoB,GACpB,gCAAgC,GAChC,iCAAiC,GACjC,2BAA2B,CAAA"}
|
package/dist/core/msgs.js
CHANGED
package/dist/core/msgs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"msgs.js","sourceRoot":"","sources":["../../src/core/msgs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"msgs.js","sourceRoot":"","sources":["../../src/core/msgs.ts"],"names":[],"mappings":""}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@injectivelabs/sdk-ts",
|
|
3
3
|
"description": "SDK in TypeScript for building Injective applications in a Node environment.",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.18",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": {
|
|
7
7
|
"name": "Bojan Angjelkoski",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@improbable-eng/grpc-web-node-http-transport": "^0.15.0",
|
|
37
37
|
"@injectivelabs/chain-api": "^1.8.0-rc3",
|
|
38
38
|
"@injectivelabs/exceptions": "^1.0.4",
|
|
39
|
-
"@injectivelabs/exchange-api": "^2.2.
|
|
39
|
+
"@injectivelabs/exchange-api": "^2.2.72",
|
|
40
40
|
"@injectivelabs/networks": "^1.0.4",
|
|
41
41
|
"@injectivelabs/token-metadata": "^1.0.4",
|
|
42
42
|
"@injectivelabs/ts-types": "^1.0.3",
|
|
@@ -54,5 +54,5 @@
|
|
|
54
54
|
"shx": "^0.3.2",
|
|
55
55
|
"snakecase-keys": "^5.4.1"
|
|
56
56
|
},
|
|
57
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "9a56ec09b54015389cec8a87f995a406fdaa87a5"
|
|
58
58
|
}
|
|
@@ -1,35 +0,0 @@
|
|
|
1
|
-
import { PrepareTxResponse, BroadcastTxResponse } from '@injectivelabs/exchange-api/injective_exchange_rpc_pb';
|
|
2
|
-
import { AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
|
|
3
|
-
import BaseConsumer from '../../BaseGrpcConsumer';
|
|
4
|
-
export declare class ChainGrpcTransactionApi extends BaseConsumer {
|
|
5
|
-
prepareTxRequest({ address, chainId, message, memo, estimateGas, gasLimit, feeDenom, feePrice, timeoutHeight, }: {
|
|
6
|
-
address: AccountAddress;
|
|
7
|
-
chainId: EthereumChainId;
|
|
8
|
-
message: any;
|
|
9
|
-
estimateGas?: boolean;
|
|
10
|
-
gasLimit?: number;
|
|
11
|
-
memo?: string;
|
|
12
|
-
timeoutHeight?: number;
|
|
13
|
-
feeDenom?: string;
|
|
14
|
-
feePrice?: string;
|
|
15
|
-
}): Promise<PrepareTxResponse>;
|
|
16
|
-
prepareExchangeTxRequest({ address, chainId, message, memo, estimateGas, gasLimit, feeDenom, feePrice, timeoutHeight, delegatedFee, }: {
|
|
17
|
-
address: AccountAddress;
|
|
18
|
-
chainId: EthereumChainId;
|
|
19
|
-
message: any;
|
|
20
|
-
estimateGas?: boolean;
|
|
21
|
-
gasLimit?: number;
|
|
22
|
-
memo?: string;
|
|
23
|
-
feeDenom?: string;
|
|
24
|
-
feePrice?: string;
|
|
25
|
-
timeoutHeight?: number;
|
|
26
|
-
delegatedFee?: boolean;
|
|
27
|
-
}): Promise<PrepareTxResponse>;
|
|
28
|
-
broadcastTxRequest({ signature, chainId, message, txResponse, }: {
|
|
29
|
-
signature: string;
|
|
30
|
-
chainId: EthereumChainId;
|
|
31
|
-
txResponse: PrepareTxResponse;
|
|
32
|
-
message: Record<string, any>;
|
|
33
|
-
}): Promise<BroadcastTxResponse.AsObject>;
|
|
34
|
-
}
|
|
35
|
-
//# sourceMappingURL=ChainGrpcTransactionApi.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ChainGrpcTransactionApi.d.ts","sourceRoot":"","sources":["../../../../src/client/chain/grpc/ChainGrpcTransactionApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAEjB,mBAAmB,EAGpB,MAAM,uDAAuD,CAAA;AAG9D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAOzE,OAAO,YAAY,MAAM,wBAAwB,CAAA;AAGjD,qBAAa,uBAAwB,SAAQ,YAAY;IACjD,gBAAgB,CAAC,EACrB,OAAO,EACP,OAAO,EACP,OAAO,EACP,IAAI,EACJ,WAAkB,EAClB,QAA4B,EAC5B,QAAmC,EACnC,QAAmC,EACnC,aAAa,GACd,EAAE;QACD,OAAO,EAAE,cAAc,CAAA;QACvB,OAAO,EAAE,eAAe,CAAA;QACxB,OAAO,EAAE,GAAG,CAAA;QACZ,WAAW,CAAC,EAAE,OAAO,CAAA;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,aAAa,CAAC,EAAE,MAAM,CAAA;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;KAClB;IA2CK,wBAAwB,CAAC,EAC7B,OAAO,EACP,OAAO,EACP,OAAO,EACP,IAAI,EACJ,WAAkB,EAClB,QAAiC,EACjC,QAAmC,EACnC,QAAmC,EACnC,aAAa,EACb,YAAY,GACb,EAAE;QACD,OAAO,EAAE,cAAc,CAAA;QACvB,OAAO,EAAE,eAAe,CAAA;QACxB,OAAO,EAAE,GAAG,CAAA;QACZ,WAAW,CAAC,EAAE,OAAO,CAAA;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,aAAa,CAAC,EAAE,MAAM,CAAA;QACtB,YAAY,CAAC,EAAE,OAAO,CAAA;KACvB;IA+CK,kBAAkB,CAAC,EACvB,SAAS,EACT,OAAO,EACP,OAAO,EACP,UAAU,GACX,EAAE;QACD,SAAS,EAAE,MAAM,CAAA;QACjB,OAAO,EAAE,eAAe,CAAA;QACxB,UAAU,EAAE,iBAAiB,CAAA;QAC7B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAC7B;CAuCF"}
|
|
@@ -1,122 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.ChainGrpcTransactionApi = void 0;
|
|
16
|
-
const injective_exchange_rpc_pb_1 = require("@injectivelabs/exchange-api/injective_exchange_rpc_pb");
|
|
17
|
-
const injective_exchange_rpc_pb_service_1 = require("@injectivelabs/exchange-api/injective_exchange_rpc_pb_service");
|
|
18
|
-
const coin_pb_1 = require("@injectivelabs/chain-api/cosmos/base/v1beta1/coin_pb");
|
|
19
|
-
const utils_1 = require("@injectivelabs/utils");
|
|
20
|
-
const BaseGrpcConsumer_1 = __importDefault(require("../../BaseGrpcConsumer"));
|
|
21
|
-
const transaction_1 = require("../../../utils/transaction");
|
|
22
|
-
class ChainGrpcTransactionApi extends BaseGrpcConsumer_1.default {
|
|
23
|
-
prepareTxRequest({ address, chainId, message, memo, estimateGas = true, gasLimit = utils_1.DEFAULT_GAS_LIMIT, feeDenom = utils_1.DEFAULT_BRIDGE_FEE_DENOM, feePrice = utils_1.DEFAULT_BRIDGE_FEE_PRICE, timeoutHeight, }) {
|
|
24
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
25
|
-
const txFeeAmount = new coin_pb_1.Coin();
|
|
26
|
-
txFeeAmount.setDenom(feeDenom);
|
|
27
|
-
txFeeAmount.setAmount(feePrice);
|
|
28
|
-
const cosmosTxFee = new injective_exchange_rpc_pb_1.CosmosTxFee();
|
|
29
|
-
cosmosTxFee.setPriceList([txFeeAmount]);
|
|
30
|
-
if (!estimateGas) {
|
|
31
|
-
cosmosTxFee.setGas(gasLimit);
|
|
32
|
-
}
|
|
33
|
-
const prepareTxRequest = new injective_exchange_rpc_pb_1.PrepareTxRequest();
|
|
34
|
-
prepareTxRequest.setChainId(chainId);
|
|
35
|
-
prepareTxRequest.setSignerAddress(address);
|
|
36
|
-
prepareTxRequest.setFee(cosmosTxFee);
|
|
37
|
-
const arrayOfMessages = Array.isArray(message) ? message : [message];
|
|
38
|
-
for (const message of arrayOfMessages) {
|
|
39
|
-
prepareTxRequest.addMsgs(Buffer.from(JSON.stringify(message), 'utf8'));
|
|
40
|
-
}
|
|
41
|
-
if (timeoutHeight !== undefined) {
|
|
42
|
-
prepareTxRequest.setTimeoutHeight(timeoutHeight);
|
|
43
|
-
}
|
|
44
|
-
if (memo) {
|
|
45
|
-
prepareTxRequest.setMemo(memo);
|
|
46
|
-
}
|
|
47
|
-
try {
|
|
48
|
-
const response = yield this.request(prepareTxRequest, injective_exchange_rpc_pb_service_1.InjectiveExchangeRPC.PrepareTx);
|
|
49
|
-
return response;
|
|
50
|
-
}
|
|
51
|
-
catch (e) {
|
|
52
|
-
throw new Error(e.message);
|
|
53
|
-
}
|
|
54
|
-
});
|
|
55
|
-
}
|
|
56
|
-
prepareExchangeTxRequest({ address, chainId, message, memo, estimateGas = true, gasLimit = utils_1.DEFAULT_EXCHANGE_LIMIT, feeDenom = utils_1.DEFAULT_BRIDGE_FEE_DENOM, feePrice = utils_1.DEFAULT_BRIDGE_FEE_PRICE, timeoutHeight, delegatedFee, }) {
|
|
57
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
58
|
-
const txFeeAmount = new coin_pb_1.Coin();
|
|
59
|
-
txFeeAmount.setDenom(feeDenom);
|
|
60
|
-
txFeeAmount.setAmount(feePrice);
|
|
61
|
-
const cosmosTxFee = new injective_exchange_rpc_pb_1.CosmosTxFee();
|
|
62
|
-
cosmosTxFee.setPriceList([txFeeAmount]);
|
|
63
|
-
if (delegatedFee !== undefined) {
|
|
64
|
-
cosmosTxFee.setDelegateFee(delegatedFee);
|
|
65
|
-
}
|
|
66
|
-
if (!estimateGas) {
|
|
67
|
-
cosmosTxFee.setGas(gasLimit);
|
|
68
|
-
}
|
|
69
|
-
const prepareTxRequest = new injective_exchange_rpc_pb_1.PrepareTxRequest();
|
|
70
|
-
prepareTxRequest.setChainId(chainId);
|
|
71
|
-
prepareTxRequest.setSignerAddress(address);
|
|
72
|
-
prepareTxRequest.setFee(cosmosTxFee);
|
|
73
|
-
const arrayOfMessages = Array.isArray(message) ? message : [message];
|
|
74
|
-
for (const message of arrayOfMessages) {
|
|
75
|
-
prepareTxRequest.addMsgs(Buffer.from(JSON.stringify(message), 'utf8'));
|
|
76
|
-
}
|
|
77
|
-
if (timeoutHeight !== undefined) {
|
|
78
|
-
prepareTxRequest.setTimeoutHeight(timeoutHeight);
|
|
79
|
-
}
|
|
80
|
-
if (memo) {
|
|
81
|
-
prepareTxRequest.setMemo(memo);
|
|
82
|
-
}
|
|
83
|
-
try {
|
|
84
|
-
const response = yield this.request(prepareTxRequest, injective_exchange_rpc_pb_service_1.InjectiveExchangeRPC.PrepareTx);
|
|
85
|
-
return response;
|
|
86
|
-
}
|
|
87
|
-
catch (e) {
|
|
88
|
-
throw new Error(e.message);
|
|
89
|
-
}
|
|
90
|
-
});
|
|
91
|
-
}
|
|
92
|
-
broadcastTxRequest({ signature, chainId, message, txResponse, }) {
|
|
93
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
94
|
-
const parsedTypedData = JSON.parse(txResponse.getData());
|
|
95
|
-
const publicKeyHex = (0, transaction_1.recoverTypedSignaturePubKey)(parsedTypedData, signature);
|
|
96
|
-
const cosmosPubKey = new injective_exchange_rpc_pb_1.CosmosPubKey();
|
|
97
|
-
cosmosPubKey.setType(txResponse.getPubKeyType());
|
|
98
|
-
cosmosPubKey.setKey(publicKeyHex);
|
|
99
|
-
parsedTypedData.message.msgs = null;
|
|
100
|
-
const broadcastTxRequest = new injective_exchange_rpc_pb_1.BroadcastTxRequest();
|
|
101
|
-
broadcastTxRequest.setMode('block');
|
|
102
|
-
broadcastTxRequest.setChainId(chainId);
|
|
103
|
-
broadcastTxRequest.setPubKey(cosmosPubKey);
|
|
104
|
-
broadcastTxRequest.setSignature(signature);
|
|
105
|
-
broadcastTxRequest.setTx(Buffer.from(JSON.stringify(parsedTypedData.message), 'utf8'));
|
|
106
|
-
broadcastTxRequest.setFeePayer(txResponse.getFeePayer());
|
|
107
|
-
broadcastTxRequest.setFeePayerSig(txResponse.getFeePayerSig());
|
|
108
|
-
const arrayOfMessages = Array.isArray(message) ? message : [message];
|
|
109
|
-
const messagesList = arrayOfMessages.map((message) => Buffer.from(JSON.stringify(message), 'utf8'));
|
|
110
|
-
broadcastTxRequest.setMsgsList(messagesList);
|
|
111
|
-
try {
|
|
112
|
-
const response = yield this.request(broadcastTxRequest, injective_exchange_rpc_pb_service_1.InjectiveExchangeRPC.BroadcastTx);
|
|
113
|
-
return response.toObject();
|
|
114
|
-
}
|
|
115
|
-
catch (e) {
|
|
116
|
-
throw new Error(e.message);
|
|
117
|
-
}
|
|
118
|
-
});
|
|
119
|
-
}
|
|
120
|
-
}
|
|
121
|
-
exports.ChainGrpcTransactionApi = ChainGrpcTransactionApi;
|
|
122
|
-
//# sourceMappingURL=ChainGrpcTransactionApi.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ChainGrpcTransactionApi.js","sourceRoot":"","sources":["../../../../src/client/chain/grpc/ChainGrpcTransactionApi.ts"],"names":[],"mappings":"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"}
|