From f7d4e3cd6b276e4d66abe89b4f1b2dfa2faf90df Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Wed, 23 Apr 2014 15:52:50 +0200
Subject: Copy over bytes from previous root
Copy over instead of directly using the previous root. This is order to
avoid resetting problems
---
ethchain/block.go | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'ethchain/block.go')
diff --git a/ethchain/block.go b/ethchain/block.go
index 8c93947fb..c9197c69a 100644
--- a/ethchain/block.go
+++ b/ethchain/block.go
@@ -80,6 +80,9 @@ func CreateBlock(root interface{},
extra string,
txes []*Transaction) *Block {
+ // Copy over the bytes
+ copiedRoot := ethutil.NewValue(root).Bytes()
+
block := &Block{
// Slice of transactions to include in this block
transactions: txes,
@@ -95,7 +98,7 @@ func CreateBlock(root interface{},
block.SetTransactions(txes)
block.SetUncles([]*Block{})
- block.state = NewState(ethutil.NewTrie(ethutil.Config.Db, root))
+ block.state = NewState(ethutil.NewTrie(ethutil.Config.Db, copiedRoot))
for _, tx := range txes {
block.MakeContract(tx)
--
cgit v1.2.3