diff --git a/package-lock.json b/package-lock.json index a5e7321a..16d07630 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11139,7 +11139,7 @@ "resolved": "https://registry.npmjs.org/@dashevo/dapi-client/-/dapi-client-0.21.2.tgz", "integrity": "sha512-4w1RmIVA7m2hXXf+GJEONIzOgHVZYYHOeAb0Bm0QbJfhSbc6gd6oJdMukaYRN4SVqqQEtNHr17ZT4iNrxAEFXg==", "requires": { - "@dashevo/dapi-grpc": "~0.21.0", + "@dashevo/dapi-grpc": "~0.21.0-dev.12", "@dashevo/dashcore-lib": "~0.19.26", "@dashevo/dpp": "~0.21.0", "@dashevo/grpc-common": "~0.5.4", diff --git a/src/types/Storage/methods/importTransaction.js b/src/types/Storage/methods/importTransaction.js index 3c9943de..ef7c27f4 100644 --- a/src/types/Storage/methods/importTransaction.js +++ b/src/types/Storage/methods/importTransaction.js @@ -1,7 +1,7 @@ const { Transaction } = require('@dashevo/dashcore-lib'); const { Output } = Transaction; const { InvalidDashcoreTransaction } = require('../../../errors'); -const { FETCHED_CONFIRMED_TRANSACTION } = require('../../../EVENTS'); +const { FETCHED_UNCONFIRMED_TRANSACTION, FETCHED_CONFIRMED_TRANSACTION } = require('../../../EVENTS'); const parseStringifiedTransaction = (stringified) => new Transaction(stringified); /** @@ -51,6 +51,7 @@ const importTransaction = function importTransaction(transaction, transactionMet if (findIndex >= 0) { mappedTransactionsHeight[height][findIndex] = mappedTransactionObject; + hasUpdateStorage = true; } else { mappedTransactionsHeight[height].push(mappedTransactionObject); } @@ -114,10 +115,15 @@ const importTransaction = function importTransaction(transaction, transactionMet addressObject.transactions.push(transaction.hash); }); + // Announce only confirmed transaction imported that are our. if (hasUpdateStorage) { this.lastModified = +new Date(); - // Announce only confirmed transaction imported that are our. - this.announce(FETCHED_CONFIRMED_TRANSACTION, { transaction }); + + if (!transaction.isChainLocked && !transaction.isInstantLocked) { + this.announce(FETCHED_UNCONFIRMED_TRANSACTION, { transaction }); + } else { + this.announce(FETCHED_CONFIRMED_TRANSACTION, { transaction }); + } } }; module.exports = importTransaction;