safebox: always rollback on tx/block validation failure

pasl-project · Mar 31, 2019 · 5d71231 · 5d71231
1 parent 1b9d563
commit 5d71231
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/blockchain/blockchain.go b/blockchain/blockchain.go
@@ -331,7 +331,6 @@ func (this *Blockchain) ProcessNewBlocks(blocks []safebox.SerializedBlock, preSa
 	defer this.lock.Unlock()
 
 	if err := this.processNewBlocksUnsafe(blocks, preSave); err != nil {
-		this.safebox.Rollback()
 		return err
 	}
 	this.safebox.Merge()

diff --git a/safebox/safebox.go b/safebox/safebox.go
@@ -131,6 +131,10 @@ func (s *Safebox) Rollback() {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
+	s.rollbackUnsafe()
+}
+
+func (s *Safebox) rollbackUnsafe() {
 	s.accounter.Rollback()
 }
 
@@ -141,6 +145,7 @@ func (s *Safebox) GetUpdatedPacks() []uint32 {
 	return s.accounter.GetUpdatedPacks()
 }
 
+func (this *Safebox) processOperationsUnsafe(miner *crypto.Public, timestamp uint32, operations []tx.CommonOperation, difficulty *big.Int) (map[*accounter.Account]map[uint32]uint32, error) {
 	blockIndex := this.accounter.GetHeight()
 	height := blockIndex + 1
 	reward := getReward(height)
@@ -185,6 +190,17 @@ func (s *Safebox) GetUpdatedPacks() []uint32 {
 	return affectedByTxes, nil
 }
 
+func (s *Safebox) ProcessOperations(miner *crypto.Public, timestamp uint32, operations []tx.CommonOperation, difficulty *big.Int) (map[*accounter.Account]map[uint32]uint32, error) {
+	s.lock.Lock()
+	defer s.lock.Unlock()
+
+	affectedByTxes, err := s.processOperationsUnsafe(miner, timestamp, operations, difficulty)
+	if err != nil {
+		s.rollbackUnsafe()
+	}
+	return affectedByTxes, err
+}
+
 func (this *Safebox) GetLastTimestamps(count uint32) (timestamps []uint32) {
 	this.lock.RLock()
 	defer this.lock.RUnlock()