@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
|
@@ -11,6 +11,7 @@ const long_1 = __importDefault(require("long"));
|
|
|
11
11
|
const protobufjs_1 = __importDefault(require("protobufjs"));
|
|
12
12
|
const constants_1 = require("../constants");
|
|
13
13
|
const errors_1 = require("../lib/errors");
|
|
14
|
+
const eth_pubkey_1 = require("../lib/eth-pubkey");
|
|
14
15
|
const registry_1 = require("../lib/registry");
|
|
15
16
|
const types_1 = require("../types");
|
|
16
17
|
const composer_1 = require("./composer");
|
|
@@ -226,9 +227,18 @@ class Post {
|
|
|
226
227
|
* @returns The Fee for broadcasting a transaction.
|
|
227
228
|
*/
|
|
228
229
|
async simulateTransaction(pubKey, sequence, messages, gasPrice = this.getGasPrice(), memo, gasAdjustment = constants_1.GAS_MULTIPLIER) {
|
|
230
|
+
// cosmjs's tx.simulate() encodes the pubkey via encodePubkey(), which
|
|
231
|
+
// cannot encode the eth_secp256k1 type. Simulation skips signature
|
|
232
|
+
// verification and the pubkey<->address match check (the SDK gates it on
|
|
233
|
+
// !simulate), and cosmos/evm prices ethsecp256k1 gas identically to
|
|
234
|
+
// secp256k1, so simulating with the cosmos secp256k1 typeUrl over the
|
|
235
|
+
// same key bytes yields the same gas estimate.
|
|
236
|
+
const simulationPubKey = (0, eth_pubkey_1.isEthSecp256k1Pubkey)(pubKey)
|
|
237
|
+
? { type: 'tendermint/PubKeySecp256k1', value: pubKey.value }
|
|
238
|
+
: pubKey;
|
|
229
239
|
// Get simulated response.
|
|
230
240
|
const encodedMessages = messages.map((message) => this.registry.encodeAsAny(message));
|
|
231
|
-
const simulationResponse = await this.get.stargateQueryClient.tx.simulate(encodedMessages, memo,
|
|
241
|
+
const simulationResponse = await this.get.stargateQueryClient.tx.simulate(encodedMessages, memo, simulationPubKey, sequence);
|
|
232
242
|
// The promise should have been rejected if the gasInfo was undefined.
|
|
233
243
|
if (simulationResponse.gasInfo === undefined) {
|
|
234
244
|
throw new errors_1.UnexpectedClientError();
|
|
@@ -398,8 +408,8 @@ class Post {
|
|
|
398
408
|
const msg = this.launchMarketMsg(subaccount.address, ticker, subaccount.subaccountNumber);
|
|
399
409
|
return this.send(subaccount, () => Promise.resolve([msg]), false, undefined, memo, broadcastMode, undefined, gasAdjustment);
|
|
400
410
|
}
|
|
401
|
-
async addAuthenticator(subaccount, authenticatorType, data) {
|
|
402
|
-
const msg = this.composer.composeMsgAddAuthenticator(subaccount.address, authenticatorType, data);
|
|
411
|
+
async addAuthenticator(subaccount, authenticatorType, data, name = '', expiresAt = 0) {
|
|
412
|
+
const msg = this.composer.composeMsgAddAuthenticator(subaccount.address, authenticatorType, data, name, expiresAt);
|
|
403
413
|
return this.send(subaccount, () => Promise.resolve([msg]), false, undefined, undefined, tendermint_rpc_1.Method.BroadcastTxSync, undefined, undefined);
|
|
404
414
|
}
|
|
405
415
|
async removeAuthenticator(subaccount, id) {
|
|
@@ -408,4 +418,4 @@ class Post {
|
|
|
408
418
|
}
|
|
409
419
|
}
|
|
410
420
|
exports.Post = Post;
|
|
411
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"post.js","sourceRoot":"","sources":["../../../../../src/clients/modules/post.ts"],"names":[],"mappings":"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"}
|
|
421
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"post.js","sourceRoot":"","sources":["../../../../../src/clients/modules/post.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ const tx_2 = require("cosmjs-types/cosmos/tx/v1beta1/tx");
|
|
|
12
12
|
const any_1 = require("cosmjs-types/google/protobuf/any");
|
|
13
13
|
const long_1 = __importDefault(require("long"));
|
|
14
14
|
const protobufjs_1 = __importDefault(require("protobufjs"));
|
|
15
|
+
const eth_pubkey_1 = require("../lib/eth-pubkey");
|
|
15
16
|
const registry_1 = require("../lib/registry");
|
|
16
17
|
// Required for encoding and decoding queries that are of type Long.
|
|
17
18
|
// Must be done once but since the individal modules should be usable
|
|
@@ -63,7 +64,11 @@ class TransactionSigner {
|
|
|
63
64
|
if (!publicKey) {
|
|
64
65
|
throw new Error('Public key cannot be undefined');
|
|
65
66
|
}
|
|
66
|
-
|
|
67
|
+
// Use the public key of the signer. cosmjs's encodePubkey() only knows the
|
|
68
|
+
// cosmos key types, so the eth pubkey gets its own Any construction.
|
|
69
|
+
const pubkey = (0, eth_pubkey_1.isEthSecp256k1Pubkey)(publicKey)
|
|
70
|
+
? (0, eth_pubkey_1.ethSecp256k1PubkeyToAny)(publicKey)
|
|
71
|
+
: (0, proto_signing_1.encodePubkey)(publicKey);
|
|
67
72
|
const gasLimit = math_1.Int53.fromString(String(fee.gas)).toNumber();
|
|
68
73
|
const authInfoBytes = (0, proto_signing_1.makeAuthInfoBytes)([{ pubkey, sequence: transactionOptions.sequence }], fee.amount, gasLimit, undefined, undefined);
|
|
69
74
|
// Create the SignDoc.
|
|
@@ -95,4 +100,4 @@ class TransactionSigner {
|
|
|
95
100
|
}
|
|
96
101
|
}
|
|
97
102
|
exports.TransactionSigner = TransactionSigner;
|
|
98
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
103
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lnbmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL2NsaWVudHMvbW9kdWxlcy9zaWduZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQ0EsK0NBQThDO0FBQzlDLHVDQUFxQztBQUNyQyx5REFPK0I7QUFFL0IsMkVBQWlGO0FBQ2pGLDBEQUFrRTtBQUNsRSwwREFBdUQ7QUFDdkQsZ0RBQXdCO0FBQ3hCLDREQUFrQztBQUVsQyxrREFJMkI7QUFDM0IsOENBQW1EO0FBR25ELG9FQUFvRTtBQUNwRSxxRUFBcUU7QUFDckUsd0VBQXdFO0FBQ3hFLGtFQUFrRTtBQUNsRSxvQkFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLEdBQUcsY0FBSSxDQUFDO0FBQzFCLG9CQUFRLENBQUMsU0FBUyxFQUFFLENBQUM7QUFFckIsTUFBYSxpQkFBaUI7SUFLNUIsWUFDRSxPQUFlLEVBQ2YscUJBQTRDLEVBQzVDLGFBQTRCO1FBRTVCLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxxQkFBcUIsR0FBRyxxQkFBcUIsQ0FBQztRQUNuRCxJQUFJLENBQUMsYUFBYSxHQUFHLGFBQWEsQ0FBQztJQUNyQyxDQUFDO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsS0FBSyxDQUFDLGVBQWUsQ0FDbkIsUUFBd0IsRUFDeEIsa0JBQXNDLEVBQ3RDLEdBQVksRUFDWixPQUFlLEVBQUUsRUFDakIsU0FBZ0Q7O1FBRWhELElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUNULE1BQU0sSUFBSSxLQUFLLENBQUMseUJBQXlCLENBQUMsQ0FBQztRQUM3QyxDQUFDO1FBRUQsTUFBTSxRQUFRLEdBQUcsSUFBQSwyQkFBZ0IsR0FBRSxDQUFDO1FBRXBDLHNCQUFzQjtRQUN0QixNQUFNLGVBQWUsR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFD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
|
package/build/cjs/src/index.js
CHANGED
|
@@ -39,10 +39,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
39
39
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
40
|
};
|
|
41
41
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
|
-
exports.NetworkOptimizer = exports.ByteArrayEncoding = exports.encodeJson = exports.ValidatorClient = exports.SubaccountInfo = exports.SubaccountClient = exports.SocketClient = exports.NobleClient = exports.LocalWallet = exports.IndexerClient = exports.FaucetClient = exports.CompositeClient = exports.validation = exports.utils = exports.tradingKeyUtils = exports.onboarding = exports.helpers = void 0;
|
|
42
|
+
exports.NetworkOptimizer = exports.ByteArrayEncoding = exports.encodeJson = exports.ValidatorClient = exports.SubaccountInfo = exports.SubaccountClient = exports.SocketClient = exports.NobleClient = exports.EthAgentWallet = exports.signAgentApprovalTx = exports.composeAgentApprovalMsg = exports.agentApprovalTypedData = exports.agentApprovalDigest = exports.agentAddressToHex = exports.agentAddressBytes = exports.AGENT_REVOCATION_ADDRESS = exports.AGENT_AUTHENTICATOR_TYPE = exports.AGENT_APPROVAL_PRIMARY_TYPE = exports.AGENT_APPROVAL_DOMAIN_VERSION = exports.AGENT_APPROVAL_DOMAIN_NAME = exports.signCosmosTxWithEip712 = exports.recoverPubKeyFromTypedDataSignature = exports.Eip712Signer = exports.signDocToEip712TypedData = exports.signDocBytesToEip712TypedData = exports.registerEip712AminoConverter = exports.eip712Digest = exports.createEip712Domain = exports.ETH_SECP256K1_PUBKEY_TYPE_URL = exports.ETH_SECP256K1_PUBKEY_TYPE = exports.ethSecp256k1PubkeyToAny = exports.isEthSecp256k1Pubkey = exports.encodeEthSecp256k1Pubkey = exports.ETH_BIP44_HD_PATH = exports.DirectEthSecp256k1Signer = exports.EthLocalWallet = exports.LocalWallet = exports.IndexerClient = exports.FaucetClient = exports.CompositeClient = exports.validation = exports.utils = exports.tradingKeyUtils = exports.onboarding = exports.helpers = exports.evmAddress = void 0;
|
|
43
43
|
// Types.
|
|
44
44
|
__exportStar(require("./types"), exports);
|
|
45
45
|
// Utility functions.
|
|
46
|
+
exports.evmAddress = __importStar(require("./lib/evm-address"));
|
|
46
47
|
exports.helpers = __importStar(require("./lib/helpers"));
|
|
47
48
|
exports.onboarding = __importStar(require("./lib/onboarding"));
|
|
48
49
|
exports.tradingKeyUtils = __importStar(require("./lib/trading-key-utils"));
|
|
@@ -56,6 +57,41 @@ var indexer_client_1 = require("./clients/indexer-client");
|
|
|
56
57
|
Object.defineProperty(exports, "IndexerClient", { enumerable: true, get: function () { return indexer_client_1.IndexerClient; } });
|
|
57
58
|
var local_wallet_1 = require("./clients/modules/local-wallet");
|
|
58
59
|
Object.defineProperty(exports, "LocalWallet", { enumerable: true, get: function () { return __importDefault(local_wallet_1).default; } });
|
|
60
|
+
var eth_wallet_1 = require("./clients/modules/eth-wallet");
|
|
61
|
+
Object.defineProperty(exports, "EthLocalWallet", { enumerable: true, get: function () { return __importDefault(eth_wallet_1).default; } });
|
|
62
|
+
Object.defineProperty(exports, "DirectEthSecp256k1Signer", { enumerable: true, get: function () { return eth_wallet_1.DirectEthSecp256k1Signer; } });
|
|
63
|
+
Object.defineProperty(exports, "ETH_BIP44_HD_PATH", { enumerable: true, get: function () { return eth_wallet_1.ETH_BIP44_HD_PATH; } });
|
|
64
|
+
var eth_pubkey_1 = require("./clients/lib/eth-pubkey");
|
|
65
|
+
Object.defineProperty(exports, "encodeEthSecp256k1Pubkey", { enumerable: true, get: function () { return eth_pubkey_1.encodeEthSecp256k1Pubkey; } });
|
|
66
|
+
Object.defineProperty(exports, "isEthSecp256k1Pubkey", { enumerable: true, get: function () { return eth_pubkey_1.isEthSecp256k1Pubkey; } });
|
|
67
|
+
Object.defineProperty(exports, "ethSecp256k1PubkeyToAny", { enumerable: true, get: function () { return eth_pubkey_1.ethSecp256k1PubkeyToAny; } });
|
|
68
|
+
Object.defineProperty(exports, "ETH_SECP256K1_PUBKEY_TYPE", { enumerable: true, get: function () { return eth_pubkey_1.ETH_SECP256K1_PUBKEY_TYPE; } });
|
|
69
|
+
Object.defineProperty(exports, "ETH_SECP256K1_PUBKEY_TYPE_URL", { enumerable: true, get: function () { return eth_pubkey_1.ETH_SECP256K1_PUBKEY_TYPE_URL; } });
|
|
70
|
+
var eip712_1 = require("./clients/lib/eip712");
|
|
71
|
+
Object.defineProperty(exports, "createEip712Domain", { enumerable: true, get: function () { return eip712_1.createEip712Domain; } });
|
|
72
|
+
Object.defineProperty(exports, "eip712Digest", { enumerable: true, get: function () { return eip712_1.eip712Digest; } });
|
|
73
|
+
Object.defineProperty(exports, "registerEip712AminoConverter", { enumerable: true, get: function () { return eip712_1.registerEip712AminoConverter; } });
|
|
74
|
+
Object.defineProperty(exports, "signDocBytesToEip712TypedData", { enumerable: true, get: function () { return eip712_1.signDocBytesToEip712TypedData; } });
|
|
75
|
+
Object.defineProperty(exports, "signDocToEip712TypedData", { enumerable: true, get: function () { return eip712_1.signDocToEip712TypedData; } });
|
|
76
|
+
var eip712_signer_1 = require("./clients/modules/eip712-signer");
|
|
77
|
+
Object.defineProperty(exports, "Eip712Signer", { enumerable: true, get: function () { return eip712_signer_1.Eip712Signer; } });
|
|
78
|
+
Object.defineProperty(exports, "recoverPubKeyFromTypedDataSignature", { enumerable: true, get: function () { return eip712_signer_1.recoverPubKeyFromTypedDataSignature; } });
|
|
79
|
+
Object.defineProperty(exports, "signCosmosTxWithEip712", { enumerable: true, get: function () { return eip712_signer_1.signCosmosTxWithEip712; } });
|
|
80
|
+
var agent_approval_1 = require("./clients/lib/agent-approval");
|
|
81
|
+
Object.defineProperty(exports, "AGENT_APPROVAL_DOMAIN_NAME", { enumerable: true, get: function () { return agent_approval_1.AGENT_APPROVAL_DOMAIN_NAME; } });
|
|
82
|
+
Object.defineProperty(exports, "AGENT_APPROVAL_DOMAIN_VERSION", { enumerable: true, get: function () { return agent_approval_1.AGENT_APPROVAL_DOMAIN_VERSION; } });
|
|
83
|
+
Object.defineProperty(exports, "AGENT_APPROVAL_PRIMARY_TYPE", { enumerable: true, get: function () { return agent_approval_1.AGENT_APPROVAL_PRIMARY_TYPE; } });
|
|
84
|
+
Object.defineProperty(exports, "AGENT_AUTHENTICATOR_TYPE", { enumerable: true, get: function () { return agent_approval_1.AGENT_AUTHENTICATOR_TYPE; } });
|
|
85
|
+
Object.defineProperty(exports, "AGENT_REVOCATION_ADDRESS", { enumerable: true, get: function () { return agent_approval_1.AGENT_REVOCATION_ADDRESS; } });
|
|
86
|
+
Object.defineProperty(exports, "agentAddressBytes", { enumerable: true, get: function () { return agent_approval_1.agentAddressBytes; } });
|
|
87
|
+
Object.defineProperty(exports, "agentAddressToHex", { enumerable: true, get: function () { return agent_approval_1.agentAddressToHex; } });
|
|
88
|
+
Object.defineProperty(exports, "agentApprovalDigest", { enumerable: true, get: function () { return agent_approval_1.agentApprovalDigest; } });
|
|
89
|
+
Object.defineProperty(exports, "agentApprovalTypedData", { enumerable: true, get: function () { return agent_approval_1.agentApprovalTypedData; } });
|
|
90
|
+
var agent_approval_tx_1 = require("./clients/lib/agent-approval-tx");
|
|
91
|
+
Object.defineProperty(exports, "composeAgentApprovalMsg", { enumerable: true, get: function () { return agent_approval_tx_1.composeAgentApprovalMsg; } });
|
|
92
|
+
Object.defineProperty(exports, "signAgentApprovalTx", { enumerable: true, get: function () { return agent_approval_tx_1.signAgentApprovalTx; } });
|
|
93
|
+
var eth_agent_wallet_1 = require("./clients/modules/eth-agent-wallet");
|
|
94
|
+
Object.defineProperty(exports, "EthAgentWallet", { enumerable: true, get: function () { return eth_agent_wallet_1.EthAgentWallet; } });
|
|
59
95
|
var noble_client_1 = require("./clients/noble-client");
|
|
60
96
|
Object.defineProperty(exports, "NobleClient", { enumerable: true, get: function () { return noble_client_1.NobleClient; } });
|
|
61
97
|
var socket_client_1 = require("./clients/socket-client");
|
|
@@ -73,4 +109,4 @@ Object.defineProperty(exports, "NetworkOptimizer", { enumerable: true, get: func
|
|
|
73
109
|
// Dual / multi-asset collateral helpers.
|
|
74
110
|
__exportStar(require("./clients/helpers/asset-registry"), exports);
|
|
75
111
|
__exportStar(require("./clients/helpers/collateral"), exports);
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
112
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsU0FBUztBQUNULDBDQUF3QjtBQUV4QixxQkFBcUI7QUFDckIsZ0VBQWdEO0FBQ2hELHlEQUF5QztBQUN6QywrREFBK0M7QUFDL0MsMkVBQTJEO0FBQzNELHFEQUFxQztBQUNyQywrREFBK0M7QUFDL0MsK0RBQTZEO0FBQXBELG1IQUFBLGVBQWUsT0FBQTtBQUN4Qix5REFBdUQ7QUFBOUMsNkdBQUEsWUFBWSxPQUFBO0FBQ3JCLDJEQUF5RDtBQUFoRCwrR0FBQSxhQUFhLE9BQUE7QUFDdEIsK0RBQXdFO0FBQS9ELDRIQUFBLE9BQU8sT0FBZTtBQUMvQiwyREFJc0M7QUFIcEMsNkhBQUEsT0FBTyxPQUFrQjtBQUN6QixzSEFBQSx3QkFBd0IsT0FBQTtBQUN4QiwrR0FBQSxpQkFBaUIsT0FBQTtBQUVuQix1REFNa0M7QUFMaEMsc0hBQUEsd0JBQXdCLE9BQUE7QUFDeEIsa0hBQUEsb0JBQW9CLE9BQUE7QUFDcEIscUhBQUEsdUJBQXVCLE9BQUE7QUFDdkIsdUhBQUEseUJBQXlCLE9BQUE7QUFDekIsMkhBQUEsNkJBQTZCLE9BQUE7QUFHL0IsK0NBTThCO0FBTDVCLDRHQUFBLGtCQUFrQixPQUFBO0FBQ2xCLHNHQUFBLFlBQVksT0FBQTtBQUNaLHNIQUFBLDRCQUE0QixPQUFBO0FBQzVCLHVIQUFBLDZCQUE2QixPQUFBO0FBQzdCLGtIQUFBLHdCQUF3QixPQUFBO0FBVTFCLGlFQUl5QztBQUh2Qyw2R0FBQSxZQUFZLE9BQUE7QUFDWixvSUFBQSxtQ0FBbUMsT0FBQTtBQUNuQyx1SEFBQSxzQkFBc0IsT0FBQTtBQUd4QiwrREFVc0M7QUFUcEMsNEhBQUEsMEJBQTBCLE9BQUE7QUFDMUIsK0hBQUEsNkJBQTZCLE9BQUE7QUFDN0IsNkhBQUEsMkJBQTJCLE9BQUE7QUFDM0IsMEhBQUEsd0JBQXdCLE9BQUE7QUFDeEIsMEhBQUEsd0JBQXdCLE9BQUE7QUFDeEIsbUhBQUEsaUJBQWlCLE9BQUE7QUFDakIsbUhBQUEsaUJBQWlCLE9BQUE7QUFDakIscUhBQUEsbUJBQW1CLE9BQUE7QUFDbkIsd0hBQUEsc0JBQXNCLE9BQUE7QUFHeEIscUVBR3lDO0FBRnZDLDRIQUFBLHVCQUF1QixPQUFBO0FBQ3ZCLHdIQUFBLG1CQUFtQixPQUFBO0FBTXJCLHVFQUFvRTtBQUEzRCxrSEFBQSxjQUFjLE9BQUE7QUFDdkIsdURBQXFEO0FBQTVDLDJHQUFBLFdBQVcsT0FBQTtBQUNwQix5REFBdUQ7QUFBOUMsNkdBQUEsWUFBWSxPQUFBO0FBQ3JCLG1EQUEwRjtBQUFqRiw4R0FBQSxjQUFjLE9BQW9CO0FBQUUsNEdBQUEsY0FBYyxPQUFBO0FBQzNELCtEQUE2RDtBQUFwRCxtSEFBQSxlQUFlLE9BQUE7QUFDeEIseUNBQThEO0FBQXJELHFHQUFBLFVBQVUsT0FBQTtBQUFFLDRHQUFBLGlCQUFpQixPQUFBO0FBQ3RDLHlEQUF1RDtBQUE5QyxxSEFBQSxnQkFBZ0IsT0FBQTtBQUV6Qix5Q0FBeUM7QUFDekMsbUVBQWlEO0FBQ2pELCtEQUE2QyJ9
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ethAddressBytesFromPubkey = ethAddressBytesFromPubkey;
|
|
4
|
+
exports.toChecksumEthAddress = toChecksumEthAddress;
|
|
5
|
+
exports.isValidEthAddress = isValidEthAddress;
|
|
6
|
+
exports.ethAddressToBech32 = ethAddressToBech32;
|
|
7
|
+
exports.bech32ToEthAddress = bech32ToEthAddress;
|
|
8
|
+
const encoding_1 = require("@cosmjs/encoding");
|
|
9
|
+
const keccak_1 = require("ethereum-cryptography/keccak");
|
|
10
|
+
const secp256k1_1 = require("ethereum-cryptography/secp256k1");
|
|
11
|
+
const constants_1 = require("./constants");
|
|
12
|
+
const helpers_1 = require("./helpers");
|
|
13
|
+
/**
|
|
14
|
+
* Ethereum-style address helpers for the 0x == rit1 wallet model: an
|
|
15
|
+
* eth_secp256k1 account's address is keccak256(uncompressed pubkey without the
|
|
16
|
+
* 04 prefix)[12:], and the 0x and bech32 representations are the same 20
|
|
17
|
+
* bytes.
|
|
18
|
+
*/
|
|
19
|
+
const ETH_ADDRESS_BYTE_LENGTH = 20;
|
|
20
|
+
const ETH_ADDRESS_REGEX = /^(0x)?[0-9a-fA-F]{40}$/;
|
|
21
|
+
/**
|
|
22
|
+
* @description Derive the ethereum-style 20-byte address from a secp256k1
|
|
23
|
+
* public key (compressed 33-byte or uncompressed 65-byte form).
|
|
24
|
+
*
|
|
25
|
+
* @returns keccak256(uncompressed pubkey without the 04 prefix)[12:].
|
|
26
|
+
*/
|
|
27
|
+
function ethAddressBytesFromPubkey(pubkey) {
|
|
28
|
+
const uncompressed = pubkey.length === 65 && pubkey[0] === 0x04
|
|
29
|
+
? pubkey
|
|
30
|
+
: secp256k1_1.secp256k1.ProjectivePoint.fromHex(pubkey).toRawBytes(false);
|
|
31
|
+
// Last 20 bytes of the 32-byte keccak hash.
|
|
32
|
+
return (0, keccak_1.keccak256)(uncompressed.slice(1)).slice(-ETH_ADDRESS_BYTE_LENGTH);
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* @description Apply the EIP-55 mixed-case checksum to a hex address.
|
|
36
|
+
*
|
|
37
|
+
* @returns Checksummed address with 0x prefix.
|
|
38
|
+
*/
|
|
39
|
+
function toChecksumEthAddress(ethAddress) {
|
|
40
|
+
const hex = (0, helpers_1.stripHexPrefix)(ethAddress).toLowerCase();
|
|
41
|
+
if (!ETH_ADDRESS_REGEX.test(hex)) {
|
|
42
|
+
throw new Error(`Invalid ethereum address: ${ethAddress}`);
|
|
43
|
+
}
|
|
44
|
+
const hash = (0, encoding_1.toHex)((0, keccak_1.keccak256)(new Uint8Array(Buffer.from(hex, 'ascii'))));
|
|
45
|
+
let checksummed = '';
|
|
46
|
+
for (let i = 0; i < hex.length; i++) {
|
|
47
|
+
checksummed += parseInt(hash[i], 16) >= 8 ? hex[i].toUpperCase() : hex[i];
|
|
48
|
+
}
|
|
49
|
+
return `0x${checksummed}`;
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* @description An address is valid if it is 0x + 40 hex characters and, when
|
|
53
|
+
* mixed-case, carries a correct EIP-55 checksum. All-lowercase and
|
|
54
|
+
* all-uppercase addresses are accepted as checksum-less.
|
|
55
|
+
*/
|
|
56
|
+
function isValidEthAddress(address) {
|
|
57
|
+
if (!/^0x[0-9a-fA-F]{40}$/.test(address)) {
|
|
58
|
+
return false;
|
|
59
|
+
}
|
|
60
|
+
const hex = address.slice(2);
|
|
61
|
+
if (hex === hex.toLowerCase() || hex === hex.toUpperCase()) {
|
|
62
|
+
return true;
|
|
63
|
+
}
|
|
64
|
+
return address === toChecksumEthAddress(address);
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
* @description Convert a 0x address to its bech32 representation (the same 20
|
|
68
|
+
* bytes). Accepts the address with or without the 0x prefix; a mixed-case
|
|
69
|
+
* address must carry a valid EIP-55 checksum.
|
|
70
|
+
*/
|
|
71
|
+
function ethAddressToBech32(ethAddress, prefix = constants_1.BECH32_PREFIX) {
|
|
72
|
+
const hex = (0, helpers_1.stripHexPrefix)(ethAddress);
|
|
73
|
+
if (!ETH_ADDRESS_REGEX.test(hex)) {
|
|
74
|
+
throw new Error(`Invalid ethereum address: ${ethAddress}`);
|
|
75
|
+
}
|
|
76
|
+
if (hex !== hex.toLowerCase() && hex !== hex.toUpperCase() && !isValidEthAddress(`0x${hex}`)) {
|
|
77
|
+
throw new Error(`Invalid EIP-55 checksum in ethereum address: ${ethAddress}`);
|
|
78
|
+
}
|
|
79
|
+
return (0, encoding_1.toBech32)(prefix, (0, encoding_1.fromHex)(hex.toLowerCase()));
|
|
80
|
+
}
|
|
81
|
+
/**
|
|
82
|
+
* @description Convert a bech32 account address to its 0x representation (the
|
|
83
|
+
* same 20 bytes) with EIP-55 checksum casing.
|
|
84
|
+
*/
|
|
85
|
+
function bech32ToEthAddress(address) {
|
|
86
|
+
const { data } = (0, encoding_1.fromBech32)(address);
|
|
87
|
+
if (data.length !== ETH_ADDRESS_BYTE_LENGTH) {
|
|
88
|
+
throw new Error(`Address ${address} decodes to ${data.length} bytes, expected ${ETH_ADDRESS_BYTE_LENGTH}`);
|
|
89
|
+
}
|
|
90
|
+
return toChecksumEthAddress((0, encoding_1.toHex)(data));
|
|
91
|
+
}
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZtLWFkZHJlc3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbGliL2V2bS1hZGRyZXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBdUJBLDhEQU9DO0FBT0Qsb0RBV0M7QUFPRCw4Q0FTQztBQU9ELGdEQVNDO0FBTUQsZ0RBUUM7QUE5RkQsK0NBQXdFO0FBQ3hFLHlEQUF5RDtBQUN6RCwrREFBNEQ7QUFFNUQsMkNBQTRDO0FBQzVDLHVDQUEyQztBQUUzQzs7Ozs7R0FLRztBQUVILE1BQU0sdUJBQXVCLEdBQUcsRUFBRSxDQUFDO0FBQ25DLE1BQU0saUJBQWlCLEdBQUcsd0JBQXdCLENBQUM7QUFFbkQ7Ozs7O0dBS0c7QUFDSCxTQUFnQix5QkFBeUIsQ0FBQyxNQUFrQjtJQUMxRCxNQUFNLFlBQVksR0FDaEIsTUFBTSxDQUFDLE1BQU0sS0FBSyxFQUFFLElBQUksTUFBTSxDQUFDLENBQUMsQ0FBQyxLQUFLLElBQUk7UUFDeEMsQ0FBQyxDQUFDLE1BQU07UUFDUixDQUFDLENBQUMscUJBQVMsQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNsRSw0Q0FBNEM7SUFDNUMsT0FBTyxJQUFBLGtCQUFTLEVBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLHVCQUF1QixDQUFDLENBQUM7QUFDMUUsQ0FBQztBQUVEOzs7O0dBSUc7QUFDSCxTQUFnQixvQkFBb0IsQ0FBQyxVQUFrQjtJQUNyRCxNQUFNLEdBQUcsR0FBRyxJQUFBLHdCQUFjLEVBQUMsVUFBVSxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDckQsSUFBSSxDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ2pDLE1BQU0sSUFBSSxLQUFLLENBQUMsNkJBQTZCLFVBQVUsRUFBRSxDQUFD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
|
|
@@ -51,6 +51,22 @@ const getAuthorizeNewTradingKeyArguments = ({ generatedWalletPubKey, }) => {
|
|
|
51
51
|
type: constants_1.AuthenticatorType.MESSAGE_FILTER,
|
|
52
52
|
config: wrapAndEncode64(constants_1.TYPE_URL_BATCH_CANCEL),
|
|
53
53
|
},
|
|
54
|
+
// Fund movements *within* the account: topping the subaccount up from the
|
|
55
|
+
// wallet, pulling the gas reserve back, moving margin between subaccounts.
|
|
56
|
+
// Safe only because SelfTransferFilter below pins both parties to the owner
|
|
57
|
+
// — on their own these three would let the key send funds to a stranger.
|
|
58
|
+
{
|
|
59
|
+
type: constants_1.AuthenticatorType.MESSAGE_FILTER,
|
|
60
|
+
config: wrapAndEncode64(constants_1.TYPE_URL_MSG_DEPOSIT_TO_SUBACCOUNT),
|
|
61
|
+
},
|
|
62
|
+
{
|
|
63
|
+
type: constants_1.AuthenticatorType.MESSAGE_FILTER,
|
|
64
|
+
config: wrapAndEncode64(constants_1.TYPE_URL_MSG_WITHDRAW_FROM_SUBACCOUNT),
|
|
65
|
+
},
|
|
66
|
+
{
|
|
67
|
+
type: constants_1.AuthenticatorType.MESSAGE_FILTER,
|
|
68
|
+
config: wrapAndEncode64(constants_1.TYPE_URL_MSG_CREATE_TRANSFER),
|
|
69
|
+
},
|
|
54
70
|
];
|
|
55
71
|
const anyOfMessageFilterConfigB64 = wrapAndEncode64(JSON.stringify(messageFilterSubAuth));
|
|
56
72
|
const subAuth = [
|
|
@@ -68,6 +84,13 @@ const getAuthorizeNewTradingKeyArguments = ({ generatedWalletPubKey, }) => {
|
|
|
68
84
|
type: constants_1.AuthenticatorType.SUBACCOUNT_FILTER,
|
|
69
85
|
config: wrapAndEncode64('0'),
|
|
70
86
|
},
|
|
87
|
+
// Money may move inside the account and nowhere else. SubaccountFilter above
|
|
88
|
+
// only inspects the three clob messages, so without this the transfer
|
|
89
|
+
// messages would be unconstrained.
|
|
90
|
+
{
|
|
91
|
+
type: constants_1.AuthenticatorType.SELF_TRANSFER_FILTER,
|
|
92
|
+
config: '',
|
|
93
|
+
},
|
|
71
94
|
];
|
|
72
95
|
const jsonString = JSON.stringify(subAuth);
|
|
73
96
|
const encodedData = new TextEncoder().encode(jsonString);
|
|
@@ -82,8 +105,8 @@ const isTruthy = (n) => Boolean(n);
|
|
|
82
105
|
// just parses out keys that match the format created in getAuthorizeNewTradingKeyArguments
|
|
83
106
|
const getAuthorizedTradingKeysMetadata = (authorizedKeys) => {
|
|
84
107
|
return authorizedKeys
|
|
85
|
-
.map(({ config, id, type }) => {
|
|
86
|
-
var _a;
|
|
108
|
+
.map(({ config, id, type, name, expiresAt }) => {
|
|
109
|
+
var _a, _b;
|
|
87
110
|
if (type !== constants_1.AuthenticatorType.ALL_OF) {
|
|
88
111
|
return null;
|
|
89
112
|
}
|
|
@@ -91,7 +114,20 @@ const getAuthorizedTradingKeysMetadata = (authorizedKeys) => {
|
|
|
91
114
|
if (parsedConfig == null) {
|
|
92
115
|
return null;
|
|
93
116
|
}
|
|
117
|
+
// Two ways a key can be authorized. A public key is the original form;
|
|
118
|
+
// an address is the agent form, where the key is recovered from each
|
|
119
|
+
// signature instead of being stored (see EthAddressSignatureVerification).
|
|
94
120
|
const publicKey = (_a = parsedConfig.find((t) => t.type === constants_1.AuthenticatorType.SIGNATURE_VERIFICATION)) === null || _a === void 0 ? void 0 : _a.config;
|
|
121
|
+
const agentAddress = (_b = parsedConfig.find((t) => t.type === constants_1.AuthenticatorType.ETH_ADDRESS_SIGNATURE_VERIFICATION)) === null || _b === void 0 ? void 0 : _b.config;
|
|
122
|
+
if (typeof agentAddress === 'string') {
|
|
123
|
+
return {
|
|
124
|
+
id: id.toString(),
|
|
125
|
+
publicKey: '',
|
|
126
|
+
address: (0, encoding_1.toBech32)(constants_2.BECH32_PREFIX, (0, encoding_1.fromBase64)(agentAddress)),
|
|
127
|
+
name: name !== null && name !== void 0 ? name : '',
|
|
128
|
+
expiresAt: expiresAt == null ? 0 : Number(expiresAt.toString()),
|
|
129
|
+
};
|
|
130
|
+
}
|
|
95
131
|
if (publicKey == null || typeof publicKey !== 'string') {
|
|
96
132
|
return null;
|
|
97
133
|
}
|
|
@@ -100,9 +136,11 @@ const getAuthorizedTradingKeysMetadata = (authorizedKeys) => {
|
|
|
100
136
|
id: id.toString(),
|
|
101
137
|
publicKey,
|
|
102
138
|
address,
|
|
139
|
+
name: name !== null && name !== void 0 ? name : '',
|
|
140
|
+
expiresAt: expiresAt == null ? 0 : Number(expiresAt.toString()),
|
|
103
141
|
};
|
|
104
142
|
})
|
|
105
143
|
.filter(isTruthy);
|
|
106
144
|
};
|
|
107
145
|
exports.getAuthorizedTradingKeysMetadata = getAuthorizedTradingKeysMetadata;
|
|
108
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
146
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhZGluZy1rZXktdXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbGliL3RyYWRpbmcta2V5LXV0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLCtDQUF5RTtBQUN6RSwyREFBd0U7QUFDeEUsd0NBQWdEO0FBQ2hELDREQUEwRDtBQUUxRCxvREFTOEI7QUFHOUIsbUZBQTBEO0FBQzFELDJDQUE0QztBQUM1Qyw2Q0FBdUQ7QUFFaEQsTUFBTSwwQkFBMEIsR0FBRyxLQUFLLElBRTdDLEVBQUU7SUFDRixNQUFNLFFBQVEsR0FBRyxJQUFBLHdCQUFnQixFQUFDLGtCQUFRLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDakQsTUFBTSxFQUFFLFVBQVUsRUFBRSxhQUFhLEVBQUUsR0FBRyxJQUFBLG9DQUF1QixFQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3hFLE1BQU0sTUFBTSxHQUFHLE1BQU0sc0JBQVcsQ0FBQyxZQUFZLENBQUMsUUFBUSxFQUFFLHlCQUFhLENBQUMsQ0FBQztJQUV2RSxNQUFNLGFBQWEsR0FBRyxhQUFhLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxLQUFLLElBQUEsZ0JBQUssRUFBQyxhQUFhLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFDdEYsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQztJQUNoQyxNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDO0lBRS9CLElBQUksYUFBYSxJQUFJLElBQUksSUFBSSxTQUFTLElBQUksSUFBSSxJQUFJLE9BQU8sSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUNsRSxPQUFPLFNBQVMsQ0FBQztJQUNuQixDQUFDO0lBRUQsT0FBTztRQUNMLG1CQUFtQjtRQUNuQixRQUFRO1FBQ1Isb0NBQW9DO1FBQ3BDLGFBQWE7UUFDYixrQkFBa0I7UUFDbEIsU0FBUyxFQUFFLFNBQVMsQ0FBQyxLQUFLO1FBQzFC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
|