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

tx/block: cache hashes.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-10-19 15:14:28 -07:00
parent d73c80c21d
commit 33bcc08656
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
4 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/primitives/abstractblock.js
View File

@ -58,6 +58,7 @@ function AbstractBlock(options) {
this._valid = null; this._valid = null;
this._hash = null; this._hash = null;
this._hhash = null;
this._size = null; this._size = null;
this._witnessSize = null; this._witnessSize = null;
@ -140,6 +141,7 @@ AbstractBlock.prototype.parseJSON = function parseJSON(json) {
AbstractBlock.prototype.hash = function hash(enc) { AbstractBlock.prototype.hash = function hash(enc) {
var hash = this._hash; var hash = this._hash;
var hex;
if (!hash) { if (!hash) {
hash = crypto.hash256(this.abbr()); hash = crypto.hash256(this.abbr());
@ -147,7 +149,17 @@ AbstractBlock.prototype.hash = function hash(enc) {
this._hash = hash; this._hash = hash;
} }
return enc === 'hex' ? hash.toString('hex') : hash; if (enc === 'hex') {
hex = this._hhash;
if (!hex) {
hex = hash.toString('hex');
if (!this.mutable)
this._hhash = hex;
}
hash = hex;
}
return hash;
}; };
/** /**

14
lib/primitives/tx.js
View File

@ -86,6 +86,7 @@ function TX(options) {
this.mutable = false; this.mutable = false;
this._hash = null; this._hash = null;
this._hhash = null;
this._whash = null; this._whash = null;
this._raw = null; this._raw = null;
@ -219,6 +220,7 @@ TX.prototype.unsetBlock = function unsetBlock() {
TX.prototype.hash = function _hash(enc) { TX.prototype.hash = function _hash(enc) {
var hash = this._hash; var hash = this._hash;
var hex;
if (!hash) { if (!hash) {
hash = crypto.hash256(this.toNormal()); hash = crypto.hash256(this.toNormal());
@ -226,7 +228,17 @@ TX.prototype.hash = function _hash(enc) {
this._hash = hash; this._hash = hash;
} }
return enc === 'hex' ? hash.toString('hex') : hash; if (enc === 'hex') {
hex = this._hhash;
if (!hex) {
hex = hash.toString('hex');
if (!this.mutable)
this._hhash = hex;
}
hash = hex;
}
return hash;
}; };
/** /**

2
test/script-test.js
View File

@ -348,6 +348,8 @@ describe('Script', function() {
tx._witnessSize = -1; tx._witnessSize = -1;
tx._lastWitnessSize = 0; tx._lastWitnessSize = 0;
tx._hash = null; tx._hash = null;
tx._hhash = null;
tx._whash = null;
tx._inputValue = -1; tx._inputValue = -1;
tx._outputValue = -1; tx._outputValue = -1;
tx._hashPrevouts = null; tx._hashPrevouts = null;

2
test/tx-test.js
View File

@ -47,6 +47,8 @@ function clearCache(tx, nocache) {
tx._witnessSize = -1; tx._witnessSize = -1;
tx._lastWitnessSize = 0; tx._lastWitnessSize = 0;
tx._hash = null; tx._hash = null;
tx._hhash = null;
tx._whash = null;
tx._inputValue = -1; tx._inputValue = -1;
tx._outputValue = -1; tx._outputValue = -1;
tx._hashPrevouts = null; tx._hashPrevouts = null;