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

chainentry: minor.

Browse Source
This commit is contained in:
Christopher Jeffrey 2017-01-21 14:40:51 -08:00
parent f3f585defc
commit 39b941516d
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/blockchain/chainentry.js
View File

@ -501,7 +501,7 @@ ChainEntry.prototype.toJSON = function toJSON() {
bits: this.bits, bits: this.bits,
nonce: this.nonce, nonce: this.nonce,
height: this.height, height: this.height,
chainwork: this.chainwork.toString(10) chainwork: this.chainwork.toString('hex', 64)
}; };
}; };
@ -514,12 +514,12 @@ ChainEntry.prototype.toJSON = function toJSON() {
ChainEntry.prototype.fromJSON = function fromJSON(json) { ChainEntry.prototype.fromJSON = function fromJSON(json) {
assert(json, 'Block data is required.'); assert(json, 'Block data is required.');
assert(typeof json.hash === 'string'); assert(typeof json.hash === 'string');
assert(util.isNumber(json.version)); assert(util.isUInt32(json.version));
assert(typeof json.prevBlock === 'string'); assert(typeof json.prevBlock === 'string');
assert(typeof json.merkleRoot === 'string'); assert(typeof json.merkleRoot === 'string');
assert(util.isNumber(json.ts)); assert(util.isUInt32(json.ts));
assert(util.isNumber(json.bits)); assert(util.isUInt32(json.bits));
assert(util.isNumber(json.nonce)); assert(util.isUInt32(json.nonce));
assert(typeof json.chainwork === 'string'); assert(typeof json.chainwork === 'string');
this.hash = util.revHex(json.hash); this.hash = util.revHex(json.hash);
@ -530,7 +530,7 @@ ChainEntry.prototype.fromJSON = function fromJSON(json) {
this.bits = json.bits; this.bits = json.bits;
this.nonce = json.nonce; this.nonce = json.nonce;
this.height = json.height; this.height = json.height;
this.chainwork = new BN(json.chainwork, 10); this.chainwork = new BN(json.chainwork, 'hex');
return this; return this;
}; };
@ -583,7 +583,7 @@ ChainEntry.prototype.inspect = function inspect() {
ChainEntry.isChainEntry = function isChainEntry(obj) { ChainEntry.isChainEntry = function isChainEntry(obj) {
return obj return obj
&& obj.chainwork !== undefined && BN.isBN(obj.chainwork)
&& typeof obj.getMedianTime === 'function'; && typeof obj.getMedianTime === 'function';
}; };