tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copy over bytes from previous root

Browse Source 
Copy over instead of directly using the previous root. This is order to
avoid resetting problems
This commit is contained in:
obscuren 2014-04-23 15:52:50 +02:00
parent 6b08efabf8
commit f7d4e3cd6b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ethchain/block.go
View File

@ -80,6 +80,9 @@ func CreateBlock(root interface{},
extra string, extra string,
txes []*Transaction) *Block { txes []*Transaction) *Block {
// Copy over the bytes
copiedRoot := ethutil.NewValue(root).Bytes()
block := &Block{ block := &Block{
// Slice of transactions to include in this block // Slice of transactions to include in this block
transactions: txes, transactions: txes,
@ -95,7 +98,7 @@ func CreateBlock(root interface{},
block.SetTransactions(txes) block.SetTransactions(txes)
block.SetUncles([]*Block{}) 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 { for _, tx := range txes {
block.MakeContract(tx) block.MakeContract(tx)