From ad51c85e5d67ca2e64e95786e79d062c4467b4c1 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 20 May 2014 19:19:53 +0200
Subject: [PATCH] Fixed crash
---
ethchain/block.go | 5 ++++-
peer.go | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ethchain/block.go b/ethchain/block.go
index c6c2c1226..bdb243286 100644
--- a/ethchain/block.go
+++ b/ethchain/block.go
@@ -99,6 +99,9 @@ func CreateBlock(root interface{},
Time: time.Now().Unix(),
Extra: extra,
UncleSha: EmptyShaList,
+ GasUsed: new(big.Int),
+ MinGasPrice: new(big.Int),
+ GasLimit: new(big.Int),
contractStates: make(map[string]*ethutil.Trie),
}
block.SetTransactions(txes)
@@ -220,7 +223,7 @@ func (block *Block) SetTransactions(txs []*Transaction) {
trie.Update(strconv.Itoa(i), string(tx.RlpEncode()))
}
- block.TxSha = trie.Root.([]byte)
+ block.TxSha = []byte(trie.Root.(string))
}
func (block *Block) Value() *ethutil.Value {
diff --git a/peer.go b/peer.go
index 993f48d20..b2e751b44 100644
--- a/peer.go
+++ b/peer.go
@@ -18,7 +18,7 @@ const (
// The size of the output buffer for writing messages
outputBufferSize = 50
// Current protocol version
- ProtocolVersion = 10
+ ProtocolVersion = 11
)
type DiscReason byte
--
GitLab