From 28acda024a79b2547fcb7e2e1a54ae6dc98f5ef1 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Sat, 3 Sep 2016 16:51:32 -0700 Subject: [PATCH] chaindb: fix reset atomicity. --- lib/chain/chaindb.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/chain/chaindb.js b/lib/chain/chaindb.js index c8db0577..4c84c2c3 100644 --- a/lib/chain/chaindb.js +++ b/lib/chain/chaindb.js @@ -224,12 +224,13 @@ ChainDB.prototype._open = function open(callback) { return callback(err); self.logger.info('Chain successfully loaded.'); - self.logger.info('Chain State: hash=%s tx=%d coin=%d value=%s.', + + self.logger.info( + 'Chain State: hash=%s tx=%d coin=%d value=%s.', self.state.rhash, self.state.tx, self.state.coin, - utils.btc(self.state.value) - ); + utils.btc(self.state.value)); self.db.checkVersion('V', 1, callback); } @@ -846,6 +847,8 @@ ChainDB.prototype.reset = function reset(block, callback) { return callback(err); } + self.put(layout.R, self.pending.commit(tip.prevBlock)); + self.commit(function(err) { if (err) return next(err);