Merge pull request #2234 from CortexFoundation/dev

precompiled

Author: ucwong

core/vm/contracts.go

@@ -47,6 +47,9 @@ type PrecompiledContract interface {
 	Run(input []byte) ([]byte, error) // Run runs the precompiled contract
 }
 
+// PrecompiledContracts contains the precompiled contracts supported at the given fork.
+type PrecompiledContracts map[common.Address]PrecompiledContract
+
 // PrecompiledContractsHomestead contains the default set of pre-compiled CortexTheseus
 // contracts used in the Frontier and Homestead releases.
 var PrecompiledContractsHomestead = map[common.Address]PrecompiledContract{
@@ -170,6 +173,17 @@ func init() {
 	}
 }
 
+func activePrecompiledContracts(rules params.Rules) PrecompiledContracts {
+	switch {
+	case rules.IsIstanbul:
+		return PrecompiledContractsIstanbul
+	case rules.IsByzantium:
+		return PrecompiledContractsByzantium
+	default:
+		return PrecompiledContractsHomestead
+	}
+}
+
 // ActivePrecompiles returns the precompiles enabled with the current configuration.
 func ActivePrecompiles(rules params.Rules) []common.Address {
 	switch {

core/vm/cvm.go

@@ -123,6 +123,9 @@ type CVM struct {
 	// applied in opCall*.
 	callGasTemp uint64
 	//Fs          *torrentfs.FileStorage
+
+	// precompiles holds the precompiled contracts for the current epoch
+	precompiles map[common.Address]PrecompiledContract
 }
 
 // NewCVM returns a new CVM. The returned CVM is not thread safe and should
@@ -138,11 +141,19 @@ func NewCVM(blockCtx BlockContext, statedb StateDB, chainConfig *params.ChainCon
 		chainRules:  chainConfig.Rules(blockCtx.BlockNumber, blockCtx.Random != nil, blockCtx.Time),
 	}
 
+	cvm.precompiles = activePrecompiledContracts(cvm.chainRules)
 	cvm.interpreter = NewCVMInterpreter(cvm)
 
 	return cvm
 }
 
+// SetPrecompiles sets the precompiled contracts for the EVM.
+// This method is only used through RPC calls.
+// It is not thread-safe.
+func (cvm *CVM) SetPrecompiles(precompiles PrecompiledContracts) {
+	cvm.precompiles = precompiles
+}
+
 // Reset resets the CVM with a new transaction context.Reset
 // This is not threadsafe and should only be done very cautiously.
 func (cvm *CVM) Reset(txCtx TxContext, statedb StateDB) {