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

core, tests: get_hash fix

Browse Source 
Make sure that we're fetching the hash from the current chain and not
the canonical chain.
This commit is contained in:
Jeffrey Wilcke 2015-10-21 02:31:46 +02:00
parent 796952a49a
commit 80f26086ee
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/vm/environment.go
View File

@ -39,7 +39,7 @@ type Environment interface {
// The block number this VM is invoken on // The block number this VM is invoken on
BlockNumber() *big.Int BlockNumber() *big.Int
// The n'th hash ago from this block number // The n'th hash ago from this block number
GetHash(n uint64) common.Hash GetHash(uint64) common.Hash
// The handler's address // The handler's address
Coinbase() common.Address Coinbase() common.Address
// The current time (block time) // The current time (block time)

6
core/vm_env.go
View File

@ -59,8 +59,10 @@ func (self *VMEnv) SetDepth(i int) { self.depth = i }
func (self *VMEnv) VmType() vm.Type { return self.typ } func (self *VMEnv) VmType() vm.Type { return self.typ }
func (self *VMEnv) SetVmType(t vm.Type) { self.typ = t } func (self *VMEnv) SetVmType(t vm.Type) { self.typ = t }
func (self *VMEnv) GetHash(n uint64) common.Hash { func (self *VMEnv) GetHash(n uint64) common.Hash {
if block := self.chain.GetBlockByNumber(n); block != nil { for block := self.chain.GetBlock(self.header.ParentHash); block != nil; block = self.chain.GetBlock(block.ParentHash()) {
return block.Hash() if block.NumberU64() == n {
return block.Hash()
}
} }
return common.Hash{} return common.Hash{}

12
tests/util.go
View File

@ -131,8 +131,8 @@ type Env struct {
initial bool initial bool
Gas *big.Int Gas *big.Int
origin common.Address origin common.Address
//parent common.Hash parent common.Hash
coinbase common.Address coinbase common.Address
number *big.Int number *big.Int
@ -163,7 +163,7 @@ func NewEnvFromMap(state *state.StateDB, envValues map[string]string, exeValues
env := NewEnv(state) env := NewEnv(state)
env.origin = common.HexToAddress(exeValues["caller"]) env.origin = common.HexToAddress(exeValues["caller"])
//env.parent = common.Hex2Bytes(envValues["previousHash"]) env.parent = common.HexToHash(envValues["previousHash"])
env.coinbase = common.HexToAddress(envValues["currentCoinbase"]) env.coinbase = common.HexToAddress(envValues["currentCoinbase"])
env.number = common.Big(envValues["currentNumber"]) env.number = common.Big(envValues["currentNumber"])
env.time = common.Big(envValues["currentTimestamp"]) env.time = common.Big(envValues["currentTimestamp"])
@ -174,10 +174,8 @@ func NewEnvFromMap(state *state.StateDB, envValues map[string]string, exeValues
return env return env
} }
func (self *Env) Origin() common.Address { return self.origin } func (self *Env) Origin() common.Address { return self.origin }
func (self *Env) BlockNumber() *big.Int { return self.number } func (self *Env) BlockNumber() *big.Int { return self.number }
//func (self *Env) PrevHash() []byte { return self.parent }
func (self *Env) Coinbase() common.Address { return self.coinbase } func (self *Env) Coinbase() common.Address { return self.coinbase }
func (self *Env) Time() *big.Int { return self.time } func (self *Env) Time() *big.Int { return self.time }
func (self *Env) Difficulty() *big.Int { return self.difficulty } func (self *Env) Difficulty() *big.Int { return self.difficulty }