@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,97 @@
|
|
|
1
|
+
import { makeAuthInfoBytes, makeSignBytes, makeSignDoc } from '@cosmjs/proto-signing';
|
|
2
|
+
import { Int53 } from '@cosmjs/math';
|
|
3
|
+
import { toBech32 } from '@cosmjs/encoding';
|
|
4
|
+
import { TxBody, TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx';
|
|
5
|
+
import { Any } from 'cosmjs-types/google/protobuf/any';
|
|
6
|
+
import { keccak256 } from 'ethereum-cryptography/keccak';
|
|
7
|
+
import { secp256k1 } from 'ethereum-cryptography/secp256k1';
|
|
8
|
+
import { TxExtension } from '@ritbit/v4-proto/src/codegen/ritbit/accountplus/tx';
|
|
9
|
+
import { BECH32_PREFIX } from '../../lib/constants';
|
|
10
|
+
import { ethAddressBytesFromPubkey } from '../../lib/evm-address';
|
|
11
|
+
import { encodeEthSecp256k1Pubkey, ethSecp256k1PubkeyToAny } from '../lib/eth-pubkey';
|
|
12
|
+
import { generateRegistry } from '../lib/registry';
|
|
13
|
+
/**
|
|
14
|
+
* A trading key that signs the way Ethereum does: keccak256 over the sign bytes
|
|
15
|
+
* and a 65-byte recoverable signature.
|
|
16
|
+
*
|
|
17
|
+
* That shape is what lets an agent be authorized by address alone. A cosmos
|
|
18
|
+
* signature is 64 bytes with no recovery id, so the chain would have to be told
|
|
19
|
+
* the public key up front — which is exactly the unreadable field the approval
|
|
20
|
+
* dialog was trying to lose. With a recovery id the chain derives the key from
|
|
21
|
+
* each signature and compares it to the approved address
|
|
22
|
+
* (x/accountplus/authenticator/eth_address_signature.go).
|
|
23
|
+
*
|
|
24
|
+
* Everything else about the transaction is identical to the ordinary signer,
|
|
25
|
+
* including the accountplus TxExtension that names which authenticator applies.
|
|
26
|
+
*/
|
|
27
|
+
export class EthAgentWallet {
|
|
28
|
+
constructor(privateKey, prefix = BECH32_PREFIX) {
|
|
29
|
+
if (privateKey.length !== 32) {
|
|
30
|
+
throw new Error(`Expected a 32-byte private key, got ${privateKey.length} bytes`);
|
|
31
|
+
}
|
|
32
|
+
this.privateKey = privateKey;
|
|
33
|
+
this.compressedPubkey = secp256k1.getPublicKey(privateKey, true);
|
|
34
|
+
this.address = toBech32(prefix, ethAddressBytesFromPubkey(this.compressedPubkey));
|
|
35
|
+
}
|
|
36
|
+
/** The pubkey in the shape AuthInfo expects, for gas simulation. */
|
|
37
|
+
get pubKey() {
|
|
38
|
+
return encodeEthSecp256k1Pubkey(this.compressedPubkey);
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Signs a transaction on behalf of the account that approved this agent.
|
|
42
|
+
*
|
|
43
|
+
* LocalWallet-compatible, so a SubaccountInfo built with this wallet goes
|
|
44
|
+
* through the same post/composite-client paths as any other.
|
|
45
|
+
*/
|
|
46
|
+
async signTransaction(messages, transactionOptions, fee, memo = '', registry = generateRegistry()) {
|
|
47
|
+
var _a;
|
|
48
|
+
if (!fee) {
|
|
49
|
+
throw new Error('Fee cannot be undefined');
|
|
50
|
+
}
|
|
51
|
+
const txExtension = TxExtension.encode({
|
|
52
|
+
selectedAuthenticators: (_a = transactionOptions.authenticators) !== null && _a !== void 0 ? _a : [],
|
|
53
|
+
}).finish();
|
|
54
|
+
const txBody = TxBody.fromPartial({
|
|
55
|
+
messages: messages.map((msg) => registry.encodeAsAny(msg)),
|
|
56
|
+
memo,
|
|
57
|
+
extensionOptions: [],
|
|
58
|
+
nonCriticalExtensionOptions: [
|
|
59
|
+
Any.fromPartial({
|
|
60
|
+
typeUrl: '/ritbit.accountplus.TxExtension',
|
|
61
|
+
value: txExtension,
|
|
62
|
+
}),
|
|
63
|
+
],
|
|
64
|
+
});
|
|
65
|
+
const bodyBytes = TxBody.encode(txBody).finish();
|
|
66
|
+
const authInfoBytes = makeAuthInfoBytes([
|
|
67
|
+
{
|
|
68
|
+
pubkey: ethSecp256k1PubkeyToAny(encodeEthSecp256k1Pubkey(this.compressedPubkey)),
|
|
69
|
+
sequence: transactionOptions.sequence,
|
|
70
|
+
},
|
|
71
|
+
], fee.amount, Int53.fromString(String(fee.gas)).toNumber(), undefined, undefined);
|
|
72
|
+
// makeSignDoc() types accountNumber as `number` but wraps it in BigInt(), so
|
|
73
|
+
// an account number above 2^53 survives (see signer.ts).
|
|
74
|
+
const signDoc = makeSignDoc(bodyBytes, authInfoBytes, transactionOptions.chainId, transactionOptions.accountNumber);
|
|
75
|
+
const signature = this.signRecoverable(makeSignBytes(signDoc));
|
|
76
|
+
return Uint8Array.from(TxRaw.encode(TxRaw.fromPartial({
|
|
77
|
+
bodyBytes,
|
|
78
|
+
authInfoBytes,
|
|
79
|
+
signatures: [signature],
|
|
80
|
+
})).finish());
|
|
81
|
+
}
|
|
82
|
+
/**
|
|
83
|
+
* keccak256 over the sign bytes, signed as r ‖ s ‖ v — the same preimage the
|
|
84
|
+
* chain hashes when it recovers the signer.
|
|
85
|
+
*/
|
|
86
|
+
signRecoverable(signBytes) {
|
|
87
|
+
var _a;
|
|
88
|
+
const digest = keccak256(signBytes);
|
|
89
|
+
const signature = secp256k1.sign(digest, this.privateKey);
|
|
90
|
+
const bytes = new Uint8Array(65);
|
|
91
|
+
bytes.set(signature.toCompactRawBytes());
|
|
92
|
+
// The chain accepts 0/1 and 27/28 alike; emit the raw recovery bit.
|
|
93
|
+
bytes[64] = (_a = signature.recovery) !== null && _a !== void 0 ? _a : 0;
|
|
94
|
+
return bytes;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXRoLWFnZW50LXdhbGxldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9jbGllbnRzL21vZHVsZXMvZXRoLWFnZW50LXdhbGxldC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTBCLGlCQUFpQixFQUFFLGFBQWEsRUFBRSxXQUFXLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUM5RyxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRXJDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ2xFLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUN2RCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDekQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRTVELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxvREFBb0QsQ0FBQztBQUVqRixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDcEQsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbEUsT0FBTyxFQUFFLHdCQUF3QixFQUFFLHVCQUF1QixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDdEYsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFHbkQ7Ozs7Ozs7Ozs7Ozs7R0FhRztBQUNILE1BQU0sT0FBTyxjQUFjO0lBTXpCLFlBQVksVUFBc0IsRUFBRSxTQUFpQixhQUFhO1FBQ2hFLElBQUksVUFBVSxDQUFDLE1BQU0sS0FBSyxFQUFFLEVBQUUsQ0FBQztZQUM3QixNQUFNLElBQUksS0FBSyxDQUFDLHVDQUF1QyxVQUFVLENBQUMsTUFBTSxRQUFRLENBQUMsQ0FBQztR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
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { AccountData, DirectSignResponse, OfflineDirectSigner } from '@cosmjs/proto-signing';
|
|
2
|
+
import { SignDoc } from 'cosmjs-types/cosmos/tx/v1beta1/tx';
|
|
3
|
+
import LocalWallet from './local-wallet';
|
|
4
|
+
/** The standard ethereum BIP44 derivation path (coin type 60). */
|
|
5
|
+
export declare const ETH_BIP44_HD_PATH = "m/44'/60'/0'/0/0";
|
|
6
|
+
/**
|
|
7
|
+
* OfflineDirectSigner for eth_secp256k1 keys: SIGN_MODE_DIRECT sign bytes are
|
|
8
|
+
* hashed with keccak256 (instead of sha256) and signed with secp256k1,
|
|
9
|
+
* producing the cosmjs-style 64-byte r||s signature the chain verifies via
|
|
10
|
+
* cosmos/evm's ethsecp256k1.PubKey.VerifySignature. The reported address is
|
|
11
|
+
* ethereum-style: bech32(keccak256(uncompressed pubkey without the 04
|
|
12
|
+
* prefix)[12:]).
|
|
13
|
+
*/
|
|
14
|
+
export declare class DirectEthSecp256k1Signer implements OfflineDirectSigner {
|
|
15
|
+
private readonly privateKey;
|
|
16
|
+
readonly compressedPubkey: Uint8Array;
|
|
17
|
+
readonly address: string;
|
|
18
|
+
constructor(privateKey: Uint8Array, prefix?: string);
|
|
19
|
+
getAccounts(): Promise<readonly AccountData[]>;
|
|
20
|
+
signDirect(signerAddress: string, signDoc: SignDoc): Promise<DirectSignResponse>;
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* LocalWallet backed by an eth_secp256k1 key (the 0x == rit1 wallet model).
|
|
24
|
+
* Behaves exactly like LocalWallet — including as the master signer of a
|
|
25
|
+
* SubaccountInfo — but derives keys on the ethereum BIP44 path, reports the
|
|
26
|
+
* ethereum-style address, and signs SIGN_MODE_DIRECT with keccak256 hashing.
|
|
27
|
+
*/
|
|
28
|
+
export default class EthLocalWallet extends LocalWallet {
|
|
29
|
+
static fromMnemonic(mnemonic: string, prefix?: string): Promise<EthLocalWallet>;
|
|
30
|
+
static fromPrivateKey(pkHex: string, prefix?: string): Promise<EthLocalWallet>;
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=eth-wallet.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"eth-wallet.d.ts","sourceRoot":"","sources":["../../../../../src/clients/modules/eth-wallet.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,WAAW,EAEX,kBAAkB,EAElB,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAS5D,OAAO,WAAW,MAAM,gBAAgB,CAAC;AAEzC,kEAAkE;AAClE,eAAO,MAAM,iBAAiB,qBAAqB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,wBAAyB,YAAW,mBAAmB;IAClE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IACxC,SAAgB,gBAAgB,EAAE,UAAU,CAAC;IAC7C,SAAgB,OAAO,EAAE,MAAM,CAAC;gBAEpB,UAAU,EAAE,UAAU,EAAE,MAAM,GAAE,MAAsB;IAS5D,WAAW,IAAI,OAAO,CAAC,SAAS,WAAW,EAAE,CAAC;IAY9C,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAmBvF;AAED;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,WAAW;WACxC,YAAY,CACvB,QAAQ,EAAE,MAAM,EAChB,MAAM,GAAE,MAAsB,GAC7B,OAAO,CAAC,cAAc,CAAC;WAUb,cAAc,CACzB,KAAK,EAAE,MAAM,EACb,MAAM,GAAE,MAAsB,GAC7B,OAAO,CAAC,cAAc,CAAC;CAK3B"}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { fromHex, toBase64, toBech32 } from '@cosmjs/encoding';
|
|
2
|
+
import { makeSignBytes, } from '@cosmjs/proto-signing';
|
|
3
|
+
import { keccak256 } from 'ethereum-cryptography/keccak';
|
|
4
|
+
import { secp256k1 } from 'ethereum-cryptography/secp256k1';
|
|
5
|
+
import { BECH32_PREFIX } from '../../lib/constants';
|
|
6
|
+
import { ethAddressBytesFromPubkey } from '../../lib/evm-address';
|
|
7
|
+
import { stripHexPrefix } from '../../lib/helpers';
|
|
8
|
+
import { deriveHDKeyFromMnemonic } from '../../lib/onboarding';
|
|
9
|
+
import { encodeEthSecp256k1Pubkey, ETH_SECP256K1_ALGO } from '../lib/eth-pubkey';
|
|
10
|
+
import LocalWallet from './local-wallet';
|
|
11
|
+
/** The standard ethereum BIP44 derivation path (coin type 60). */
|
|
12
|
+
export const ETH_BIP44_HD_PATH = "m/44'/60'/0'/0/0";
|
|
13
|
+
/**
|
|
14
|
+
* OfflineDirectSigner for eth_secp256k1 keys: SIGN_MODE_DIRECT sign bytes are
|
|
15
|
+
* hashed with keccak256 (instead of sha256) and signed with secp256k1,
|
|
16
|
+
* producing the cosmjs-style 64-byte r||s signature the chain verifies via
|
|
17
|
+
* cosmos/evm's ethsecp256k1.PubKey.VerifySignature. The reported address is
|
|
18
|
+
* ethereum-style: bech32(keccak256(uncompressed pubkey without the 04
|
|
19
|
+
* prefix)[12:]).
|
|
20
|
+
*/
|
|
21
|
+
export class DirectEthSecp256k1Signer {
|
|
22
|
+
constructor(privateKey, prefix = BECH32_PREFIX) {
|
|
23
|
+
if (privateKey.length !== 32) {
|
|
24
|
+
throw new Error('Eth private key must be 32 bytes');
|
|
25
|
+
}
|
|
26
|
+
this.privateKey = privateKey;
|
|
27
|
+
this.compressedPubkey = secp256k1.getPublicKey(privateKey, true);
|
|
28
|
+
this.address = toBech32(prefix, ethAddressBytesFromPubkey(this.compressedPubkey));
|
|
29
|
+
}
|
|
30
|
+
async getAccounts() {
|
|
31
|
+
return [
|
|
32
|
+
{
|
|
33
|
+
address: this.address,
|
|
34
|
+
// cosmjs's Algo union has no eth variant; local-wallet.ts branches on
|
|
35
|
+
// this marker to build the eth pubkey type.
|
|
36
|
+
algo: ETH_SECP256K1_ALGO,
|
|
37
|
+
pubkey: this.compressedPubkey,
|
|
38
|
+
},
|
|
39
|
+
];
|
|
40
|
+
}
|
|
41
|
+
async signDirect(signerAddress, signDoc) {
|
|
42
|
+
if (signerAddress !== this.address) {
|
|
43
|
+
throw new Error(`Address ${signerAddress} not found in wallet`);
|
|
44
|
+
}
|
|
45
|
+
const signBytes = makeSignBytes(signDoc);
|
|
46
|
+
const hash = keccak256(signBytes);
|
|
47
|
+
// noble's sign() normalizes to low-s by default, matching what the chain
|
|
48
|
+
// (and cosmjs's Secp256k1.createSignature) expects.
|
|
49
|
+
const signature = secp256k1.sign(hash, this.privateKey);
|
|
50
|
+
const signatureBytes = signature.toCompactRawBytes(); // 64-byte r||s
|
|
51
|
+
const stdSignature = {
|
|
52
|
+
pub_key: encodeEthSecp256k1Pubkey(this.compressedPubkey),
|
|
53
|
+
signature: toBase64(signatureBytes),
|
|
54
|
+
};
|
|
55
|
+
return {
|
|
56
|
+
signed: signDoc,
|
|
57
|
+
signature: stdSignature,
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* LocalWallet backed by an eth_secp256k1 key (the 0x == rit1 wallet model).
|
|
63
|
+
* Behaves exactly like LocalWallet — including as the master signer of a
|
|
64
|
+
* SubaccountInfo — but derives keys on the ethereum BIP44 path, reports the
|
|
65
|
+
* ethereum-style address, and signs SIGN_MODE_DIRECT with keccak256 hashing.
|
|
66
|
+
*/
|
|
67
|
+
export default class EthLocalWallet extends LocalWallet {
|
|
68
|
+
static async fromMnemonic(mnemonic, prefix = BECH32_PREFIX) {
|
|
69
|
+
const wallet = new EthLocalWallet();
|
|
70
|
+
const { privateKey } = deriveHDKeyFromMnemonic(mnemonic, ETH_BIP44_HD_PATH);
|
|
71
|
+
if (privateKey === null) {
|
|
72
|
+
throw new Error('Could not derive a private key from the mnemonic');
|
|
73
|
+
}
|
|
74
|
+
await wallet.setSigner(new DirectEthSecp256k1Signer(privateKey, prefix));
|
|
75
|
+
return wallet;
|
|
76
|
+
}
|
|
77
|
+
static async fromPrivateKey(pkHex, prefix = BECH32_PREFIX) {
|
|
78
|
+
const wallet = new EthLocalWallet();
|
|
79
|
+
await wallet.setSigner(new DirectEthSecp256k1Signer(fromHex(stripHexPrefix(pkHex)), prefix));
|
|
80
|
+
return wallet;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXRoLXdhbGxldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9jbGllbnRzL21vZHVsZXMvZXRoLXdhbGxldC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMvRCxPQUFPLEVBSUwsYUFBYSxHQUVkLE1BQU0sdUJBQXVCLENBQUM7QUFFL0IsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ3pELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU1RCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDcEQsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ25ELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQy9ELE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2pGLE9BQU8sV0FBVyxNQUFNLGdCQUFnQixDQUFDO0FBRXpDLGtFQUFrRTtBQUNsRSxNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FBRyxrQkFBa0IsQ0FBQztBQUVwRDs7Ozs7OztHQU9HO0FBQ0gsTUFBTSxPQUFPLHdCQUF3QjtJQUtuQyxZQUFZLFVBQXNCLEVBQUUsU0FBaUIsYUFBYTtRQUNoRSxJQUFJLFVBQVUsQ0FBQyxNQUFNLEtBQUssRUFBRSxFQUFFLENBQUM7WUFDN0IsTUFBTSxJQUFJLEtBQUssQ0FBQyxrQ0FBa0MsQ0FBQyxDQUFDO1FBQ3RELENBQUM7UUFDRCxJQUFJLENBQUMsVUFBVSxHQUFHLFVBQVUsQ0FBQztRQUM3QixJQUFJLENBQUMsZ0JBQWdCLEdBQUcsU0FBUyxDQUFDLFlB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
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { Secp256k1Pubkey, StdFee } from '@cosmjs/amino';
|
|
2
2
|
import { AccountData, EncodeObject, OfflineSigner } from '@cosmjs/proto-signing';
|
|
3
|
+
import { EthSecp256k1Pubkey } from '../lib/eth-pubkey';
|
|
3
4
|
import { TransactionOptions } from '../types';
|
|
4
5
|
import { TransactionSigner } from './signer';
|
|
5
6
|
export default class LocalWallet {
|
|
6
7
|
accounts?: AccountData[];
|
|
7
8
|
address?: string;
|
|
8
|
-
pubKey?: Secp256k1Pubkey;
|
|
9
|
+
pubKey?: Secp256k1Pubkey | EthSecp256k1Pubkey;
|
|
9
10
|
signer?: TransactionSigner;
|
|
10
11
|
offlineSigner?: OfflineSigner;
|
|
11
12
|
static fromOfflineSigner(signer: OfflineSigner): Promise<LocalWallet>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-wallet.d.ts","sourceRoot":"","sources":["../../../../../src/clients/modules/local-wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAyB,MAAM,eAAe,CAAC;AAE/E,OAAO,EACL,WAAW,EAGX,YAAY,EACZ,aAAa,EACd,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"local-wallet.d.ts","sourceRoot":"","sources":["../../../../../src/clients/modules/local-wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAyB,MAAM,eAAe,CAAC;AAE/E,OAAO,EACL,WAAW,EAGX,YAAY,EACZ,aAAa,EACd,MAAM,uBAAuB,CAAC;AAM/B,OAAO,EAGL,kBAAkB,EACnB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAM7C,MAAM,CAAC,OAAO,OAAO,WAAW;IAC9B,QAAQ,CAAC,EAAE,WAAW,EAAE,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,eAAe,GAAG,kBAAkB,CAAC;IAC9C,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,aAAa,CAAC,EAAE,aAAa,CAAC;WAEjB,iBAAiB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC;WAM9D,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;WAMrE,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAM3E,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB/C,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7D,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKrD,eAAe,CAC1B,QAAQ,EAAE,YAAY,EAAE,EACxB,kBAAkB,EAAE,kBAAkB,EACtC,GAAG,CAAC,EAAE,MAAM,EACZ,IAAI,GAAE,MAAW,GAChB,OAAO,CAAC,UAAU,CAAC;CAGvB"}
|
|
@@ -5,6 +5,7 @@ import { SigningStargateClient } from '@cosmjs/stargate';
|
|
|
5
5
|
import Long from 'long';
|
|
6
6
|
import protobuf from 'protobufjs';
|
|
7
7
|
import { stripHexPrefix } from '../../lib/helpers';
|
|
8
|
+
import { encodeEthSecp256k1Pubkey, ETH_SECP256K1_ALGO, } from '../lib/eth-pubkey';
|
|
8
9
|
import { generateRegistry } from '../lib/registry';
|
|
9
10
|
import { TransactionSigner } from './signer';
|
|
10
11
|
// Required for encoding and decoding queries that are of type Long.
|
|
@@ -35,7 +36,13 @@ export default class LocalWallet {
|
|
|
35
36
|
const firstAccount = accountData[0];
|
|
36
37
|
this.accounts = [...accountData];
|
|
37
38
|
this.address = firstAccount.address;
|
|
38
|
-
|
|
39
|
+
// Eth signers (see eth-wallet.ts) report the eth_secp256k1 algo marker;
|
|
40
|
+
// their pubkey must be encoded with the eth type so signer.ts puts the
|
|
41
|
+
// right Any typeUrl into AuthInfo.
|
|
42
|
+
this.pubKey =
|
|
43
|
+
firstAccount.algo === ETH_SECP256K1_ALGO
|
|
44
|
+
? encodeEthSecp256k1Pubkey(firstAccount.pubkey)
|
|
45
|
+
: encodeSecp256k1Pubkey(firstAccount.pubkey);
|
|
39
46
|
this.signer = new TransactionSigner(this.address, stargateClient, signer);
|
|
40
47
|
}
|
|
41
48
|
async setMnemonic(mnemonic, prefix) {
|
|
@@ -50,4 +57,4 @@ export default class LocalWallet {
|
|
|
50
57
|
return this.signer.signTransaction(messages, transactionOptions, fee, memo, this.pubKey);
|
|
51
58
|
}
|
|
52
59
|
}
|
|
53
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtd2FsbGV0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL2NsaWVudHMvbW9kdWxlcy9sb2NhbC13YWxsZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUEyQixxQkFBcUIsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMvRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDM0MsT0FBTyxFQUVMLHVCQUF1QixFQUN2QixxQkFBcUIsR0FHdEIsTUFBTSx1QkFBdUIsQ0FBQztBQUMvQixPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUN6RCxPQUFPLElBQUksTUFBTSxNQUFNLENBQUM7QUFDeEIsT0FBTyxRQUFRLE1BQU0sWUFBWSxDQUFDO0FBRWxDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNuRCxPQUFPLEVBQ0wsd0JBQXdCLEVBQ3hCLGtCQUFrQixHQUVuQixNQUFNLG1CQUFtQixDQUFDO0FBQzNCLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRW5ELE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUU3QyxvRUFBb0U7QUFDcEUsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO0FBQzFCLFFBQVEsQ0FBQyxTQUFTLEVBQUUsQ0FBQztBQUVyQixNQUFNLENBQUMsT0FBTyxPQUFPLFdBQVc7SUFPOUIsTUFBTSxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxNQUFxQjtRQUNsRCxNQUFNLE1BQU0sR0FBRyxJQUFJLFdBQVcsRUFBRSxDQUFDO1FBQ2pDLE1BQU0sTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUMvQixPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDO0lBRUQsTUFBTSxDQUFDLEtBQUssQ0FBQyxZQUFZLENB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
|
|
@@ -131,7 +131,7 @@ export declare class Post {
|
|
|
131
131
|
registerAffiliateMsg(...args: Parameters<Composer['composeMsgRegisterAffiliate']>): EncodeObject;
|
|
132
132
|
launchMarketMsg(...args: Parameters<Composer['composeMsgCreateMarketPermissionless']>): EncodeObject;
|
|
133
133
|
createMarketPermissionless(ticker: string, subaccount: SubaccountInfo, broadcastMode?: BroadcastMode, gasAdjustment?: number, memo?: string): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx>;
|
|
134
|
-
addAuthenticator(subaccount: SubaccountInfo, authenticatorType: AuthenticatorType, data: Uint8Array): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx>;
|
|
134
|
+
addAuthenticator(subaccount: SubaccountInfo, authenticatorType: AuthenticatorType, data: Uint8Array, name?: string, expiresAt?: Long | number): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx>;
|
|
135
135
|
removeAuthenticator(subaccount: SubaccountInfo, id: Long): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx>;
|
|
136
136
|
}
|
|
137
137
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../../../src/clients/modules/post.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAmB,MAAM,eAAe,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAY,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAgB,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAU,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,KAAK,wBAAwB,GAAG,YAAY,CAAC,wBAAwB,CAAC;AACtE,KAAK,uBAAuB,GAAG,YAAY,CAAC,uBAAuB,CAAC;AAEpE,OAAO,EAAE,iBAAiB,EAAkB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACnF,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../../../src/clients/modules/post.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAmB,MAAM,eAAe,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAY,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAgB,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAU,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,KAAK,wBAAwB,GAAG,YAAY,CAAC,wBAAwB,CAAC;AACtE,KAAK,uBAAuB,GAAG,YAAY,CAAC,uBAAuB,CAAC;AAEpE,OAAO,EAAE,iBAAiB,EAAkB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACnF,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAI1C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,UAAU,EACV,aAAa,EAEb,WAAW,EACX,YAAY,EACZ,WAAW,EACX,eAAe,EACf,sBAAsB,EACvB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EACL,UAAU,EACV,iBAAiB,EAIjB,mBAAmB,EACnB,UAAU,EACX,MAAM,kBAAkB,CAAC;AAS1B,qBAAa,IAAI;IACf,SAAgB,QAAQ,EAAE,QAAQ,CAAC;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,SAAgB,GAAG,EAAE,GAAG,CAAC;IACzB,SAAgB,MAAM,EAAE,WAAW,CAAC;IACpC,SAAgB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAEpC,gBAAgB,EAAE,gBAAgB,CAAyB;IAClE,SAAgB,eAAe,EAAE,QAAQ,CAAC;IAC1C,SAAgB,oBAAoB,EAAE,QAAQ,CAAC;IAExC,iBAAiB,EAAE,OAAO,CAAS;IACnC,sBAAsB,EAAE,MAAM,CAAK;IAC1C,OAAO,CAAC,kBAAkB,CAAmC;gBAG3D,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,WAAW,EACnB,iBAAiB,CAAC,EAAE,MAAM,EAC1B,iBAAiB,CAAC,EAAE,OAAO,EAC3B,sBAAsB,CAAC,EAAE,MAAM;IAwBjC;;;;;OAKG;IACU,0BAA0B,CACrC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IAS3C,mBAAmB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,IAAI;IAI7D,WAAW,IAAI,QAAQ;IAMvB;;;;;;;OAOG;IACG,QAAQ,CACZ,UAAU,EAAE,cAAc,EAC1B,SAAS,EAAE,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,EACxC,QAAQ,GAAE,QAA6B,EACvC,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GAC/B,OAAO,CAAC,MAAM,CAAC;IAwBlB;;;;;;;OAOG;IACG,IAAI,CACR,UAAU,EAAE,cAAc,EAC1B,SAAS,EAAE,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,EACxC,OAAO,EAAE,OAAO,EAChB,QAAQ,GAAE,QAA6B,EACvC,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GAC/B,OAAO,CAAC,UAAU,CAAC;IAQtB;;;;;;;OAOG;IACG,IAAI,CACR,UAAU,EAAE,cAAc,EAC1B,SAAS,EAAE,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,EACxC,OAAO,EAAE,OAAO,EAChB,QAAQ,GAAE,QAA6B,EACvC,IAAI,CAAC,EAAE,MAAM,EACb,aAAa,CAAC,EAAE,aAAa,EAC7B,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,EAChC,aAAa,GAAE,MAAuB,EACtC,kBAAkB,CAAC,EAAE,IAAI,EAAE,GAC1B,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAmB1E;;OAEG;IACH,OAAO,CAAC,oBAAoB;IA0B5B;;;;OAIG;YACW,eAAe;IAuD7B;;;;;OAKG;IACU,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAahF;;;;OAIG;YACW,sBAAsB;IAwBpC;;;;OAIG;IACG,qBAAqB,CACzB,iBAAiB,EAAE,UAAU,EAC7B,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAO1E;;;;;;OAMG;YACW,mBAAmB;IA6D3B,UAAU,CACd,UAAU,EAAE,cAAc,EAC1B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,IAAI,EACd,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,iBAAiB,EAC9B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,OAAO,EACnB,YAAY,CAAC,EAAE,MAAM,EACrB,gBAAgB,CAAC,EAAE,MAAM,EACzB,cAAc,GAAE,MAAU,EAC1B,aAAa,GAAE,mBAAoE,EACnF,+BAA+B,GAAE,IAAsB,EACvD,cAAc,CAAC,EAAE,eAAe,EAChC,qBAAqB,CAAC,EAAE,sBAAsB,EAC9C,kBAAkB,CAAC,EAAE,MAAM,EAC3B,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAiCpE,aAAa,CACjB,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,IAAI,EACd,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,iBAAiB,EAC9B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,OAAO,EACnB,YAAY,CAAC,EAAE,MAAM,EACrB,gBAAgB,CAAC,EAAE,MAAM,EACzB,cAAc,GAAE,MAAU,EAC1B,aAAa,GAAE,mBAAoE,EACnF,+BAA+B,GAAE,IAAsB,EACvD,cAAc,CAAC,EAAE,eAAe,EAChC,qBAAqB,CAAC,EAAE,sBAAsB,EAC9C,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,YAAY,CAAC;IA0BlB,gBAAgB,CACpB,UAAU,EAAE,cAAc,EAC1B,UAAU,EAAE,WAAW,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAuBpE,WAAW,CACf,UAAU,EAAE,cAAc,EAC1B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,MAAM,EACrB,gBAAgB,CAAC,EAAE,MAAM,EACzB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAoBpE,cAAc,CAClB,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,MAAM,EACrB,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,YAAY,CAAC;IAelB,iBAAiB,CACrB,UAAU,EAAE,cAAc,EAC1B,WAAW,EAAE,YAAY,EACzB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAYpE,0BAA0B,CAC9B,UAAU,EAAE,cAAc,EAC1B,eAAe,EAAE,UAAU,EAAE,EAC7B,YAAY,EAAE,MAAM,EACpB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAiBpE,6BAA6B,CACjC,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,EACxB,eAAe,EAAE,UAAU,EAAE,EAC7B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,YAAY,CAAC;IAYlB,QAAQ,CACZ,UAAU,EAAE,cAAc,EAC1B,gBAAgB,EAAE,MAAM,EACxB,yBAAyB,EAAE,MAAM,EACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,IAAI,EACZ,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAmBpE,WAAW,CACf,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE,MAAM,EACxB,yBAAyB,EAAE,MAAM,EACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,IAAI,GACX,OAAO,CAAC,YAAY,CAAC;IAclB,OAAO,CACX,UAAU,EAAE,cAAc,EAC1B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,IAAI,EACd,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAiBpE,UAAU,CACd,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,IAAI,GACb,OAAO,CAAC,YAAY,CAAC;IAYlB,QAAQ,CACZ,UAAU,EAAE,cAAc,EAC1B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,IAAI,EACd,SAAS,CAAC,EAAE,MAAM,EAClB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAkBpE,WAAW,CACf,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,IAAI,EACd,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,YAAY,CAAC;IAalB,SAAS,CACb,UAAU,EAAE,cAAc,EAC1B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,OAAc,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAYpE,YAAY,CAChB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,YAAY,CAAC;IAWlB,QAAQ,CACZ,UAAU,EAAE,cAAc,EAC1B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAe1E,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY;IAOzE,UAAU,CACd,UAAU,EAAE,cAAc,EAC1B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAe1E,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY;IAO3E,uBAAuB,CAC3B,UAAU,EAAE,cAAc,EAC1B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAY1E,0BAA0B,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,YAAY;IAKxE,kBAAkB,CACtB,UAAU,EAAE,cAAc,EAC1B,aAAa,EAAE,UAAU,EACzB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAgB1E,qBAAqB,CACnB,GAAG,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC,8BAA8B,CAAC,CAAC,GAC5D,YAAY;IAIT,qBAAqB,CACzB,UAAU,EAAE,cAAc,EAC1B,MAAM,EAAE,UAAU,EAClB,gBAAgB,EAAE,UAAU,EAC5B,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAiB1E,wBAAwB,CACtB,GAAG,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC,iCAAiC,CAAC,CAAC,GAC/D,YAAY;IAIT,iBAAiB,CACrB,UAAU,EAAE,cAAc,EAC1B,SAAS,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,aAAa,EAC7B,aAAa,GAAE,MAAU,GACxB,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAc1E,oBAAoB,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC,GAAG,YAAY;IAIhG,eAAe,CACb,GAAG,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC,sCAAsC,CAAC,CAAC,GACpE,YAAY;IAIT,0BAA0B,CAC9B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,cAAc,EAC1B,aAAa,CAAC,EAAE,aAAa,EAC7B,aAAa,CAAC,EAAE,MAAM,EACtB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAepE,gBAAgB,CACpB,UAAU,EAAE,cAAc,EAC1B,iBAAiB,EAAE,iBAAiB,EACpC,IAAI,EAAE,UAAU,EAChB,IAAI,GAAE,MAAW,EACjB,SAAS,GAAE,IAAI,GAAG,MAAU,GAC3B,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;IAqBpE,mBAAmB,CACvB,UAAU,EAAE,cAAc,EAC1B,EAAE,EAAE,IAAI,GACP,OAAO,CAAC,wBAAwB,GAAG,uBAAuB,GAAG,SAAS,CAAC;CAc3E"}
|
|
@@ -5,6 +5,7 @@ import Long from 'long';
|
|
|
5
5
|
import protobuf from 'protobufjs';
|
|
6
6
|
import { GAS_MULTIPLIER, SelectedGasDenom } from '../constants';
|
|
7
7
|
import { UnexpectedClientError } from '../lib/errors';
|
|
8
|
+
import { isEthSecp256k1Pubkey } from '../lib/eth-pubkey';
|
|
8
9
|
import { generateRegistry } from '../lib/registry';
|
|
9
10
|
import { OrderFlags, } from '../types';
|
|
10
11
|
import { Composer } from './composer';
|
|
@@ -220,9 +221,18 @@ export class Post {
|
|
|
220
221
|
* @returns The Fee for broadcasting a transaction.
|
|
221
222
|
*/
|
|
222
223
|
async simulateTransaction(pubKey, sequence, messages, gasPrice = this.getGasPrice(), memo, gasAdjustment = GAS_MULTIPLIER) {
|
|
224
|
+
// cosmjs's tx.simulate() encodes the pubkey via encodePubkey(), which
|
|
225
|
+
// cannot encode the eth_secp256k1 type. Simulation skips signature
|
|
226
|
+
// verification and the pubkey<->address match check (the SDK gates it on
|
|
227
|
+
// !simulate), and cosmos/evm prices ethsecp256k1 gas identically to
|
|
228
|
+
// secp256k1, so simulating with the cosmos secp256k1 typeUrl over the
|
|
229
|
+
// same key bytes yields the same gas estimate.
|
|
230
|
+
const simulationPubKey = isEthSecp256k1Pubkey(pubKey)
|
|
231
|
+
? { type: 'tendermint/PubKeySecp256k1', value: pubKey.value }
|
|
232
|
+
: pubKey;
|
|
223
233
|
// Get simulated response.
|
|
224
234
|
const encodedMessages = messages.map((message) => this.registry.encodeAsAny(message));
|
|
225
|
-
const simulationResponse = await this.get.stargateQueryClient.tx.simulate(encodedMessages, memo,
|
|
235
|
+
const simulationResponse = await this.get.stargateQueryClient.tx.simulate(encodedMessages, memo, simulationPubKey, sequence);
|
|
226
236
|
// The promise should have been rejected if the gasInfo was undefined.
|
|
227
237
|
if (simulationResponse.gasInfo === undefined) {
|
|
228
238
|
throw new UnexpectedClientError();
|
|
@@ -392,8 +402,8 @@ export class Post {
|
|
|
392
402
|
const msg = this.launchMarketMsg(subaccount.address, ticker, subaccount.subaccountNumber);
|
|
393
403
|
return this.send(subaccount, () => Promise.resolve([msg]), false, undefined, memo, broadcastMode, undefined, gasAdjustment);
|
|
394
404
|
}
|
|
395
|
-
async addAuthenticator(subaccount, authenticatorType, data) {
|
|
396
|
-
const msg = this.composer.composeMsgAddAuthenticator(subaccount.address, authenticatorType, data);
|
|
405
|
+
async addAuthenticator(subaccount, authenticatorType, data, name = '', expiresAt = 0) {
|
|
406
|
+
const msg = this.composer.composeMsgAddAuthenticator(subaccount.address, authenticatorType, data, name, expiresAt);
|
|
397
407
|
return this.send(subaccount, () => Promise.resolve([msg]), false, undefined, undefined, Method.BroadcastTxSync, undefined, undefined);
|
|
398
408
|
}
|
|
399
409
|
async removeAuthenticator(subaccount, id) {
|
|
@@ -401,4 +411,4 @@ export class Post {
|
|
|
401
411
|
return this.send(subaccount, () => Promise.resolve([msg]), false, undefined, undefined, Method.BroadcastTxSync, undefined, 3);
|
|
402
412
|
}
|
|
403
413
|
}
|
|
404
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"post.js","sourceRoot":"","sources":["../../../../../src/clients/modules/post.ts"],"names":[],"mappings":"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"}
|
|
414
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"post.js","sourceRoot":"","sources":["../../../../../src/clients/modules/post.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAqB,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,MAAM,EAAgB,MAAM,wBAAwB,CAAC;AAC9D,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,QAAQ,MAAM,YAAY,CAAC;AAKlC,OAAO,EAAqB,cAAc,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEnF,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAsB,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,OAAO,EACL,UAAU,GAQX,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAML,mBAAmB,GAEpB,MAAM,kBAAkB,CAAC;AAE1B,oEAAoE;AACpE,qEAAqE;AACrE,wEAAwE;AACxE,kEAAkE;AAClE,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;AAC1B,QAAQ,CAAC,SAAS,EAAE,CAAC;AAErB,MAAM,OAAO,IAAI;IAgBf,YACE,GAAQ,EACR,OAAe,EACf,MAAmB,EACnB,iBAA0B,EAC1B,iBAA2B,EAC3B,sBAA+B;QAd1B,qBAAgB,GAAqB,gBAAgB,CAAC,IAAI,CAAC;QAI3D,sBAAiB,GAAY,KAAK,CAAC;QACnC,2BAAsB,GAAW,CAAC,CAAC;QAClC,uBAAkB,GAAyB,IAAI,GAAG,EAAE,CAAC;QAU3D,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,gBAAgB,EAAE,CAAC;QACnC,IAAI,CAAC,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC,UAAU,CACxC,QAAQ,MAAM,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,CAC1F,CAAC;QACF,IAAI,CAAC,oBAAoB,GAAG,QAAQ,CAAC,UAAU,CAC7C,cACE,MAAM,CAAC,oBAAoB,KAAK,SAAS;YACvC,CAAC,CAAC,MAAM,CAAC,oBAAoB;YAC7B,CAAC,CAAC,MAAM,CAAC,gBACb,EAAE,CACH,CAAC;QACF,IAAI,iBAAiB,KAAK,IAAI,EAAE,CAAC;YAC/B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;YAC3C,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,aAAtB,sBAAsB,cAAtB,sBAAsB,GAAI,IAAI,CAAC,sBAAsB,CAAC;QACtF,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,0BAA0B,CACrC,OAAe;QAEf,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC;YAAE,OAAO,SAAS,CAAC;QAE3D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,GAAG,MAAM,CAAC;QACvC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9C,OAAO,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACnD,CAAC;IAED,mBAAmB,CAAC,gBAAkC;QACpD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC3C,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,gBAAgB,KAAK,gBAAgB,CAAC,IAAI;YACpD,CAAC,CAAC,IAAI,CAAC,eAAe;YACtB,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC;IAChC,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,QAAQ,CACZ,UAA0B,EAC1B,SAAwC,EACxC,WAAqB,IAAI,CAAC,WAAW,EAAE,EACvC,IAAa,EACb,OAAgC;QAEhC,IAAI,IAAoB,CAAC;QACzB,iGAAiG;QACjG,IAAI,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,sBAAsB,CAAC;QAExD,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,IAAI,GAAG,MAAM,SAAS,EAAE,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,MAAM,WAAW,GAAG,SAAS,EAAE,CAAC;YAChC,MAAM,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC,MAAM,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACpF,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;YACxE,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;YACzB,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QACxC,CAAC;QAED,OAAO,IAAI,CAAC,mBAAmB,CAC7B,UAAU,CAAC,aAAa,CAAC,MAAO,EAChC,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,IAAI,CACL,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,IAAI,CACR,UAA0B,EAC1B,SAAwC,EACxC,OAAgB,EAChB,WAAqB,IAAI,CAAC,WAAW,EAAE,EACvC,IAAa,EACb,OAAgC;QAEhC,MAAM,WAAW,GAAG,MAAM,SAAS,EAAE,CAAC;QACtC,MAAM,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC,MAAM,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACpF,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;QACxE,MAAM,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC5F,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,IAAI,CACR,UAA0B,EAC1B,SAAwC,EACxC,OAAgB,EAChB,WAAqB,IAAI,CAAC,WAAW,EAAE,EACvC,IAAa,EACb,aAA6B,EAC7B,OAAgC,EAChC,gBAAwB,cAAc,EACtC,kBAA2B;QAE3B,MAAM,WAAW,GAAG,SAAS,EAAE,CAAC;QAChC,MAAM,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC,MAAM,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACpF,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;QACxE,MAAM,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QAE/B,OAAO,IAAI,CAAC,sBAAsB,CAChC,UAAU,EACV,cAAc,CAAC,CAAC,CAAC,EACjB,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,IAAI,CAAC,iBAAiB,EAC9B,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAChD,aAAa,EACb,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAED;;OAEG;IACK,oBAAoB,CAAC,IAAoB;;QAC/C,IACE,IAAI,CAAC,MAAM,KAAK,CAAC;YACjB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,4BAA4B;gBAC/C,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,6BAA6B,CAAC,EACpD,CAAC;YACD,MAAM,UAAU,GACd,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,4BAA4B;gBAC9C,CAAC,CAAC,MAAA,MAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAuB,CAAC,KAAK,0CAAE,OAAO,0CAAE,UAAU;gBAC7D,CAAC,CAAC,MAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAwB,CAAC,OAAO,0CAAE,UAAU,CAAC;YAE5D,QAAQ,UAAU,EAAE,CAAC;gBACnB,KAAK,UAAU,CAAC,UAAU;oBACxB,OAAO,MAAM,CAAC,eAAe,CAAC;gBAEhC,KAAK,UAAU,CAAC,SAAS,CAAC;gBAC1B,KAAK,UAAU,CAAC,WAAW;oBACzB,OAAO,MAAM,CAAC,iBAAiB,CAAC;gBAElC;oBACE,MAAM;YACV,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC,eAAe,CAAC;IAChC,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,eAAe,CAC3B,UAA0B,EAC1B,QAAwB,EACxB,OAAgB,EAChB,OAAgB,EAChB,WAAqB,IAAI,CAAC,WAAW,EAAE,EACvC,IAAa,EACb,gBAAwB,cAAc,EACtC,kBAA2B;;QAE3B,iGAAiG;QACjG,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB;YACrC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,sBAAsB;YAC1C,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;QACrB,+CAA+C;QAC/C,IAAI,GAAG,GAAW,OAAO;YACvB,CAAC,CAAC;gBACE,MAAM,EAAE,EAAE;gBACV,GAAG,EAAE,SAAS;aACf;YACH,CAAC,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAC5B,UAAU,CAAC,aAAa,CAAC,MAAO,EAChC,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,IAAI,EACJ,aAAa,CACd,CAAC;QAEN,IAAI,kBAAkB,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;YAC1C,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;gBAC3B,MAAM,GAAG,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,mCAAI,GAAG,CAAC;gBACxC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpE,CAAC;YACD,KAAK,MAAM,CAAC,IAAI,kBAAkB,EAAE,CAAC;gBACnC,MAAM,GAAG,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,mCAAI,GAAG,CAAC;gBACxC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpE,CAAC;YACD,GAAG,GAAG;gBACJ,GAAG,GAAG;gBACN,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;aACpF,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,GAAuB;YACpC,QAAQ;YACR,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,cAAc,EAAE,UAAU,CAAC,cAAc;SAC1C,CAAC;QACF,+BAA+B;QAC/B,OAAO,UAAU,CAAC,aAAa,CAAC,eAAe,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IAClF,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,OAAO,CAAC,OAAe,EAAE,UAAuB;QAC3D,IAAI,UAAU,KAAK,UAAU,CAAC,UAAU,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACnE,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBACzC,uFAAuF;gBACvF,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC;YAC/C,CAAC;QACH,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,EAAE,GAAG,MAAM,CAAC;QACjD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9C,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,sBAAsB,CAClC,UAA0B,EAC1B,OAAgB,EAChB,QAAwB,EACxB,OAAgB,EAChB,WAAqB,IAAI,CAAC,WAAW,EAAE,EACvC,IAAa,EACb,aAA6B,EAC7B,gBAAwB,cAAc,EACtC,kBAA2B;QAE3B,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,eAAe,CAClD,UAAU,EACV,QAAQ,EACR,OAAO,EACP,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,aAAa,EACb,kBAAkB,CACnB,CAAC;QACF,OAAO,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;IACtE,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,qBAAqB,CACzB,iBAA6B,EAC7B,aAA6B;QAE7B,OAAO,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,oBAAoB,CACnD,iBAAiB,EACjB,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CACrE,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,mBAAmB,CAC/B,MAA4C,EAC5C,QAAgB,EAChB,QAAiC,EACjC,WAAqB,IAAI,CAAC,WAAW,EAAE,EACvC,IAAa,EACb,gBAAwB,cAAc;QAEtC,sEAAsE;QACtE,mEAAmE;QACnE,yEAAyE;QACzE,oEAAoE;QACpE,sEAAsE;QACtE,+CAA+C;QAC/C,MAAM,gBAAgB,GAAoB,oBAAoB,CAAC,MAAM,CAAC;YACpE,CAAC,CAAC,EAAE,IAAI,EAAE,4BAA4B,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE;YAC7D,CAAC,CAAC,MAAM,CAAC;QACX,0BAA0B;QAC1B,MAAM,eAAe,GAAU,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAqB,EAAE,EAAE,CACpE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CACnC,CAAC;QACF,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,CAAC,QAAQ,CACvE,eAAe,EACf,IAAI,EACJ,gBAAgB,EAChB,QAAQ,CACT,CAAC;QAEF,sEAAsE;QACtE,IAAI,kBAAkB,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC7C,MAAM,IAAI,qBAAqB,EAAE,CAAC;QACpC,CAAC;QAED,6CAA6C;QAC7C,MAAM,WAAW,GAAW,MAAM,CAAC,UAAU,CAC3C,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAC9C,CAAC,QAAQ,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,aAAa,CAAC,EAAE,QAAQ,CAAC,CAAC;QAE5E,6FAA6F;QAC7F,oFAAoF;QACpF,uFAAuF;QACvF,8BAA8B;QAC9B,MAAM,MAAM,GAAW,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAU,EAAE,EAAE;YACnD,IAAI,IAAI,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;gBAC3B,OAAO;oBACL,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;iBAC9B,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,GAAG,GAAG;YACN,MAAM;SACP,CAAC;IACJ,CAAC;IAED,2CAA2C;IAE3C,KAAK,CAAC,UAAU,CACd,UAA0B,EAC1B,QAAgB,EAChB,UAAkB,EAClB,IAAgB,EAChB,QAAc,EACd,QAAc,EACd,WAA8B,EAC9B,UAAkB,EAClB,UAAmB,EACnB,YAAqB,EACrB,gBAAyB,EACzB,iBAAyB,CAAC,EAC1B,gBAAqC,mBAAmB,CAAC,0BAA0B,EACnF,kCAAwC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EACvD,cAAgC,EAChC,qBAA8C,EAC9C,kBAA2B,EAC3B,aAA6B;QAE7B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAClC,UAAU,CAAC,OAAO,EAClB,UAAU,CAAC,gBAAgB,EAC3B,QAAQ,EACR,UAAU,EACV,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,WAAW,EACX,UAAU,EACV,UAAU,EACV,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,+BAA+B,EAC/B,cAAc,EACd,qBAAqB,EACrB,kBAAkB,CACnB,CAAC;QACF,MAAM,OAAO,GAAqB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC/E,OAAO,IAAI,CAAC,IAAI,CACd,UAAU,EACV,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAC5B,IAAI,EACJ,SAAS,EACT,SAAS,EACT,aAAa,EACb,GAAG,EAAE,CAAC,OAAO,CACd,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,OAAe,EACf,gBAAwB,EACxB,QAAgB,EAChB,UAAkB,EAClB,IAAgB,EAChB,QAAc,EACd,QAAc,EACd,WAA8B,EAC9B,UAAkB,EAClB,UAAmB,EACnB,YAAqB,EACrB,gBAAyB,EACzB,iBAAyB,CAAC,EAC1B,gBAAqC,mBAAmB,CAAC,0BAA0B,EACnF,kCAAwC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EACvD,cAAgC,EAChC,qBAA8C,EAC9C,kBAA2B;QAE3B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAC5C,OAAO,EACP,gBAAgB,EAChB,QAAQ,EACR,UAAU,EACV,UAAU,EACV,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,CAAC,EACjB,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,CAAC,EACrB,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,WAAW,EACX,UAAU,EACV,cAAc,EACd,aAAa,EACb,+BAA+B,EAC/B,cAAc,EACd,qBAAqB,EACrB,kBAAkB,CACnB,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,UAA0B,EAC1B,UAAuB,EACvB,aAA6B;;QAE7B,OAAO,IAAI,CAAC,UAAU,CACpB,UAAU,EACV,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,UAAU,EACrB,UAAU,CAAC,IAAI,EACf,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,WAAW,EACtB,UAAU,CAAC,UAAU,EACrB,UAAU,CAAC,UAAU,EACrB,UAAU,CAAC,YAAY,EACvB,UAAU,CAAC,gBAAgB,EAC3B,UAAU,CAAC,cAAc,EACzB,MAAA,UAAU,CAAC,aAAa,mCAAI,mBAAmB,CAAC,0BAA0B,EAC1E,MAAA,UAAU,CAAC,+BAA+B,mCAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAC7D,UAAU,CAAC,cAAc,EACzB,UAAU,CAAC,qBAAqB,EAChC,UAAU,CAAC,kBAAkB,EAC7B,aAAa,CACd,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW,CACf,UAA0B,EAC1B,QAAgB,EAChB,UAAsB,EACtB,UAAkB,EAClB,YAAqB,EACrB,gBAAyB,EACzB,aAA6B;QAE7B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,cAAc,CACnC,UAAU,CAAC,OAAO,EAClB,UAAU,CAAC,gBAAgB,EAC3B,QAAQ,EACR,UAAU,EACV,UAAU,EACV,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,CAAC,EACjB,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,CAAC,CACtB,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CACd,UAAU,EACV,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAC5B,IAAI,EACJ,SAAS,EACT,SAAS,EACT,aAAa,CACd,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,OAAe,EACf,gBAAwB,EACxB,QAAgB,EAChB,UAAsB,EACtB,UAAkB,EAClB,YAAqB,EACrB,gBAAyB;QAEzB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAC7C,OAAO,EACP,gBAAgB,EAChB,QAAQ,EACR,UAAU,EACV,UAAU,EACV,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,CAAC,EACjB,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,CAAC,CACtB,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,UAA0B,EAC1B,WAAyB,EACzB,aAA6B;QAE7B,OAAO,IAAI,CAAC,WAAW,CACrB,UAAU,EACV,WAAW,CAAC,QAAQ,EACpB,WAAW,CAAC,UAAU,EACtB,WAAW,CAAC,UAAU,EACtB,WAAW,CAAC,YAAY,EACxB,WAAW,CAAC,gBAAgB,EAC5B,aAAa,CACd,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,0BAA0B,CAC9B,UAA0B,EAC1B,eAA6B,EAC7B,YAAoB,EACpB,aAA6B;QAE7B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAClD,UAAU,CAAC,OAAO,EAClB,UAAU,CAAC,gBAAgB,EAC3B,eAAe,EACf,YAAY,CACb,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CACd,UAAU,EACV,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAC5B,IAAI,EACJ,SAAS,EACT,SAAS,EACT,aAAa,CACd,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,6BAA6B,CACjC,OAAe,EACf,gBAAwB,EACxB,eAA6B,EAC7B,YAAoB;QAEpB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,oCAAoC,CAC5D,OAAO,EACP,gBAAgB,EAChB,eAAe,EACf,YAAY,CACb,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,UAA0B,EAC1B,gBAAwB,EACxB,yBAAiC,EACjC,OAAe,EACf,MAAY,EACZ,aAA6B;QAE7B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAChC,UAAU,CAAC,OAAO,EAClB,UAAU,CAAC,gBAAgB,EAC3B,gBAAgB,EAChB,yBAAyB,EACzB,OAAO,EACP,MAAM,CACP,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CACd,UAAU,EACV,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAC5B,KAAK,EACL,SAAS,EACT,SAAS,EACT,aAAa,CACd,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW,CACf,OAAe,EACf,gBAAwB,EACxB,gBAAwB,EACxB,yBAAiC,EACjC,OAAe,EACf,MAAY;QAEZ,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAC1C,OAAO,EACP,gBAAgB,EAChB,gBAAgB,EAChB,yBAAyB,EACzB,OAAO,EACP,MAAM,CACP,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CACX,UAA0B,EAC1B,OAAe,EACf,QAAc,EACd,aAA6B;QAE7B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAC/B,UAAU,CAAC,OAAO,EAClB,UAAU,CAAC,gBAAgB,EAC3B,OAAO,EACP,QAAQ,CACT,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CACd,UAAU,EACV,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAC5B,KAAK,EACL,SAAS,EACT,SAAS,EACT,aAAa,CACd,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,UAAU,CACd,OAAe,EACf,gBAAwB,EACxB,OAAe,EACf,QAAc;QAEd,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,6BAA6B,CACrD,OAAO,EACP,gBAAgB,EAChB,OAAO,EACP,QAAQ,CACT,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,UAA0B,EAC1B,OAAe,EACf,QAAc,EACd,SAAkB,EAClB,aAA6B;QAE7B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAChC,UAAU,CAAC,OAAO,EAClB,UAAU,CAAC,gBAAgB,EAC3B,OAAO,EACP,QAAQ,EACR,SAAS,CACV,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CACd,UAAU,EACV,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAC5B,KAAK,EACL,SAAS,EACT,SAAS,EACT,aAAa,CACd,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW,CACf,OAAe,EACf,gBAAwB,EACxB,OAAe,EACf,QAAc,EACd,SAAkB;QAElB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,gCAAgC,CACxD,OAAO,EACP,gBAAgB,EAChB,OAAO,EACP,QAAQ,EACR,SAAS,CACV,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CACb,UAA0B,EAC1B,SAAiB,EACjB,SAAiB,EACjB,QAAgB,EAChB,UAAmB,IAAI,EACvB,aAA6B;QAE7B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QACxF,OAAO,IAAI,CAAC,IAAI,CACd,UAAU,EACV,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAC5B,OAAO,EACP,SAAS,KAAK,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,EAC7F,SAAS,EACT,aAAa,CACd,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,OAAe,EACf,SAAiB,EACjB,SAAiB,EACjB,QAAgB;QAEhB,IAAI,SAAS,KAAK,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,SAAS,KAAK,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YACvF,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC3C,CAAC;QAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;YACvF,OAAO,CAAC,GAAG,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,UAA0B,EAC1B,SAAiB,EACjB,SAAiB,EACjB,MAAc,EACd,aAA6B;QAE7B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,SAAS,EAAE,SAAS,EAAE;YACjE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB;YACnC,MAAM;SACP,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,IAAI,CACd,UAAU,EACV,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAC5B,KAAK,EACL,IAAI,CAAC,oBAAoB,EACzB,SAAS,EACT,aAAa,CACd,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,SAAiB,EAAE,SAAiB,EAAE,MAAc;QAC9D,OAAO,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,SAAS,EAAE,SAAS,EAAE;YAC5D,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB;YACnC,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CACd,UAA0B,EAC1B,SAAiB,EACjB,SAAiB,EACjB,MAAc,EACd,aAA6B;QAE7B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,SAAS,EAAE;YACnE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB;YACnC,MAAM;SACP,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,IAAI,CACd,UAAU,EACV,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAC5B,KAAK,EACL,IAAI,CAAC,oBAAoB,EACzB,SAAS,EACT,aAAa,CACd,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,SAAiB,EAAE,SAAiB,EAAE,MAAc;QAChE,OAAO,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,SAAS,EAAE;YAC9D,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB;YACnC,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,UAA0B,EAC1B,SAAiB,EACjB,SAAiB,EACjB,aAA6B;QAE7B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,iCAAiC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAClF,OAAO,IAAI,CAAC,IAAI,CACd,UAAU,EACV,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAC5B,KAAK,EACL,IAAI,CAAC,eAAe,EACpB,SAAS,EACT,aAAa,CACd,CAAC;IACJ,CAAC;IAED,0BAA0B,CAAC,SAAiB,EAAE,SAAiB;QAC7D,OAAO,IAAI,CAAC,QAAQ,CAAC,iCAAiC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC/E,CAAC;IAED,SAAS;IACT,KAAK,CAAC,kBAAkB,CACtB,UAA0B,EAC1B,aAAyB,EACzB,aAA6B;QAE7B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAC1C,UAAU,CAAC,OAAO,EAClB,UAAU,CAAC,gBAAgB,EAC3B,aAAa,CACd,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CACd,UAAU,EACV,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAC5B,KAAK,EACL,SAAS,EACT,SAAS,EACT,aAAa,CACd,CAAC;IACJ,CAAC;IAED,qBAAqB,CACnB,GAAG,IAA0D;QAE7D,OAAO,IAAI,CAAC,QAAQ,CAAC,4BAA4B,CAAC,GAAG,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,UAA0B,EAC1B,MAAkB,EAClB,gBAA4B,EAC5B,aAA6B;QAE7B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAC7C,UAAU,CAAC,OAAO,EAClB,UAAU,CAAC,gBAAgB,EAC3B,MAAM,EACN,gBAAgB,CACjB,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CACd,UAAU,EACV,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAC5B,KAAK,EACL,SAAS,EACT,SAAS,EACT,aAAa,CACd,CAAC;IACJ,CAAC;IAED,wBAAwB,CACtB,GAAG,IAA6D;QAEhE,OAAO,IAAI,CAAC,QAAQ,CAAC,+BAA+B,CAAC,GAAG,IAAI,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,UAA0B,EAC1B,SAAiB,EACjB,aAA6B,EAC7B,gBAAwB,CAAC;QAEzB,MAAM,GAAG,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACrE,OAAO,IAAI,CAAC,IAAI,CACd,UAAU,EACV,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAC5B,KAAK,EACL,SAAS,EACT,SAAS,EACT,aAAa,EACb,SAAS,EACT,aAAa,CACd,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,GAAG,IAAyD;QAC/E,OAAO,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5D,CAAC;IAED,eAAe,CACb,GAAG,IAAkE;QAErE,OAAO,IAAI,CAAC,QAAQ,CAAC,oCAAoC,CAAC,GAAG,IAAI,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,0BAA0B,CAC9B,MAAc,EACd,UAA0B,EAC1B,aAA6B,EAC7B,aAAsB,EACtB,IAAa;QAEb,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAC;QAE1F,OAAO,IAAI,CAAC,IAAI,CACd,UAAU,EACV,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAC5B,KAAK,EACL,SAAS,EACT,IAAI,EACJ,aAAa,EACb,SAAS,EACT,aAAa,CACd,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,UAA0B,EAC1B,iBAAoC,EACpC,IAAgB,EAChB,OAAe,EAAE,EACjB,YAA2B,CAAC;QAE5B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,0BAA0B,CAClD,UAAU,CAAC,OAAO,EAClB,iBAAiB,EACjB,IAAI,EACJ,IAAI,EACJ,SAAS,CACV,CAAC;QAEF,OAAO,IAAI,CAAC,IAAI,CACd,UAAU,EACV,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAC5B,KAAK,EACL,SAAS,EACT,SAAS,EACT,MAAM,CAAC,eAAe,EACtB,SAAS,EACT,SAAS,CACV,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,UAA0B,EAC1B,EAAQ;QAER,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,6BAA6B,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAEhF,OAAO,IAAI,CAAC,IAAI,CACd,UAAU,EACV,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAC5B,KAAK,EACL,SAAS,EACT,SAAS,EACT,MAAM,CAAC,eAAe,EACtB,SAAS,EACT,CAAC,CACF,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Secp256k1Pubkey } from '@cosmjs/amino';
|
|
2
2
|
import { EncodeObject, OfflineSigner } from '@cosmjs/proto-signing';
|
|
3
3
|
import { SigningStargateClient, StdFee } from '@cosmjs/stargate';
|
|
4
|
+
import { EthSecp256k1Pubkey } from '../lib/eth-pubkey';
|
|
4
5
|
import { TransactionOptions } from '../types';
|
|
5
6
|
export declare class TransactionSigner {
|
|
6
7
|
readonly address: string;
|
|
@@ -14,6 +15,6 @@ export declare class TransactionSigner {
|
|
|
14
15
|
* @throws UserError if the fee is undefined.
|
|
15
16
|
* @returns The signed and encoded transaction.
|
|
16
17
|
*/
|
|
17
|
-
signTransaction(messages: EncodeObject[], transactionOptions: TransactionOptions, fee?: StdFee, memo?: string, publicKey?: Secp256k1Pubkey): Promise<Uint8Array>;
|
|
18
|
+
signTransaction(messages: EncodeObject[], transactionOptions: TransactionOptions, fee?: StdFee, memo?: string, publicKey?: Secp256k1Pubkey | EthSecp256k1Pubkey): Promise<Uint8Array>;
|
|
18
19
|
}
|
|
19
20
|
//# sourceMappingURL=signer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../../../../src/clients/modules/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGhD,OAAO,EACL,YAAY,EAKZ,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../../../../src/clients/modules/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGhD,OAAO,EACL,YAAY,EAKZ,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAOjE,OAAO,EACL,kBAAkB,EAGnB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAS9C,qBAAa,iBAAiB;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IACtD,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;gBAGpC,OAAO,EAAE,MAAM,EACf,qBAAqB,EAAE,qBAAqB,EAC5C,aAAa,EAAE,aAAa;IAO9B;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,YAAY,EAAE,EACxB,kBAAkB,EAAE,kBAAkB,EACtC,GAAG,CAAC,EAAE,MAAM,EACZ,IAAI,GAAE,MAAW,EACjB,SAAS,CAAC,EAAE,eAAe,GAAG,kBAAkB,GAC/C,OAAO,CAAC,UAAU,CAAC;CA2FvB"}
|
|
@@ -6,6 +6,7 @@ import { TxBody, TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx';
|
|
|
6
6
|
import { Any } from 'cosmjs-types/google/protobuf/any';
|
|
7
7
|
import Long from 'long';
|
|
8
8
|
import protobuf from 'protobufjs';
|
|
9
|
+
import { ethSecp256k1PubkeyToAny, isEthSecp256k1Pubkey, } from '../lib/eth-pubkey';
|
|
9
10
|
import { generateRegistry } from '../lib/registry';
|
|
10
11
|
// Required for encoding and decoding queries that are of type Long.
|
|
11
12
|
// Must be done once but since the individal modules should be usable
|
|
@@ -57,7 +58,11 @@ export class TransactionSigner {
|
|
|
57
58
|
if (!publicKey) {
|
|
58
59
|
throw new Error('Public key cannot be undefined');
|
|
59
60
|
}
|
|
60
|
-
|
|
61
|
+
// Use the public key of the signer. cosmjs's encodePubkey() only knows the
|
|
62
|
+
// cosmos key types, so the eth pubkey gets its own Any construction.
|
|
63
|
+
const pubkey = isEthSecp256k1Pubkey(publicKey)
|
|
64
|
+
? ethSecp256k1PubkeyToAny(publicKey)
|
|
65
|
+
: encodePubkey(publicKey);
|
|
61
66
|
const gasLimit = Int53.fromString(String(fee.gas)).toNumber();
|
|
62
67
|
const authInfoBytes = makeAuthInfoBytes([{ pubkey, sequence: transactionOptions.sequence }], fee.amount, gasLimit, undefined, undefined);
|
|
63
68
|
// Create the SignDoc.
|
|
@@ -88,4 +93,4 @@ export class TransactionSigner {
|
|
|
88
93
|
}
|
|
89
94
|
}
|
|
90
95
|
}
|
|
91
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lnbmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL2NsaWVudHMvbW9kdWxlcy9zaWduZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQzlDLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDckMsT0FBTyxFQUVMLFlBQVksRUFDWixxQkFBcUIsRUFDckIsaUJBQWlCLEVBQ2pCLFdBQVcsR0FFWixNQUFNLHVCQUF1QixDQUFDO0FBRS9CLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxvREFBb0QsQ0FBQztBQUNqRixPQUFPLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ2xFLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUN2RCxPQUFPLElBQUksTUFBTSxNQUFNLENBQUM7QUFDeEIsT0FBTyxRQUFRLE1BQU0sWUFBWSxDQUFDO0FBRWxDLE9BQU8sRUFFTCx1QkFBdUIsRUFDdkIsb0JBQW9CLEdBQ3JCLE1BQU0sbUJBQW1CLENBQUM7QUFDM0IsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFHbkQsb0VBQW9FO0FBQ3BFLHFFQUFxRTtBQUNyRSx3RUFBd0U7QUFDeEUsa0VBQWtFO0FBQ2xFLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztBQUMxQixRQUFRLENBQUMsU0FBUyxFQUFFLENBQUM7QUFFckIsTUFBTSxPQUFPLGlCQUFpQjtJQUs1QixZQUNFLE9BQWUsRUFDZixxQkFBNEMsRUFDNUMsYUFBNEI7UUFFNUIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDdkIsSUFBSSxDQUFDLHFCQUFxQixHQUFHLHFCQUFxQixDQUFDO1FBQ25ELElBQUksQ0FBQyxhQUFhLEdBQUcsYUFBYSxDQUFDO0lBQ3JDLENBQUM7SUFFRDs7Ozs7O09BTUc7SUFDSCxLQUFLLENBQUMsZUFBZSxDQUNuQixRQUF3QixFQUN4QixrQkFBc0MsRUFDdEMsR0FBWSxFQUNaLE9BQWUsRUFBRSxFQUNqQixTQUFnRDs7UUFFaEQsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQ1QsTUFBTSxJQUFJLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO1FBQzdDLENBQUM7UUFFRCxNQUFNLFFBQVEsR0FBRyxnQkFBZ0IsRUFBRSxDQUFDO1FBRXBDLHNCQUFzQjtRQUN0QixNQUFNLGVBQWUsR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFFekUsaUNBQWlDO1FBQ2pDLE1BQU0sV0FBVyxHQUFHLFdBQVcsQ0FBQyxNQUFNLENBQUM7WUFDckMsc0JBQXNCLEVBQUUsTUFBQSxrQkFBa0IsQ0FBQyxjQUFjLG1DQUFJLEVBQUU7U0FDaEUsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBRVosNENBQTRDO1FBQzVDLE1BQU0sMkJBQTJCLEdBQVU7WUFDekMsR0FBRyxDQUFDLFdBQVcsQ0FBQztnQkFDZCxPQUFPLEVBQUUsaUNBQWlDO2dCQUMxQyxLQUFLLEVBQUUsV0FBVzthQUNuQixDQUFDO1NBQ0gsQ0FBQztRQUVGLHVCQUF1QjtRQUN2QixNQUFNLE1BQU0sR0FBVyxNQUFNLENBQUMsV0FBVyxDQUFDO1lBQ3hDLFFBQVEsRUFBRSxlQUFlO1lBQ3pCLElBQUk7WUFDSixnQkFBZ0IsRUFBRSxFQUFFO1lBQ3BCLDJCQUEyQjtTQUM1QixDQUFDLENBQUM7UUFFSCxvQkFBb0I7UUFDcEIsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUVuRCxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDZixNQUFNLElBQUksS0FBSyxDQUFDLGdDQUFnQyxDQUFDLENBQUM7UUFDcEQsQ0FBQztRQUNELDJFQUEyRTtRQUMzRSxxRUFBcUU7UUFDckUsTUFBTSxNQUFNLEdBQUcsb0JBQW9CLENBQUMsU0FBUyxDQUFDO1lBQzVDLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQyxTQUFTLENBQUM7WUFDcEMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUU1QixNQUFNLFFBQVEsR0FBRyxLQUFLLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUM5RCxNQUFNLGFBQWEsR0FBRyxpQkFBaUIsQ0FDckMsQ0FBQyxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsa0JBQWtCLENBQUMsUUFBUSxFQUFFLENBQUMsRUFDbkQsR0FBRyxDQUFDLE1BQU0sRUFDVixRQUFRLEVBQ1IsU0FBUyxFQUNULFNBQVMsQ0FDVixDQUFDO1FBRUYsc0JBQXNCO1FBQ3RCLDBFQUEwRTtRQUMxRSwyRUFBMkU7UUFDM0Usa0NBQWtDO1FBQ2xDLE1BQU0sT0FBTyxHQUFHLFdBQVcsQ0FDekIsV0FBVyxFQUNYLGFBQWEsRUFDYixrQkFBa0IsQ0FBQyxPQUFPLEVBQzFCLGtCQUFrQixDQUFDLGFBQXVCLENBQzNDLENBQUM7UUFFRiw0Q0FBNEM7UUFDNUMsTUFBTSxhQUFhLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUNuQyxJQUFJLHFCQUFxQixDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsRUFBRSxDQUFDO1lBQzlDLE1BQU0sRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLEdBQUcsTUFBTSxJQUFJLENBQUMsYUFBYSxDQUFDLFVBQVUsQ0FBQyxhQUFhLEVBQUUsT0FBTyxDQUFDLENBQUM7WUFFMUYsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLFdBQVcsQ0FBQztnQkFDOUIsU0FBUyxFQUFFLE1BQU0sQ0FBQyxTQUFTO2dCQUMzQixhQUFhLEVBQUUsTUFBTSxDQUFDLGFBQWE7Z0JBQ25DLFVBQVUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLENBQUM7YUFDOUMsQ0FBQyxDQUFDO1lBQ0gsT0FBTyxVQUFVLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUN2RCxDQUFDO2FBQU0sQ0FBQztZQUNOLE1BQU0sS0FBSyxHQUFVLE1BQU0sSUFBSSxDQUFDLHFCQUFxQixDQUFDLElBQUksQ0FDeEQsSUFBSSxDQUFDLE9BQU8sRUFDWixRQUFRLEVBQ1IsR0FBRyxFQUNILElBQUksRUFDSjtnQkFDRSxpRUFBaUU7Z0JBQ2pFLG1FQUFtRTtnQkFDbkUsYUFBYSxFQUFFLGtCQUFrQixDQUFDLGFBQXVCO2dCQUN6RCxRQUFRLEVBQUUsa0JBQWtCLENBQUMsUUFBUTtnQkFDckMsT0FBTyxFQUFFLGtCQUFrQixDQUFDLE9BQU87YUFDcEMsQ0FDRixDQUFDO1lBQ0YsT0FBTyxVQUFVLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUN2RCxDQUFDO0lBQ0gsQ0FBQztDQUNGIn0=
|
package/build/esm/src/index.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export * from './types';
|
|
2
|
+
export * as evmAddress from './lib/evm-address';
|
|
2
3
|
export * as helpers from './lib/helpers';
|
|
3
4
|
export * as onboarding from './lib/onboarding';
|
|
4
5
|
export * as tradingKeyUtils from './lib/trading-key-utils';
|
|
@@ -8,6 +9,18 @@ export { CompositeClient } from './clients/composite-client';
|
|
|
8
9
|
export { FaucetClient } from './clients/faucet-client';
|
|
9
10
|
export { IndexerClient } from './clients/indexer-client';
|
|
10
11
|
export { default as LocalWallet } from './clients/modules/local-wallet';
|
|
12
|
+
export { default as EthLocalWallet, DirectEthSecp256k1Signer, ETH_BIP44_HD_PATH, } from './clients/modules/eth-wallet';
|
|
13
|
+
export { encodeEthSecp256k1Pubkey, isEthSecp256k1Pubkey, ethSecp256k1PubkeyToAny, ETH_SECP256K1_PUBKEY_TYPE, ETH_SECP256K1_PUBKEY_TYPE_URL, } from './clients/lib/eth-pubkey';
|
|
14
|
+
export type { EthSecp256k1Pubkey } from './clients/lib/eth-pubkey';
|
|
15
|
+
export { createEip712Domain, eip712Digest, registerEip712AminoConverter, signDocBytesToEip712TypedData, signDocToEip712TypedData, } from './clients/lib/eip712';
|
|
16
|
+
export type { Eip712AminoConverter, Eip712AminoMsg, Eip712Domain, Eip712TypedData, Eip712TypeField, Eip712Types, } from './clients/lib/eip712';
|
|
17
|
+
export { Eip712Signer, recoverPubKeyFromTypedDataSignature, signCosmosTxWithEip712, } from './clients/modules/eip712-signer';
|
|
18
|
+
export type { Eip712SignOptions, SignTypedDataCallback } from './clients/modules/eip712-signer';
|
|
19
|
+
export { AGENT_APPROVAL_DOMAIN_NAME, AGENT_APPROVAL_DOMAIN_VERSION, AGENT_APPROVAL_PRIMARY_TYPE, AGENT_AUTHENTICATOR_TYPE, AGENT_REVOCATION_ADDRESS, agentAddressBytes, agentAddressToHex, agentApprovalDigest, agentApprovalTypedData, } from './clients/lib/agent-approval';
|
|
20
|
+
export type { AgentApproval } from './clients/lib/agent-approval';
|
|
21
|
+
export { composeAgentApprovalMsg, signAgentApprovalTx, } from './clients/lib/agent-approval-tx';
|
|
22
|
+
export type { AgentApprovalTxOptions, SignAgentApprovalCallback, } from './clients/lib/agent-approval-tx';
|
|
23
|
+
export { EthAgentWallet } from './clients/modules/eth-agent-wallet';
|
|
11
24
|
export { NobleClient } from './clients/noble-client';
|
|
12
25
|
export { SocketClient } from './clients/socket-client';
|
|
13
26
|
export { SubaccountInfo as SubaccountClient, SubaccountInfo } from './clients/subaccount';
|