changes for ISC wasp

Author: dessaya

core/vm/evm.go

@@ -223,7 +223,9 @@ func (evm *EVM) Call(caller common.Address, addr common.Address, input []byte, g
 	}
 	evm.Context.Transfer(evm.StateDB, caller, addr, value)
 
-	if isPrecompile {
+	if evm.Config.MagicContracts != nil && evm.Config.MagicContracts[addr] != nil {
+		ret, gas, err = evm.Config.MagicContracts[addr].Run(evm, caller, input, value, gas, false)
+	} else if isPrecompile {
 		ret, gas, err = RunPrecompiledContract(p, input, gas, evm.Config.Tracer)
 	} else {
 		// Initialise a new contract and set the code that is to be used by the EVM.
@@ -286,8 +288,10 @@ func (evm *EVM) CallCode(caller common.Address, addr common.Address, input []byt
 	}
 	var snapshot = evm.StateDB.Snapshot()
 
-	// It is allowed to call precompiles, even via delegatecall
-	if p, isPrecompile := evm.precompile(addr); isPrecompile {
+	if evm.Config.MagicContracts != nil && evm.Config.MagicContracts[addr] != nil {
+		ret, gas, err = evm.Config.MagicContracts[addr].Run(evm, caller, input, value, gas, false)
+	} else if p, isPrecompile := evm.precompile(addr); isPrecompile {
+		// It is allowed to call precompiles, even via delegatecall
 		ret, gas, err = RunPrecompiledContract(p, input, gas, evm.Config.Tracer)
 	} else {
 		// Initialise a new contract and set the code that is to be used by the EVM.
@@ -329,8 +333,9 @@ func (evm *EVM) DelegateCall(originCaller common.Address, caller common.Address,
 	}
 	var snapshot = evm.StateDB.Snapshot()
 
-	// It is allowed to call precompiles, even via delegatecall
-	if p, isPrecompile := evm.precompile(addr); isPrecompile {
+	if evm.Config.MagicContracts != nil && evm.Config.MagicContracts[addr] != nil {
+		ret, gas, err = evm.Config.MagicContracts[addr].Run(evm, caller, input, new(uint256.Int), gas, false)
+	} else if p, isPrecompile := evm.precompile(addr); isPrecompile {
 		ret, gas, err = RunPrecompiledContract(p, input, gas, evm.Config.Tracer)
 	} else {
 		// Initialise a new contract and make initialise the delegate values
@@ -382,7 +387,9 @@ func (evm *EVM) StaticCall(caller common.Address, addr common.Address, input []b
 	// future scenarios
 	evm.StateDB.AddBalance(addr, new(uint256.Int), tracing.BalanceChangeTouchAccount)
 
-	if p, isPrecompile := evm.precompile(addr); isPrecompile {
+	if evm.Config.MagicContracts != nil && evm.Config.MagicContracts[addr] != nil {
+		ret, gas, err = evm.Config.MagicContracts[addr].Run(evm, caller, input, new(uint256.Int), gas, true)
+	} else if p, isPrecompile := evm.precompile(addr); isPrecompile {
 		ret, gas, err = RunPrecompiledContract(p, input, gas, evm.Config.Tracer)
 	} else {
 		// Initialise a new contract and set the code that is to be used by the EVM.

core/vm/interpreter.go

@@ -35,6 +35,9 @@ type Config struct {
 	ExtraEips               []int // Additional EIPS that are to be enabled
 
 	StatelessSelfValidation bool // Generate execution witnesses and self-check against them (testing purpose)
+
+	// MagicContracts allows the interpreter to run native code at arbitrary addresses
+	MagicContracts map[common.Address]ISCMagicContract
 }
 
 // ScopeContext contains the things that are per-call, such as stack and memory,

core/vm/isc.go

@@ -0,0 +1,10 @@
+package vm
+
+import (
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/holiman/uint256"
+)
+
+type ISCMagicContract interface {
+	Run(evm *EVM, caller common.Address, input []byte, value *uint256.Int, gas uint64, readOnly bool) ([]byte, uint64, error)
+}

eth/protocols/snap/sync.go

@@ -1987,9 +1987,7 @@ func (s *Syncer) processAccountResponse(res *accountResponse) {
 func (s *Syncer) processBytecodeResponse(res *bytecodeResponse) {
 	batch := s.db.NewBatch()
 
-	var (
-		codes uint64
-	)
+	var codes uint64
 	for i, hash := range res.hashes {
 		code := res.codes[i]
 

rpc/websocket_extensions_wasp.go

@@ -0,0 +1,11 @@
+package rpc
+
+import (
+	"net/http"
+
+	"github.com/gorilla/websocket"
+)
+
+func NewWebSocketCodec(conn *websocket.Conn, host string, req http.Header, readLimit int64) ServerCodec {
+	return newWebsocketCodec(conn, host, req, readLimit)
+}