@bsv/wallet-toolbox-client 1.1.60 → 1.1.62
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/out/src/Wallet.d.ts.map +1 -1
- package/out/src/Wallet.js +4 -11
- package/out/src/Wallet.js.map +1 -1
- package/out/src/monitor/Monitor.d.ts.map +1 -1
- package/out/src/monitor/Monitor.js.map +1 -1
- package/out/src/monitor/tasks/TaskCheckForProofs.d.ts.map +1 -1
- package/out/src/monitor/tasks/TaskCheckForProofs.js +2 -10
- package/out/src/monitor/tasks/TaskCheckForProofs.js.map +1 -1
- package/out/src/monitor/tasks/TaskClock.d.ts.map +1 -1
- package/out/src/monitor/tasks/TaskClock.js +1 -1
- package/out/src/monitor/tasks/TaskClock.js.map +1 -1
- package/out/src/monitor/tasks/TaskFailAbandoned.d.ts.map +1 -1
- package/out/src/monitor/tasks/TaskFailAbandoned.js.map +1 -1
- package/out/src/monitor/tasks/TaskNewHeader.d.ts.map +1 -1
- package/out/src/monitor/tasks/TaskNewHeader.js +1 -2
- package/out/src/monitor/tasks/TaskNewHeader.js.map +1 -1
- package/out/src/monitor/tasks/TaskPurge.d.ts.map +1 -1
- package/out/src/monitor/tasks/TaskPurge.js +1 -2
- package/out/src/monitor/tasks/TaskPurge.js.map +1 -1
- package/out/src/monitor/tasks/TaskReviewStatus.d.ts.map +1 -1
- package/out/src/monitor/tasks/TaskReviewStatus.js +1 -2
- package/out/src/monitor/tasks/TaskReviewStatus.js.map +1 -1
- package/out/src/monitor/tasks/TaskSendWaiting.d.ts.map +1 -1
- package/out/src/monitor/tasks/TaskSendWaiting.js.map +1 -1
- package/out/src/sdk/CertOps.d.ts.map +1 -1
- package/out/src/sdk/CertOps.js +4 -12
- package/out/src/sdk/CertOps.js.map +1 -1
- package/out/src/sdk/PrivilegedKeyManager.d.ts.map +1 -1
- package/out/src/sdk/PrivilegedKeyManager.js.map +1 -1
- package/out/src/sdk/WERR_errors.d.ts.map +1 -1
- package/out/src/sdk/WERR_errors.js.map +1 -1
- package/out/src/sdk/WalletError.d.ts.map +1 -1
- package/out/src/sdk/WalletError.js +1 -4
- package/out/src/sdk/WalletError.js.map +1 -1
- package/out/src/sdk/WalletServices.interfaces.d.ts +2 -0
- package/out/src/sdk/WalletServices.interfaces.d.ts.map +1 -1
- package/out/src/sdk/WalletStorage.interfaces.d.ts.map +1 -1
- package/out/src/sdk/types.d.ts.map +1 -1
- package/out/src/sdk/types.js +2 -10
- package/out/src/sdk/types.js.map +1 -1
- package/out/src/sdk/validationHelpers.d.ts.map +1 -1
- package/out/src/sdk/validationHelpers.js +5 -12
- package/out/src/sdk/validationHelpers.js.map +1 -1
- package/out/src/services/Services.d.ts +1 -0
- package/out/src/services/Services.d.ts.map +1 -1
- package/out/src/services/Services.js +29 -38
- package/out/src/services/Services.js.map +1 -1
- package/out/src/services/chaintracker/ChaintracksChainTracker.d.ts.map +1 -1
- package/out/src/services/chaintracker/ChaintracksChainTracker.js.map +1 -1
- package/out/src/services/chaintracker/chaintracks/BlockHeaderApi.d.ts.map +1 -1
- package/out/src/services/chaintracker/chaintracks/BlockHeaderApi.js.map +1 -1
- package/out/src/services/chaintracker/chaintracks/ChaintracksServiceClient.d.ts.map +1 -1
- package/out/src/services/chaintracker/chaintracks/ChaintracksServiceClient.js +1 -3
- package/out/src/services/chaintracker/chaintracks/ChaintracksServiceClient.js.map +1 -1
- package/out/src/services/createDefaultWalletServicesOptions.d.ts.map +1 -1
- package/out/src/services/createDefaultWalletServicesOptions.js.map +1 -1
- package/out/src/services/providers/ARC.d.ts.map +1 -1
- package/out/src/services/providers/ARC.js +2 -3
- package/out/src/services/providers/ARC.js.map +1 -1
- package/out/src/services/providers/Bitails.d.ts.map +1 -1
- package/out/src/services/providers/Bitails.js +62 -134
- package/out/src/services/providers/Bitails.js.map +1 -1
- package/out/src/services/providers/SdkWhatsOnChain.d.ts.map +1 -1
- package/out/src/services/providers/SdkWhatsOnChain.js.map +1 -1
- package/out/src/services/providers/WhatsOnChain.d.ts.map +1 -1
- package/out/src/services/providers/WhatsOnChain.js +6 -21
- package/out/src/services/providers/WhatsOnChain.js.map +1 -1
- package/out/src/services/providers/echangeRates.d.ts.map +1 -1
- package/out/src/services/providers/echangeRates.js.map +1 -1
- package/out/src/signer/WalletSigner.d.ts.map +1 -1
- package/out/src/signer/WalletSigner.js.map +1 -1
- package/out/src/signer/methods/acquireDirectCertificate.d.ts.map +1 -1
- package/out/src/signer/methods/acquireDirectCertificate.js +1 -3
- package/out/src/signer/methods/acquireDirectCertificate.js.map +1 -1
- package/out/src/signer/methods/buildSignableTransaction.d.ts.map +1 -1
- package/out/src/signer/methods/buildSignableTransaction.js +3 -11
- package/out/src/signer/methods/buildSignableTransaction.js.map +1 -1
- package/out/src/signer/methods/createAction.d.ts.map +1 -1
- package/out/src/signer/methods/createAction.js +3 -10
- package/out/src/signer/methods/createAction.js.map +1 -1
- package/out/src/signer/methods/internalizeAction.d.ts.map +1 -1
- package/out/src/signer/methods/internalizeAction.js.map +1 -1
- package/out/src/signer/methods/proveCertificate.d.ts.map +1 -1
- package/out/src/signer/methods/proveCertificate.js.map +1 -1
- package/out/src/signer/methods/signAction.d.ts.map +1 -1
- package/out/src/signer/methods/signAction.js +2 -7
- package/out/src/signer/methods/signAction.js.map +1 -1
- package/out/src/storage/StorageProvider.d.ts.map +1 -1
- package/out/src/storage/StorageProvider.js +9 -34
- package/out/src/storage/StorageProvider.js.map +1 -1
- package/out/src/storage/StorageReader.d.ts.map +1 -1
- package/out/src/storage/StorageReader.js.map +1 -1
- package/out/src/storage/StorageReaderWriter.d.ts.map +1 -1
- package/out/src/storage/StorageReaderWriter.js.map +1 -1
- package/out/src/storage/StorageSyncReader.d.ts.map +1 -1
- package/out/src/storage/StorageSyncReader.js.map +1 -1
- package/out/src/storage/WalletStorageManager.d.ts.map +1 -1
- package/out/src/storage/WalletStorageManager.js +5 -10
- package/out/src/storage/WalletStorageManager.js.map +1 -1
- package/out/src/storage/methods/attemptToPostReqsToNetwork.d.ts.map +1 -1
- package/out/src/storage/methods/attemptToPostReqsToNetwork.js +6 -20
- package/out/src/storage/methods/attemptToPostReqsToNetwork.js.map +1 -1
- package/out/src/storage/methods/createAction.d.ts.map +1 -1
- package/out/src/storage/methods/createAction.js +4 -9
- package/out/src/storage/methods/createAction.js.map +1 -1
- package/out/src/storage/methods/generateChange.d.ts.map +1 -1
- package/out/src/storage/methods/generateChange.js +7 -18
- package/out/src/storage/methods/generateChange.js.map +1 -1
- package/out/src/storage/methods/getBeefForTransaction.d.ts.map +1 -1
- package/out/src/storage/methods/getBeefForTransaction.js +1 -3
- package/out/src/storage/methods/getBeefForTransaction.js.map +1 -1
- package/out/src/storage/methods/getSyncChunk.d.ts.map +1 -1
- package/out/src/storage/methods/getSyncChunk.js.map +1 -1
- package/out/src/storage/methods/internalizeAction.d.ts.map +1 -1
- package/out/src/storage/methods/internalizeAction.js +2 -9
- package/out/src/storage/methods/internalizeAction.js.map +1 -1
- package/out/src/storage/methods/listCertificates.d.ts.map +1 -1
- package/out/src/storage/methods/listCertificates.js.map +1 -1
- package/out/src/storage/methods/processAction.d.ts.map +1 -1
- package/out/src/storage/methods/processAction.js +4 -10
- package/out/src/storage/methods/processAction.js.map +1 -1
- package/out/src/storage/remoting/StorageClient.d.ts.map +1 -1
- package/out/src/storage/remoting/StorageClient.js +15 -41
- package/out/src/storage/remoting/StorageClient.js.map +1 -1
- package/out/src/storage/schema/entities/Certificate.d.ts.map +1 -1
- package/out/src/storage/schema/entities/Certificate.js +1 -1
- package/out/src/storage/schema/entities/Certificate.js.map +1 -1
- package/out/src/storage/schema/entities/CertificateField.d.ts.map +1 -1
- package/out/src/storage/schema/entities/CertificateField.js +2 -5
- package/out/src/storage/schema/entities/CertificateField.js.map +1 -1
- package/out/src/storage/schema/entities/Commission.d.ts.map +1 -1
- package/out/src/storage/schema/entities/Commission.js +2 -5
- package/out/src/storage/schema/entities/Commission.js.map +1 -1
- package/out/src/storage/schema/entities/EntityBase.d.ts.map +1 -1
- package/out/src/storage/schema/entities/EntityBase.js.map +1 -1
- package/out/src/storage/schema/entities/MergeEntity.d.ts.map +1 -1
- package/out/src/storage/schema/entities/MergeEntity.js +14 -9
- package/out/src/storage/schema/entities/MergeEntity.js.map +1 -1
- package/out/src/storage/schema/entities/Output.d.ts.map +1 -1
- package/out/src/storage/schema/entities/Output.js +8 -25
- package/out/src/storage/schema/entities/Output.js.map +1 -1
- package/out/src/storage/schema/entities/OutputBasket.d.ts.map +1 -1
- package/out/src/storage/schema/entities/OutputBasket.js +1 -1
- package/out/src/storage/schema/entities/OutputBasket.js.map +1 -1
- package/out/src/storage/schema/entities/OutputTag.d.ts.map +1 -1
- package/out/src/storage/schema/entities/OutputTag.js +1 -1
- package/out/src/storage/schema/entities/OutputTag.js.map +1 -1
- package/out/src/storage/schema/entities/OutputTagMap.d.ts.map +1 -1
- package/out/src/storage/schema/entities/OutputTagMap.js +3 -7
- package/out/src/storage/schema/entities/OutputTagMap.js.map +1 -1
- package/out/src/storage/schema/entities/ProvenTx.d.ts.map +1 -1
- package/out/src/storage/schema/entities/ProvenTx.js +10 -20
- package/out/src/storage/schema/entities/ProvenTx.js.map +1 -1
- package/out/src/storage/schema/entities/ProvenTxReq.d.ts.map +1 -1
- package/out/src/storage/schema/entities/ProvenTxReq.js +8 -18
- package/out/src/storage/schema/entities/ProvenTxReq.js.map +1 -1
- package/out/src/storage/schema/entities/SyncState.d.ts +1 -0
- package/out/src/storage/schema/entities/SyncState.d.ts.map +1 -1
- package/out/src/storage/schema/entities/SyncState.js +41 -6
- package/out/src/storage/schema/entities/SyncState.js.map +1 -1
- package/out/src/storage/schema/entities/Transaction.d.ts.map +1 -1
- package/out/src/storage/schema/entities/Transaction.js +4 -13
- package/out/src/storage/schema/entities/Transaction.js.map +1 -1
- package/out/src/storage/schema/entities/TxLabel.d.ts.map +1 -1
- package/out/src/storage/schema/entities/TxLabel.js +1 -1
- package/out/src/storage/schema/entities/TxLabel.js.map +1 -1
- package/out/src/storage/schema/entities/TxLabelMap.d.ts.map +1 -1
- package/out/src/storage/schema/entities/TxLabelMap.js +3 -9
- package/out/src/storage/schema/entities/TxLabelMap.js.map +1 -1
- package/out/src/storage/schema/entities/User.d.ts.map +1 -1
- package/out/src/storage/schema/entities/User.js +3 -5
- package/out/src/storage/schema/entities/User.js.map +1 -1
- package/out/src/storage/schema/tables/TableSettings.d.ts.map +1 -1
- package/out/src/utility/ScriptTemplateBRC29.d.ts.map +1 -1
- package/out/src/utility/ScriptTemplateBRC29.js +1 -2
- package/out/src/utility/ScriptTemplateBRC29.js.map +1 -1
- package/out/src/utility/stampLog.d.ts.map +1 -1
- package/out/src/utility/stampLog.js.map +1 -1
- package/out/src/utility/tscProofToMerklePath.d.ts.map +1 -1
- package/out/src/utility/tscProofToMerklePath.js.map +1 -1
- package/out/src/utility/utilityHelpers.d.ts.map +1 -1
- package/out/src/utility/utilityHelpers.js +1 -3
- package/out/src/utility/utilityHelpers.js.map +1 -1
- package/package.json +2 -2
|
@@ -159,10 +159,7 @@ class StorageClient {
|
|
|
159
159
|
* @returns `internalizeAction` results
|
|
160
160
|
*/
|
|
161
161
|
async internalizeAction(auth, args) {
|
|
162
|
-
return this.rpcCall('internalizeAction', [
|
|
163
|
-
auth,
|
|
164
|
-
args
|
|
165
|
-
]);
|
|
162
|
+
return this.rpcCall('internalizeAction', [auth, args]);
|
|
166
163
|
}
|
|
167
164
|
/**
|
|
168
165
|
* Storage level processing for wallet `createAction`.
|
|
@@ -172,10 +169,7 @@ class StorageClient {
|
|
|
172
169
|
* @returns `StorageCreateActionResults` supporting additional wallet processing to yield `createAction` results.
|
|
173
170
|
*/
|
|
174
171
|
async createAction(auth, args) {
|
|
175
|
-
return this.rpcCall('createAction', [
|
|
176
|
-
auth,
|
|
177
|
-
args
|
|
178
|
-
]);
|
|
172
|
+
return this.rpcCall('createAction', [auth, args]);
|
|
179
173
|
}
|
|
180
174
|
/**
|
|
181
175
|
* Storage level processing for wallet `createAction` and `signAction`.
|
|
@@ -188,10 +182,7 @@ class StorageClient {
|
|
|
188
182
|
* @returns `StorageProcessActionResults` supporting final wallet processing to yield `createAction` or `signAction` results.
|
|
189
183
|
*/
|
|
190
184
|
async processAction(auth, args) {
|
|
191
|
-
return this.rpcCall('processAction', [
|
|
192
|
-
auth,
|
|
193
|
-
args
|
|
194
|
-
]);
|
|
185
|
+
return this.rpcCall('processAction', [auth, args]);
|
|
195
186
|
}
|
|
196
187
|
/**
|
|
197
188
|
* Aborts an action by `reference` string.
|
|
@@ -221,7 +212,11 @@ class StorageClient {
|
|
|
221
212
|
* @returns `TableSyncState` and whether a new record was created.
|
|
222
213
|
*/
|
|
223
214
|
async findOrInsertSyncStateAuth(auth, storageIdentityKey, storageName) {
|
|
224
|
-
const r = await this.rpcCall('findOrInsertSyncStateAuth', [
|
|
215
|
+
const r = await this.rpcCall('findOrInsertSyncStateAuth', [
|
|
216
|
+
auth,
|
|
217
|
+
storageIdentityKey,
|
|
218
|
+
storageName
|
|
219
|
+
]);
|
|
225
220
|
r.syncState = this.validateEntity(r.syncState, ['when']);
|
|
226
221
|
return r;
|
|
227
222
|
}
|
|
@@ -233,10 +228,7 @@ class StorageClient {
|
|
|
233
228
|
* @returns record Id of the inserted `TableCertificate` record.
|
|
234
229
|
*/
|
|
235
230
|
async insertCertificateAuth(auth, certificate) {
|
|
236
|
-
const r = await this.rpcCall('insertCertificateAuth', [
|
|
237
|
-
auth,
|
|
238
|
-
certificate
|
|
239
|
-
]);
|
|
231
|
+
const r = await this.rpcCall('insertCertificateAuth', [auth, certificate]);
|
|
240
232
|
return r;
|
|
241
233
|
}
|
|
242
234
|
/**
|
|
@@ -247,10 +239,7 @@ class StorageClient {
|
|
|
247
239
|
* @returns `listActions` results.
|
|
248
240
|
*/
|
|
249
241
|
async listActions(auth, vargs) {
|
|
250
|
-
const r = await this.rpcCall('listActions', [
|
|
251
|
-
auth,
|
|
252
|
-
vargs
|
|
253
|
-
]);
|
|
242
|
+
const r = await this.rpcCall('listActions', [auth, vargs]);
|
|
254
243
|
return r;
|
|
255
244
|
}
|
|
256
245
|
/**
|
|
@@ -261,10 +250,7 @@ class StorageClient {
|
|
|
261
250
|
* @returns `listOutputs` results.
|
|
262
251
|
*/
|
|
263
252
|
async listOutputs(auth, vargs) {
|
|
264
|
-
const r = await this.rpcCall('listOutputs', [
|
|
265
|
-
auth,
|
|
266
|
-
vargs
|
|
267
|
-
]);
|
|
253
|
+
const r = await this.rpcCall('listOutputs', [auth, vargs]);
|
|
268
254
|
return r;
|
|
269
255
|
}
|
|
270
256
|
/**
|
|
@@ -275,10 +261,7 @@ class StorageClient {
|
|
|
275
261
|
* @returns `listCertificates` results.
|
|
276
262
|
*/
|
|
277
263
|
async listCertificates(auth, vargs) {
|
|
278
|
-
const r = await this.rpcCall('listCertificates', [
|
|
279
|
-
auth,
|
|
280
|
-
vargs
|
|
281
|
-
]);
|
|
264
|
+
const r = await this.rpcCall('listCertificates', [auth, vargs]);
|
|
282
265
|
return r;
|
|
283
266
|
}
|
|
284
267
|
/**
|
|
@@ -293,10 +276,7 @@ class StorageClient {
|
|
|
293
276
|
* @returns array of certificates matching args.
|
|
294
277
|
*/
|
|
295
278
|
async findCertificatesAuth(auth, args) {
|
|
296
|
-
const r = await this.rpcCall('findCertificatesAuth', [
|
|
297
|
-
auth,
|
|
298
|
-
args
|
|
299
|
-
]);
|
|
279
|
+
const r = await this.rpcCall('findCertificatesAuth', [auth, args]);
|
|
300
280
|
this.validateEntities(r);
|
|
301
281
|
if (args.includeFields) {
|
|
302
282
|
for (const c of r) {
|
|
@@ -317,10 +297,7 @@ class StorageClient {
|
|
|
317
297
|
* @returns array of output baskets matching args.
|
|
318
298
|
*/
|
|
319
299
|
async findOutputBasketsAuth(auth, args) {
|
|
320
|
-
const r = await this.rpcCall('findOutputBaskets', [
|
|
321
|
-
auth,
|
|
322
|
-
args
|
|
323
|
-
]);
|
|
300
|
+
const r = await this.rpcCall('findOutputBaskets', [auth, args]);
|
|
324
301
|
this.validateEntities(r);
|
|
325
302
|
return r;
|
|
326
303
|
}
|
|
@@ -455,10 +432,7 @@ class StorageClient {
|
|
|
455
432
|
* @param newActiveStorageIdentityKey which must be a currently configured backup storage provider.
|
|
456
433
|
*/
|
|
457
434
|
async setActive(auth, newActiveStorageIdentityKey) {
|
|
458
|
-
return this.rpcCall('setActive', [
|
|
459
|
-
auth,
|
|
460
|
-
newActiveStorageIdentityKey
|
|
461
|
-
]);
|
|
435
|
+
return this.rpcCall('setActive', [auth, newActiveStorageIdentityKey]);
|
|
462
436
|
}
|
|
463
437
|
validateDate(date) {
|
|
464
438
|
let r;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageClient.js","sourceRoot":"","sources":["../../../../../src/storage/remoting/StorageClient.ts"],"names":[],"mappings":";;;AAYA,qDAU2B;AAC3B,kCAAoC;AAEpC;;;;;;;;;;;;;GAaG;AACH,MAAa,aAAa;IAQxB,YAAY,MAAuB,EAAE,WAAmB;QANhD,WAAM,GAAG,CAAC,CAAA;QAOhB,IAAI,CAAC,UAAU,GAAG,IAAI,eAAS,CAAC,MAAM,CAAC,CAAA;QACvC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;IAChC,CAAC;IAED;;;;;OAKG;IACH,iBAAiB;QACf,OAAO,KAAK,CAAA;IACd,CAAC;IAED,8EAA8E;IAC9E,kBAAkB;IAClB,8EAA8E;IAE9E;;;;OAIG;IACK,KAAK,CAAC,OAAO,CAAI,MAAc,EAAE,MAAiB;QACxD,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;YACxB,MAAM,IAAI,GAAG;gBACX,OAAO,EAAE,KAAK;gBACd,MAAM;gBACN,MAAM;gBACN,EAAE;aACH,CAAA;YAED,IAAI,QAAkB,CAAA;YACtB,IAAI,CAAC;gBACH,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE;oBACvD,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;oBAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;iBAC3B,CAAC,CAAA;YACJ,CAAC;YAAC,OAAO,EAAW,EAAE,CAAC;gBACrB,MAAM,EAAE,CAAA;YACV,CAAC;YAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"StorageClient.js","sourceRoot":"","sources":["../../../../../src/storage/remoting/StorageClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Certificate.d.ts","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/Certificate.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"Certificate.d.ts","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/Certificate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,GAAG,EAAE,gBAAgB,EAA6B,MAAM,uBAAuB,CAAA;AACrG,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,CAAA;AAEtD,qBAAa,iBAAkB,SAAQ,UAAU,CAAC,gBAAgB,CAAC;gBACrD,GAAG,CAAC,EAAE,gBAAgB;IAoBzB,SAAS,IAAI,IAAI;IAI1B,IAAI,aAAa,IAGI,MAAM,CAD1B;IACD,IAAI,aAAa,CAAC,CAAC,EAAE,MAAM,EAE1B;IACD,IAAI,UAAU,IAGI,IAAI,CADrB;IACD,IAAI,UAAU,CAAC,CAAC,EAAE,IAAI,EAErB;IACD,IAAI,UAAU,IAGI,IAAI,CADrB;IACD,IAAI,UAAU,CAAC,CAAC,EAAE,IAAI,EAErB;IACD,IAAI,MAAM,IAGI,MAAM,CADnB;IACD,IAAI,MAAM,CAAC,CAAC,EAAE,MAAM,EAEnB;IACD,IAAI,IAAI,IAGI,MAAM,CADjB;IACD,IAAI,IAAI,CAAC,CAAC,EAAE,MAAM,EAEjB;IACD,IAAI,OAAO,IAGI,MAAM,CADpB;IACD,IAAI,OAAO,CAAC,CAAC,EAAE,MAAM,EAEpB;IACD,IAAI,QAAQ,IAGI,MAAM,GAAG,SAAS,CADjC;IACD,IAAI,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,EAEjC;IACD,IAAI,YAAY,IAGI,MAAM,CADzB;IACD,IAAI,YAAY,CAAC,CAAC,EAAE,MAAM,EAEzB;IACD,IAAI,SAAS,IAGI,MAAM,CADtB;IACD,IAAI,SAAS,CAAC,CAAC,EAAE,MAAM,EAEtB;IACD,IAAI,kBAAkB,IAGI,MAAM,CAD/B;IACD,IAAI,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAE/B;IACD,IAAI,SAAS,IAGI,MAAM,CADtB;IACD,IAAI,SAAS,CAAC,CAAC,EAAE,MAAM,EAEtB;IACD,IAAI,SAAS,IAGI,OAAO,CADvB;IACD,IAAI,SAAS,CAAC,CAAC,EAAE,OAAO,EAEvB;IAKD,IAAa,EAAE,IAAI,MAAM,CAExB;IACD,IAAa,EAAE,CAAC,CAAC,EAAE,MAAM,EAExB;IACD,IAAa,UAAU,IAAI,MAAM,CAEhC;IACD,IAAa,WAAW,IAAI,MAAM,CAEjC;IAEQ,MAAM,CAAC,EAAE,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO;WAepD,SAAS,CACpB,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,gBAAgB,EACpB,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,GACjB,OAAO,CAAC;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,EAAE,EAAE,iBAAiB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAkBpD,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrG,aAAa,CAC1B,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,IAAI,GAAG,SAAS,EACvB,EAAE,EAAE,gBAAgB,EACpB,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,GACjB,OAAO,CAAC,OAAO,CAAC;CAgBpB"}
|
|
@@ -151,7 +151,7 @@ class EntityCertificate extends _1.EntityBase {
|
|
|
151
151
|
this.signature = ei.signature;
|
|
152
152
|
this.verifier = ei.verifier;
|
|
153
153
|
this.isDeleted = ei.isDeleted;
|
|
154
|
-
this.updated_at = new Date();
|
|
154
|
+
this.updated_at = new Date(Math.max(ei.updated_at.getTime(), this.updated_at.getTime()));
|
|
155
155
|
await storage.updateCertificate(this.id, this.toApi(), trx);
|
|
156
156
|
wasMerged = true;
|
|
157
157
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Certificate.js","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/Certificate.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"Certificate.js","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/Certificate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CertificateField.d.ts","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/CertificateField.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"CertificateField.d.ts","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/CertificateField.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,GAAG,EAAE,qBAAqB,EAA6B,MAAM,uBAAuB,CAAA;AAC1G,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,CAAA;AAEtD,qBAAa,sBAAuB,SAAQ,UAAU,CAAC,qBAAqB,CAAC;gBAC/D,GAAG,CAAC,EAAE,qBAAqB;IAe9B,SAAS,IAAI,IAAI;IAI1B,IAAI,MAAM,IAGI,MAAM,CADnB;IACD,IAAI,MAAM,CAAC,CAAC,EAAE,MAAM,EAEnB;IACD,IAAI,aAAa,IAGI,MAAM,CAD1B;IACD,IAAI,aAAa,CAAC,CAAC,EAAE,MAAM,EAE1B;IACD,IAAI,UAAU,IAGI,IAAI,CADrB;IACD,IAAI,UAAU,CAAC,CAAC,EAAE,IAAI,EAErB;IACD,IAAI,UAAU,IAGI,IAAI,CADrB;IACD,IAAI,UAAU,CAAC,CAAC,EAAE,IAAI,EAErB;IACD,IAAI,SAAS,IAGI,MAAM,CADtB;IACD,IAAI,SAAS,CAAC,CAAC,EAAE,MAAM,EAEtB;IACD,IAAI,UAAU,IAGI,MAAM,CADvB;IACD,IAAI,UAAU,CAAC,CAAC,EAAE,MAAM,EAEvB;IACD,IAAI,SAAS,IAGI,MAAM,CADtB;IACD,IAAI,SAAS,CAAC,CAAC,EAAE,MAAM,EAEtB;IAED,IAAa,EAAE,IAAI,MAAM,CAExB;IACD,IAAa,UAAU,IAAI,MAAM,CAEhC;IACD,IAAa,WAAW,IAAI,MAAM,CAEjC;IAEQ,MAAM,CAAC,EAAE,EAAE,qBAAqB,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO;WAYrE,SAAS,CACpB,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,qBAAqB,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,GACjB,OAAO,CAAC;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,EAAE,EAAE,sBAAsB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAezD,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrG,aAAa,CAC1B,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,IAAI,GAAG,SAAS,EACvB,EAAE,EAAE,qBAAqB,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,GACjB,OAAO,CAAC,OAAO,CAAC;CAWpB"}
|
|
@@ -71,10 +71,7 @@ class EntityCertificateField extends _1.EntityBase {
|
|
|
71
71
|
return 'certificate_fields';
|
|
72
72
|
}
|
|
73
73
|
equals(ei, syncMap) {
|
|
74
|
-
if (this.certificateId !==
|
|
75
|
-
(syncMap
|
|
76
|
-
? syncMap.certificate.idMap[ei.certificateId]
|
|
77
|
-
: ei.certificateId) ||
|
|
74
|
+
if (this.certificateId !== (syncMap ? syncMap.certificate.idMap[ei.certificateId] : ei.certificateId) ||
|
|
78
75
|
this.fieldName !== ei.fieldName ||
|
|
79
76
|
this.fieldValue !== ei.fieldValue ||
|
|
80
77
|
this.masterKey !== ei.masterKey)
|
|
@@ -103,7 +100,7 @@ class EntityCertificateField extends _1.EntityBase {
|
|
|
103
100
|
if (ei.updated_at > this.updated_at) {
|
|
104
101
|
this.fieldValue = ei.fieldValue;
|
|
105
102
|
this.masterKey = ei.masterKey;
|
|
106
|
-
this.updated_at = new Date();
|
|
103
|
+
this.updated_at = new Date(Math.max(ei.updated_at.getTime(), this.updated_at.getTime()));
|
|
107
104
|
await storage.updateCertificateField(this.certificateId, this.fieldName, this.toApi(), trx);
|
|
108
105
|
wasMerged = true;
|
|
109
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CertificateField.js","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/CertificateField.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"CertificateField.js","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/CertificateField.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Commission.d.ts","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/Commission.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"Commission.d.ts","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/Commission.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,GAAG,EAAE,eAAe,EAA6B,MAAM,uBAAuB,CAAA;AACpG,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,CAAA;AAEtD,qBAAa,gBAAiB,SAAQ,UAAU,CAAC,eAAe,CAAC;gBACnD,GAAG,CAAC,EAAE,eAAe;IAiBxB,SAAS,IAAI,IAAI;IAI1B,IAAI,YAAY,IAGI,MAAM,CADzB;IACD,IAAI,YAAY,CAAC,CAAC,EAAE,MAAM,EAEzB;IACD,IAAI,UAAU,IAGI,IAAI,CADrB;IACD,IAAI,UAAU,CAAC,CAAC,EAAE,IAAI,EAErB;IACD,IAAI,UAAU,IAGI,IAAI,CADrB;IACD,IAAI,UAAU,CAAC,CAAC,EAAE,IAAI,EAErB;IACD,IAAI,aAAa,IAGI,MAAM,CAD1B;IACD,IAAI,aAAa,CAAC,CAAC,EAAE,MAAM,EAE1B;IACD,IAAI,MAAM,IAGI,MAAM,CADnB;IACD,IAAI,MAAM,CAAC,CAAC,EAAE,MAAM,EAEnB;IACD,IAAI,UAAU,IAGI,OAAO,CADxB;IACD,IAAI,UAAU,CAAC,CAAC,EAAE,OAAO,EAExB;IACD,IAAI,SAAS,IAGI,MAAM,CADtB;IACD,IAAI,SAAS,CAAC,CAAC,EAAE,MAAM,EAEtB;IACD,IAAI,aAAa,IAGI,MAAM,EAAE,CAD5B;IACD,IAAI,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,EAE5B;IACD,IAAI,QAAQ,IAGI,MAAM,CADrB;IACD,IAAI,QAAQ,CAAC,CAAC,EAAE,MAAM,EAErB;IAED,IAAa,EAAE,IAAI,MAAM,CAExB;IACD,IAAa,EAAE,CAAC,CAAC,EAAE,MAAM,EAExB;IACD,IAAa,UAAU,IAAI,MAAM,CAEhC;IACD,IAAa,WAAW,IAAI,MAAM,CAEjC;IAEQ,MAAM,CAAC,EAAE,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO;WAa/D,SAAS,CACpB,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,eAAe,EACnB,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,GACjB,OAAO,CAAC;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,EAAE,EAAE,gBAAgB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAUnD,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAOrG,aAAa,CAC1B,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,IAAI,GAAG,SAAS,EACvB,EAAE,EAAE,eAAe,EACnB,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,GACjB,OAAO,CAAC,OAAO,CAAC;CAUpB"}
|
|
@@ -89,10 +89,7 @@ class EntityCommission extends _1.EntityBase {
|
|
|
89
89
|
}
|
|
90
90
|
equals(ei, syncMap) {
|
|
91
91
|
if (this.isRedeemed !== ei.isRedeemed ||
|
|
92
|
-
this.transactionId !==
|
|
93
|
-
(syncMap
|
|
94
|
-
? syncMap.transaction.idMap[ei.transactionId]
|
|
95
|
-
: ei.transactionId) ||
|
|
92
|
+
this.transactionId !== (syncMap ? syncMap.transaction.idMap[ei.transactionId] : ei.transactionId) ||
|
|
96
93
|
this.keyOffset !== ei.keyOffset ||
|
|
97
94
|
!(0, index_client_1.arraysEqual)(this.lockingScript, ei.lockingScript) ||
|
|
98
95
|
this.satoshis !== ei.satoshis)
|
|
@@ -119,7 +116,7 @@ class EntityCommission extends _1.EntityBase {
|
|
|
119
116
|
let wasMerged = false;
|
|
120
117
|
if (ei.updated_at > this.updated_at) {
|
|
121
118
|
this.isRedeemed = ei.isRedeemed;
|
|
122
|
-
this.updated_at = new Date();
|
|
119
|
+
this.updated_at = new Date(Math.max(ei.updated_at.getTime(), this.updated_at.getTime()));
|
|
123
120
|
await storage.updateCommission(this.id, this.toApi(), trx);
|
|
124
121
|
wasMerged = true;
|
|
125
122
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Commission.js","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/Commission.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"Commission.js","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/Commission.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityBase.d.ts","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/EntityBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE5D,MAAM,MAAM,aAAa,GAAG,eAAe,CAAA;AAE3C,8BAAsB,UAAU,CAAC,CAAC;IAChC,GAAG,EAAE,CAAC,CAAA;gBAEM,GAAG,EAAE,CAAC;IAIlB;;OAEG;IACH,QAAQ,KAAK,EAAE,IAAI,MAAM,CAAA;IAEzB;;OAEG;IACH,QAAQ,KAAK,UAAU,IAAI,MAAM,CAAA;IAEjC;;OAEG;IACH,QAAQ,KAAK,WAAW,IAAI,MAAM,CAAA;IAElC;;;;;;;;OAQG;IACH,QAAQ,CAAC,SAAS,IAAI,IAAI;IAE1B;;;;;;;OAOG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO;IAElD;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"EntityBase.d.ts","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/EntityBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE5D,MAAM,MAAM,aAAa,GAAG,eAAe,CAAA;AAE3C,8BAAsB,UAAU,CAAC,CAAC;IAChC,GAAG,EAAE,CAAC,CAAA;gBAEM,GAAG,EAAE,CAAC;IAIlB;;OAEG;IACH,QAAQ,KAAK,EAAE,IAAI,MAAM,CAAA;IAEzB;;OAEG;IACH,QAAQ,KAAK,UAAU,IAAI,MAAM,CAAA;IAEjC;;OAEG;IACH,QAAQ,KAAK,WAAW,IAAI,MAAM,CAAA;IAElC;;;;;;;;OAQG;IACH,QAAQ,CAAC,SAAS,IAAI,IAAI;IAE1B;;;;;;;OAOG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO;IAElD;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAE9G;;;;;;;OAOG;IACH,QAAQ,CAAC,aAAa,CACpB,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,IAAI,GAAG,SAAS,EACvB,EAAE,EAAE,CAAC,EACL,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,GACjB,OAAO,CAAC,OAAO,CAAC;IAEnB;;;;;;;OAOG;IACH,KAAK,IAAI,CAAC;CAIX;AAED,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAA;IAElB;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAE7B;;;OAGG;IACH,aAAa,CAAC,EAAE,IAAI,CAAA;IAEpB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,OAAO;IACtB,QAAQ,EAAE,aAAa,CAAA;IACvB,YAAY,EAAE,aAAa,CAAA;IAC3B,WAAW,EAAE,aAAa,CAAA;IAC1B,WAAW,EAAE,aAAa,CAAA;IAC1B,OAAO,EAAE,aAAa,CAAA;IACtB,UAAU,EAAE,aAAa,CAAA;IACzB,MAAM,EAAE,aAAa,CAAA;IACrB,SAAS,EAAE,aAAa,CAAA;IACxB,YAAY,EAAE,aAAa,CAAA;IAC3B,WAAW,EAAE,aAAa,CAAA;IAC1B,gBAAgB,EAAE,aAAa,CAAA;IAC/B,UAAU,EAAE,aAAa,CAAA;CAC1B;AAED,wBAAgB,aAAa,IAAI,OAAO,CA4EvC;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityBase.js","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/EntityBase.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"EntityBase.js","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/EntityBase.ts"],"names":[],"mappings":";;;AA8HA,sCA4EC;AAtMD,MAAsB,UAAU;IAG9B,YAAY,GAAM;QAChB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IAgED;;;;;;;OAOG;IACH,KAAK;QACH,IAAI,CAAC,SAAS,EAAE,CAAA;QAChB,OAAO,IAAI,CAAC,GAAG,CAAA;IACjB,CAAC;CACF;AAjFD,gCAiFC;AAyCD,SAAgB,aAAa;IAC3B,MAAM,CAAC,GAAY;QACjB,QAAQ,EAAE;YACR,UAAU,EAAE,UAAU;YACtB,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,SAAS;YACxB,KAAK,EAAE,CAAC;SACT;QACD,YAAY,EAAE;YACZ,UAAU,EAAE,cAAc;YAC1B,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,SAAS;YACxB,KAAK,EAAE,CAAC;SACT;QACD,WAAW,EAAE;YACX,UAAU,EAAE,aAAa;YACzB,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,SAAS;YACxB,KAAK,EAAE,CAAC;SACT;QACD,WAAW,EAAE;YACX,UAAU,EAAE,aAAa;YACzB,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,SAAS;YACxB,KAAK,EAAE,CAAC;SACT;QACD,OAAO,EAAE;YACP,UAAU,EAAE,SAAS;YACrB,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,SAAS;YACxB,KAAK,EAAE,CAAC;SACT;QACD,UAAU,EAAE;YACV,UAAU,EAAE,YAAY;YACxB,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,SAAS;YACxB,KAAK,EAAE,CAAC;SACT;QACD,MAAM,EAAE;YACN,UAAU,EAAE,QAAQ;YACpB,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,SAAS;YACxB,KAAK,EAAE,CAAC;SACT;QACD,SAAS,EAAE;YACT,UAAU,EAAE,WAAW;YACvB,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,SAAS;YACxB,KAAK,EAAE,CAAC;SACT;QACD,YAAY,EAAE;YACZ,UAAU,EAAE,cAAc;YAC1B,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,SAAS;YACxB,KAAK,EAAE,CAAC;SACT;QACD,WAAW,EAAE;YACX,UAAU,EAAE,aAAa;YACzB,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,SAAS;YACxB,KAAK,EAAE,CAAC;SACT;QACD,gBAAgB,EAAE;YAChB,UAAU,EAAE,kBAAkB;YAC9B,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,SAAS;YACxB,KAAK,EAAE,CAAC;SACT;QACD,UAAU,EAAE;YACV,UAAU,EAAE,YAAY;YACxB,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,SAAS;YACxB,KAAK,EAAE,CAAC;SACT;KACF,CAAA;IACD,OAAO,CAAC,CAAA;AACV,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MergeEntity.d.ts","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/MergeEntity.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,GAAG,EAAY,MAAM,uBAAuB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEhF;;;GAGG;AACH,qBAAa,WAAW,
|
|
1
|
+
{"version":3,"file":"MergeEntity.d.ts","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/MergeEntity.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,GAAG,EAAY,MAAM,uBAAuB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEhF;;;GAGG;AACH,qBAAa,WAAW,CAAC,GAAG,SAAS,GAAG,CAAC,eAAe,EAAE,EAAE,SAAS,UAAU,CAAC,GAAG,CAAC;IAIzE,UAAU,EAAE,GAAG,EAAE,GAAG,SAAS;IAC7B,IAAI,EAAE,CACX,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,GAAG,EACP,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,KACf,OAAO,CAAC;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,EAAE,EAAE,EAAE,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACtD,kDAAkD;IAC3C,GAAG,EAAE,aAAa;IAZ3B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;gBAGpB,UAAU,EAAE,GAAG,EAAE,GAAG,SAAS,EAC7B,IAAI,EAAE,CACX,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,GAAG,EACP,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,KACf,OAAO,CAAC;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,EAAE,EAAE,EAAE,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACtD,kDAAkD;IAC3C,GAAG,EAAE,aAAa;IAK3B,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAStE;;OAEG;IACG,KAAK,CACT,KAAK,EAAE,IAAI,GAAG,SAAS,EACvB,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,GACjB,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CA2BjD"}
|
|
@@ -37,18 +37,23 @@ class MergeEntity {
|
|
|
37
37
|
* TODO:
|
|
38
38
|
* Switch to using syncMap. If the ei id is in the map its an existing merge, else its a new merge.
|
|
39
39
|
*/
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
if (
|
|
43
|
-
|
|
40
|
+
try {
|
|
41
|
+
const { found, eo, eiId } = await this.find(storage, userId, ei, syncMap, trx);
|
|
42
|
+
if (found) {
|
|
43
|
+
if (await eo.mergeExisting(storage, since, ei, syncMap, trx)) {
|
|
44
|
+
updates++;
|
|
45
|
+
}
|
|
44
46
|
}
|
|
47
|
+
else {
|
|
48
|
+
await eo.mergeNew(storage, userId, syncMap, trx);
|
|
49
|
+
inserts++;
|
|
50
|
+
}
|
|
51
|
+
if (eiId > -1)
|
|
52
|
+
this.updateSyncMap(this.idMap, eiId, eo.id);
|
|
45
53
|
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
inserts++;
|
|
54
|
+
catch (eu) {
|
|
55
|
+
throw eu;
|
|
49
56
|
}
|
|
50
|
-
if (eiId > -1)
|
|
51
|
-
this.updateSyncMap(this.idMap, eiId, eo.id);
|
|
52
57
|
}
|
|
53
58
|
return { inserts, updates };
|
|
54
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MergeEntity.js","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/MergeEntity.ts"],"names":[],"mappings":";;;AACA,wDAA8D;AAG9D;;;GAGG;AACH,MAAa,WAAW;
|
|
1
|
+
{"version":3,"file":"MergeEntity.js","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/MergeEntity.ts"],"names":[],"mappings":";;;AACA,wDAA8D;AAG9D;;;GAGG;AACH,MAAa,WAAW;IAGtB,YACS,UAA6B,EAC7B,IAM+C;IACtD,kDAAkD;IAC3C,GAAkB;QATlB,eAAU,GAAV,UAAU,CAAmB;QAC7B,SAAI,GAAJ,IAAI,CAM2C;QAE/C,QAAG,GAAH,GAAG,CAAe;QAEzB,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAA;IACxB,CAAC;IAED,aAAa,CAAC,GAA2B,EAAE,IAAY,EAAE,KAAa;QACpE,MAAM,CAAC,GAAG,IAAA,uBAAQ,EAAC,IAAI,CAAC,CAAA;QACxB,MAAM,CAAC,GAAG,IAAA,uBAAQ,EAAC,KAAK,CAAC,CAAA;QACzB,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;YACzB,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;QACZ,CAAC;aAAM,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;YACrB,MAAM,IAAI,kBAAG,CAAC,aAAa,CAAC,qBAAqB,IAAI,oBAAoB,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IAChG,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK,CACT,KAAuB,EACvB,OAAsB,EACtB,MAAc,EACd,OAAgB,EAChB,GAAkB;QAElB,IAAI,OAAO,GAAG,CAAC,EACb,OAAO,GAAG,CAAC,CAAA;QACb,IAAI,CAAC,IAAI,CAAC,UAAU;YAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA;QACjD,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACjC,IAAI,CAAC,GAAG,CAAC,aAAa,GAAG,IAAA,sBAAO,EAAC,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,EAAE,CAAC,UAAU,CAAC,CAAA;YACvE;;;eAGG;YACH,IAAI,CAAC;gBACH,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;gBAC9E,IAAI,KAAK,EAAE,CAAC;oBACV,IAAI,MAAM,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC;wBAC7D,OAAO,EAAE,CAAA;oBACX,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;oBAChD,OAAO,EAAE,CAAA;gBACX,CAAC;gBACD,IAAI,IAAI,GAAG,CAAC,CAAC;oBAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;YAC5D,CAAC;YAAC,OAAO,EAAW,EAAE,CAAC;gBACrB,MAAM,EAAE,CAAA;YACV,CAAC;QACH,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA;IAC7B,CAAC;CACF;AA/DD,kCA+DC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Output.d.ts","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/Output.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"Output.d.ts","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/Output.ts"],"names":[],"mappings":"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"}
|
|
@@ -193,18 +193,9 @@ class EntityOutput extends _1.EntityBase {
|
|
|
193
193
|
return 'outputs';
|
|
194
194
|
}
|
|
195
195
|
equals(ei, syncMap) {
|
|
196
|
-
if (this.transactionId !==
|
|
197
|
-
(syncMap
|
|
198
|
-
|
|
199
|
-
: ei.transactionId) ||
|
|
200
|
-
this.basketId !==
|
|
201
|
-
(syncMap && ei.basketId
|
|
202
|
-
? syncMap.outputBasket.idMap[ei.basketId]
|
|
203
|
-
: ei.basketId) ||
|
|
204
|
-
this.spentBy !==
|
|
205
|
-
(syncMap && ei.spentBy
|
|
206
|
-
? syncMap.transaction.idMap[ei.spentBy]
|
|
207
|
-
: ei.spentBy) ||
|
|
196
|
+
if (this.transactionId !== (syncMap ? syncMap.transaction.idMap[ei.transactionId] : ei.transactionId) ||
|
|
197
|
+
this.basketId !== (syncMap && ei.basketId ? syncMap.outputBasket.idMap[ei.basketId] : ei.basketId) ||
|
|
198
|
+
this.spentBy !== (syncMap && ei.spentBy ? syncMap.transaction.idMap[ei.spentBy] : ei.spentBy) ||
|
|
208
199
|
this.vout !== ei.vout ||
|
|
209
200
|
this.satoshis !== ei.satoshis ||
|
|
210
201
|
this.spendable !== ei.spendable ||
|
|
@@ -227,9 +218,7 @@ class EntityOutput extends _1.EntityBase {
|
|
|
227
218
|
}
|
|
228
219
|
static async mergeFind(storage, userId, ei, syncMap, trx) {
|
|
229
220
|
const transactionId = syncMap.transaction.idMap[ei.transactionId];
|
|
230
|
-
const basketId = ei.basketId
|
|
231
|
-
? syncMap.outputBasket.idMap[ei.basketId]
|
|
232
|
-
: null;
|
|
221
|
+
const basketId = ei.basketId ? syncMap.outputBasket.idMap[ei.basketId] : null;
|
|
233
222
|
const ef = (0, index_client_1.verifyOneOrNone)(await storage.findOutputs({
|
|
234
223
|
partial: { userId, transactionId, vout: ei.vout },
|
|
235
224
|
trx
|
|
@@ -242,22 +231,16 @@ class EntityOutput extends _1.EntityBase {
|
|
|
242
231
|
}
|
|
243
232
|
async mergeNew(storage, userId, syncMap, trx) {
|
|
244
233
|
this.userId = userId;
|
|
245
|
-
this.basketId = this.basketId
|
|
246
|
-
? syncMap.outputBasket.idMap[this.basketId]
|
|
247
|
-
: undefined;
|
|
234
|
+
this.basketId = this.basketId ? syncMap.outputBasket.idMap[this.basketId] : undefined;
|
|
248
235
|
this.transactionId = syncMap.transaction.idMap[this.transactionId];
|
|
249
|
-
this.spentBy = this.spentBy
|
|
250
|
-
? syncMap.transaction.idMap[this.spentBy]
|
|
251
|
-
: undefined;
|
|
236
|
+
this.spentBy = this.spentBy ? syncMap.transaction.idMap[this.spentBy] : undefined;
|
|
252
237
|
this.outputId = 0;
|
|
253
238
|
this.outputId = await storage.insertOutput(this.toApi(), trx);
|
|
254
239
|
}
|
|
255
240
|
async mergeExisting(storage, since, ei, syncMap, trx) {
|
|
256
241
|
let wasMerged = false;
|
|
257
242
|
if (ei.updated_at > this.updated_at) {
|
|
258
|
-
this.spentBy = ei.spentBy
|
|
259
|
-
? syncMap.transaction.idMap[ei.spentBy]
|
|
260
|
-
: undefined;
|
|
243
|
+
this.spentBy = ei.spentBy ? syncMap.transaction.idMap[ei.spentBy] : undefined;
|
|
261
244
|
this.spendable = ei.spendable;
|
|
262
245
|
this.change = ei.change;
|
|
263
246
|
this.type = ei.type;
|
|
@@ -270,7 +253,7 @@ class EntityOutput extends _1.EntityBase {
|
|
|
270
253
|
this.scriptLength = ei.scriptLength;
|
|
271
254
|
this.scriptOffset = ei.scriptOffset;
|
|
272
255
|
this.lockingScript = ei.lockingScript;
|
|
273
|
-
this.updated_at = new Date();
|
|
256
|
+
this.updated_at = new Date(Math.max(ei.updated_at.getTime(), this.updated_at.getTime()));
|
|
274
257
|
await storage.updateOutput(this.id, this.toApi(), trx);
|
|
275
258
|
wasMerged = true;
|
|
276
259
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Output.js","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/Output.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"Output.js","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/Output.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OutputBasket.d.ts","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/OutputBasket.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"OutputBasket.d.ts","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/OutputBasket.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,GAAG,EAAE,iBAAiB,EAA6B,MAAM,uBAAuB,CAAA;AACtG,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,CAAA;AAEtD,qBAAa,kBAAmB,SAAQ,UAAU,CAAC,iBAAiB,CAAC;gBACvD,GAAG,CAAC,EAAE,iBAAiB;IAgBnC,IAAI,QAAQ,IAGI,MAAM,CADrB;IACD,IAAI,QAAQ,CAAC,CAAC,EAAE,MAAM,EAErB;IACD,IAAI,UAAU,IAGI,IAAI,CADrB;IACD,IAAI,UAAU,CAAC,CAAC,EAAE,IAAI,EAErB;IACD,IAAI,UAAU,IAGI,IAAI,CADrB;IACD,IAAI,UAAU,CAAC,CAAC,EAAE,IAAI,EAErB;IACD,IAAI,MAAM,IAGI,MAAM,CADnB;IACD,IAAI,MAAM,CAAC,CAAC,EAAE,MAAM,EAEnB;IACD,IAAI,IAAI,IAGI,MAAM,CADjB;IACD,IAAI,IAAI,CAAC,CAAC,EAAE,MAAM,EAEjB;IACD,IAAI,oBAAoB,IAGI,MAAM,CADjC;IACD,IAAI,oBAAoB,CAAC,CAAC,EAAE,MAAM,EAEjC;IACD,IAAI,uBAAuB,IAGI,MAAM,CADpC;IACD,IAAI,uBAAuB,CAAC,CAAC,EAAE,MAAM,EAEpC;IACD,IAAI,SAAS,IAGI,OAAO,CADvB;IACD,IAAI,SAAS,CAAC,CAAC,EAAE,OAAO,EAEvB;IAED,IAAa,EAAE,IAGI,MAAM,CADxB;IACD,IAAa,EAAE,CAAC,CAAC,EAAE,MAAM,EAExB;IACD,IAAa,UAAU,IAAI,MAAM,CAEhC;IACD,IAAa,WAAW,IAAI,MAAM,CAEjC;IAEQ,SAAS,IAAI,IAAI;IAIjB,MAAM,CAAC,EAAE,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO;WAgBrD,SAAS,CACpB,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,iBAAiB,EACrB,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,GACjB,OAAO,CAAC;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,EAAE,EAAE,kBAAkB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAerD,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAQrG,aAAa,CAC1B,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,IAAI,GAAG,SAAS,EACvB,EAAE,EAAE,iBAAiB,EACrB,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,GACjB,OAAO,CAAC,OAAO,CAAC;CAapB"}
|
|
@@ -122,7 +122,7 @@ class EntityOutputBasket extends _1.EntityBase {
|
|
|
122
122
|
this.minimumDesiredUTXOValue = ei.minimumDesiredUTXOValue;
|
|
123
123
|
this.numberOfDesiredUTXOs = ei.numberOfDesiredUTXOs;
|
|
124
124
|
this.isDeleted = ei.isDeleted;
|
|
125
|
-
this.updated_at = new Date();
|
|
125
|
+
this.updated_at = new Date(Math.max(ei.updated_at.getTime(), this.updated_at.getTime()));
|
|
126
126
|
await storage.updateOutputBasket(this.id, this.toApi(), trx);
|
|
127
127
|
wasMerged = true;
|
|
128
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OutputBasket.js","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/OutputBasket.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"OutputBasket.js","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/OutputBasket.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OutputTag.d.ts","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/OutputTag.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"OutputTag.d.ts","sourceRoot":"","sources":["../../../../../../src/storage/schema/entities/OutputTag.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,GAAG,EAAE,cAAc,EAA6B,MAAM,uBAAuB,CAAA;AACnG,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,CAAA;AAEtD,qBAAa,eAAgB,SAAQ,UAAU,CAAC,cAAc,CAAC;gBACjD,GAAG,CAAC,EAAE,cAAc;IAcvB,SAAS,IAAI,IAAI;IAI1B,IAAI,WAAW,IAGI,MAAM,CADxB;IACD,IAAI,WAAW,CAAC,CAAC,EAAE,MAAM,EAExB;IACD,IAAI,UAAU,IAGI,IAAI,CADrB;IACD,IAAI,UAAU,CAAC,CAAC,EAAE,IAAI,EAErB;IACD,IAAI,UAAU,IAGI,IAAI,CADrB;IACD,IAAI,UAAU,CAAC,CAAC,EAAE,IAAI,EAErB;IACD,IAAI,GAAG,IAGI,MAAM,CADhB;IACD,IAAI,GAAG,CAAC,CAAC,EAAE,MAAM,EAEhB;IACD,IAAI,MAAM,IAGI,MAAM,CADnB;IACD,IAAI,MAAM,CAAC,CAAC,EAAE,MAAM,EAEnB;IACD,IAAI,SAAS,IAGI,OAAO,CADvB;IACD,IAAI,SAAS,CAAC,CAAC,EAAE,OAAO,EAEvB;IAED,IAAa,EAAE,IAAI,MAAM,CAExB;IACD,IAAa,EAAE,CAAC,CAAC,EAAE,MAAM,EAExB;IACD,IAAa,UAAU,IAAI,MAAM,CAEhC;IACD,IAAa,WAAW,IAAI,MAAM,CAEjC;IAEQ,MAAM,CAAC,EAAE,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO;WAS9D,SAAS,CACpB,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,cAAc,EAClB,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,GACjB,OAAO,CAAC;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,EAAE,EAAE,eAAe,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IASlD,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrG,aAAa,CAC1B,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,IAAI,GAAG,SAAS,EACvB,EAAE,EAAE,cAAc,EAClB,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,GAAG,CAAC,QAAQ,GACjB,OAAO,CAAC,OAAO,CAAC;CAUpB"}
|