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

coin: better json.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-10-24 16:35:19 -07:00
parent 9dcd366d15
commit d8006cb9df
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/primitives/coin.js
View File

@ -165,11 +165,17 @@ Coin.prototype.inspect = function inspect() {
*/ */
Coin.prototype.toJSON = function toJSON() { Coin.prototype.toJSON = function toJSON() {
var address = this.getAddress();
if (address)
address = address.toBase58();
return { return {
version: this.version, version: this.version,
height: this.height, height: this.height,
value: utils.btc(this.value), value: utils.btc(this.value),
script: this.script.toJSON(), script: this.script.toJSON(),
address: address,
coinbase: this.coinbase, coinbase: this.coinbase,
hash: this.hash ? utils.revHex(this.hash) : null, hash: this.hash ? utils.revHex(this.hash) : null,
index: this.index index: this.index

2
lib/wallet/walletdb.js
View File

@ -1850,7 +1850,7 @@ WalletDB.prototype._removeBlock = co(function* removeBlock(entry) {
yield this.setTip(prev); yield this.setTip(prev);
this.logger.warning('Disconnected block %s (tx=%d).', this.logger.warning('Disconnected block %s (tx=%d).',
utils.revHex(block.hash), block.txs.length); utils.revHex(tip.hash), block.txs.length);
return block.txs.length; return block.txs.length;
}); });