Merge branch 'badsig' of https://github.com/ebuchman/go-ethereum into ebuchman-badsig

Conflicts:
	core/transaction_pool.go
This commit is contained in:
obscuren
2014-12-19 00:33:05 +01:00
4 changed files with 14 additions and 10 deletions

View File

@ -100,7 +100,7 @@ func NewJSTx(tx *types.Transaction, state *state.StateDB) *JSTransaction {
if receiver == "0000000000000000000000000000000000000000" {
receiver = ethutil.Bytes2Hex(core.AddressFromMessage(tx))
}
sender := ethutil.Bytes2Hex(tx.Sender())
sender := ethutil.Bytes2Hex(tx.From())
createsContract := core.MessageCreatesContract(tx)
var data string