core, tests: get_hash fix

Make sure that we're fetching the hash from the current chain and not
the canonical chain.

Conflicts:
	core/vm/environment.go

core/vm/environment.go

@@ -31,7 +31,9 @@ type Environment interface {
 
 	Origin() common.Address
 	BlockNumber() *big.Int
-	GetHash(n uint64) common.Hash
+	// The n'th hash ago from this block number
+	GetHash(uint64) common.Hash
+	// The handler's address
 	Coinbase() common.Address
 	Time() *big.Int
 	Difficulty() *big.Int

core/vm_env.go

@@ -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) SetVmType(t vm.Type)      { self.typ = t }
 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{}

tests/util.go

@@ -130,8 +130,8 @@ type Env struct {
 	initial      bool
 	Gas          *big.Int
 
-	origin common.Address
+	origin   common.Address
-	//parent   common.Hash
+	parent   common.Hash
 	coinbase common.Address
 
 	number     *big.Int
@@ -162,7 +162,7 @@ func NewEnvFromMap(state *state.StateDB, envValues map[string]string, exeValues
 	env := NewEnv(state)
 
 	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.number = common.Big(envValues["currentNumber"])
 	env.time = common.Big(envValues["currentTimestamp"])
@@ -173,10 +173,8 @@ func NewEnvFromMap(state *state.StateDB, envValues map[string]string, exeValues
 	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) Time() *big.Int           { return self.time }
 func (self *Env) Difficulty() *big.Int     { return self.difficulty }