Skip to content
This repository was archived by the owner on Dec 14, 2018. It is now read-only.

Commit 7fbfade

Browse files
committed
Revert "Really activates the almonds."
This reverts commit 0e3c2e1.
1 parent 818508d commit 7fbfade

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

modules/blocks.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,9 @@ Blocks.prototype.verifyBlock = function (block, checkPreviousBlock) {
10451045
for (var i in transactions) {
10461046
var transaction = transactions[i];
10471047

1048-
transaction.id = library.logic.transaction.getId(transaction);
1048+
if(!transaction.id){
1049+
transaction.id = library.logic.transaction.getId(transaction);
1050+
}
10491051

10501052
var bytes;
10511053

@@ -1066,7 +1068,7 @@ Blocks.prototype.verifyBlock = function (block, checkPreviousBlock) {
10661068
result.errors.push('Encountered duplicate transaction: ' + transaction.id);
10671069
}
10681070

1069-
appliedTransactions[transaction.id] = modules.transactionPool.getTransactionFromMempool(transaction.id);
1071+
appliedTransactions[transaction.id] = transaction;
10701072

10711073
payloadHash.update(bytes);
10721074

0 commit comments

Comments
 (0)