poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix/1' into develop

This commit is contained in:
obscuren 2014-05-20 19:20:09 +02:00
parent 9562aba86a ad51c85e5d
commit de87e436ab
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ethchain/block.go
View File

@ -99,6 +99,9 @@ func CreateBlock(root interface{},
Time: time.Now().Unix(), Time: time.Now().Unix(),
Extra: extra, Extra: extra,
UncleSha: EmptyShaList, UncleSha: EmptyShaList,
GasUsed: new(big.Int),
MinGasPrice: new(big.Int),
GasLimit: new(big.Int),
contractStates: make(map[string]*ethutil.Trie), contractStates: make(map[string]*ethutil.Trie),
} }
block.SetTransactions(txes) block.SetTransactions(txes)
@ -220,7 +223,7 @@ func (block *Block) SetTransactions(txs []*Transaction) {
trie.Update(strconv.Itoa(i), string(tx.RlpEncode())) 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 { func (block *Block) Value() *ethutil.Value {

2
peer.go
View File

@ -18,7 +18,7 @@ const (
// The size of the output buffer for writing messages // The size of the output buffer for writing messages
outputBufferSize = 50 outputBufferSize = 50
// Current protocol version // Current protocol version
ProtocolVersion = 10 ProtocolVersion = 11
) )
type DiscReason byte type DiscReason byte