Add kernel contract eth-proxy

go.mod

@@ -26,19 +26,18 @@ require (
 	github.com/libp2p/go-libp2p-kbucket v0.4.2
 	github.com/libp2p/go-libp2p-record v0.1.2
 	github.com/libp2p/go-libp2p-secio v0.2.2
-	github.com/mr-tron/base58 v1.2.0
 	github.com/multiformats/go-multiaddr v0.3.1
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/prometheus/client_golang v1.1.0
+	github.com/prometheus/client_golang v1.11.0
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/viper v1.6.2
 	github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca
 	github.com/xuperchain/crypto v0.0.0-20201028025054-4d560674bcd6
 	github.com/xuperchain/log15 v0.0.0-20190620081506-bc88a9198230
 	github.com/xuperchain/xvm v0.0.0-20210126142521-68fd016c56d7
 	golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
-	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
+	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
 	google.golang.org/grpc v1.35.0
 )
 
-replace github.com/hyperledger/burrow => github.com/xuperchain/burrow v0.30.6-0.20210317023017-369050d94f4a
+replace github.com/hyperledger/burrow => github.com/xuperchain/burrow v0.30.6-0.20210806065218-1c6d40be4365

kernel/contract/kernel.go

@@ -15,7 +15,8 @@ type KContext interface {
 	Initiator() string
 	Caller() string
 	AuthRequire() []string
-
+	TransferAmount() string
+	ContractName() string
 	// 状态修改接口
 	StateSandbox
 

kernel/contract/kernel/kcontext_impl.go

@@ -97,3 +97,11 @@ func (k *kcontextImpl) EmitAsyncTask(event string, args interface{}) (err error)
 	k.AddEvent(&e)
 	return
 }
+
+func (k *kcontextImpl) TransferAmount() string {
+	return k.ctx.TransferAmount
+}
+
+func (k *kcontextImpl) ContractName() string {
+	return k.ctx.ContractName
+}

kernel/contract/mock/helper.go

@@ -3,13 +3,14 @@ package mock
 import (
 	"crypto/rand"
 	"encoding/json"
-	"github.com/xuperchain/xupercore/kernel/contract/bridge"
 	"io/ioutil"
 	"math/big"
 	"os"
 
 	"github.com/golang/protobuf/proto"
+
 	"github.com/xuperchain/xupercore/kernel/contract"
+	"github.com/xuperchain/xupercore/kernel/contract/bridge"
 	"github.com/xuperchain/xupercore/kernel/contract/sandbox"
 	"github.com/xuperchain/xupercore/kernel/ledger"
 	"github.com/xuperchain/xupercore/kernel/permission/acl/utils"
@@ -75,8 +76,7 @@ func (t *TestHelper) UTXOState() *contract.UTXORWSet {
 
 func (t *TestHelper) initAccount() {
 	t.state.Put(utils.GetAccountBucket(), []byte(ContractAccount), &ledger.VersionedData{
-		RefTxid:  []byte("txid"),
-		PureData: nil,
+		RefTxid: []byte("txid"),
 	})
 
 	utxoReader := sandbox.NewUTXOReaderFromInput([]*protos.TxInput{
@@ -91,6 +91,9 @@ func (t *TestHelper) initAccount() {
 
 	t.utxoReader = utxoReader
 }
+func (t *TestHelper) SetUtxoReader(reader contract.UtxoReader) {
+	t.utxoReader = reader
+}
 
 func (t *TestHelper) Deploy(module, lang, contractName string, bin []byte, args map[string][]byte) (*contract.Response, error) {
 	m := t.Manager()
@@ -192,8 +195,8 @@ func (t *TestHelper) Invoke(module, contractName, method string, args map[string
 		return nil, err
 	}
 	defer ctx.Release()
-
 	resp, err := ctx.Invoke(method, args)
+
 	if err != nil {
 		return nil, err
 	}

kernel/engines/xuperos/agent/rely.go

@@ -2,6 +2,7 @@ package agent
 
 import (
 	"fmt"
+	"github.com/xuperchain/xupercore/kernel/evm"
 	"path/filepath"
 
 	"github.com/xuperchain/xupercore/lib/logs"
@@ -207,6 +208,12 @@ func (t *ChainRelyAgentImpl) CreateProposal() (propose.ProposeManager, error) {
 	return proposalObj, nil
 }
 
+func (t *ChainRelyAgentImpl) CreateEVManager() (evm.EVMProxy, error) {
+	ctx := t.chain.Context()
+	proxy, err := evm.NewEVMProxy(ctx.Contract)
+	return proxy, err
+}
+
 // 创建定时器任务实例
 func (t *ChainRelyAgentImpl) CreateTimerTask() (timerTask.TimerManager, error) {
 	ctx := t.chain.Context()

kernel/engines/xuperos/chain.go

@@ -429,6 +429,12 @@ func (t *Chain) initChainCtx() error {
 	t.ctx.State.SetTimerTaskMG(t.ctx.TimerTask)
 	t.log.Trace("create timer_task succ", "bcName", t.ctx.BCName)
 	t.log.Trace("create chain succ", "bcName", t.ctx.BCName)
+	// 11. EVM Proxy
+	_, err = t.relyAgent.CreateEVManager()
+	if err != nil {
+		t.log.Error("create evm proxy failed", "bcname", t.ctx.BCName, "err", err)
+		return fmt.Errorf("create evm proxy error")
+	}
 	return nil
 }
 

kernel/engines/xuperos/common/interface.go

@@ -12,6 +12,7 @@ import (
 	"github.com/xuperchain/xupercore/kernel/contract/proposal/propose"
 	timerTask "github.com/xuperchain/xupercore/kernel/contract/proposal/timer"
 	"github.com/xuperchain/xupercore/kernel/engines"
+	"github.com/xuperchain/xupercore/kernel/evm"
 	kledger "github.com/xuperchain/xupercore/kernel/ledger"
 	"github.com/xuperchain/xupercore/kernel/network"
 	aclBase "github.com/xuperchain/xupercore/kernel/permission/acl/base"
@@ -61,6 +62,7 @@ type ChainRelyAgent interface {
 	CreateGovernToken() (governToken.GovManager, error)
 	CreateProposal() (propose.ProposeManager, error)
 	CreateTimerTask() (timerTask.TimerManager, error)
+	CreateEVManager() (evm.EVMProxy, error)
 }
 
 type ChainManager interface {