@ritbit/v4-client-js 2.5.2 → 2.6.0
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/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/accountplus/models.js +19 -3
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/accountplus/params.js +28 -3
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/accountplus/tx.js +92 -5
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/accountplus/tx.rpc.msg.js +7 -1
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/assets/tx.js +19 -3
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/bridge/tx.js +1 -1
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/denomwrap/params.js +134 -0
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/denomwrap/tx.js +204 -0
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/denomwrap/tx.rpc.msg.js +57 -0
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/lcd.js +4 -1
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/rpc.query.js +3 -2
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/rpc.tx.js +4 -2
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/sending/tx.js +1 -1
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/genesis.js +151 -0
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/params.js +134 -0
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/query.js +248 -0
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/query.lcd.js +34 -0
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/query.rpc.Query.js +71 -0
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/tx.js +282 -0
- package/build/cjs/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/tx.rpc.msg.js +63 -0
- package/build/cjs/src/clients/composite-client.js +7 -3
- package/build/cjs/src/clients/constants.js +15 -3
- package/build/cjs/src/clients/lib/accounts.js +44 -5
- package/build/cjs/src/clients/lib/agent-approval-tx.js +83 -0
- package/build/cjs/src/clients/lib/agent-approval.js +119 -0
- package/build/cjs/src/clients/lib/eip712.js +592 -0
- package/build/cjs/src/clients/lib/eth-pubkey.js +68 -0
- package/build/cjs/src/clients/modules/composer.js +15 -2
- package/build/cjs/src/clients/modules/eip712-signer.js +189 -0
- package/build/cjs/src/clients/modules/eth-agent-wallet.js +101 -0
- package/build/cjs/src/clients/modules/eth-wallet.js +91 -0
- package/build/cjs/src/clients/modules/local-wallet.js +9 -2
- package/build/cjs/src/clients/modules/post.js +14 -4
- package/build/cjs/src/clients/modules/signer.js +7 -2
- package/build/cjs/src/index.js +38 -2
- package/build/cjs/src/lib/evm-address.js +92 -0
- package/build/cjs/src/lib/trading-key-utils.js +41 -3
- package/build/cjs/tsconfig.cjs.tsbuildinfo +1 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/accountplus/models.d.ts +15 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/accountplus/models.d.ts.map +1 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/accountplus/models.js +19 -3
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/accountplus/params.d.ts +24 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/accountplus/params.d.ts.map +1 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/accountplus/params.js +28 -3
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/accountplus/tx.d.ts +43 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/accountplus/tx.d.ts.map +1 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/accountplus/tx.js +91 -4
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/accountplus/tx.rpc.msg.d.ts +4 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/accountplus/tx.rpc.msg.d.ts.map +1 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/accountplus/tx.rpc.msg.js +8 -2
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/assets/tx.d.ts +9 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/assets/tx.d.ts.map +1 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/assets/tx.js +19 -3
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/bridge/tx.d.ts +14 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/bridge/tx.d.ts.map +1 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/bridge/tx.js +1 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/denomwrap/params.d.ts +116 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/denomwrap/params.d.ts.map +1 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/denomwrap/params.js +98 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/denomwrap/tx.d.ts +80 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/denomwrap/tx.d.ts.map +1 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/denomwrap/tx.js +168 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/denomwrap/tx.rpc.msg.d.ts +21 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/denomwrap/tx.rpc.msg.d.ts.map +1 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/denomwrap/tx.rpc.msg.js +20 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/lcd.d.ts +1 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/lcd.d.ts.map +1 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/lcd.js +4 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/rpc.query.d.ts +4 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/rpc.query.d.ts.map +1 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/rpc.query.js +3 -2
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/rpc.tx.d.ts +2 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/rpc.tx.d.ts.map +1 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/rpc.tx.js +4 -2
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/sending/tx.d.ts +0 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/sending/tx.d.ts.map +1 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/sending/tx.js +1 -1
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/genesis.d.ts +79 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/genesis.d.ts.map +1 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/genesis.js +115 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/params.d.ts +116 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/params.d.ts.map +1 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/params.js +98 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/query.d.ts +82 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/query.d.ts.map +1 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/query.js +212 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/query.lcd.d.ts +11 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/query.lcd.d.ts.map +1 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/query.lcd.js +30 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/query.rpc.Query.d.ts +29 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/query.rpc.Query.d.ts.map +1 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/query.rpc.Query.js +33 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/tx.d.ts +123 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/tx.d.ts.map +1 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/tx.js +246 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/tx.rpc.msg.d.ts +36 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/tx.rpc.msg.d.ts.map +1 -0
- package/build/esm/node_modules/@ritbit/v4-proto/src/codegen/ritbit/wrap/tx.rpc.msg.js +26 -0
- package/build/esm/src/clients/composite-client.d.ts +6 -1
- package/build/esm/src/clients/composite-client.d.ts.map +1 -1
- package/build/esm/src/clients/composite-client.js +7 -3
- package/build/esm/src/clients/constants.d.ts +13 -1
- package/build/esm/src/clients/constants.d.ts.map +1 -1
- package/build/esm/src/clients/constants.js +13 -1
- package/build/esm/src/clients/lib/accounts.d.ts +4 -3
- package/build/esm/src/clients/lib/accounts.d.ts.map +1 -1
- package/build/esm/src/clients/lib/accounts.js +44 -5
- package/build/esm/src/clients/lib/agent-approval-tx.d.ts +46 -0
- package/build/esm/src/clients/lib/agent-approval-tx.d.ts.map +1 -0
- package/build/esm/src/clients/lib/agent-approval-tx.js +79 -0
- package/build/esm/src/clients/lib/agent-approval.d.ts +64 -0
- package/build/esm/src/clients/lib/agent-approval.d.ts.map +1 -0
- package/build/esm/src/clients/lib/agent-approval.js +112 -0
- package/build/esm/src/clients/lib/eip712.d.ts +95 -0
- package/build/esm/src/clients/lib/eip712.d.ts.map +1 -0
- package/build/esm/src/clients/lib/eip712.js +581 -0
- package/build/esm/src/clients/lib/eth-pubkey.d.ts +44 -0
- package/build/esm/src/clients/lib/eth-pubkey.d.ts.map +1 -0
- package/build/esm/src/clients/lib/eth-pubkey.js +61 -0
- package/build/esm/src/clients/modules/composer.d.ts +12 -1
- package/build/esm/src/clients/modules/composer.d.ts.map +1 -1
- package/build/esm/src/clients/modules/composer.js +15 -2
- package/build/esm/src/clients/modules/eip712-signer.d.ts +99 -0
- package/build/esm/src/clients/modules/eip712-signer.d.ts.map +1 -0
- package/build/esm/src/clients/modules/eip712-signer.js +183 -0
- package/build/esm/src/clients/modules/eth-agent-wallet.d.ts +39 -0
- package/build/esm/src/clients/modules/eth-agent-wallet.d.ts.map +1 -0
- package/build/esm/src/clients/modules/eth-agent-wallet.js +97 -0
- package/build/esm/src/clients/modules/eth-wallet.d.ts +32 -0
- package/build/esm/src/clients/modules/eth-wallet.d.ts.map +1 -0
- package/build/esm/src/clients/modules/eth-wallet.js +83 -0
- package/build/esm/src/clients/modules/local-wallet.d.ts +2 -1
- package/build/esm/src/clients/modules/local-wallet.d.ts.map +1 -1
- package/build/esm/src/clients/modules/local-wallet.js +9 -2
- package/build/esm/src/clients/modules/post.d.ts +1 -1
- package/build/esm/src/clients/modules/post.d.ts.map +1 -1
- package/build/esm/src/clients/modules/post.js +14 -4
- package/build/esm/src/clients/modules/signer.d.ts +2 -1
- package/build/esm/src/clients/modules/signer.d.ts.map +1 -1
- package/build/esm/src/clients/modules/signer.js +7 -2
- package/build/esm/src/index.d.ts +13 -0
- package/build/esm/src/index.d.ts.map +1 -1
- package/build/esm/src/index.js +9 -1
- package/build/esm/src/lib/evm-address.d.ts +31 -0
- package/build/esm/src/lib/evm-address.d.ts.map +1 -0
- package/build/esm/src/lib/evm-address.js +85 -0
- package/build/esm/src/lib/trading-key-utils.d.ts +3 -0
- package/build/esm/src/lib/trading-key-utils.d.ts.map +1 -1
- package/build/esm/src/lib/trading-key-utils.js +42 -4
- package/build/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1,592 @@
|
|
|
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
|
+
exports.registerEip712AminoConverter = registerEip712AminoConverter;
|
|
7
|
+
exports.createEip712Domain = createEip712Domain;
|
|
8
|
+
exports.signDocToEip712Message = signDocToEip712Message;
|
|
9
|
+
exports.signDocToEip712TypedData = signDocToEip712TypedData;
|
|
10
|
+
exports.signDocBytesToEip712TypedData = signDocBytesToEip712TypedData;
|
|
11
|
+
exports.eip712Digest = eip712Digest;
|
|
12
|
+
const encoding_1 = require("@cosmjs/encoding");
|
|
13
|
+
const tx_1 = require("@ritbit/v4-proto/src/codegen/ritbit/accountplus/tx");
|
|
14
|
+
const transfer_1 = require("@ritbit/v4-proto/src/codegen/ritbit/sending/transfer");
|
|
15
|
+
const tx_2 = require("@ritbit/v4-proto/src/codegen/ritbit/affiliates/tx");
|
|
16
|
+
const tx_3 = require("@ritbit/v4-proto/src/codegen/ritbit/bridge/tx");
|
|
17
|
+
const tx_4 = require("@ritbit/v4-proto/src/codegen/ritbit/listing/tx");
|
|
18
|
+
const tx_5 = require("@ritbit/v4-proto/src/codegen/ritbit/sending/tx");
|
|
19
|
+
const tx_6 = require("@ritbit/v4-proto/src/codegen/ritbit/wrap/tx");
|
|
20
|
+
const tx_7 = require("@ritbit/v4-proto/src/codegen/ritbit/vault/tx");
|
|
21
|
+
const tx_8 = require("cosmjs-types/cosmos/bank/v1beta1/tx");
|
|
22
|
+
const tx_9 = require("cosmjs-types/cosmos/distribution/v1beta1/tx");
|
|
23
|
+
const tx_10 = require("cosmjs-types/cosmos/staking/v1beta1/tx");
|
|
24
|
+
const tx_11 = require("cosmjs-types/cosmos/tx/v1beta1/tx");
|
|
25
|
+
const ethers_1 = require("ethers");
|
|
26
|
+
const long_1 = __importDefault(require("long"));
|
|
27
|
+
const constants_1 = require("../constants");
|
|
28
|
+
function coinToAmino(coin) {
|
|
29
|
+
const value = {};
|
|
30
|
+
if (coin.denom !== '') {
|
|
31
|
+
value.denom = coin.denom;
|
|
32
|
+
}
|
|
33
|
+
// Coin.amount is amino.dont_omitempty: always rendered.
|
|
34
|
+
value.amount = coin.amount;
|
|
35
|
+
return value;
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* SubaccountId rendered as an amino JSON object. The chain's gogoproto
|
|
39
|
+
* declares subaccount ids as non-nullable embedded messages, so the field is
|
|
40
|
+
* always present on the wire (and thus always rendered, possibly as {}),
|
|
41
|
+
* while its own empty/zero subfields are omitted.
|
|
42
|
+
*/
|
|
43
|
+
function subaccountIdToAmino(id) {
|
|
44
|
+
const value = {};
|
|
45
|
+
if (id !== undefined && id.owner !== '') {
|
|
46
|
+
value.owner = id.owner;
|
|
47
|
+
}
|
|
48
|
+
if (id !== undefined && id.number !== 0) {
|
|
49
|
+
value.number = id.number;
|
|
50
|
+
}
|
|
51
|
+
return value;
|
|
52
|
+
}
|
|
53
|
+
function isLongSet(value) {
|
|
54
|
+
return value !== undefined && !long_1.default.fromValue(value).isZero();
|
|
55
|
+
}
|
|
56
|
+
const defaultEip712AminoConverters = {
|
|
57
|
+
[constants_1.TYPE_URL_MSG_SEND]: (bytes) => {
|
|
58
|
+
const msg = tx_8.MsgSend.decode(bytes);
|
|
59
|
+
const value = {};
|
|
60
|
+
if (msg.fromAddress !== '') {
|
|
61
|
+
value.from_address = msg.fromAddress;
|
|
62
|
+
}
|
|
63
|
+
if (msg.toAddress !== '') {
|
|
64
|
+
value.to_address = msg.toAddress;
|
|
65
|
+
}
|
|
66
|
+
// amount is amino.dont_omitempty + legacy_coins: always rendered.
|
|
67
|
+
value.amount = msg.amount.map(coinToAmino);
|
|
68
|
+
return { type: 'cosmos-sdk/MsgSend', value };
|
|
69
|
+
},
|
|
70
|
+
[constants_1.TYPE_URL_MSG_ADD_AUTHENTICATOR]: (bytes) => {
|
|
71
|
+
const msg = tx_1.MsgAddAuthenticator.decode(bytes);
|
|
72
|
+
const value = {};
|
|
73
|
+
if (msg.sender !== '') {
|
|
74
|
+
value.sender = msg.sender;
|
|
75
|
+
}
|
|
76
|
+
if (msg.authenticatorType !== '') {
|
|
77
|
+
value.authenticator_type = msg.authenticatorType;
|
|
78
|
+
}
|
|
79
|
+
if (msg.data.length > 0) {
|
|
80
|
+
value.data = (0, encoding_1.toBase64)(msg.data);
|
|
81
|
+
}
|
|
82
|
+
if (msg.name !== '') {
|
|
83
|
+
value.name = msg.name;
|
|
84
|
+
}
|
|
85
|
+
if (isLongSet(msg.expiresAt)) {
|
|
86
|
+
value.expires_at = msg.expiresAt.toString();
|
|
87
|
+
}
|
|
88
|
+
return { type: 'ritbit/accountplus/MsgAddAuthenticator', value };
|
|
89
|
+
},
|
|
90
|
+
[constants_1.TYPE_URL_MSG_REMOVE_AUTHENTICATOR]: (bytes) => {
|
|
91
|
+
const msg = tx_1.MsgRemoveAuthenticator.decode(bytes);
|
|
92
|
+
const value = {};
|
|
93
|
+
if (msg.sender !== '') {
|
|
94
|
+
value.sender = msg.sender;
|
|
95
|
+
}
|
|
96
|
+
if (isLongSet(msg.id)) {
|
|
97
|
+
value.id = msg.id.toString();
|
|
98
|
+
}
|
|
99
|
+
return { type: 'ritbit/accountplus/MsgRemoveAuthenticator', value };
|
|
100
|
+
},
|
|
101
|
+
[constants_1.TYPE_URL_MSG_WITHDRAW_FROM_SUBACCOUNT]: (bytes) => {
|
|
102
|
+
const msg = transfer_1.MsgWithdrawFromSubaccount.decode(bytes);
|
|
103
|
+
const value = {};
|
|
104
|
+
// sender is gogoproto non-nullable: always present.
|
|
105
|
+
value.sender = subaccountIdToAmino(msg.sender);
|
|
106
|
+
if (msg.recipient !== '') {
|
|
107
|
+
value.recipient = msg.recipient;
|
|
108
|
+
}
|
|
109
|
+
if (msg.assetId !== 0) {
|
|
110
|
+
value.asset_id = msg.assetId;
|
|
111
|
+
}
|
|
112
|
+
if (isLongSet(msg.quantums)) {
|
|
113
|
+
value.quantums = msg.quantums.toString();
|
|
114
|
+
}
|
|
115
|
+
return { type: 'ritbit/sending/MsgWithdrawFromSubaccount', value };
|
|
116
|
+
},
|
|
117
|
+
[constants_1.TYPE_URL_MSG_DEPOSIT_TO_SUBACCOUNT]: (bytes) => {
|
|
118
|
+
const msg = transfer_1.MsgDepositToSubaccount.decode(bytes);
|
|
119
|
+
const value = {};
|
|
120
|
+
if (msg.sender !== '') {
|
|
121
|
+
value.sender = msg.sender;
|
|
122
|
+
}
|
|
123
|
+
// recipient is gogoproto non-nullable: always present.
|
|
124
|
+
value.recipient = subaccountIdToAmino(msg.recipient);
|
|
125
|
+
if (msg.assetId !== 0) {
|
|
126
|
+
value.asset_id = msg.assetId;
|
|
127
|
+
}
|
|
128
|
+
if (isLongSet(msg.quantums)) {
|
|
129
|
+
value.quantums = msg.quantums.toString();
|
|
130
|
+
}
|
|
131
|
+
return { type: 'ritbit/sending/MsgDepositToSubaccount', value };
|
|
132
|
+
},
|
|
133
|
+
[constants_1.TYPE_URL_MSG_CREATE_TRANSFER]: (bytes) => {
|
|
134
|
+
const msg = tx_5.MsgCreateTransfer.decode(bytes);
|
|
135
|
+
const value = {};
|
|
136
|
+
if (msg.transfer !== undefined) {
|
|
137
|
+
const transfer = {
|
|
138
|
+
// sender/recipient are gogoproto non-nullable: always present.
|
|
139
|
+
sender: subaccountIdToAmino(msg.transfer.sender),
|
|
140
|
+
recipient: subaccountIdToAmino(msg.transfer.recipient),
|
|
141
|
+
};
|
|
142
|
+
if (msg.transfer.assetId !== 0) {
|
|
143
|
+
transfer.asset_id = msg.transfer.assetId;
|
|
144
|
+
}
|
|
145
|
+
if (isLongSet(msg.transfer.amount)) {
|
|
146
|
+
transfer.amount = msg.transfer.amount.toString();
|
|
147
|
+
}
|
|
148
|
+
value.transfer = transfer;
|
|
149
|
+
}
|
|
150
|
+
return { type: 'ritbit/sending/MsgCreateTransfer', value };
|
|
151
|
+
},
|
|
152
|
+
// Staking from the web: master-account transactions the wallet signs.
|
|
153
|
+
// legacy coins render with both fields always present; the claim message
|
|
154
|
+
// keeps the SDK's historical amino name (…DelegationReward, not Delegator).
|
|
155
|
+
// Pinned by the MsgDelegate/MsgUndelegate/MsgWithdrawDelegatorReward goldens.
|
|
156
|
+
[constants_1.TYPE_URL_MSG_DELEGATE]: (bytes) => {
|
|
157
|
+
const msg = tx_10.MsgDelegate.decode(bytes);
|
|
158
|
+
const value = {};
|
|
159
|
+
if (msg.delegatorAddress !== '') {
|
|
160
|
+
value.delegator_address = msg.delegatorAddress;
|
|
161
|
+
}
|
|
162
|
+
if (msg.validatorAddress !== '') {
|
|
163
|
+
value.validator_address = msg.validatorAddress;
|
|
164
|
+
}
|
|
165
|
+
if (msg.amount !== undefined) {
|
|
166
|
+
value.amount = coinToAmino(msg.amount);
|
|
167
|
+
}
|
|
168
|
+
return { type: 'cosmos-sdk/MsgDelegate', value };
|
|
169
|
+
},
|
|
170
|
+
[constants_1.TYPE_URL_MSG_UNDELEGATE]: (bytes) => {
|
|
171
|
+
const msg = tx_10.MsgUndelegate.decode(bytes);
|
|
172
|
+
const value = {};
|
|
173
|
+
if (msg.delegatorAddress !== '') {
|
|
174
|
+
value.delegator_address = msg.delegatorAddress;
|
|
175
|
+
}
|
|
176
|
+
if (msg.validatorAddress !== '') {
|
|
177
|
+
value.validator_address = msg.validatorAddress;
|
|
178
|
+
}
|
|
179
|
+
if (msg.amount !== undefined) {
|
|
180
|
+
value.amount = coinToAmino(msg.amount);
|
|
181
|
+
}
|
|
182
|
+
return { type: 'cosmos-sdk/MsgUndelegate', value };
|
|
183
|
+
},
|
|
184
|
+
[constants_1.TYPE_URL_MSG_WITHDRAW_DELEGATOR_REWARD]: (bytes) => {
|
|
185
|
+
const msg = tx_9.MsgWithdrawDelegatorReward.decode(bytes);
|
|
186
|
+
const value = {};
|
|
187
|
+
if (msg.delegatorAddress !== '') {
|
|
188
|
+
value.delegator_address = msg.delegatorAddress;
|
|
189
|
+
}
|
|
190
|
+
if (msg.validatorAddress !== '') {
|
|
191
|
+
value.validator_address = msg.validatorAddress;
|
|
192
|
+
}
|
|
193
|
+
return { type: 'cosmos-sdk/MsgWithdrawDelegationReward', value };
|
|
194
|
+
},
|
|
195
|
+
// The bridge withdrawal the web's withdraw form sends. math.Int renders as a
|
|
196
|
+
// decimal string; uint64 as a string; zero scalars are omitted. Pinned by the
|
|
197
|
+
// MsgBridgeWithdrawal golden.
|
|
198
|
+
[constants_1.TYPE_URL_MSG_WITHDRAWAL]: (bytes) => {
|
|
199
|
+
const msg = tx_3.MsgWithdrawal.decode(bytes);
|
|
200
|
+
const value = {};
|
|
201
|
+
if (msg.sender !== '') {
|
|
202
|
+
value.sender = msg.sender;
|
|
203
|
+
}
|
|
204
|
+
if (msg.amount !== '' && msg.amount !== '0') {
|
|
205
|
+
value.amount = msg.amount;
|
|
206
|
+
}
|
|
207
|
+
if (msg.ethRecipient !== '') {
|
|
208
|
+
value.eth_recipient = msg.ethRecipient;
|
|
209
|
+
}
|
|
210
|
+
if (isLongSet(msg.ethChainId)) {
|
|
211
|
+
value.eth_chain_id = msg.ethChainId.toString();
|
|
212
|
+
}
|
|
213
|
+
if (msg.assetId !== 0) {
|
|
214
|
+
value.asset_id = msg.assetId;
|
|
215
|
+
}
|
|
216
|
+
return { type: 'ritbit/bridge/MsgWithdrawal', value };
|
|
217
|
+
},
|
|
218
|
+
[constants_1.TYPE_URL_MSG_REGISTER_AFFILIATE]: (bytes) => {
|
|
219
|
+
const msg = tx_2.MsgRegisterAffiliate.decode(bytes);
|
|
220
|
+
const value = {};
|
|
221
|
+
if (msg.referee !== '') {
|
|
222
|
+
value.referee = msg.referee;
|
|
223
|
+
}
|
|
224
|
+
if (msg.affiliate !== '') {
|
|
225
|
+
value.affiliate = msg.affiliate;
|
|
226
|
+
}
|
|
227
|
+
return { type: 'ritbit/affiliates/MsgRegisterAffiliate', value };
|
|
228
|
+
},
|
|
229
|
+
[constants_1.TYPE_URL_MSG_CREATE_MARKET_PERMISSIONLESS]: (bytes) => {
|
|
230
|
+
const msg = tx_4.MsgCreateMarketPermissionless.decode(bytes);
|
|
231
|
+
const value = {};
|
|
232
|
+
if (msg.ticker !== '') {
|
|
233
|
+
value.ticker = msg.ticker;
|
|
234
|
+
}
|
|
235
|
+
// subaccount_id is a nullable pointer: present only when set.
|
|
236
|
+
if (msg.subaccountId !== undefined) {
|
|
237
|
+
value.subaccount_id = subaccountIdToAmino(msg.subaccountId);
|
|
238
|
+
}
|
|
239
|
+
return { type: 'ritbit/listing/MsgCreateMarketPermissionless', value };
|
|
240
|
+
},
|
|
241
|
+
[constants_1.TYPE_URL_MSG_WRAP_WITHDRAW]: (bytes) => {
|
|
242
|
+
const msg = tx_6.MsgWithdraw.decode(bytes);
|
|
243
|
+
const value = {};
|
|
244
|
+
if (msg.sender !== '') {
|
|
245
|
+
value.sender = msg.sender;
|
|
246
|
+
}
|
|
247
|
+
if (msg.amount !== '' && msg.amount !== '0') {
|
|
248
|
+
value.amount = msg.amount;
|
|
249
|
+
}
|
|
250
|
+
if (msg.receiver !== '') {
|
|
251
|
+
value.receiver = msg.receiver;
|
|
252
|
+
}
|
|
253
|
+
if (isLongSet(msg.timeoutSeconds)) {
|
|
254
|
+
value.timeout_seconds = msg.timeoutSeconds.toString();
|
|
255
|
+
}
|
|
256
|
+
if (msg.voucherDenom !== '') {
|
|
257
|
+
value.voucher_denom = msg.voucherDenom;
|
|
258
|
+
}
|
|
259
|
+
return { type: 'ritbit/wrap/MsgWithdraw', value };
|
|
260
|
+
},
|
|
261
|
+
[constants_1.TYPE_URL_MSG_WRAP_REDEEM]: (bytes) => {
|
|
262
|
+
const msg = tx_6.MsgRedeem.decode(bytes);
|
|
263
|
+
const value = {};
|
|
264
|
+
if (msg.sender !== '') {
|
|
265
|
+
value.sender = msg.sender;
|
|
266
|
+
}
|
|
267
|
+
if (msg.amount !== '' && msg.amount !== '0') {
|
|
268
|
+
value.amount = msg.amount;
|
|
269
|
+
}
|
|
270
|
+
if (msg.voucherDenom !== '') {
|
|
271
|
+
value.voucher_denom = msg.voucherDenom;
|
|
272
|
+
}
|
|
273
|
+
return { type: 'ritbit/wrap/MsgRedeem', value };
|
|
274
|
+
},
|
|
275
|
+
// Vault deposits/withdrawals are master-account transactions the wallet
|
|
276
|
+
// signs directly (the web's vault form). Amino shapes mirror the chain's
|
|
277
|
+
// aminojson encoding exactly — pinned by the MsgDepositToMegavault /
|
|
278
|
+
// MsgWithdrawFromMegavault vectors in eip712_goldens.json.
|
|
279
|
+
[constants_1.TYPE_URL_MSG_DEPOSIT_TO_MEGAVAULT]: (bytes) => {
|
|
280
|
+
const msg = tx_7.MsgDepositToMegavault.decode(bytes);
|
|
281
|
+
const value = {};
|
|
282
|
+
// subaccount_id is a nullable pointer on the chain: present only when set.
|
|
283
|
+
if (msg.subaccountId !== undefined) {
|
|
284
|
+
value.subaccount_id = subaccountIdToAmino(msg.subaccountId);
|
|
285
|
+
}
|
|
286
|
+
// SerializableInt renders as the raw big-int bytes in base64.
|
|
287
|
+
if (msg.quoteQuantums.length > 0) {
|
|
288
|
+
value.quote_quantums = (0, encoding_1.toBase64)(msg.quoteQuantums);
|
|
289
|
+
}
|
|
290
|
+
return { type: 'ritbit/vault/MsgDepositToMegavault', value };
|
|
291
|
+
},
|
|
292
|
+
[constants_1.TYPE_URL_MSG_WITHDRAW_FROM_MEGAVAULT]: (bytes) => {
|
|
293
|
+
const msg = tx_7.MsgWithdrawFromMegavault.decode(bytes);
|
|
294
|
+
const value = {};
|
|
295
|
+
// subaccount_id and shares are gogoproto non-nullable: always present.
|
|
296
|
+
value.subaccount_id = subaccountIdToAmino(msg.subaccountId);
|
|
297
|
+
const shares = {};
|
|
298
|
+
if (msg.shares !== undefined && msg.shares.numShares.length > 0) {
|
|
299
|
+
shares.num_shares = (0, encoding_1.toBase64)(msg.shares.numShares);
|
|
300
|
+
}
|
|
301
|
+
value.shares = shares;
|
|
302
|
+
if (msg.minQuoteQuantums.length > 0) {
|
|
303
|
+
value.min_quote_quantums = (0, encoding_1.toBase64)(msg.minQuoteQuantums);
|
|
304
|
+
}
|
|
305
|
+
return { type: 'ritbit/vault/MsgWithdrawFromMegavault', value };
|
|
306
|
+
},
|
|
307
|
+
};
|
|
308
|
+
const eip712AminoConverters = {
|
|
309
|
+
...defaultEip712AminoConverters,
|
|
310
|
+
};
|
|
311
|
+
/**
|
|
312
|
+
* Registers (or overrides) the amino converter for a msg typeUrl, extending
|
|
313
|
+
* the set of message types that can be EIP-712 signed.
|
|
314
|
+
*/
|
|
315
|
+
function registerEip712AminoConverter(typeUrl, converter) {
|
|
316
|
+
eip712AminoConverters[typeUrl] = converter;
|
|
317
|
+
}
|
|
318
|
+
function convertAnyToAminoMsg(msgAny) {
|
|
319
|
+
const converter = eip712AminoConverters[msgAny.typeUrl];
|
|
320
|
+
if (converter === undefined) {
|
|
321
|
+
throw new Error(`EIP-712 signing does not support msg type ${msgAny.typeUrl}`);
|
|
322
|
+
}
|
|
323
|
+
return converter(msgAny.value);
|
|
324
|
+
}
|
|
325
|
+
// ---------------------------------------------------------------------------
|
|
326
|
+
// Types generation (port of cosmos/evm ethereum/eip712/types.go)
|
|
327
|
+
// ---------------------------------------------------------------------------
|
|
328
|
+
const ROOT_PREFIX = '_';
|
|
329
|
+
const TYPE_PREFIX = 'Type';
|
|
330
|
+
const TX_FIELD = 'Tx';
|
|
331
|
+
const MAX_DUPLICATE_TYPE_DEFS = 1000;
|
|
332
|
+
/** Port of message.go msgFieldForIndex: msgs[2] becomes 'msg2'. */
|
|
333
|
+
function msgFieldForIndex(i) {
|
|
334
|
+
return `msg${i}`;
|
|
335
|
+
}
|
|
336
|
+
/**
|
|
337
|
+
* Port of types.go sanitizeTypedef: '_.foo_bar.baz' -> 'TypeFooBarBaz'.
|
|
338
|
+
* Title-cases each underscore-separated subpart (first letter only, the rest
|
|
339
|
+
* of the casing is preserved — cases.Title with NoLower).
|
|
340
|
+
*/
|
|
341
|
+
function sanitizeTypedef(str) {
|
|
342
|
+
return str
|
|
343
|
+
.split('.')
|
|
344
|
+
.map((part) => {
|
|
345
|
+
if (part === ROOT_PREFIX) {
|
|
346
|
+
return TYPE_PREFIX;
|
|
347
|
+
}
|
|
348
|
+
return part
|
|
349
|
+
.split('_')
|
|
350
|
+
.map((subpart) => (subpart === '' ? '' : subpart.charAt(0).toUpperCase() + subpart.slice(1)))
|
|
351
|
+
.join('');
|
|
352
|
+
})
|
|
353
|
+
.join('');
|
|
354
|
+
}
|
|
355
|
+
/**
|
|
356
|
+
* Port of types.go sortedJSONKeys: keys sorted in REVERSE lexicographic
|
|
357
|
+
* (byte-wise descending) order, for deterministic type generation.
|
|
358
|
+
*/
|
|
359
|
+
function sortedJsonKeys(obj) {
|
|
360
|
+
return Object.keys(obj).sort((a, b) => (a < b ? 1 : a > b ? -1 : 0));
|
|
361
|
+
}
|
|
362
|
+
/** Port of types.go getEthTypeForJSON. Empty string for objects/arrays/null. */
|
|
363
|
+
function getEthTypeForJson(value) {
|
|
364
|
+
switch (typeof value) {
|
|
365
|
+
case 'boolean':
|
|
366
|
+
return 'bool';
|
|
367
|
+
case 'number':
|
|
368
|
+
return 'int64';
|
|
369
|
+
case 'string':
|
|
370
|
+
return 'string';
|
|
371
|
+
default:
|
|
372
|
+
return '';
|
|
373
|
+
}
|
|
374
|
+
}
|
|
375
|
+
function typesAreEqual(types1, types2) {
|
|
376
|
+
if (types1.length !== types2.length) {
|
|
377
|
+
return false;
|
|
378
|
+
}
|
|
379
|
+
for (let i = 0; i < types1.length; i++) {
|
|
380
|
+
if (types1[i].name !== types2[i].name || types1[i].type !== types2[i].type) {
|
|
381
|
+
return false;
|
|
382
|
+
}
|
|
383
|
+
}
|
|
384
|
+
return true;
|
|
385
|
+
}
|
|
386
|
+
/**
|
|
387
|
+
* Port of types.go addTypesToRoot: inserts the type list at the next
|
|
388
|
+
* available '<typeDef><n>' key (reusing an identical existing definition) and
|
|
389
|
+
* returns that key. All typedefs therefore carry a numeric suffix, e.g.
|
|
390
|
+
* 'TypeMsgSend0', 'TypeValue0'.
|
|
391
|
+
*/
|
|
392
|
+
function addTypesToRoot(typeMap, typeDef, types) {
|
|
393
|
+
for (let index = 0; index < MAX_DUPLICATE_TYPE_DEFS; index++) {
|
|
394
|
+
const indexedTypeDef = `${typeDef}${index}`;
|
|
395
|
+
const existingTypes = typeMap[indexedTypeDef];
|
|
396
|
+
if (existingTypes !== undefined && typesAreEqual(types, existingTypes)) {
|
|
397
|
+
return indexedTypeDef;
|
|
398
|
+
}
|
|
399
|
+
if (existingTypes === undefined) {
|
|
400
|
+
typeMap[indexedTypeDef] = types;
|
|
401
|
+
return indexedTypeDef;
|
|
402
|
+
}
|
|
403
|
+
}
|
|
404
|
+
throw new Error('exceeded maximum number of duplicates for a single type definition');
|
|
405
|
+
}
|
|
406
|
+
/**
|
|
407
|
+
* Port of types.go recursivelyAddTypesToRoot: walks the msg JSON with keys in
|
|
408
|
+
* reverse-sorted order, unwrapping the first element of arrays, mapping JSON
|
|
409
|
+
* primitives to string/int64/bool and recursing into nested objects with the
|
|
410
|
+
* '_.field' prefix scheme.
|
|
411
|
+
*/
|
|
412
|
+
function recursivelyAddTypesToRoot(typeMap, rootType, prefix, payload) {
|
|
413
|
+
const typesToAdd = [];
|
|
414
|
+
const typeDef = prefix === ROOT_PREFIX ? rootType : sanitizeTypedef(prefix);
|
|
415
|
+
for (const fieldName of sortedJsonKeys(payload)) {
|
|
416
|
+
let field = payload[fieldName];
|
|
417
|
+
if (field === null || field === undefined) {
|
|
418
|
+
continue;
|
|
419
|
+
}
|
|
420
|
+
// Handle array types by unwrapping the first element. Arrays with
|
|
421
|
+
// multiple types are not supported in EIP-712.
|
|
422
|
+
let isCollection = false;
|
|
423
|
+
if (Array.isArray(field)) {
|
|
424
|
+
if (field.length === 0) {
|
|
425
|
+
// Arbitrarily use string[] for empty arrays, since we cannot access
|
|
426
|
+
// the underlying object.
|
|
427
|
+
typesToAdd.push({ name: fieldName, type: 'string[]' });
|
|
428
|
+
continue;
|
|
429
|
+
}
|
|
430
|
+
[field] = field;
|
|
431
|
+
isCollection = true;
|
|
432
|
+
}
|
|
433
|
+
const ethType = getEthTypeForJson(field);
|
|
434
|
+
if (ethType !== '') {
|
|
435
|
+
typesToAdd.push({ name: fieldName, type: isCollection ? `${ethType}[]` : ethType });
|
|
436
|
+
continue;
|
|
437
|
+
}
|
|
438
|
+
if (typeof field === 'object' && !Array.isArray(field)) {
|
|
439
|
+
const fieldPrefix = `${prefix}.${fieldName}`;
|
|
440
|
+
let fieldTypeDef = recursivelyAddTypesToRoot(typeMap, rootType, fieldPrefix, field);
|
|
441
|
+
fieldTypeDef = sanitizeTypedef(fieldTypeDef);
|
|
442
|
+
if (isCollection) {
|
|
443
|
+
fieldTypeDef += '[]';
|
|
444
|
+
}
|
|
445
|
+
typesToAdd.push({ name: fieldName, type: fieldTypeDef });
|
|
446
|
+
}
|
|
447
|
+
}
|
|
448
|
+
return addTypesToRoot(typeMap, typeDef, typesToAdd);
|
|
449
|
+
}
|
|
450
|
+
/** Port of types.go msgRootType: e.g. 'cosmos-sdk/MsgSend' -> 'TypeMsgSend'. */
|
|
451
|
+
function msgRootType(msg) {
|
|
452
|
+
const typeTokenized = msg.type.split('/');
|
|
453
|
+
return `${TYPE_PREFIX}${typeTokenized[typeTokenized.length - 1]}`;
|
|
454
|
+
}
|
|
455
|
+
/**
|
|
456
|
+
* Port of types.go createEIP712Types: the static skeleton (EIP712Domain, Tx,
|
|
457
|
+
* Fee, Coin) plus recursively generated per-msg types, with each msgN's
|
|
458
|
+
* resolved typedef appended to Tx.
|
|
459
|
+
*/
|
|
460
|
+
function createEip712Types(payload, numMsgs) {
|
|
461
|
+
const types = {
|
|
462
|
+
EIP712Domain: [
|
|
463
|
+
{ name: 'name', type: 'string' },
|
|
464
|
+
{ name: 'version', type: 'string' },
|
|
465
|
+
{ name: 'chainId', type: 'uint256' },
|
|
466
|
+
{ name: 'verifyingContract', type: 'string' },
|
|
467
|
+
{ name: 'salt', type: 'string' },
|
|
468
|
+
],
|
|
469
|
+
Tx: [
|
|
470
|
+
{ name: 'account_number', type: 'string' },
|
|
471
|
+
{ name: 'chain_id', type: 'string' },
|
|
472
|
+
{ name: 'fee', type: 'Fee' },
|
|
473
|
+
{ name: 'memo', type: 'string' },
|
|
474
|
+
{ name: 'sequence', type: 'string' },
|
|
475
|
+
],
|
|
476
|
+
Fee: [
|
|
477
|
+
{ name: 'amount', type: 'Coin[]' },
|
|
478
|
+
{ name: 'gas', type: 'string' },
|
|
479
|
+
],
|
|
480
|
+
Coin: [
|
|
481
|
+
{ name: 'denom', type: 'string' },
|
|
482
|
+
{ name: 'amount', type: 'string' },
|
|
483
|
+
],
|
|
484
|
+
};
|
|
485
|
+
for (let i = 0; i < numMsgs; i++) {
|
|
486
|
+
const field = msgFieldForIndex(i);
|
|
487
|
+
const msg = payload[field];
|
|
488
|
+
const msgTypeDef = recursivelyAddTypesToRoot(types, msgRootType(msg), ROOT_PREFIX, msg);
|
|
489
|
+
types[TX_FIELD].push({ name: field, type: msgTypeDef });
|
|
490
|
+
}
|
|
491
|
+
return types;
|
|
492
|
+
}
|
|
493
|
+
// ---------------------------------------------------------------------------
|
|
494
|
+
// Domain (port of domain.go) and SignDoc decoding (port of encoding.go)
|
|
495
|
+
// ---------------------------------------------------------------------------
|
|
496
|
+
/**
|
|
497
|
+
* Port of domain.go createEIP712Domain. The chainId is rendered the way geth's
|
|
498
|
+
* math.HexOrDecimal256 marshals it (0x-prefixed lowercase hex).
|
|
499
|
+
*/
|
|
500
|
+
function createEip712Domain(evmChainId) {
|
|
501
|
+
return {
|
|
502
|
+
name: 'Cosmos Web3',
|
|
503
|
+
version: '1.0.0',
|
|
504
|
+
chainId: `0x${evmChainId.toString(16)}`,
|
|
505
|
+
verifyingContract: 'cosmos',
|
|
506
|
+
salt: '0',
|
|
507
|
+
};
|
|
508
|
+
}
|
|
509
|
+
/**
|
|
510
|
+
* Port of encoding.go decodeProtobufSignDoc + message.go FlattenPayloadMessages:
|
|
511
|
+
* decodes a SIGN_MODE_DIRECT SignDoc, renders the equivalent aminojson sign
|
|
512
|
+
* doc payload and flattens the msgs array into msg0/msg1/... fields.
|
|
513
|
+
*
|
|
514
|
+
* Returns the flattened payload (= the typed-data message) and the number of
|
|
515
|
+
* msgs it contains.
|
|
516
|
+
*/
|
|
517
|
+
function signDocToEip712Message(signDoc) {
|
|
518
|
+
var _a, _b, _c, _d;
|
|
519
|
+
const body = tx_11.TxBody.decode(signDoc.bodyBytes);
|
|
520
|
+
const authInfo = tx_11.AuthInfo.decode(signDoc.authInfoBytes);
|
|
521
|
+
// Same restrictions as the chain-side decoder (encoding.go).
|
|
522
|
+
if (body.timeoutHeight.toString() !== '0') {
|
|
523
|
+
throw new Error('EIP-712 signing does not support TxBody.timeoutHeight');
|
|
524
|
+
}
|
|
525
|
+
if (body.extensionOptions.length !== 0 || body.nonCriticalExtensionOptions.length !== 0) {
|
|
526
|
+
throw new Error('EIP-712 signing does not support TxBody extensionOptions or nonCriticalExtensionOptions');
|
|
527
|
+
}
|
|
528
|
+
if (authInfo.signerInfos.length !== 1) {
|
|
529
|
+
throw new Error(`invalid number of signer infos provided, expected 1 got ${authInfo.signerInfos.length}`);
|
|
530
|
+
}
|
|
531
|
+
if (body.messages.length === 0) {
|
|
532
|
+
throw new Error('unable to build EIP-712 payload: transaction does not contain any messages');
|
|
533
|
+
}
|
|
534
|
+
// The aminojson sign doc envelope (x/tx AminoSignDoc): account_number,
|
|
535
|
+
// sequence, chain_id, memo, fee and msgs are amino.dont_omitempty (always
|
|
536
|
+
// rendered); timeout_height is omitted when 0 (and rejected above);
|
|
537
|
+
// fee.payer/granter are dropped by the chain-side conversion.
|
|
538
|
+
const message = {
|
|
539
|
+
account_number: signDoc.accountNumber.toString(),
|
|
540
|
+
chain_id: signDoc.chainId,
|
|
541
|
+
fee: {
|
|
542
|
+
amount: ((_b = (_a = authInfo.fee) === null || _a === void 0 ? void 0 : _a.amount) !== null && _b !== void 0 ? _b : []).map(coinToAmino),
|
|
543
|
+
gas: ((_d = (_c = authInfo.fee) === null || _c === void 0 ? void 0 : _c.gasLimit) !== null && _d !== void 0 ? _d : 0).toString(),
|
|
544
|
+
},
|
|
545
|
+
memo: body.memo,
|
|
546
|
+
sequence: authInfo.signerInfos[0].sequence.toString(),
|
|
547
|
+
};
|
|
548
|
+
// Flattening (message.go): msgs array -> msg0/msg1/... fields, msgs dropped.
|
|
549
|
+
body.messages.forEach((msgAny, i) => {
|
|
550
|
+
message[msgFieldForIndex(i)] = convertAnyToAminoMsg(msgAny);
|
|
551
|
+
});
|
|
552
|
+
return { message, numMsgs: body.messages.length };
|
|
553
|
+
}
|
|
554
|
+
/**
|
|
555
|
+
* Converts a SIGN_MODE_DIRECT SignDoc into the EIP-712 typed data the chain
|
|
556
|
+
* expects a browser wallet to sign (port of cosmos/evm's WrapTxToTypedData
|
|
557
|
+
* over decodeProtobufSignDoc).
|
|
558
|
+
*
|
|
559
|
+
* @param evmChainId The EIP-155 chain id of the chain (e.g. 111984).
|
|
560
|
+
*/
|
|
561
|
+
function signDocToEip712TypedData(signDoc, evmChainId) {
|
|
562
|
+
const { message, numMsgs } = signDocToEip712Message(signDoc);
|
|
563
|
+
return {
|
|
564
|
+
types: createEip712Types(message, numMsgs),
|
|
565
|
+
primaryType: TX_FIELD,
|
|
566
|
+
domain: createEip712Domain(evmChainId),
|
|
567
|
+
message,
|
|
568
|
+
};
|
|
569
|
+
}
|
|
570
|
+
/** Same as signDocToEip712TypedData, from raw protobuf SignDoc bytes. */
|
|
571
|
+
function signDocBytesToEip712TypedData(signDocBytes, evmChainId) {
|
|
572
|
+
return signDocToEip712TypedData(tx_11.SignDoc.decode(signDocBytes), evmChainId);
|
|
573
|
+
}
|
|
574
|
+
// ---------------------------------------------------------------------------
|
|
575
|
+
// Digest
|
|
576
|
+
// ---------------------------------------------------------------------------
|
|
577
|
+
/**
|
|
578
|
+
* The EIP-712 digest the wallet signs:
|
|
579
|
+
* keccak256(0x1901 || hashStruct(EIP712Domain) || hashStruct(Tx)).
|
|
580
|
+
*
|
|
581
|
+
* The domain separator is hashed with the DECLARED domain types (geth's
|
|
582
|
+
* apitypes behavior) — verifyingContract and salt are 'string' fields here,
|
|
583
|
+
* not address/bytes32 — so it cannot go through ethers' built-in
|
|
584
|
+
* TypedDataEncoder.hash(), whose fixed domain schema differs.
|
|
585
|
+
*/
|
|
586
|
+
function eip712Digest(typedData) {
|
|
587
|
+
const { EIP712Domain: domainTypes, ...messageTypes } = typedData.types;
|
|
588
|
+
const domainHash = ethers_1.TypedDataEncoder.hashStruct('EIP712Domain', { EIP712Domain: domainTypes }, typedData.domain);
|
|
589
|
+
const messageHash = ethers_1.TypedDataEncoder.hashStruct(typedData.primaryType, messageTypes, typedData.message);
|
|
590
|
+
return (0, ethers_1.getBytes)((0, ethers_1.keccak256)((0, ethers_1.concat)(['0x1901', domainHash, messageHash])));
|
|
591
|
+
}
|
|
592
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"eip712.js","sourceRoot":"","sources":["../../../../../src/clients/lib/eip712.ts"],"names":[],"mappings":"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"}
|