@dydxprotocol/v4-client-js 1.17.0 → 1.19.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/CHANGELOG.md +2 -2
- package/build/examples/websocket_orderbook_example.d.ts +1 -0
- package/build/examples/websocket_orderbook_example.js +196 -0
- package/build/src/clients/modules/local-wallet.d.ts +4 -4
- package/build/src/clients/modules/local-wallet.js +1 -1
- package/build/src/clients/modules/signer.d.ts +3 -3
- package/build/src/clients/modules/signer.js +18 -8
- package/build/tsconfig.tsbuildinfo +1 -1
- package/examples/websocket_orderbook_example.ts +239 -0
- package/package.json +1 -1
- package/src/clients/modules/local-wallet.ts +4 -4
- package/src/clients/modules/signer.ts +33 -12
package/CHANGELOG.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
# [1.
|
|
1
|
+
# [1.19.0](https://github.com/dydxprotocol/v4-clients/compare/v4-client-js@1.18.0...v4-client-js@1.19.0) (2025-02-18)
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
### Features
|
|
5
5
|
|
|
6
|
-
*
|
|
6
|
+
* support amino and direct signer types ([#332](https://github.com/dydxprotocol/v4-clients/issues/332)) ([8c07023](https://github.com/dydxprotocol/v4-clients/commit/8c07023462fdaecec3c13dade28f2a87e2b8dba5))
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,196 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
4
|
+
/* eslint-disable no-param-reassign */
|
|
5
|
+
const constants_1 = require("../src/clients/constants");
|
|
6
|
+
const socket_client_1 = require("../src/clients/socket-client");
|
|
7
|
+
function test() {
|
|
8
|
+
let orderBookBidList = [];
|
|
9
|
+
let orderBookAskList = [];
|
|
10
|
+
const mySocket = new socket_client_1.SocketClient(constants_1.Network.mainnet().indexerConfig, () => {
|
|
11
|
+
console.log('socket opened');
|
|
12
|
+
mySocket.subscribeToOrderbook('ETH-USD');
|
|
13
|
+
}, () => {
|
|
14
|
+
console.log('socket closed');
|
|
15
|
+
}, (message) => {
|
|
16
|
+
try {
|
|
17
|
+
if (typeof message.data === 'string') {
|
|
18
|
+
const jsonString = message.data;
|
|
19
|
+
const parsingData = JSON.parse(jsonString);
|
|
20
|
+
const messageId = parsingData.message_id;
|
|
21
|
+
const orderBookDataList = parsingData.contents;
|
|
22
|
+
if (orderBookDataList instanceof Array) {
|
|
23
|
+
// common orderBook data;
|
|
24
|
+
[orderBookBidList, orderBookAskList] = updateOrderBook(orderBookDataList, orderBookBidList, orderBookAskList, messageId);
|
|
25
|
+
// sort
|
|
26
|
+
orderBookBidList = sortByNthElementDesc(orderBookBidList, 0);
|
|
27
|
+
orderBookAskList = sortByNthElementAsc(orderBookAskList, 0);
|
|
28
|
+
// resolving crossed orderBook
|
|
29
|
+
if (orderBookBidList.length > 0 &&
|
|
30
|
+
orderBookAskList.length > 0 &&
|
|
31
|
+
orderBookBidList[0][0] >= orderBookAskList[0][0]) {
|
|
32
|
+
[orderBookBidList, orderBookAskList] = resolveCrossedOrderBook(orderBookBidList, orderBookAskList);
|
|
33
|
+
}
|
|
34
|
+
printOrderBook(orderBookBidList, orderBookAskList);
|
|
35
|
+
if (orderBookBidList.length > 300) {
|
|
36
|
+
orderBookBidList.splice(50);
|
|
37
|
+
}
|
|
38
|
+
if (orderBookAskList.length > 300) {
|
|
39
|
+
orderBookAskList.splice(50);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
else if (orderBookDataList !== null && orderBookDataList !== undefined) {
|
|
43
|
+
// initial OrderBook data
|
|
44
|
+
setInitialOrderBook(orderBookDataList, orderBookBidList, orderBookAskList, messageId);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
catch (e) {
|
|
49
|
+
console.error('Error parsing JSON message:', e);
|
|
50
|
+
}
|
|
51
|
+
}, (event) => {
|
|
52
|
+
console.error('Encountered error:', event.message);
|
|
53
|
+
});
|
|
54
|
+
mySocket.connect();
|
|
55
|
+
}
|
|
56
|
+
const sortByNthElementAsc = (arr, n) => {
|
|
57
|
+
return arr.sort((a, b) => {
|
|
58
|
+
if (a[n] < b[n])
|
|
59
|
+
return -1;
|
|
60
|
+
if (a[n] > b[n])
|
|
61
|
+
return 1;
|
|
62
|
+
return 0;
|
|
63
|
+
});
|
|
64
|
+
};
|
|
65
|
+
const sortByNthElementDesc = (arr, n) => {
|
|
66
|
+
return arr.sort((a, b) => {
|
|
67
|
+
if (a[n] > b[n])
|
|
68
|
+
return -1;
|
|
69
|
+
if (a[n] < b[n])
|
|
70
|
+
return 1;
|
|
71
|
+
return 0;
|
|
72
|
+
});
|
|
73
|
+
};
|
|
74
|
+
const printOrderBook = (orderBookBidList, orderBookAskList) => {
|
|
75
|
+
// print
|
|
76
|
+
console.log(`OrderBook for ETH-USD:`);
|
|
77
|
+
console.log(`Price Qty`);
|
|
78
|
+
for (let i = 4; i > -1; i--) {
|
|
79
|
+
const priceStr = String(orderBookAskList[i][0]);
|
|
80
|
+
const spaces = createSpaces(10 - priceStr.length);
|
|
81
|
+
console.log(`${priceStr}${spaces}${orderBookAskList[i][1]}`);
|
|
82
|
+
}
|
|
83
|
+
console.log('---------------------');
|
|
84
|
+
for (let i = 0; i < 5; i++) {
|
|
85
|
+
const priceStr = String(orderBookBidList[i][0]);
|
|
86
|
+
const spaces = createSpaces(10 - priceStr.length);
|
|
87
|
+
console.log(`${priceStr}${spaces}${orderBookBidList[i][1]}`);
|
|
88
|
+
}
|
|
89
|
+
console.log('');
|
|
90
|
+
};
|
|
91
|
+
function createSpaces(count) {
|
|
92
|
+
if (count <= 0) {
|
|
93
|
+
return '';
|
|
94
|
+
}
|
|
95
|
+
let spaces = '';
|
|
96
|
+
for (let i = 0; i < count; i++) {
|
|
97
|
+
spaces += ' ';
|
|
98
|
+
}
|
|
99
|
+
return spaces;
|
|
100
|
+
}
|
|
101
|
+
const resolveCrossedOrderBook = (orderBookBidList, orderBookAskList) => {
|
|
102
|
+
while (orderBookBidList[0][0] >= orderBookAskList[0][0]) {
|
|
103
|
+
if (orderBookBidList[0][2] < orderBookAskList[0][2]) {
|
|
104
|
+
orderBookBidList.shift();
|
|
105
|
+
}
|
|
106
|
+
else if (orderBookBidList[0][2] > orderBookAskList[0][2]) {
|
|
107
|
+
orderBookAskList.shift();
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
if (orderBookBidList[0][1] > orderBookAskList[0][1]) {
|
|
111
|
+
orderBookBidList[0][1] -= orderBookAskList[0][1];
|
|
112
|
+
orderBookAskList.shift();
|
|
113
|
+
}
|
|
114
|
+
else if (orderBookBidList[0][1] < orderBookAskList[0][1]) {
|
|
115
|
+
orderBookAskList[0][1] -= orderBookBidList[0][1];
|
|
116
|
+
orderBookBidList.shift();
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
orderBookAskList.shift();
|
|
120
|
+
orderBookBidList.shift();
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
return [orderBookBidList, orderBookAskList];
|
|
125
|
+
};
|
|
126
|
+
const setInitialOrderBook = (orderBookDataList, orderBookBidList, orderBookAskList, messageId) => {
|
|
127
|
+
orderBookDataList.bids.forEach((item) => {
|
|
128
|
+
orderBookBidList.push([Number(item.price), Number(item.size), messageId]);
|
|
129
|
+
});
|
|
130
|
+
orderBookDataList.asks.forEach((item) => {
|
|
131
|
+
orderBookAskList.push([Number(item.price), Number(item.size), messageId]);
|
|
132
|
+
});
|
|
133
|
+
};
|
|
134
|
+
const updateOrderBook = (orderBookDataList, orderBookBidList, orderBookAskList, messageId) => {
|
|
135
|
+
orderBookDataList.forEach((entry) => {
|
|
136
|
+
if (entry.bids !== null && entry.bids !== undefined) {
|
|
137
|
+
const flattened = entry.bids.reduce((acc, val) => acc.concat(val), []);
|
|
138
|
+
const entryBidPrice = Number(flattened[0]);
|
|
139
|
+
const entryBidSize = Number(flattened[1]);
|
|
140
|
+
// remove prices with zero Qty
|
|
141
|
+
if (entryBidSize === 0) {
|
|
142
|
+
for (let i = orderBookBidList.length - 1; i >= 0; i--) {
|
|
143
|
+
if (orderBookBidList[i][0] === entryBidPrice) {
|
|
144
|
+
orderBookBidList.splice(i, 1);
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
else {
|
|
149
|
+
// The price that already exists in the order book is modified only Qty
|
|
150
|
+
if (orderBookBidList.some((innerArray) => innerArray[0] === entryBidPrice)) {
|
|
151
|
+
orderBookBidList.forEach((item, index) => {
|
|
152
|
+
if (item[0] === entryBidPrice) {
|
|
153
|
+
orderBookBidList[index][1] = entryBidSize;
|
|
154
|
+
orderBookBidList[index][2] = messageId;
|
|
155
|
+
}
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
else {
|
|
159
|
+
// Add new data to order book
|
|
160
|
+
orderBookBidList.push([entryBidPrice, entryBidSize, messageId]);
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
if (entry.asks !== null && entry.asks !== undefined) {
|
|
165
|
+
const flattened = entry.asks.reduce((acc, val) => acc.concat(val), []);
|
|
166
|
+
const entryAskPrice = Number(flattened[0]);
|
|
167
|
+
const entryAskSize = Number(flattened[1]);
|
|
168
|
+
if (entryAskSize === 0) {
|
|
169
|
+
// remove prices with zero Qty
|
|
170
|
+
for (let i = orderBookAskList.length - 1; i >= 0; i--) {
|
|
171
|
+
if (orderBookAskList[i][0] === entryAskPrice) {
|
|
172
|
+
orderBookAskList.splice(i, 1);
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
else {
|
|
177
|
+
// The price that already exists in the order book is modified only Qty
|
|
178
|
+
if (orderBookAskList.some((innerArray) => innerArray[0] === entryAskPrice)) {
|
|
179
|
+
orderBookAskList.forEach((item, index) => {
|
|
180
|
+
if (item[0] === entryAskPrice) {
|
|
181
|
+
orderBookAskList[index][1] = entryAskSize;
|
|
182
|
+
orderBookAskList[index][2] = messageId;
|
|
183
|
+
}
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
else {
|
|
187
|
+
// Add new data to order book
|
|
188
|
+
orderBookAskList.push([entryAskPrice, entryAskSize, messageId]);
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
});
|
|
193
|
+
return [orderBookBidList, orderBookAskList];
|
|
194
|
+
};
|
|
195
|
+
test();
|
|
196
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"websocket_orderbook_example.js","sourceRoot":"","sources":["../../examples/websocket_orderbook_example.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Secp256k1Pubkey, StdFee } from '@cosmjs/amino';
|
|
2
|
-
import { AccountData, EncodeObject,
|
|
2
|
+
import { AccountData, EncodeObject, OfflineSigner } from '@cosmjs/proto-signing';
|
|
3
3
|
import { TransactionOptions } from '../types';
|
|
4
4
|
import { TransactionSigner } from './signer';
|
|
5
5
|
export default class LocalWallet {
|
|
@@ -7,10 +7,10 @@ export default class LocalWallet {
|
|
|
7
7
|
address?: string;
|
|
8
8
|
pubKey?: Secp256k1Pubkey;
|
|
9
9
|
signer?: TransactionSigner;
|
|
10
|
-
offlineSigner?:
|
|
11
|
-
static fromOfflineSigner(signer:
|
|
10
|
+
offlineSigner?: OfflineSigner;
|
|
11
|
+
static fromOfflineSigner(signer: OfflineSigner): Promise<LocalWallet>;
|
|
12
12
|
static fromMnemonic(mnemonic: string, prefix?: string): Promise<LocalWallet>;
|
|
13
|
-
setSigner(signer:
|
|
13
|
+
setSigner(signer: OfflineSigner): Promise<void>;
|
|
14
14
|
setMnemonic(mnemonic: string, prefix?: string): Promise<void>;
|
|
15
15
|
signTransaction(messages: EncodeObject[], transactionOptions: TransactionOptions, fee?: StdFee, memo?: string): Promise<Uint8Array>;
|
|
16
16
|
}
|
|
@@ -45,4 +45,4 @@ class LocalWallet {
|
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
exports.default = LocalWallet;
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtd2FsbGV0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2NsaWVudHMvbW9kdWxlcy9sb2NhbC13YWxsZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSx5Q0FBK0U7QUFDL0UseURBSytCO0FBQy9CLCtDQUF5RDtBQUN6RCxnREFBd0I7QUFDeEIsNERBQWtDO0FBRWxDLDhDQUFtRDtBQUVuRCxxQ0FBNkM7QUFFN0Msb0VBQW9FO0FBQ3BFLG9CQUFRLENBQUMsSUFBSSxDQUFDLElBQUksR0FBRyxjQUFJLENBQUM7QUFDMUIsb0JBQVEsQ0FBQyxTQUFTLEVBQUUsQ0FBQztBQUVyQixNQUFxQixXQUFXO0lBTzlCLE1BQU0sQ0FBQyxLQUFLLENBQUMsaUJBQWlCLENBQUMsTUFBcUI7UUFDbEQsTUFBTSxNQUFNLEdBQUcsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNqQyxNQUFNLE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDL0IsT0FBTyxNQUFNLENBQUM7SUFDaEIsQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLFFBQWdCLEVBQUUsTUFBZTtRQUN6RCxNQUFNLE1BQU0sR0FBRyxJQUFJLFdBQVcsRUFBRSxDQUFDO1FBQ2pDLE1BQU0sTUFBTSxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDM0MsT0FBTyxNQUFNLENBQUM7SUFDaEIsQ0FBQztJQUVELEtBQUssQ0FBQyxTQUFTLENBQUMsTUFBcUI7UUFDbkMsSUFBSSxDQUFDLGFBQWEsR0FBRyxNQUFNLENBQUM7UUFDNUIsTUFBTSxjQUFjLEdBQUcsTUFBTSxnQ0FBcUIsQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFO1lBQ2pFLFFBQVEsRUFBRSxJQUFBLDJCQUFnQixHQUFFO1NBQzdCLENBQUMsQ0FBQztRQUNILE1BQU0sV0FBVyxHQUFHLE1BQU0sTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQy9DLE1BQU0sWUFBWSxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUUsQ0FBQztRQUNyQyxJQUFJLENBQUMsUUFBUSxHQUFHLENBQUMsR0FBRyxXQUFXLENBQUMsQ0FBQztRQUNqQyxJQUFJLENBQUMsT0FBTyxHQUFHLFlBQVksQ0FBQyxPQUFPLENBQUM7UUFDcEMsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFBLDZCQUFxQixFQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN6RCxJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksMEJBQWlCLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDNUUsQ0FBQztJQUVELEtBQUssQ0FBQyxXQUFXLENBQUMsUUFBZ0IsRUFBRSxNQUFlO1FBQ2pELE1BQU0sTUFBTSxHQUFHLE1BQU0sdUNBQXVCLENBQUMsWUFBWSxDQUFDLFFBQVEsRUFBRSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFDaEYsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ2hDLENBQUM7SUFFTSxLQUFLLENBQUMsZUFBZSxDQUMxQixRQUF3QixFQUN4QixrQkFBc0MsRUFDdEMsR0FBWSxFQUNaLE9BQWUsRUFBRTtRQUVqQixPQUFPLElBQUksQ0FBQyxNQUFPLENBQUMsZUFBZSxDQUFDLFFBQVEsRUFBRSxrQkFBa0IsRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUM1RixDQUFDO0NBQ0Y7QUE3Q0QsOEJBNkNDIn0=
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { Secp256k1Pubkey } from '@cosmjs/amino';
|
|
2
|
-
import { EncodeObject,
|
|
2
|
+
import { EncodeObject, OfflineSigner } from '@cosmjs/proto-signing';
|
|
3
3
|
import { SigningStargateClient, StdFee } from '@cosmjs/stargate';
|
|
4
4
|
import { TransactionOptions } from '../types';
|
|
5
5
|
export declare class TransactionSigner {
|
|
6
6
|
readonly address: string;
|
|
7
7
|
readonly stargateSigningClient: SigningStargateClient;
|
|
8
|
-
readonly offlineSigner:
|
|
9
|
-
constructor(address: string, stargateSigningClient: SigningStargateClient, offlineSigner:
|
|
8
|
+
readonly offlineSigner: OfflineSigner;
|
|
9
|
+
constructor(address: string, stargateSigningClient: SigningStargateClient, offlineSigner: OfflineSigner);
|
|
10
10
|
/**
|
|
11
11
|
* @description Get the encoded signed transaction or the promise is rejected if
|
|
12
12
|
* no fee can be set for the transaction.
|
|
@@ -70,14 +70,24 @@ class TransactionSigner {
|
|
|
70
70
|
const signDoc = (0, proto_signing_1.makeSignDoc)(txBodyBytes, authInfoBytes, transactionOptions.chainId, transactionOptions.accountNumber);
|
|
71
71
|
// Use OfflineSigner to sign the transaction
|
|
72
72
|
const signerAddress = this.address;
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
73
|
+
if ((0, proto_signing_1.isOfflineDirectSigner)(this.offlineSigner)) {
|
|
74
|
+
const { signed, signature } = await this.offlineSigner.signDirect(signerAddress, signDoc);
|
|
75
|
+
const txRaw = tx_2.TxRaw.fromPartial({
|
|
76
|
+
bodyBytes: signed.bodyBytes,
|
|
77
|
+
authInfoBytes: signed.authInfoBytes,
|
|
78
|
+
signatures: [(0, encoding_1.fromBase64)(signature.signature)],
|
|
79
|
+
});
|
|
80
|
+
return Uint8Array.from(tx_2.TxRaw.encode(txRaw).finish());
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
const rawTx = await this.stargateSigningClient.sign(this.address, messages, fee, memo, {
|
|
84
|
+
accountNumber: transactionOptions.accountNumber,
|
|
85
|
+
sequence: transactionOptions.sequence,
|
|
86
|
+
chainId: transactionOptions.chainId,
|
|
87
|
+
});
|
|
88
|
+
return Uint8Array.from(tx_2.TxRaw.encode(rawTx).finish());
|
|
89
|
+
}
|
|
80
90
|
}
|
|
81
91
|
}
|
|
82
92
|
exports.TransactionSigner = TransactionSigner;
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
93
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lnbmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2NsaWVudHMvbW9kdWxlcy9zaWduZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQ0EsK0NBQThDO0FBQzlDLHVDQUFxQztBQUNyQyx5REFPK0I7QUFFL0IsdUZBQTZGO0FBQzdGLDBEQUFrRTtBQUNsRSwwREFBdUQ7QUFDdkQsZ0RBQXdCO0FBQ3hCLDREQUFrQztBQUVsQyw4Q0FBbUQ7QUFHbkQsb0VBQW9FO0FBQ3BFLHFFQUFxRTtBQUNyRSx3RUFBd0U7QUFDeEUsa0VBQWtFO0FBQ2xFLG9CQUFRLENBQUMsSUFBSSxDQUFDLElBQUksR0FBRyxjQUFJLENBQUM7QUFDMUIsb0JBQVEsQ0FBQyxTQUFTLEVBQUUsQ0FBQztBQUVyQixNQUFhLGlCQUFpQjtJQUs1QixZQUNFLE9BQWUsRUFDZixxQkFBNEMsRUFDNUMsYUFBNEI7UUFFNUIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDdkIsSUFBSSxDQUFDLHFCQUFxQixHQUFHLHFCQUFxQixDQUFDO1FBQ25ELElBQUksQ0FBQyxhQUFhLEdBQUcsYUFBYSxDQUFDO0lBQ3JDLENBQUM7SUFFRDs7Ozs7O09BTUc7SUFDSCxLQUFLLENBQUMsZUFBZSxDQUNuQixRQUF3QixFQUN4QixrQkFBc0MsRUFDdEMsR0FBWSxFQUNaLE9BQWUsRUFBRSxFQUNqQixTQUEyQjs7UUFFM0IsSUFBSSxDQUFDLEdBQUcsRUFBRTtZQUNSLE1BQU0sSUFBSSxLQUFLLENBQUMseUJBQXlCLENBQUMsQ0FBQztTQUM1QztRQUVELE1BQU0sUUFBUSxHQUFHLElBQUEsMkJBQWdCLEdBQUUsQ0FBQztRQUVwQyxzQkFBc0I7UUFDdEIsTUFBTSxlQUFlLEdBQUcsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBRXpF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
|