From b9c3451661aadceb7ca8e8651ed3ea6925ad4314 Mon Sep 17 00:00:00 2001
From: BJ4 <bojie@dexon.org>
Date: Thu, 15 Nov 2018 16:02:19 +0800
Subject: app: add cache to reuse same tx address which has already recovered
 (#26)

---
 dex/app.go | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'dex/app.go')

diff --git a/dex/app.go b/dex/app.go
index af8295c9a..38ca382e3 100644
--- a/dex/app.go
+++ b/dex/app.go
@@ -458,18 +458,11 @@ func (d *DexconApp) BlockDelivered(
 	d.chainLock(chainID)
 	defer d.chainUnlock(chainID)
 
-	block := d.blockchain.GetConfirmedBlockByHash(chainID, blockHash)
+	block, txs := d.blockchain.GetConfirmedBlockByHash(chainID, blockHash)
 	if block == nil {
 		panic("Can not get confirmed block")
 	}
 
-	var transactions types.Transactions
-	err := rlp.DecodeBytes(block.Payload, &transactions)
-	if err != nil {
-		log.Error("Payload rlp decode failed", "error", err)
-		panic(err)
-	}
-
 	block.Payload = nil
 	dexconMeta, err := rlp.EncodeToBytes(block)
 	if err != nil {
@@ -485,7 +478,7 @@ func (d *DexconApp) BlockDelivered(
 		Round:      block.Position.Round,
 		DexconMeta: dexconMeta,
 		Randomness: result.Randomness,
-	}, transactions, nil, nil)
+	}, txs, nil, nil)
 
 	root, err := d.blockchain.ProcessPendingBlock(newBlock, &block.Witness)
 	if err != nil {
-- 
cgit v1.2.3