RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chain: refactor getLocks.

Browse Source
This commit is contained in:
Christopher Jeffrey 2017-07-09 14:49:14 -07:00
parent 8a1eb9f5e1
commit 18c1476de9
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/blockchain/chain.js
View File

@ -2266,7 +2266,6 @@ Chain.prototype.getLocks = async function getLocks(prev, tx, view, flags) {
let disableFlag = consensus.SEQUENCE_DISABLE_FLAG; let disableFlag = consensus.SEQUENCE_DISABLE_FLAG;
let typeFlag = consensus.SEQUENCE_TYPE_FLAG; let typeFlag = consensus.SEQUENCE_TYPE_FLAG;
let hasFlag = flags & common.lockFlags.VERIFY_SEQUENCE; let hasFlag = flags & common.lockFlags.VERIFY_SEQUENCE;
let nextHeight = this.height + 1;
let minHeight = -1; let minHeight = -1;
let minTime = -1; let minTime = -1;
@ -2274,28 +2273,29 @@ Chain.prototype.getLocks = async function getLocks(prev, tx, view, flags) {
return [minHeight, minTime]; return [minHeight, minTime];
for (let input of tx.inputs) { for (let input of tx.inputs) {
let coinHeight, coinTime, entry; let height, time, entry;
if (input.sequence & disableFlag) if (input.sequence & disableFlag)
continue; continue;
coinHeight = view.getHeight(input); height = view.getHeight(input);
if (coinHeight === -1) if (height === -1)
coinHeight = nextHeight; height = this.height + 1;
if ((input.sequence & typeFlag) === 0) { if ((input.sequence & typeFlag) === 0) {
coinHeight += (input.sequence & mask) - 1; height += (input.sequence & mask) - 1;
minHeight = Math.max(minHeight, coinHeight); minHeight = Math.max(minHeight, height);
continue; continue;
} }
entry = await prev.getAncestor(Math.max(coinHeight - 1, 0)); height = Math.max(height - 1, 0);
entry = await prev.getAncestor(height);
assert(entry, 'Database is corrupt.'); assert(entry, 'Database is corrupt.');
coinTime = await entry.getMedianTime(); time = await entry.getMedianTime();
coinTime += ((input.sequence & mask) << granularity) - 1; time += ((input.sequence & mask) << granularity) - 1;
minTime = Math.max(minTime, coinTime); minTime = Math.max(minTime, time);
} }
return [minHeight, minTime]; return [minHeight, minTime];