carbon-js-sdk 0.1.84 → 0.1.85
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/lib/util/generic.d.ts +1 -0
- package/lib/util/generic.d.ts.map +1 -1
- package/lib/util/generic.js +5 -1
- package/lib/util/generic.js.map +1 -1
- package/lib/util/tx.d.ts +2 -1
- package/lib/util/tx.d.ts.map +1 -1
- package/lib/util/tx.js.map +1 -1
- package/lib/wallet/CarbonWallet.d.ts +9 -2
- package/lib/wallet/CarbonWallet.d.ts.map +1 -1
- package/lib/wallet/CarbonWallet.js +62 -14
- package/lib/wallet/CarbonWallet.js.map +1 -1
- package/package.json +1 -1
package/lib/util/generic.d.ts
CHANGED
|
@@ -15,4 +15,5 @@ export declare const toTxHash: (bytes?: Uint8Array | Buffer | undefined) => stri
|
|
|
15
15
|
* Broadcast methods are untouched to ensure retries don't hit cache.
|
|
16
16
|
*/
|
|
17
17
|
export declare const modifyTmClient: (tmClient: Tendermint34Client) => Tendermint34Client;
|
|
18
|
+
export declare const callIgnoreError: <T = any>(runnable: () => T) => T;
|
|
18
19
|
//# sourceMappingURL=generic.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generic.d.ts","sourceRoot":"","sources":["../../src/util/generic.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG5D,eAAO,MAAM,cAAc,oEAoB1B,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,GAAG,KAAG,OAYvC,CAAC;AAEF,eAAO,MAAM,cAAc,UAAW,MAAM,WAE3C,CAAC;AAEF,eAAO,MAAM,eAAe,UAAW,MAAM,WAE5C,CAAC;AAEF,eAAO,MAAM,aAAa,+CAAkC,MAAM,GAAG,SAIpE,CAAA;AACD,eAAO,MAAM,QAAQ,+CAAkC,MAAM,GAAG,SAI/D,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,aAAc,kBAAkB,uBAmB1D,CAAA"}
|
|
1
|
+
{"version":3,"file":"generic.d.ts","sourceRoot":"","sources":["../../src/util/generic.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG5D,eAAO,MAAM,cAAc,oEAoB1B,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,GAAG,KAAG,OAYvC,CAAC;AAEF,eAAO,MAAM,cAAc,UAAW,MAAM,WAE3C,CAAC;AAEF,eAAO,MAAM,eAAe,UAAW,MAAM,WAE5C,CAAC;AAEF,eAAO,MAAM,aAAa,+CAAkC,MAAM,GAAG,SAIpE,CAAA;AACD,eAAO,MAAM,QAAQ,+CAAkC,MAAM,GAAG,SAI/D,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,aAAc,kBAAkB,uBAmB1D,CAAA;AAED,eAAO,MAAM,eAAe,mCAE3B,CAAC"}
|
package/lib/util/generic.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.modifyTmClient = exports.toTxHash = exports.computeTxHash = exports.appendHexPrefix = exports.stripHexPrefix = exports.sortObject = exports.overrideConfig = void 0;
|
|
3
|
+
exports.callIgnoreError = exports.modifyTmClient = exports.toTxHash = exports.computeTxHash = exports.appendHexPrefix = exports.stripHexPrefix = exports.sortObject = exports.overrideConfig = void 0;
|
|
4
4
|
const crypto_1 = require("@cosmjs/crypto");
|
|
5
5
|
const overrideConfig = (defaults, override) => {
|
|
6
6
|
const result = Object.assign({}, defaults);
|
|
@@ -83,4 +83,8 @@ const modifyTmClient = (tmClient) => {
|
|
|
83
83
|
return tmClient;
|
|
84
84
|
};
|
|
85
85
|
exports.modifyTmClient = modifyTmClient;
|
|
86
|
+
const callIgnoreError = (runnable) => {
|
|
87
|
+
return runnable();
|
|
88
|
+
};
|
|
89
|
+
exports.callIgnoreError = callIgnoreError;
|
|
86
90
|
//# sourceMappingURL=generic.js.map
|
package/lib/util/generic.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generic.js","sourceRoot":"","sources":["../../src/util/generic.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"generic.js","sourceRoot":"","sources":["../../src/util/generic.ts"],"names":[],"mappings":"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"}
|
package/lib/util/tx.d.ts
CHANGED
|
@@ -18,9 +18,10 @@ export declare enum BroadcastTxMode {
|
|
|
18
18
|
export interface SignTxOpts {
|
|
19
19
|
fee?: StdFee;
|
|
20
20
|
memo?: string;
|
|
21
|
-
explicitSignerData?: SignerData
|
|
21
|
+
explicitSignerData?: Partial<SignerData>;
|
|
22
22
|
}
|
|
23
23
|
export interface BroadcastTxOpts {
|
|
24
|
+
mode?: BroadcastTxMode;
|
|
24
25
|
timeoutMs?: number;
|
|
25
26
|
pollIntervalMs?: number;
|
|
26
27
|
}
|
package/lib/util/tx.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx.d.ts","sourceRoot":"","sources":["../../src/util/tx.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,KAAK,YAAY,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAe,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC5D,MAAM,WAAW,MAAO,SAAQ,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC;IACtE,QAAQ,EAAE,OAAO,EAAE,CAAA;CACpB;AACD,MAAM,WAAW,EAAG,SAAQ,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC;IAC1D,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AA4CD,eAAO,MAAM,MAAM,+CAAkC,EAAE,GAAG,SAyBzD,CAAA;AAED,eAAO,MAAM,SAAS,cAAe,EAAE,4CAA8B,MAOpE,CAAA;AAED,oBAAY,eAAe;IACzB,eAAe,SAAS;IACxB,gBAAgB,UAAU;CAC3B;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"tx.d.ts","sourceRoot":"","sources":["../../src/util/tx.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,KAAK,YAAY,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAe,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC5D,MAAM,WAAW,MAAO,SAAQ,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC;IACtE,QAAQ,EAAE,OAAO,EAAE,CAAA;CACpB;AACD,MAAM,WAAW,EAAG,SAAQ,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC;IAC1D,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AA4CD,eAAO,MAAM,MAAM,+CAAkC,EAAE,GAAG,SAyBzD,CAAA;AAED,eAAO,MAAM,SAAS,cAAe,EAAE,4CAA8B,MAOpE,CAAA;AAED,oBAAY,eAAe;IACzB,eAAe,SAAS;IACxB,gBAAgB,UAAU;CAC3B;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,eAAe,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,oBAAY,oBAAoB,GAAG,OAAO,CAAC,UAAU,GAAG,eAAe,CAAC,CAAA;AAExE,MAAM,WAAW,KAAK;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,OAAO,EAAE,CAAA;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAEhB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IAGjB,IAAI,EAAE,KAAK,EAAE,CAAC;IAGd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAU,CAAC;AAE7B,eAAO,MAAM,iBAAiB,EAAE,UAG/B,CAAA;AAED,eAAO,MAAM,mBAAmB,gBAAgB,CAAC;AACjD,eAAO,MAAM,YAAY;;CAQxB,CAAA"}
|
package/lib/util/tx.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx.js","sourceRoot":"","sources":["../../src/util/tx.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tx.js","sourceRoot":"","sources":["../../src/util/tx.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { CarbonQueryClient } from "../clients";
|
|
3
3
|
import { MsgFee } from "../codec";
|
|
4
|
-
import { TxRaw as StargateTxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
|
|
5
4
|
import { Network, NetworkConfig } from "../constant";
|
|
6
5
|
import { ProviderAgent } from "../constant/walletProvider";
|
|
7
6
|
import { CosmosLedger } from "../provider";
|
|
@@ -9,9 +8,10 @@ import { CarbonTx } from "../util";
|
|
|
9
8
|
import { SimpleMap } from "../util/type";
|
|
10
9
|
import { StdSignature } from "@cosmjs/amino";
|
|
11
10
|
import { EncodeObject, OfflineDirectSigner, OfflineSigner } from "@cosmjs/proto-signing";
|
|
12
|
-
import { BroadcastTxResponse, SigningStargateClient } from "@cosmjs/stargate";
|
|
11
|
+
import { Account, BroadcastTxResponse, SigningStargateClient } from "@cosmjs/stargate";
|
|
13
12
|
import { BroadcastTxSyncResponse } from "@cosmjs/tendermint-rpc/build/tendermint34/responses";
|
|
14
13
|
import BigNumber from "bignumber.js";
|
|
14
|
+
import { TxRaw as StargateTxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
|
|
15
15
|
import { CarbonSigner, CarbonSignerTypes } from "./CarbonSigner";
|
|
16
16
|
export interface CarbonWalletGenericOpts {
|
|
17
17
|
network?: Network;
|
|
@@ -55,6 +55,9 @@ export declare type CarbonWalletInitOpts = CarbonWalletGenericOpts & ({
|
|
|
55
55
|
bech32Address: string;
|
|
56
56
|
customSigner?: OfflineSigner & OfflineDirectSigner;
|
|
57
57
|
});
|
|
58
|
+
export interface AccountInfo extends Account {
|
|
59
|
+
chainId: string;
|
|
60
|
+
}
|
|
58
61
|
export declare class CarbonWallet {
|
|
59
62
|
network: Network;
|
|
60
63
|
configOverride: Partial<NetworkConfig>;
|
|
@@ -69,6 +72,7 @@ export declare class CarbonWallet {
|
|
|
69
72
|
query?: CarbonQueryClient;
|
|
70
73
|
txFees?: SimpleMap<BigNumber>;
|
|
71
74
|
initialized: boolean;
|
|
75
|
+
accountInfo?: AccountInfo;
|
|
72
76
|
providerAgent?: ProviderAgent | string;
|
|
73
77
|
private signingClient?;
|
|
74
78
|
constructor(opts: CarbonWalletInitOpts);
|
|
@@ -90,6 +94,7 @@ export declare class CarbonWallet {
|
|
|
90
94
|
*/
|
|
91
95
|
broadcastTxWithoutConfirm(txRaw: CarbonWallet.TxRaw): Promise<CarbonWallet.SendTxWithoutConfirmResponse>;
|
|
92
96
|
getSignedTx(signerAddress: string, messages: readonly EncodeObject[], opts?: CarbonTx.SignTxOpts): Promise<CarbonWallet.TxRaw>;
|
|
97
|
+
signAndBroadcast(msgs: EncodeObject[], signOpts?: CarbonTx.SignTxOpts, broadcastOpts?: CarbonTx.BroadcastTxOpts): Promise<BroadcastTxResponse | BroadcastTxSyncResponse>;
|
|
93
98
|
sendTxs(msgs: EncodeObject[], opts?: CarbonTx.SignTxOpts): Promise<CarbonWallet.SendTxResponse>;
|
|
94
99
|
sendTxsWithoutConfirm(msgs: EncodeObject[], opts?: CarbonTx.SignTxOpts): Promise<CarbonWallet.SendTxWithoutConfirmResponse>;
|
|
95
100
|
sendTx(msg: EncodeObject, opts?: CarbonTx.SignTxOpts): Promise<CarbonWallet.SendTxResponse>;
|
|
@@ -101,6 +106,8 @@ export declare class CarbonWallet {
|
|
|
101
106
|
getFee(msgTypeUrl: string): BigNumber;
|
|
102
107
|
updateTxFees(msgFees: MsgFee[]): void;
|
|
103
108
|
reloadTxFees(): Promise<void>;
|
|
109
|
+
reloadAccountSequence(): Promise<void>;
|
|
110
|
+
private isNonceMismatchError;
|
|
104
111
|
private getQueryClient;
|
|
105
112
|
}
|
|
106
113
|
export declare namespace CarbonWallet {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CarbonWallet.d.ts","sourceRoot":"","sources":["../../src/wallet/CarbonWallet.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAY,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"CarbonWallet.d.ts","sourceRoot":"","sources":["../../src/wallet/CarbonWallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,21 +11,32 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.CarbonWallet = void 0;
|
|
13
13
|
const codec_1 = require("../codec");
|
|
14
|
-
const tx_1 = require("cosmjs-types/cosmos/tx/v1beta1/tx");
|
|
15
14
|
const constant_1 = require("../constant");
|
|
16
15
|
const provider_1 = require("../provider");
|
|
17
16
|
const util_1 = require("../util");
|
|
18
17
|
const address_1 = require("../util/address");
|
|
19
18
|
const number_1 = require("../util/number");
|
|
20
|
-
const
|
|
19
|
+
const tx_1 = require("../util/tx");
|
|
21
20
|
const amino_1 = require("@cosmjs/amino");
|
|
22
21
|
const stargate_1 = require("@cosmjs/stargate");
|
|
23
22
|
const tendermint_rpc_1 = require("@cosmjs/tendermint-rpc");
|
|
23
|
+
const tx_2 = require("cosmjs-types/cosmos/tx/v1beta1/tx");
|
|
24
24
|
const CarbonSigner_1 = require("./CarbonSigner");
|
|
25
25
|
class CarbonWallet {
|
|
26
26
|
constructor(opts) {
|
|
27
27
|
var _a, _b;
|
|
28
28
|
this.initialized = false;
|
|
29
|
+
this.isNonceMismatchError = (error) => {
|
|
30
|
+
const regex = /^Broadcasting transaction failed with code 32 \(codespace: sdk\)\. Log: account sequence mismatch, expected (\d+), got (\d+): incorrect account sequence/;
|
|
31
|
+
const match = error === null || error === void 0 ? void 0 : error.message.match(regex);
|
|
32
|
+
if (match) {
|
|
33
|
+
return {
|
|
34
|
+
expected: match[1],
|
|
35
|
+
provided: match[2],
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
return false;
|
|
39
|
+
};
|
|
29
40
|
const network = (_a = opts.network) !== null && _a !== void 0 ? _a : constant_1.DEFAULT_NETWORK;
|
|
30
41
|
this.network = network;
|
|
31
42
|
this.networkConfig = constant_1.NetworkConfigs[network];
|
|
@@ -90,7 +101,10 @@ class CarbonWallet {
|
|
|
90
101
|
initialize(queryClient) {
|
|
91
102
|
return __awaiter(this, void 0, void 0, function* () {
|
|
92
103
|
this.query = queryClient;
|
|
93
|
-
yield
|
|
104
|
+
yield Promise.all([
|
|
105
|
+
this.reloadTxFees(),
|
|
106
|
+
this.reloadAccountSequence(),
|
|
107
|
+
]);
|
|
94
108
|
this.initialized = true;
|
|
95
109
|
return this;
|
|
96
110
|
});
|
|
@@ -108,8 +122,8 @@ class CarbonWallet {
|
|
|
108
122
|
broadcastTx(txRaw, opts = {}) {
|
|
109
123
|
return __awaiter(this, void 0, void 0, function* () {
|
|
110
124
|
const { pollIntervalMs = 3000, timeoutMs = 60000, } = opts;
|
|
111
|
-
const signingClient = yield this.getSigningClient();
|
|
112
125
|
const tx = CarbonWallet.TxRaw.encode(txRaw).finish();
|
|
126
|
+
const signingClient = yield this.getSigningClient();
|
|
113
127
|
const response = yield signingClient.broadcastTx(tx, timeoutMs, pollIntervalMs);
|
|
114
128
|
if ((0, stargate_1.isBroadcastTxFailure)(response)) {
|
|
115
129
|
// tx failed
|
|
@@ -132,7 +146,6 @@ class CarbonWallet {
|
|
|
132
146
|
}
|
|
133
147
|
;
|
|
134
148
|
getSignedTx(signerAddress, messages, opts = {}) {
|
|
135
|
-
var _a, _b;
|
|
136
149
|
return __awaiter(this, void 0, void 0, function* () {
|
|
137
150
|
const { memo = "", explicitSignerData, } = opts;
|
|
138
151
|
let fee = opts === null || opts === void 0 ? void 0 : opts.fee;
|
|
@@ -154,26 +167,48 @@ class CarbonWallet {
|
|
|
154
167
|
const [account] = yield this.signer.getAccounts();
|
|
155
168
|
let signature = null;
|
|
156
169
|
try {
|
|
157
|
-
(
|
|
158
|
-
|
|
170
|
+
if (!this.accountInfo)
|
|
171
|
+
yield this.reloadAccountSequence();
|
|
172
|
+
yield util_1.GenericUtils.callIgnoreError(() => { var _a; return (_a = this.onRequestSign) === null || _a === void 0 ? void 0 : _a.call(this, messages); });
|
|
173
|
+
const signerData = Object.assign({ accountNumber: this.accountInfo.accountNumber, sequence: this.accountInfo.sequence, chainId: this.accountInfo.chainId }, explicitSignerData);
|
|
174
|
+
const txRaw = yield signingClient.sign(signerAddress, messages, fee, memo, signerData);
|
|
159
175
|
signature = (0, amino_1.encodeSecp256k1Signature)(account.pubkey, txRaw.signatures[0]);
|
|
160
176
|
return txRaw;
|
|
161
177
|
}
|
|
162
178
|
finally {
|
|
163
|
-
(
|
|
179
|
+
yield util_1.GenericUtils.callIgnoreError(() => { var _a; return (_a = this.onSignComplete) === null || _a === void 0 ? void 0 : _a.call(this, signature); });
|
|
180
|
+
}
|
|
181
|
+
});
|
|
182
|
+
}
|
|
183
|
+
signAndBroadcast(msgs, signOpts, broadcastOpts) {
|
|
184
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
185
|
+
const signedTx = yield this.getSignedTx(this.bech32Address, msgs, signOpts);
|
|
186
|
+
const broadcastFunc = (broadcastOpts === null || broadcastOpts === void 0 ? void 0 : broadcastOpts.mode) === tx_1.BroadcastTxMode.BroadcastTxSync ? this.broadcastTxWithoutConfirm.bind(this) : this.broadcastTx.bind(this);
|
|
187
|
+
try {
|
|
188
|
+
return yield broadcastFunc(signedTx, broadcastOpts);
|
|
189
|
+
}
|
|
190
|
+
catch (error) {
|
|
191
|
+
const result = this.isNonceMismatchError(error);
|
|
192
|
+
if (!result)
|
|
193
|
+
throw error;
|
|
194
|
+
console.log(`encountered account sequence error: provided ${result.provided}, retrying with ${result.expected}…`);
|
|
195
|
+
// encountered account sequence error, retrying…
|
|
196
|
+
this.accountInfo = Object.assign(Object.assign({}, this.accountInfo), { sequence: parseInt(result.expected) });
|
|
197
|
+
const signedTx = yield this.getSignedTx(this.bech32Address, msgs, signOpts);
|
|
198
|
+
return broadcastFunc(signedTx, broadcastOpts);
|
|
164
199
|
}
|
|
165
200
|
});
|
|
166
201
|
}
|
|
167
202
|
sendTxs(msgs, opts) {
|
|
168
203
|
return __awaiter(this, void 0, void 0, function* () {
|
|
169
|
-
const
|
|
170
|
-
return
|
|
204
|
+
const result = yield this.signAndBroadcast(msgs, opts, { mode: tx_1.BroadcastTxMode.BroadcastTxBlock });
|
|
205
|
+
return result;
|
|
171
206
|
});
|
|
172
207
|
}
|
|
173
208
|
sendTxsWithoutConfirm(msgs, opts) {
|
|
174
209
|
return __awaiter(this, void 0, void 0, function* () {
|
|
175
|
-
const
|
|
176
|
-
return
|
|
210
|
+
const result = yield this.signAndBroadcast(msgs, opts, { mode: tx_1.BroadcastTxMode.BroadcastTxSync });
|
|
211
|
+
return result;
|
|
177
212
|
});
|
|
178
213
|
}
|
|
179
214
|
sendTx(msg, opts) {
|
|
@@ -207,7 +242,7 @@ class CarbonWallet {
|
|
|
207
242
|
if (!this.txFees) {
|
|
208
243
|
console.warn("tx fees not initialized");
|
|
209
244
|
}
|
|
210
|
-
return (_d = (_b = (_a = this.txFees) === null || _a === void 0 ? void 0 : _a[msgTypeUrl]) !== null && _b !== void 0 ? _b : (_c = this.txFees) === null || _c === void 0 ? void 0 : _c[
|
|
245
|
+
return (_d = (_b = (_a = this.txFees) === null || _a === void 0 ? void 0 : _a[msgTypeUrl]) !== null && _b !== void 0 ? _b : (_c = this.txFees) === null || _c === void 0 ? void 0 : _c[tx_1.TxFeeTypeDefaultKey]) !== null && _d !== void 0 ? _d : number_1.BN_ZERO;
|
|
211
246
|
}
|
|
212
247
|
updateTxFees(msgFees) {
|
|
213
248
|
const feesMap = msgFees.reduce((accum, fee) => {
|
|
@@ -223,6 +258,19 @@ class CarbonWallet {
|
|
|
223
258
|
this.updateTxFees(response.msgFees);
|
|
224
259
|
});
|
|
225
260
|
}
|
|
261
|
+
reloadAccountSequence() {
|
|
262
|
+
var _a, _b, _c, _d;
|
|
263
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
264
|
+
const info = yield this.getQueryClient().chain.getSequence(this.bech32Address);
|
|
265
|
+
const pubkey = (_b = (_a = this.accountInfo) === null || _a === void 0 ? void 0 : _a.pubkey) !== null && _b !== void 0 ? _b : {
|
|
266
|
+
type: "tendermint/PubKeySecp256k1",
|
|
267
|
+
value: this.publicKey.toString("base64"),
|
|
268
|
+
};
|
|
269
|
+
const chainId = (_d = (_c = this.accountInfo) === null || _c === void 0 ? void 0 : _c.chainId) !== null && _d !== void 0 ? _d : yield this.getQueryClient().chain.getChainId();
|
|
270
|
+
this.accountInfo = Object.assign(Object.assign({}, info), { address: this.bech32Address, pubkey,
|
|
271
|
+
chainId });
|
|
272
|
+
});
|
|
273
|
+
}
|
|
226
274
|
getQueryClient() {
|
|
227
275
|
if (!this.query)
|
|
228
276
|
throw new Error("wallet not initialized");
|
|
@@ -232,6 +280,6 @@ class CarbonWallet {
|
|
|
232
280
|
exports.CarbonWallet = CarbonWallet;
|
|
233
281
|
(function (CarbonWallet) {
|
|
234
282
|
;
|
|
235
|
-
CarbonWallet.TxRaw = Object.assign({},
|
|
283
|
+
CarbonWallet.TxRaw = Object.assign({}, tx_2.TxRaw);
|
|
236
284
|
})(CarbonWallet = exports.CarbonWallet || (exports.CarbonWallet = {}));
|
|
237
285
|
//# sourceMappingURL=CarbonWallet.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CarbonWallet.js","sourceRoot":"","sources":["../../src/wallet/CarbonWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6CAAqD;
|
|
1
|
+
{"version":3,"file":"CarbonWallet.js","sourceRoot":"","sources":["../../src/wallet/CarbonWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6CAAqD;AAErD,mDAA4G;AAE5G,mDAAmE;AACnE,2CAAwE;AACxE,sDAAuD;AACvD,oDAA4D;AAC5D,4CAA2E;AAE3E,yCAAuE;AAEvE,+CAA6G;AAC7G,2DAA4D;AAG5D,0DAA2E;AAC3E,iDAA8H;AA6D9H,MAAa,YAAY;IA0BvB,YAAY,IAA0B;;QATtC,gBAAW,GAAY,KAAK,CAAC;QAsUrB,yBAAoB,GAAG,CAAC,KAAa,EAAE,EAAE;YAC/C,MAAM,KAAK,GAAG,0JAA0J,CAAC;YACzK,MAAM,KAAK,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC1C,IAAI,KAAK,EAAE;gBACT,OAAO;oBACL,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;oBAClB,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;iBACnB,CAAA;aACF;YAED,OAAO,KAAK,CAAC;QACf,CAAC,CAAA;QAvUC,MAAM,OAAO,GAAG,MAAA,IAAI,CAAC,OAAO,mCAAI,0BAAe,CAAC;QAChD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,aAAa,GAAG,yBAAc,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,cAAc,GAAG,MAAA,IAAI,CAAC,MAAM,mCAAI,EAAE,CAAC;QACxC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAE5B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAE1C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,UAAU,GAAG,mBAAY,CAAC,WAAW,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAChF;aAAM,IAAI,IAAI,CAAC,UAAU,EAAE;YAC1B,IAAI,CAAC,UAAU,GAAG,mBAAY,CAAC,sBAAsB,CAAC,IAAI,CAAC,UAAU,CAAE,CAAC;SACzE;QAED,MAAM,WAAW,mBACf,OAAO,IACJ,IAAI,CAAC,cAAc,CAAC,YAAY,IAAI;YACrC,YAAY,EAAE,IAAI,CAAC,cAAc,CAAC,YAAY;SAC/C,CACF,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAC1B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAgB,EAAE,QAAQ,CAAC,CAAC;YAE9D,IAAI,CAAC,aAAa,GAAG,mBAAY,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;SAC/F;aAAM,IAAI,IAAI,CAAC,UAAU,EAAE;YAC1B,IAAI,CAAC,SAAS,GAAG,mBAAY,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAE9E,IAAI,CAAC,aAAa,GAAG,mBAAY,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;YAE9F,IAAI,MAAM,GAAG,WAAW,CAAC,YAAY,CAAA;YACrC,IAAI,CAAC,WAAW,CAAC,YAAY;gBAC3B,MAAM,GAAG,qBAAW,CAAC,eAAe,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,YAAY,CAAC,CAAA;YAEvF,IAAI,CAAC,MAAM;gBACT,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;YAEhE,IAAI,CAAC,MAAM,GAAG,IAAI,qCAAsB,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;SAEnE;aAAM,IAAI,IAAI,CAAC,aAAa,EAAE;YAC7B,gDAAgD;YAChD,IAAI,CAAC,MAAM,GAAG,IAAI,8BAAe,EAAE,CAAC;YACpC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACjC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;SACzC;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;SACrD;IACH,CAAC;IAEM,MAAM,CAAC,cAAc,CAC1B,UAA2B,EAC3B,OAAiD,EAAE;QAEnD,OAAO,IAAI,YAAY,iCAClB,IAAI,KACP,UAAU,IACV,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,YAAY,CACxB,QAAgB,EAChB,OAA+C,EAAE;QAEjD,OAAO,IAAI,YAAY,iCAClB,IAAI,KACP,QAAQ,IACR,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,UAAU,CACtB,YAA0B,EAC1B,eAAuB,EACvB,OAA6C,EAAE;QAE/C,MAAM,MAAM,GAAG,IAAI,iCAAkB,CAAC,YAAY,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,YAAY,CAAC,UAAU,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;QACtE,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,MAAM,CAAC,UAAU,CACtB,MAAoB,EACpB,eAAuB,EACvB,OAA6C,EAAE;QAE/C,OAAO,IAAI,YAAY,iCAClB,IAAI,KACP,MAAM;YACN,eAAe,EACf,YAAY,EAAE,IAAI,CAAC,YAAY,IAC/B,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,WAAW,CACvB,aAAqB,EACrB,OAAsC,EAAE;QAExC,OAAO,IAAI,YAAY,iCAClB,IAAI,KACP,aAAa,IACb,CAAA;IACJ,CAAC;IAEY,UAAU,CAAC,WAA8B;;YACpD,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC;YAEzB,MAAM,OAAO,CAAC,GAAG,CAAC;gBAChB,IAAI,CAAC,YAAY,EAAE;gBACnB,IAAI,CAAC,qBAAqB,EAAE;aAC7B,CAAC,CAAC;YAEH,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YACxB,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAEM,aAAa,CAAC,OAAgB;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,mBAAY,CAAC,cAAc,CAAC,yBAAc,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAC/F,OAAO,IAAI,CAAC,aAAa,CAAC;QAE1B,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACG,WAAW,CACf,KAAyB,EACzB,OAAiC,EAAE;;YAEnC,MAAM,EACJ,cAAc,GAAG,IAAK,EACtB,SAAS,GAAG,KAAM,GACnB,GAAG,IAAI,CAAC;YAET,MAAM,EAAE,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;YACrD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACpD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;YAChF,IAAI,IAAA,+BAAoB,EAAC,QAAQ,CAAC,EAAE;gBAClC,YAAY;gBACZ,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBACxB,MAAM,IAAI,KAAK,CAAC,IAAI,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;aAC1D;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC;KAAA;IAED;;;OAGG;IACG,yBAAyB,CAAC,KAAyB;;YACvD,MAAM,EAAE,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;YACrD,MAAM,QAAQ,GAAG,MAAM,mCAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAC/E,OAAO,QAAQ,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1C,CAAC;KAAA;IAAA,CAAC;IAEI,WAAW,CACf,aAAqB,EACrB,QAAiC,EACjC,OAA4B,EAAE;;YAE9B,MAAM,EACJ,IAAI,GAAG,EAAE,EACT,kBAAkB,GACnB,GAAG,IAAI,CAAC;YAET,IAAI,GAAG,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,CAAC;YAEpB,IAAI,CAAC,GAAG,EAAE;gBACR,uBAAuB;gBACvB,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE;oBACzD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAC5C,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;gBACzD,CAAC,EAAE,gBAAO,CAAC,CAAC;gBACZ,GAAG,GAAG;oBACJ,MAAM,EAAE,CAAC;4BACP,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;4BACjC,KAAK,EAAE,MAAM;yBACd,CAAC;oBACF,GAAG,EAAE,sBAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;iBACrD,CAAC;aACH;YACD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAEpD,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YAClD,IAAI,SAAS,GAAwB,IAAI,CAAC;YAC1C,IAAI;gBACF,IAAI,CAAC,IAAI,CAAC,WAAW;oBACnB,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBAErC,MAAM,mBAAY,CAAC,eAAe,CAAC,GAAG,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,aAAa,+CAAlB,IAAI,EAAiB,QAAQ,CAAC,CAAA,EAAA,CAAC,CAAC;gBACzE,MAAM,UAAU,mBACd,aAAa,EAAE,IAAI,CAAC,WAAY,CAAC,aAAa,EAC9C,QAAQ,EAAE,IAAI,CAAC,WAAY,CAAC,QAAQ,EACpC,OAAO,EAAE,IAAI,CAAC,WAAY,CAAC,OAAO,IAC/B,kBAAkB,CACtB,CAAC;gBACF,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;gBACvF,SAAS,GAAG,IAAA,gCAAwB,EAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC1E,OAAO,KAAK,CAAC;aACd;oBAAS;gBACR,MAAM,mBAAY,CAAC,eAAe,CAAC,GAAG,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,cAAc,+CAAnB,IAAI,EAAkB,SAAS,CAAC,CAAA,EAAA,CAAC,CAAC;aAC5E;QACH,CAAC;KAAA;IAEK,gBAAgB,CAAC,IAAoB,EAAE,QAA8B,EAAE,aAAwC;;YACnH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;YAE5E,MAAM,aAAa,GAAG,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,MAAK,oBAAe,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAExJ,IAAI;gBACF,OAAO,MAAM,aAAa,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;aACrD;YAAC,OAAO,KAAU,EAAE;gBACnB,MAAM,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;gBAChD,IAAI,CAAC,MAAM;oBACT,MAAM,KAAK,CAAC;gBAEd,OAAO,CAAC,GAAG,CAAC,gDAAgD,MAAM,CAAC,QAAQ,mBAAmB,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC;gBAClH,gDAAgD;gBAChD,IAAI,CAAC,WAAW,mCACX,IAAI,CAAC,WAAY,KACpB,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,GACpC,CAAC;gBACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;gBAC5E,OAAO,aAAa,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;aAC/C;QACH,CAAC;KAAA;IAEK,OAAO,CAAC,IAAoB,EAAE,IAA0B;;YAC5D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,oBAAe,CAAC,gBAAgB,EAAE,CAAC,CAAC;YACnG,OAAO,MAA6B,CAAC;QACvC,CAAC;KAAA;IAEK,qBAAqB,CAAC,IAAoB,EAAE,IAA0B;;YAC1E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,oBAAe,CAAC,eAAe,EAAE,CAAC,CAAC;YAChG,OAAO,MAAiC,CAAC;QAC7C,CAAC;KAAA;IAEK,MAAM,CAAC,GAAiB,EAAE,IAA0B;;YACxD,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QACnC,CAAC;KAAA;IAEK,gBAAgB;;YACpB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;gBACvB,IAAI,CAAC,aAAa,GAAG,MAAM,gCAAqB,CAAC,iBAAiB,CAChE,IAAI,CAAC,aAAa,CAAC,QAAQ,EAC3B,IAAI,CAAC,MAAM,kCAEN,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,gCAAiB,CAAC,MAAM,IAAI,EAAE,UAAU,EAAE,wBAAa,EAAE,CAAC,KACnF,QAAQ,EAAR,gBAAQ,IAEX,CAAC;aACH;YACD,OAAO,IAAI,CAAC,aAAa,CAAC;QAC5B,CAAC;KAAA;IAAA,CAAC;IAEF,QAAQ,CAAC,UAA6B;QACpC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC;IACzC,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,gCAAiB,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC,gCAAiB,CAAC,UAAU,CAAC,CAAC;IACrD,CAAC;IAED,uBAAuB;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,gCAAiB,CAAC,eAAe,CAAC,CAAC;IAC1D,CAAC;IAEM,MAAM,CAAC,UAAkB;;QAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;SACzC;QACD,OAAO,MAAA,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAG,UAAU,CAAC,mCAAI,MAAA,IAAI,CAAC,MAAM,0CAAG,wBAAmB,CAAC,mCAAI,gBAAO,CAAC;IACpF,CAAC;IAEM,YAAY,CAAC,OAAiB;QACnC,MAAM,OAAO,GAAyB,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAClE,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,IAAA,iBAAQ,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACvC,OAAO,KAAK,CAAC;QACf,CAAC,EAAE,EAA0B,CAAC,CAAC;QAE/B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;IACxB,CAAC;IAEY,YAAY;;YACvB,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YAC1C,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YACrD,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACtC,CAAC;KAAA;IAEY,qBAAqB;;;YAChC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAE/E,MAAM,MAAM,GAAG,MAAA,MAAA,IAAI,CAAC,WAAW,0CAAE,MAAM,mCAAI;gBACzC,IAAI,EAAE,4BAA4B;gBAClC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC;aACzC,CAAC;YAEF,MAAM,OAAO,GAAG,MAAA,MAAA,IAAI,CAAC,WAAW,0CAAE,OAAO,mCAAI,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;YAE5F,IAAI,CAAC,WAAW,mCACX,IAAI,KACP,OAAO,EAAE,IAAI,CAAC,aAAa,EAC3B,MAAM;gBACN,OAAO,GACR,CAAC;;KACH;IAeO,cAAc;QACpB,IAAI,CAAC,IAAI,CAAC,KAAK;YACb,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC5C,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;CACF;AAzWD,oCAyWC;AAED,WAAiB,YAAY;IAOqB,CAAC;IACpC,kBAAK,qBAA8B,UAAa,CAAE,CAAC;AAClE,CAAC,EATgB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAS5B"}
|