gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[release/1.4.9] Revert "core: add voting and result tracking for the dao soft-fork"

Browse Source 
This reverts commit f31a3a251a.
This commit is contained in:
Péter Szilágyi
2016-06-29 11:53:23 +03:00
parent 3eef19598e
commit c793cb3385
5 changed files with 20 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/vm_env.go
View File

@ -25,9 +25,7 @@ import (
"github.com/ethereum/go-ethereum/core/vm"
)
// BlockedCodeHashes is a set of EVM code hashes that this node should block
// sending funds from.
var BlockedCodeHashes map[common.Hash]struct{}
var IllegalCodeHashes map[common.Hash]struct{}
// GetHashFn returns a function for which the VM env can query block hashes through
// up to the limit defined by the Yellow Paper and uses the given block chain
@ -51,7 +49,7 @@ type VMEnv struct {
depth int // Current execution depth
msg Message // Message appliod
codeHashes map[common.Hash]struct{} // code hashes collected during execution
CodeHashes []common.Hash // code hashes collected during execution
header *types.Header // Header information
chain *BlockChain // Blockchain handle
@ -62,7 +60,6 @@ type VMEnv struct {
func NewEnv(state *state.StateDB, chainConfig *ChainConfig, chain *BlockChain, msg Message, header *types.Header, cfg vm.Config) *VMEnv {
env := &VMEnv{
chainConfig: chainConfig,
codeHashes: make(map[common.Hash]struct{}),
chain: chain,
state: state,
header: header,
@ -79,8 +76,7 @@ func NewEnv(state *state.StateDB, chainConfig *ChainConfig, chain *BlockChain, m
return env
}
func (self *VMEnv) MarkCodeHash(hash common.Hash) { self.codeHashes[hash] = struct{}{} }
func (self *VMEnv) GetMarkedCodeHashes() map[common.Hash]struct{} { return self.codeHashes }
func (self *VMEnv) MarkCodeHash(hash common.Hash) { self.CodeHashes = append(self.CodeHashes, hash) }
func (self *VMEnv) RuleSet() vm.RuleSet { return self.chainConfig }
func (self *VMEnv) Vm() vm.Vm { return self.evm }