@bsv/wallet-toolbox 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/.prettierrc +1 -1
- package/docs/client.md +39 -5
- package/docs/services.md +1 -0
- package/docs/setup.md +9 -26
- package/docs/storage.md +35 -0
- package/docs/wallet.md +39 -5
- package/out/src/Setup.d.ts.map +1 -1
- package/out/src/Setup.js +6 -16
- package/out/src/Setup.js.map +1 -1
- 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/MonitorDaemon.d.ts.map +1 -1
- package/out/src/monitor/MonitorDaemon.js +1 -3
- package/out/src/monitor/MonitorDaemon.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/__test/CertificateLifeCycle.test.js +1 -3
- package/out/src/sdk/__test/CertificateLifeCycle.test.js.map +1 -1
- package/out/src/sdk/__test/PrivilegedKeyManager.test.js +13 -26
- package/out/src/sdk/__test/PrivilegedKeyManager.test.js.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/__tests/ARC.test.js +9 -0
- package/out/src/services/__tests/ARC.test.js.map +1 -1
- package/out/src/services/__tests/bitrails.test.js.map +1 -1
- package/out/src/services/__tests/getMerklePath.test.js.map +1 -1
- package/out/src/services/__tests/getRawTx.test.js.map +1 -1
- package/out/src/services/__tests/verifyBeef.test.js +2 -1
- package/out/src/services/__tests/verifyBeef.test.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/__tests/WhatsOnChain.test.js +1 -2
- package/out/src/services/providers/__tests/WhatsOnChain.test.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/StorageKnex.d.ts.map +1 -1
- package/out/src/storage/StorageKnex.js +15 -44
- package/out/src/storage/StorageKnex.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/__test/WalletStorageManager.test.js +2 -8
- package/out/src/storage/__test/WalletStorageManager.test.js.map +1 -1
- package/out/src/storage/methods/__test/GenerateChange/generateChangeSdk.test.js +10 -30
- package/out/src/storage/methods/__test/GenerateChange/generateChangeSdk.test.js.map +1 -1
- package/out/src/storage/methods/__test/GenerateChange/randomValsUsed1.d.ts.map +1 -1
- package/out/src/storage/methods/__test/GenerateChange/randomValsUsed1.js +17 -28
- package/out/src/storage/methods/__test/GenerateChange/randomValsUsed1.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/listActions.d.ts.map +1 -1
- package/out/src/storage/methods/listActions.js +3 -15
- package/out/src/storage/methods/listActions.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/listOutputs.d.ts.map +1 -1
- package/out/src/storage/methods/listOutputs.js +5 -12
- package/out/src/storage/methods/listOutputs.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/methods/purgeData.d.ts.map +1 -1
- package/out/src/storage/methods/purgeData.js +8 -32
- package/out/src/storage/methods/purgeData.js.map +1 -1
- package/out/src/storage/methods/reviewStatus.d.ts.map +1 -1
- package/out/src/storage/methods/reviewStatus.js +1 -3
- package/out/src/storage/methods/reviewStatus.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/remoting/StorageServer.d.ts.map +1 -1
- package/out/src/storage/remoting/StorageServer.js +2 -5
- package/out/src/storage/remoting/StorageServer.js.map +1 -1
- package/out/src/storage/schema/KnexMigrations.d.ts.map +1 -1
- package/out/src/storage/schema/KnexMigrations.js +24 -130
- package/out/src/storage/schema/KnexMigrations.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/entities/__tests/CertificateFieldTests.test.js.map +1 -1
- package/out/src/storage/schema/entities/__tests/CertificateTests.test.js.map +1 -1
- package/out/src/storage/schema/entities/__tests/CommissionTests.test.js.map +1 -1
- package/out/src/storage/schema/entities/__tests/OutputBasketTests.test.js.map +1 -1
- package/out/src/storage/schema/entities/__tests/OutputTagMapTests.test.js.map +1 -1
- package/out/src/storage/schema/entities/__tests/OutputTagTests.test.js.map +1 -1
- package/out/src/storage/schema/entities/__tests/OutputTests.test.js.map +1 -1
- package/out/src/storage/schema/entities/__tests/ProvenTxReqTests.test.js.map +1 -1
- package/out/src/storage/schema/entities/__tests/ProvenTxTests.test.js +1 -2
- package/out/src/storage/schema/entities/__tests/ProvenTxTests.test.js.map +1 -1
- package/out/src/storage/schema/entities/__tests/SyncStateTests.test.js.map +1 -1
- package/out/src/storage/schema/entities/__tests/TransactionTests.test.js +2 -2
- package/out/src/storage/schema/entities/__tests/TransactionTests.test.js.map +1 -1
- package/out/src/storage/schema/entities/__tests/TxLabelMapTests.test.js.map +1 -1
- package/out/src/storage/schema/entities/__tests/TxLabelTests.test.js.map +1 -1
- package/out/src/storage/schema/entities/__tests/stampLogTests.test.js.map +1 -1
- package/out/src/storage/schema/entities/__tests/usersTests.test.js.map +1 -1
- package/out/src/storage/schema/tables/TableSettings.d.ts.map +1 -1
- package/out/src/storage/sync/StorageMySQLDojoReader.d.ts.map +1 -1
- package/out/src/storage/sync/StorageMySQLDojoReader.js +1 -3
- package/out/src/storage/sync/StorageMySQLDojoReader.js.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.buffer.d.ts.map +1 -1
- package/out/src/utility/utilityHelpers.buffer.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/out/test/Wallet/StorageClient/storageClient.man.test.js.map +1 -1
- package/out/test/Wallet/action/internalizeAction.a.test.js.map +1 -1
- package/out/test/Wallet/certificate/acquireCertificate.test.js.map +1 -1
- package/out/test/Wallet/certificate/listCertificates.test.js.map +1 -1
- package/out/test/Wallet/get/getHeaderForHeight.test.js +2 -6
- package/out/test/Wallet/get/getHeaderForHeight.test.js.map +1 -1
- package/out/test/Wallet/get/getHeight.test.js.map +1 -1
- package/out/test/Wallet/get/getKnownTxids.test.js.map +1 -1
- package/out/test/Wallet/get/getNetwork.test.js.map +1 -1
- package/out/test/Wallet/get/getVersion.test.js.map +1 -1
- package/out/test/Wallet/live/walletLive.man.test.d.ts.map +1 -1
- package/out/test/Wallet/live/walletLive.man.test.js +3 -9
- package/out/test/Wallet/live/walletLive.man.test.js.map +1 -1
- package/out/test/Wallet/local/localWallet.man.test.d.ts.map +1 -1
- package/out/test/Wallet/local/localWallet.man.test.js +39 -31
- package/out/test/Wallet/local/localWallet.man.test.js.map +1 -1
- package/out/test/Wallet/specOps/specOps.man.test.js +1 -4
- package/out/test/Wallet/specOps/specOps.man.test.js.map +1 -1
- package/out/test/Wallet/support/janitor.man.test.js.map +1 -1
- package/out/test/Wallet/sync/Wallet.updateWalletLegacyTestData.man.test.js.map +1 -1
- package/out/test/Wallet/sync/setActive.test.js +73 -50
- package/out/test/Wallet/sync/setActive.test.js.map +1 -1
- package/out/test/checkDB.d.ts.map +1 -1
- package/out/test/checkDB.js.map +1 -1
- package/out/test/examples/backup.man.test.d.ts.map +1 -1
- package/out/test/examples/backup.man.test.js.map +1 -1
- package/out/test/examples/pushdrop.test.d.ts.map +1 -1
- package/out/test/examples/pushdrop.test.js +5 -4
- package/out/test/examples/pushdrop.test.js.map +1 -1
- package/out/test/monitor/Monitor.test.js.map +1 -1
- package/out/test/services/Services.test.js.map +1 -1
- package/out/test/storage/KnexMigrations.test.js.map +1 -1
- package/out/test/storage/StorageMySQLDojoReader.man.test.js +1 -3
- package/out/test/storage/StorageMySQLDojoReader.man.test.js.map +1 -1
- package/out/test/storage/count.test.js.map +1 -1
- package/out/test/storage/find.test.js +5 -10
- package/out/test/storage/find.test.js.map +1 -1
- package/out/test/storage/findLegacy.test.js.map +1 -1
- package/out/test/storage/insert.test.js.map +1 -1
- package/out/test/storage/update.test.js +7 -19
- package/out/test/storage/update.test.js.map +1 -1
- package/out/test/storage/update2.test.js +22 -24
- package/out/test/storage/update2.test.js.map +1 -1
- package/out/test/utils/TestUtilsWalletStorage.d.ts +3 -1
- package/out/test/utils/TestUtilsWalletStorage.d.ts.map +1 -1
- package/out/test/utils/TestUtilsWalletStorage.js +52 -76
- package/out/test/utils/TestUtilsWalletStorage.js.map +1 -1
- package/out/test/wallet/action/abortAction.test.js.map +1 -1
- package/out/test/wallet/action/createAction.test.js +1 -2
- package/out/test/wallet/action/createAction.test.js.map +1 -1
- package/out/test/wallet/action/createAction2.test.d.ts.map +1 -1
- package/out/test/wallet/action/createAction2.test.js +6 -16
- package/out/test/wallet/action/createAction2.test.js.map +1 -1
- package/out/test/wallet/action/createActionToGenerateBeefs.man.test.js.map +1 -1
- package/out/test/wallet/action/internalizeAction.test.js.map +1 -1
- package/out/test/wallet/action/relinquishOutput.test.js.map +1 -1
- package/out/test/wallet/list/listActions.test.js.map +1 -1
- package/out/test/wallet/list/listActions2.test.js.map +1 -1
- package/out/test/wallet/list/listCertificates.test.js +2 -6
- package/out/test/wallet/list/listCertificates.test.js.map +1 -1
- package/out/test/wallet/list/listOutputs.test.js +2 -10
- package/out/test/wallet/list/listOutputs.test.js.map +1 -1
- package/out/test/wallet/sync/Wallet.sync.test.js +4 -6
- package/out/test/wallet/sync/Wallet.sync.test.js.map +1 -1
- package/out/tsconfig.all.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/src/Setup.ts +15 -52
- package/src/Wallet.ts +58 -161
- package/src/monitor/Monitor.ts +7 -22
- package/src/monitor/MonitorDaemon.ts +6 -23
- package/src/monitor/tasks/TaskCheckForProofs.ts +4 -23
- package/src/monitor/tasks/TaskClock.ts +1 -3
- package/src/monitor/tasks/TaskFailAbandoned.ts +1 -3
- package/src/monitor/tasks/TaskNewHeader.ts +1 -4
- package/src/monitor/tasks/TaskPurge.ts +1 -2
- package/src/monitor/tasks/TaskReviewStatus.ts +1 -3
- package/src/monitor/tasks/TaskSendWaiting.ts +3 -10
- package/src/sdk/CertOps.ts +31 -103
- package/src/sdk/PrivilegedKeyManager.ts +18 -48
- package/src/sdk/WERR_errors.ts +6 -25
- package/src/sdk/WalletError.ts +5 -21
- package/src/sdk/WalletServices.interfaces.ts +11 -33
- package/src/sdk/WalletStorage.interfaces.ts +25 -91
- package/src/sdk/__test/CertificateLifeCycle.test.ts +9 -27
- package/src/sdk/__test/PrivilegedKeyManager.test.ts +29 -66
- package/src/sdk/types.ts +6 -26
- package/src/sdk/validationHelpers.ts +111 -402
- package/src/services/Services.ts +51 -114
- package/src/services/__tests/ARC.test.ts +14 -1
- package/src/services/__tests/bitrails.test.ts +4 -15
- package/src/services/__tests/getMerklePath.test.ts +1 -2
- package/src/services/__tests/getRawTx.test.ts +1 -3
- package/src/services/__tests/verifyBeef.test.ts +2 -1
- package/src/services/chaintracker/ChaintracksChainTracker.ts +3 -13
- package/src/services/chaintracker/chaintracks/BlockHeaderApi.ts +4 -12
- package/src/services/chaintracker/chaintracks/ChaintracksServiceClient.ts +9 -27
- package/src/services/createDefaultWalletServicesOptions.ts +2 -5
- package/src/services/processingErrors/arcSuccessError.json +76 -0
- package/src/services/providers/ARC.ts +6 -25
- package/src/services/providers/Bitails.ts +61 -159
- package/src/services/providers/SdkWhatsOnChain.ts +4 -17
- package/src/services/providers/WhatsOnChain.ts +31 -100
- package/src/services/providers/__tests/WhatsOnChain.test.ts +5 -15
- package/src/services/providers/echangeRates.ts +7 -22
- package/src/signer/WalletSigner.ts +1 -5
- package/src/signer/methods/acquireDirectCertificate.ts +1 -4
- package/src/signer/methods/buildSignableTransaction.ts +5 -20
- package/src/signer/methods/createAction.ts +15 -54
- package/src/signer/methods/internalizeAction.ts +10 -39
- package/src/signer/methods/proveCertificate.ts +2 -5
- package/src/signer/methods/signAction.ts +9 -39
- package/src/storage/StorageKnex.ts +166 -499
- package/src/storage/StorageProvider.ts +75 -291
- package/src/storage/StorageReader.ts +20 -65
- package/src/storage/StorageReaderWriter.ts +67 -264
- package/src/storage/StorageSyncReader.ts +2 -5
- package/src/storage/WalletStorageManager.ts +33 -108
- package/src/storage/__test/WalletStorageManager.test.ts +6 -23
- package/src/storage/methods/__test/GenerateChange/generateChangeSdk.test.ts +53 -171
- package/src/storage/methods/__test/GenerateChange/randomValsUsed1.ts +17 -28
- package/src/storage/methods/attemptToPostReqsToNetwork.ts +9 -37
- package/src/storage/methods/createAction.ts +45 -181
- package/src/storage/methods/generateChange.ts +33 -114
- package/src/storage/methods/getBeefForTransaction.ts +7 -37
- package/src/storage/methods/getSyncChunk.ts +18 -69
- package/src/storage/methods/internalizeAction.ts +18 -70
- package/src/storage/methods/listActions.ts +6 -23
- package/src/storage/methods/listCertificates.ts +5 -14
- package/src/storage/methods/listOutputs.ts +15 -69
- package/src/storage/methods/processAction.ts +29 -104
- package/src/storage/methods/purgeData.ts +11 -45
- package/src/storage/methods/reviewStatus.ts +3 -9
- package/src/storage/remoting/StorageClient.ts +43 -146
- package/src/storage/remoting/StorageServer.ts +21 -59
- package/src/storage/schema/KnexMigrations.ts +34 -165
- package/src/storage/schema/entities/Certificate.ts +3 -14
- package/src/storage/schema/entities/CertificateField.ts +6 -28
- package/src/storage/schema/entities/Commission.ts +6 -23
- package/src/storage/schema/entities/EntityBase.ts +1 -6
- package/src/storage/schema/entities/MergeEntity.ts +14 -21
- package/src/storage/schema/entities/Output.ts +10 -39
- package/src/storage/schema/entities/OutputBasket.ts +4 -16
- package/src/storage/schema/entities/OutputTag.ts +4 -17
- package/src/storage/schema/entities/OutputTagMap.ts +7 -30
- package/src/storage/schema/entities/ProvenTx.ts +16 -57
- package/src/storage/schema/entities/ProvenTxReq.ts +29 -93
- package/src/storage/schema/entities/SyncState.ts +64 -116
- package/src/storage/schema/entities/Transaction.ts +10 -35
- package/src/storage/schema/entities/TxLabel.ts +4 -17
- package/src/storage/schema/entities/TxLabelMap.ts +6 -28
- package/src/storage/schema/entities/User.ts +8 -31
- package/src/storage/schema/entities/__tests/CertificateFieldTests.test.ts +23 -54
- package/src/storage/schema/entities/__tests/CertificateTests.test.ts +26 -59
- package/src/storage/schema/entities/__tests/CommissionTests.test.ts +2 -11
- package/src/storage/schema/entities/__tests/OutputBasketTests.test.ts +2 -10
- package/src/storage/schema/entities/__tests/OutputTagMapTests.test.ts +2 -10
- package/src/storage/schema/entities/__tests/OutputTagTests.test.ts +1 -4
- package/src/storage/schema/entities/__tests/OutputTests.test.ts +3 -14
- package/src/storage/schema/entities/__tests/ProvenTxReqTests.test.ts +4 -16
- package/src/storage/schema/entities/__tests/ProvenTxTests.test.ts +5 -18
- package/src/storage/schema/entities/__tests/SyncStateTests.test.ts +5 -26
- package/src/storage/schema/entities/__tests/TransactionTests.test.ts +12 -48
- package/src/storage/schema/entities/__tests/TxLabelMapTests.test.ts +4 -22
- package/src/storage/schema/entities/__tests/TxLabelTests.test.ts +2 -10
- package/src/storage/schema/entities/__tests/stampLogTests.test.ts +3 -10
- package/src/storage/schema/entities/__tests/usersTests.test.ts +4 -7
- package/src/storage/schema/tables/TableSettings.ts +1 -3
- package/src/storage/sync/StorageMySQLDojoReader.ts +47 -148
- package/src/utility/ScriptTemplateBRC29.ts +2 -11
- package/src/utility/stampLog.ts +2 -6
- package/src/utility/tscProofToMerklePath.ts +1 -4
- package/src/utility/utilityHelpers.buffer.ts +3 -12
- package/src/utility/utilityHelpers.ts +14 -49
- package/test/Wallet/StorageClient/storageClient.man.test.ts +2 -8
- package/test/Wallet/action/internalizeAction.a.test.ts +8 -23
- package/test/Wallet/certificate/acquireCertificate.test.ts +10 -24
- package/test/Wallet/certificate/listCertificates.test.ts +8 -18
- package/test/Wallet/get/getHeaderForHeight.test.ts +4 -15
- package/test/Wallet/get/getHeight.test.ts +2 -6
- package/test/Wallet/get/getKnownTxids.test.ts +1 -5
- package/test/Wallet/get/getNetwork.test.ts +1 -2
- package/test/Wallet/get/getVersion.test.ts +1 -2
- package/test/Wallet/live/walletLive.man.test.ts +14 -41
- package/test/Wallet/local/localWallet.man.test.ts +45 -102
- package/test/Wallet/specOps/specOps.man.test.ts +4 -13
- package/test/Wallet/support/janitor.man.test.ts +2 -7
- package/test/Wallet/sync/Wallet.updateWalletLegacyTestData.man.test.ts +11 -34
- package/test/Wallet/sync/setActive.test.ts +75 -61
- package/test/checkDB.ts +2 -8
- package/test/examples/backup.man.test.ts +2 -9
- package/test/examples/pushdrop.test.ts +7 -20
- package/test/monitor/Monitor.test.ts +33 -87
- package/test/services/Services.test.ts +8 -19
- package/test/storage/KnexMigrations.test.ts +3 -18
- package/test/storage/StorageMySQLDojoReader.man.test.ts +4 -15
- package/test/storage/count.test.ts +7 -24
- package/test/storage/find.test.ts +7 -29
- package/test/storage/findLegacy.test.ts +2 -5
- package/test/storage/insert.test.ts +3 -19
- package/test/storage/update.test.ts +47 -179
- package/test/storage/update2.test.ts +54 -176
- package/test/utils/TestUtilsWalletStorage.ts +139 -372
- package/test/wallet/action/abortAction.test.ts +4 -12
- package/test/wallet/action/createAction.test.ts +4 -14
- package/test/wallet/action/createAction2.test.ts +74 -208
- package/test/wallet/action/createActionToGenerateBeefs.man.test.ts +8 -11
- package/test/wallet/action/internalizeAction.test.ts +20 -72
- package/test/wallet/action/relinquishOutput.test.ts +3 -9
- package/test/wallet/list/listActions.test.ts +2 -9
- package/test/wallet/list/listActions2.test.ts +8 -34
- package/test/wallet/list/listCertificates.test.ts +5 -16
- package/test/wallet/list/listOutputs.test.ts +15 -54
- package/test/wallet/sync/Wallet.sync.test.ts +18 -49
|
@@ -37,24 +37,12 @@ class KnexMigrations {
|
|
|
37
37
|
const migrations = {};
|
|
38
38
|
const addTimeStamps = (knex, table, dbtype) => {
|
|
39
39
|
if (dbtype === 'MySQL') {
|
|
40
|
-
table
|
|
41
|
-
|
|
42
|
-
.defaultTo(knex.fn.now(3))
|
|
43
|
-
.notNullable();
|
|
44
|
-
table
|
|
45
|
-
.timestamp('updated_at', { precision: 3 })
|
|
46
|
-
.defaultTo(knex.fn.now(3))
|
|
47
|
-
.notNullable();
|
|
40
|
+
table.timestamp('created_at', { precision: 3 }).defaultTo(knex.fn.now(3)).notNullable();
|
|
41
|
+
table.timestamp('updated_at', { precision: 3 }).defaultTo(knex.fn.now(3)).notNullable();
|
|
48
42
|
}
|
|
49
43
|
else {
|
|
50
|
-
table
|
|
51
|
-
|
|
52
|
-
.defaultTo(knex.fn.now())
|
|
53
|
-
.notNullable();
|
|
54
|
-
table
|
|
55
|
-
.timestamp('updated_at', { precision: 3 })
|
|
56
|
-
.defaultTo(knex.fn.now())
|
|
57
|
-
.notNullable();
|
|
44
|
+
table.timestamp('created_at', { precision: 3 }).defaultTo(knex.fn.now()).notNullable();
|
|
45
|
+
table.timestamp('updated_at', { precision: 3 }).defaultTo(knex.fn.now()).notNullable();
|
|
58
46
|
}
|
|
59
47
|
};
|
|
60
48
|
migrations['2025-03-03-001 descriptions to 2000'] = {
|
|
@@ -145,11 +133,7 @@ class KnexMigrations {
|
|
|
145
133
|
await knex.schema.createTable('proven_tx_reqs', table => {
|
|
146
134
|
addTimeStamps(knex, table, dbtype);
|
|
147
135
|
table.increments('provenTxReqId');
|
|
148
|
-
table
|
|
149
|
-
.integer('provenTxId')
|
|
150
|
-
.unsigned()
|
|
151
|
-
.references('provenTxId')
|
|
152
|
-
.inTable('proven_txs');
|
|
136
|
+
table.integer('provenTxId').unsigned().references('provenTxId').inTable('proven_txs');
|
|
153
137
|
table.string('status', 16).notNullable().defaultTo('unknown');
|
|
154
138
|
table.integer('attempts').unsigned().defaultTo(0).notNullable();
|
|
155
139
|
table.boolean('notified').notNullable().defaultTo(false);
|
|
@@ -170,12 +154,7 @@ class KnexMigrations {
|
|
|
170
154
|
await knex.schema.createTable('certificates', table => {
|
|
171
155
|
addTimeStamps(knex, table, dbtype);
|
|
172
156
|
table.increments('certificateId');
|
|
173
|
-
table
|
|
174
|
-
.integer('userId')
|
|
175
|
-
.unsigned()
|
|
176
|
-
.references('userId')
|
|
177
|
-
.inTable('users')
|
|
178
|
-
.notNullable();
|
|
157
|
+
table.integer('userId').unsigned().references('userId').inTable('users').notNullable();
|
|
179
158
|
table.string('serialNumber', 100).notNullable();
|
|
180
159
|
table.string('type', 100).notNullable();
|
|
181
160
|
table.string('certifier', 100).notNullable();
|
|
@@ -188,18 +167,8 @@ class KnexMigrations {
|
|
|
188
167
|
});
|
|
189
168
|
await knex.schema.createTable('certificate_fields', table => {
|
|
190
169
|
addTimeStamps(knex, table, dbtype);
|
|
191
|
-
table
|
|
192
|
-
|
|
193
|
-
.unsigned()
|
|
194
|
-
.references('userId')
|
|
195
|
-
.inTable('users')
|
|
196
|
-
.notNullable();
|
|
197
|
-
table
|
|
198
|
-
.integer('certificateId')
|
|
199
|
-
.unsigned()
|
|
200
|
-
.references('certificateId')
|
|
201
|
-
.inTable('certificates')
|
|
202
|
-
.notNullable();
|
|
170
|
+
table.integer('userId').unsigned().references('userId').inTable('users').notNullable();
|
|
171
|
+
table.integer('certificateId').unsigned().references('certificateId').inTable('certificates').notNullable();
|
|
203
172
|
table.string('fieldName', 100).notNullable();
|
|
204
173
|
table.string('fieldValue').notNullable();
|
|
205
174
|
table.string('masterKey', 255).defaultTo('').notNullable();
|
|
@@ -208,35 +177,18 @@ class KnexMigrations {
|
|
|
208
177
|
await knex.schema.createTable('output_baskets', table => {
|
|
209
178
|
addTimeStamps(knex, table, dbtype);
|
|
210
179
|
table.increments('basketId');
|
|
211
|
-
table
|
|
212
|
-
.integer('userId')
|
|
213
|
-
.unsigned()
|
|
214
|
-
.references('userId')
|
|
215
|
-
.inTable('users')
|
|
216
|
-
.notNullable();
|
|
180
|
+
table.integer('userId').unsigned().references('userId').inTable('users').notNullable();
|
|
217
181
|
table.string('name', 300).notNullable();
|
|
218
182
|
table.integer('numberOfDesiredUTXOs', 6).defaultTo(6).notNullable();
|
|
219
|
-
table
|
|
220
|
-
.integer('minimumDesiredUTXOValue', 15)
|
|
221
|
-
.defaultTo(10000)
|
|
222
|
-
.notNullable();
|
|
183
|
+
table.integer('minimumDesiredUTXOValue', 15).defaultTo(10000).notNullable();
|
|
223
184
|
table.boolean('isDeleted').notNullable().defaultTo(false);
|
|
224
185
|
table.unique(['name', 'userId']);
|
|
225
186
|
});
|
|
226
187
|
await knex.schema.createTable('transactions', table => {
|
|
227
188
|
addTimeStamps(knex, table, dbtype);
|
|
228
189
|
table.increments('transactionId');
|
|
229
|
-
table
|
|
230
|
-
|
|
231
|
-
.unsigned()
|
|
232
|
-
.references('userId')
|
|
233
|
-
.inTable('users')
|
|
234
|
-
.notNullable();
|
|
235
|
-
table
|
|
236
|
-
.integer('provenTxId')
|
|
237
|
-
.unsigned()
|
|
238
|
-
.references('provenTxId')
|
|
239
|
-
.inTable('proven_txs');
|
|
190
|
+
table.integer('userId').unsigned().references('userId').inTable('users').notNullable();
|
|
191
|
+
table.integer('provenTxId').unsigned().references('provenTxId').inTable('proven_txs');
|
|
240
192
|
table.string('status', 64).notNullable();
|
|
241
193
|
table.string('reference', 64).notNullable().unique();
|
|
242
194
|
table.boolean('isOutgoing').notNullable();
|
|
@@ -252,12 +204,7 @@ class KnexMigrations {
|
|
|
252
204
|
await knex.schema.createTable('commissions', table => {
|
|
253
205
|
addTimeStamps(knex, table, dbtype);
|
|
254
206
|
table.increments('commissionId');
|
|
255
|
-
table
|
|
256
|
-
.integer('userId')
|
|
257
|
-
.unsigned()
|
|
258
|
-
.references('userId')
|
|
259
|
-
.inTable('users')
|
|
260
|
-
.notNullable();
|
|
207
|
+
table.integer('userId').unsigned().references('userId').inTable('users').notNullable();
|
|
261
208
|
table
|
|
262
209
|
.integer('transactionId')
|
|
263
210
|
.unsigned()
|
|
@@ -274,23 +221,9 @@ class KnexMigrations {
|
|
|
274
221
|
await knex.schema.createTable('outputs', table => {
|
|
275
222
|
addTimeStamps(knex, table, dbtype);
|
|
276
223
|
table.increments('outputId');
|
|
277
|
-
table
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
.references('userId')
|
|
281
|
-
.inTable('users')
|
|
282
|
-
.notNullable();
|
|
283
|
-
table
|
|
284
|
-
.integer('transactionId')
|
|
285
|
-
.unsigned()
|
|
286
|
-
.references('transactionId')
|
|
287
|
-
.inTable('transactions')
|
|
288
|
-
.notNullable();
|
|
289
|
-
table
|
|
290
|
-
.integer('basketId')
|
|
291
|
-
.unsigned()
|
|
292
|
-
.references('basketId')
|
|
293
|
-
.inTable('output_baskets');
|
|
224
|
+
table.integer('userId').unsigned().references('userId').inTable('users').notNullable();
|
|
225
|
+
table.integer('transactionId').unsigned().references('transactionId').inTable('transactions').notNullable();
|
|
226
|
+
table.integer('basketId').unsigned().references('basketId').inTable('output_baskets');
|
|
294
227
|
table.boolean('spendable').defaultTo(false).notNullable();
|
|
295
228
|
table.boolean('change').defaultTo(false).notNullable();
|
|
296
229
|
table.integer('vout', 10).notNullable();
|
|
@@ -304,11 +237,7 @@ class KnexMigrations {
|
|
|
304
237
|
table.string('derivationPrefix', 32);
|
|
305
238
|
table.string('derivationSuffix', 32);
|
|
306
239
|
table.string('customInstructions', 2500);
|
|
307
|
-
table
|
|
308
|
-
.integer('spentBy')
|
|
309
|
-
.unsigned()
|
|
310
|
-
.references('transactionId')
|
|
311
|
-
.inTable('transactions');
|
|
240
|
+
table.integer('spentBy').unsigned().references('transactionId').inTable('transactions');
|
|
312
241
|
table.integer('sequenceNumber').unsigned().nullable();
|
|
313
242
|
table.string('spendingDescription');
|
|
314
243
|
table.bigint('scriptLength').unsigned().nullable();
|
|
@@ -319,30 +248,15 @@ class KnexMigrations {
|
|
|
319
248
|
await knex.schema.createTable('output_tags', table => {
|
|
320
249
|
addTimeStamps(knex, table, dbtype);
|
|
321
250
|
table.increments('outputTagId');
|
|
322
|
-
table
|
|
323
|
-
.integer('userId')
|
|
324
|
-
.unsigned()
|
|
325
|
-
.references('userId')
|
|
326
|
-
.inTable('users')
|
|
327
|
-
.notNullable();
|
|
251
|
+
table.integer('userId').unsigned().references('userId').inTable('users').notNullable();
|
|
328
252
|
table.string('tag', 150).notNullable();
|
|
329
253
|
table.boolean('isDeleted').notNullable().defaultTo(false);
|
|
330
254
|
table.unique(['tag', 'userId']);
|
|
331
255
|
});
|
|
332
256
|
await knex.schema.createTable('output_tags_map', table => {
|
|
333
257
|
addTimeStamps(knex, table, dbtype);
|
|
334
|
-
table
|
|
335
|
-
|
|
336
|
-
.unsigned()
|
|
337
|
-
.references('outputTagId')
|
|
338
|
-
.inTable('output_tags')
|
|
339
|
-
.notNullable();
|
|
340
|
-
table
|
|
341
|
-
.integer('outputId')
|
|
342
|
-
.unsigned()
|
|
343
|
-
.references('outputId')
|
|
344
|
-
.inTable('outputs')
|
|
345
|
-
.notNullable();
|
|
258
|
+
table.integer('outputTagId').unsigned().references('outputTagId').inTable('output_tags').notNullable();
|
|
259
|
+
table.integer('outputId').unsigned().references('outputId').inTable('outputs').notNullable();
|
|
346
260
|
table.boolean('isDeleted').notNullable().defaultTo(false);
|
|
347
261
|
table.unique(['outputTagId', 'outputId']);
|
|
348
262
|
table.index('outputId');
|
|
@@ -350,30 +264,15 @@ class KnexMigrations {
|
|
|
350
264
|
await knex.schema.createTable('tx_labels', table => {
|
|
351
265
|
addTimeStamps(knex, table, dbtype);
|
|
352
266
|
table.increments('txLabelId');
|
|
353
|
-
table
|
|
354
|
-
.integer('userId')
|
|
355
|
-
.unsigned()
|
|
356
|
-
.references('userId')
|
|
357
|
-
.inTable('users')
|
|
358
|
-
.notNullable();
|
|
267
|
+
table.integer('userId').unsigned().references('userId').inTable('users').notNullable();
|
|
359
268
|
table.string('label', 300).notNullable();
|
|
360
269
|
table.boolean('isDeleted').notNullable().defaultTo(false);
|
|
361
270
|
table.unique(['label', 'userId']);
|
|
362
271
|
});
|
|
363
272
|
await knex.schema.createTable('tx_labels_map', table => {
|
|
364
273
|
addTimeStamps(knex, table, dbtype);
|
|
365
|
-
table
|
|
366
|
-
|
|
367
|
-
.unsigned()
|
|
368
|
-
.references('txLabelId')
|
|
369
|
-
.inTable('tx_labels')
|
|
370
|
-
.notNullable();
|
|
371
|
-
table
|
|
372
|
-
.integer('transactionId')
|
|
373
|
-
.unsigned()
|
|
374
|
-
.references('transactionId')
|
|
375
|
-
.inTable('transactions')
|
|
376
|
-
.notNullable();
|
|
274
|
+
table.integer('txLabelId').unsigned().references('txLabelId').inTable('tx_labels').notNullable();
|
|
275
|
+
table.integer('transactionId').unsigned().references('transactionId').inTable('transactions').notNullable();
|
|
377
276
|
table.boolean('isDeleted').notNullable().defaultTo(false);
|
|
378
277
|
table.unique(['txLabelId', 'transactionId']);
|
|
379
278
|
table.index('transactionId');
|
|
@@ -395,12 +294,7 @@ class KnexMigrations {
|
|
|
395
294
|
await knex.schema.createTable('sync_states', table => {
|
|
396
295
|
addTimeStamps(knex, table, dbtype);
|
|
397
296
|
table.increments('syncStateId');
|
|
398
|
-
table
|
|
399
|
-
.integer('userId')
|
|
400
|
-
.unsigned()
|
|
401
|
-
.notNullable()
|
|
402
|
-
.references('userId')
|
|
403
|
-
.inTable('users');
|
|
297
|
+
table.integer('userId').unsigned().notNullable().references('userId').inTable('users');
|
|
404
298
|
table.string('storageIdentityKey', 130).notNullable().defaultTo('');
|
|
405
299
|
table.string('storageName').notNullable();
|
|
406
300
|
table.string('status').notNullable().defaultTo('unknown');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KnexMigrations.js","sourceRoot":"","sources":["../../../../src/storage/schema/KnexMigrations.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"KnexMigrations.js","sourceRoot":"","sources":["../../../../src/storage/schema/KnexMigrations.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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"}
|