Merge branch 'x2eth_200507' of https://github.com/zhengjunhe/plugin into x2eth_200507

plugin/dapp/x2ethereum/ebrelayer/ethtxs/ethtxs_test.go

+package ethtxs
+
+import (
+	"math/big"
+	"testing"
+
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethinterface"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
+	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_LoadABI(t *testing.T) {
+	abi1 := LoadABI(Chain33BankABI)
+	abi2 := LoadABI(Chain33BridgeABI)
+	abi3 := LoadABI(EthereumBankABI)
+	assert.NotEmpty(t, abi1, abi2, abi3)
+}
+
+func Test_isWebsocketURL(t *testing.T) {
+	bret := isWebsocketURL("ws://127.0.0.1:7545/")
+	assert.Equal(t, bret, true)
+
+	bret = isWebsocketURL("https://127.0.0.1:7545/")
+	assert.Equal(t, bret, false)
+}
+
+func TestContractRegistry_String(t *testing.T) {
+	assert.Equal(t, Valset.String(), "valset")
+	assert.Equal(t, Oracle.String(), "oracle")
+	assert.Equal(t, BridgeBank.String(), "bridgebank")
+	assert.Equal(t, Chain33Bridge.String(), "chain33bridge")
+
+}
+
+func Test_GetAddressFromBridgeRegistry(t *testing.T) {
+	genesiskey, _ := crypto.GenerateKey()
+	alloc := make(core.GenesisAlloc)
+	genesisAddr := crypto.PubkeyToAddress(genesiskey.PublicKey)
+	genesisAccount := core.GenesisAccount{
+		Balance:    big.NewInt(10000000000 * 10000),
+		PrivateKey: crypto.FromECDSA(genesiskey),
+	}
+	alloc[genesisAddr] = genesisAccount
+	gasLimit := uint64(100000000)
+	sim := new(ethinterface.SimExtend)
+	sim.SimulatedBackend = backends.NewSimulatedBackend(alloc, gasLimit)
+
+	var bridgebankTest ContractRegistry
+	bridgebankTest = 5
+	_, err := GetAddressFromBridgeRegistry(sim, genesisAddr, genesisAddr, bridgebankTest)
+	require.NotNil(t, err)
+}

plugin/dapp/x2ethereum/ebrelayer/ethtxs/registry.go

@@ -27,7 +27,7 @@ const (
 
 // String : returns the event type as a string
 func (d ContractRegistry) String() string {
-	return [...]string{"valset", "oracle", "bridgebank", "chain33bridge"}[d-1]
+	return [...]string{"valset", "oracle", "bridgebank", "chain33bridge", "notsupport"}[d-1]
 }
 
 // GetAddressFromBridgeRegistry : utility method which queries the requested contract address from the BridgeRegistry

plugin/dapp/x2ethereum/ebrelayer/events/ethereumEvents.go

@@ -14,9 +14,9 @@ func NewEventWrite(txHash string, event LockEvent) {
 }
 
 // IsEventRecorded : checks the sessions stored events for this transaction hash
-func IsEventRecorded(txHash string) bool {
-	return EventRecords[txHash].Nonce != nil
-}
+//func IsEventRecorded(txHash string) bool {
+//	return EventRecords[txHash].Nonce != nil
+//}
 
 //// PrintLockEventByTx : prints any witnessed events associated with a given transaction hash
 //func PrintLockEventByTx(txHash string) {

plugin/dapp/x2ethereum/ebrelayer/relayer/chain33/chain33.go

@@ -128,6 +128,7 @@ func (chain33Relayer *Relayer4Chain33) getCurrentHeight() int64 {
 
 func (chain33Relayer *Relayer4Chain33) onNewHeightProc(currentHeight int64) {
 	//检查已经提交的交易结果
+	chain33Relayer.rwLock.Lock()
 	for chain33Relayer.statusCheckedIndex < chain33Relayer.totalTx4Chain33ToEth {
 		index := chain33Relayer.statusCheckedIndex + 1
 		txhash, err := chain33Relayer.getEthTxhash(index)
@@ -145,6 +146,7 @@ func (chain33Relayer *Relayer4Chain33) onNewHeightProc(currentHeight int64) {
 		atomic.AddInt64(&chain33Relayer.statusCheckedIndex, 1)
 		_ = chain33Relayer.setStatusCheckedIndex(chain33Relayer.statusCheckedIndex)
 	}
+	chain33Relayer.rwLock.Unlock()
 	//未达到足够的成熟度，不进行处理
 	//  +++++++++||++++++++++++||++++++++++||
 	//           ^             ^           ^

plugin/dapp/x2ethereum/ebrelayer/relayer/chain33/chain33_test.go

@@ -5,11 +5,8 @@ import (
 	"encoding/hex"
 	"flag"
 	"fmt"
+	"math/big"
 	"os"
-	"os/signal"
-	"sync"
-	"sync/atomic"
-	"syscall"
 	"testing"
 	"time"
 
@@ -20,6 +17,8 @@ import (
 	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethcontract/test/setup"
 	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethinterface"
 	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethtxs"
+	relayerTx "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethtxs"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/events"
 	syncTx "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/relayer/chain33/transceiver/sync"
 	ebTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
 	relayerTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
@@ -28,7 +27,10 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/stretchr/testify/suite"
+	ethTypes "github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	// 需要显示引用系统插件，以加载系统内置合约
 	"github.com/33cn/chain33/client/mocks"
@@ -37,175 +39,273 @@ import (
 )
 
 var (
-	configPath    = flag.String("f", "./../../relayer.toml", "configfile")
-	chainTestCfg  = types.NewChain33Config(types.GetDefaultCfgstring())
+	configPath = flag.String("f", "./../../relayer.toml", "configfile")
+	//chainTestCfg  = types.NewChain33Config(types.GetDefaultCfgstring())
 	privateKeyStr = "0x3fa21584ae2e4fd74db9b58e2386f5481607dfa4d7ba0617aaa7858e5025dc1e"
 	accountAddr   = "0x92c8b16afd6d423652559c6e266cbe1c29bfd84f"
 	passphrase    = "123456hzj"
 	test          = "0ac3050aa3020a0a7832657468657265756d126d60671a690a2a3078303030303030303030303030303030303030303030303030303030303030303030303030303030301a2a307830633035626135633233306664616135303362353337303261663139363265303864306336306266220831303030303030302a0365746838121a6e080112210320bbac09528e19c55b0f89cb37ab265e7e856b1a8c388780322dbbfd194b52ba1a473045022100c403d9a6e531292336b44d52e4f4dbb9b8ab1e16335383954583728b909478da022031d8a29efcbcea8df648c4054f3c09ab1ab7a330797cf79fd891a3d9336922e920a08d0628e0f193f60530a1d7ad93e5ebc28e253a22314c7538586d537459765777664e716951336e4e4b33345239466648346b5270425612ce0208021a5e0802125a0a2b10c0d59294bb192222313271796f6361794e46374c7636433971573461767873324537553431664b536676122b10a0c88c94bb192222313271796f6361794e46374c7636433971573461767873324537553431664b5366761a55080f12510a291080ade2042222313271796f6361794e46374c7636433971573461767873324537553431664b53667612242222313271796f6361794e46374c7636433971573461767873324537553431664b5366761a92010867128d010a2a3078303030303030303030303030303030303030303030303030303030303030303030303030303030301222313271796f6361794e46374c7636433971573461767873324537553431664b5366761a2a307830633035626135633233306664616135303362353337303261663139363265303864306336306266220831303030303030302a03657468301220c4092a207a38e1da7de4444f2d34c7488293f3a2e01ce2561e720e9bbef355e83755ad833220e68d8418f69d5f18278a53dca53b101f26f76883337a60a5754d5f6d94e42e3c400148c409"
+
+	// 0x8AFDADFC88a1087c9A1D6c0F5Dd04634b87F303a
+	deployerPrivateKey = "8656d2bc732a8a816a461ba5e2d8aac7c7f85c26a813df30d5327210465eb230"
+	// 0x92C8b16aFD6d423652559C6E266cBE1c29Bfd84f
+	ethValidatorAddrKeyA = "3fa21584ae2e4fd74db9b58e2386f5481607dfa4d7ba0617aaa7858e5025dc1e"
+	ethValidatorAddrKeyB = "a5f3063552f4483cfc20ac4f40f45b798791379862219de9e915c64722c1d400"
+	ethValidatorAddrKeyC = "bbf5e65539e9af0eb0cfac30bad475111054b09c11d668fc0731d54ea777471e"
+	ethValidatorAddrKeyD = "c9fa31d7984edf81b8ef3b40c761f1847f6fcd5711ab2462da97dc458f1f896b"
 )
 
-type suiteChain33Relayer struct {
-	suite.Suite
-	chain33Relayer  *Relayer4Chain33
-	sim             *ethinterface.SimExtend
-	x2EthContracts  *ethtxs.X2EthContracts
-	x2EthDeployInfo *ethtxs.X2EthDeployInfo
-	para            *ethtxs.DeployPara
-}
+func Test_HandleRequest(t *testing.T) {
+	mock33 := newMock33("127.0.0.1:8801")
+	defer mock33.Close()
+	_, sim, _, x2EthDeployInfo := deployContracts()
+	//require.NoError(t, err)
+	chain33Relayer := newChain33Relayer(sim, x2EthDeployInfo, "127.0.0.1:60002", "http://127.0.0.1:8801", t)
+	_, err := chain33Relayer.ImportPrivateKey(passphrase, privateKeyStr)
+	assert.NoError(t, err)
 
-func TestRunSuiteX2Ethereum(t *testing.T) {
-	var ret = types.ReplySubscribePush{IsOk: true}
-	var he = types.Header{Height: 10000}
+	body, err := hex.DecodeString(test)
+	assert.NoError(t, err)
 
-	mockapi := &mocks.QueueProtocolAPI{}
-	// 这里对需要mock的方法打桩,Close是必须的，其它方法根据需要
-	mockapi.On("Close").Return()
-	mockapi.On("AddPushSubscribe", mock.Anything).Return(&ret, nil)
-	mockapi.On("GetLastHeader", mock.Anything).Return(&he, nil)
-	mockapi.On("GetConfig", mock.Anything).Return(chainTestCfg, nil)
+	chain33Relayer.statusCheckedIndex = 1220
+	err = syncTx.HandleRequest(body)
+	assert.NoError(t, err)
 
-	mock33 := testnode.New("", mockapi)
-	defer mock33.Close()
-	rpcCfg := mock33.GetCfg().RPC
-	// 这里必须设置监听端口，默认的是无效值
-	rpcCfg.JrpcBindAddr = "127.0.0.1:8801"
-	mock33.GetRPC().Listen()
+	time.Sleep(time.Second)
 
-	log := new(suiteChain33Relayer)
-	suite.Run(t, log)
-}
+	ret := chain33Relayer.QueryTxhashRelay2Eth()
+	assert.NotEmpty(t, ret)
 
-func (r *suiteChain33Relayer) SetupSuite() {
-	r.deployContracts()
-	r.chain33Relayer = r.newChain33Relayer()
+	event := getOracleClaimType(events.MsgLock.String())
+	assert.Equal(t, event, events.Event(events.ClaimTypeLock))
 }
 
-func (r *suiteChain33Relayer) Test_1_ImportPrivateKey() {
-	addr, err := r.chain33Relayer.ImportPrivateKey(passphrase, privateKeyStr)
-	r.NoError(err)
-	r.Equal(addr, accountAddr)
+func Test_ImportPrivateKey(t *testing.T) {
+	mock33 := newMock33("127.0.0.1:8802")
+	defer mock33.Close()
+	_, sim, _, x2EthDeployInfo, err := setup.DeployContracts()
+	require.NoError(t, err)
+	chain33Relayer := newChain33Relayer(sim, x2EthDeployInfo, "127.0.0.1:60000", "http://127.0.0.1:8802", t)
+
+	addr, err := chain33Relayer.ImportPrivateKey(passphrase, privateKeyStr)
+	assert.NoError(t, err)
+	assert.Equal(t, addr, accountAddr)
 
 	time.Sleep(50 * time.Millisecond)
 
-	addr, err = r.chain33Relayer.GetAccountAddr()
-	r.NoError(err)
-	r.Equal(addr, accountAddr)
+	addr, err = chain33Relayer.GetAccountAddr()
+	assert.NoError(t, err)
+	assert.Equal(t, addr, accountAddr)
 
-	key, _, _ := r.chain33Relayer.GetAccount("123")
-	r.NotEqual(key, privateKeyStr)
+	key, _, _ := chain33Relayer.GetAccount("123")
+	assert.NotEqual(t, key, privateKeyStr)
 
-	key, _, _ = r.chain33Relayer.GetAccount(passphrase)
-	r.Equal(key, privateKeyStr)
+	key, _, _ = chain33Relayer.GetAccount(passphrase)
+	assert.Equal(t, key, privateKeyStr)
 }
 
-func (r *suiteChain33Relayer) Test_2_HandleRequest() {
-	body, err := hex.DecodeString(test)
-	r.NoError(err)
+func Test_Lockbty(t *testing.T) {
+	mock33 := newMock33("127.0.0.1:8803")
+	defer mock33.Close()
+	para, sim, x2EthContracts, x2EthDeployInfo, err := setup.DeployContracts()
+	require.NoError(t, err)
+	chain33Relayer := newChain33Relayer(sim, x2EthDeployInfo, "127.0.0.1:60001", "http://127.0.0.1:8803", t)
+	_, err = chain33Relayer.ImportPrivateKey(passphrase, privateKeyStr)
+	assert.NoError(t, err)
 
-	r.chain33Relayer.statusCheckedIndex = 1220
-	err = syncTx.HandleRequest(body)
-	r.NoError(err)
+	//Test_1_ImportPrivateKey()
+	ctx := context.Background()
 
-	time.Sleep(50 * time.Millisecond)
-}
+	//2nd：订阅事件
+	eventName := "LogNewBridgeToken"
+	bridgeBankABI := ethtxs.LoadABI(ethtxs.BridgeBankABI)
+	logNewBridgeTokenSig := bridgeBankABI.Events[eventName].ID().Hex()
+	query := ethereum.FilterQuery{
+		Addresses: []common.Address{x2EthDeployInfo.BridgeBank.Address},
+	}
+	// We will check logs for new events
+	logs := make(chan ethTypes.Log)
+	// Filter by contract and event, write results to logs
+	sub, err := sim.SubscribeFilterLogs(ctx, query, logs)
+	//require.Nil(t, err)
+
+	opts := &bind.CallOpts{
+		Pending: true,
+		From:    para.Operator,
+		Context: ctx,
+	}
 
-func (r *suiteChain33Relayer) Test_3_QueryTxhashRelay2Eth() {
-	ret := r.chain33Relayer.QueryTxhashRelay2Eth()
-	r.NotEmpty(ret)
-}
+	tokenCount, err := x2EthContracts.BridgeBank.BridgeTokenCount(opts)
+	require.Nil(t, err)
+	assert.Equal(t, tokenCount.Int64(), int64(0))
+
+	//3rd：创建token
+	symbol := "BTY"
+	auth, err := ethtxs.PrepareAuth(sim, para.DeployPrivateKey, para.Operator)
+	require.Nil(t, err)
+	_, err = x2EthContracts.BridgeBank.BridgeBankTransactor.CreateNewBridgeToken(auth, symbol)
+	require.Nil(t, err)
+	sim.Commit()
+
+	logEvent := &events.LogNewBridgeToken{}
+	select {
+	// Handle any errors
+	case err := <-sub.Err():
+		t.Fatalf("sub error:%s", err.Error())
+	// vLog is raw event data
+	case vLog := <-logs:
+		// Check if the event is a 'LogLock' event
+		if vLog.Topics[0].Hex() == logNewBridgeTokenSig {
+			err = bridgeBankABI.Unpack(logEvent, eventName, vLog.Data)
+			require.Nil(t, err)
+			require.Equal(t, symbol, logEvent.Symbol)
+
+			//tokenCount正确加1
+			tokenCount, err = x2EthContracts.BridgeBank.BridgeTokenCount(opts)
+			require.Nil(t, err)
+			require.Equal(t, tokenCount.Int64(), int64(1))
+			break
+		}
+	}
+
+	///////////newOracleClaim///////////////////////////
+	balance, _ := sim.BalanceAt(ctx, para.InitValidators[0], nil)
+	fmt.Println("InitValidators[0] addr,", para.InitValidators[0].String(), "balance =", balance.String())
+
+	chain33Sender := []byte("14KEKbYtKKQm4wMthSK9J4La4nAiidGozt")
+	amount := int64(99)
+	ethReceiver := para.InitValidators[2]
+	claimID := crypto.Keccak256Hash(chain33Sender, ethReceiver.Bytes(), logEvent.Token.Bytes(), big.NewInt(amount).Bytes())
+
+	authOracle, err := ethtxs.PrepareAuth(sim, para.ValidatorPriKey[0], para.InitValidators[0])
+	require.Nil(t, err)
 
-func (r *suiteChain33Relayer) Test_4_getEthTxhash() {
-	txIndex := atomic.LoadInt64(&r.chain33Relayer.totalTx4Chain33ToEth)
-	hash, err := r.chain33Relayer.getEthTxhash(txIndex)
-	r.NoError(err)
-	r.Equal(hash.String(), "0x6fa087c7a2a8a4421f6e269fbc6c0838e99fa59d5760155a71cd7eb1c01aafad")
+	signature, err := ethtxs.SignClaim4Eth(claimID, para.ValidatorPriKey[0])
+	require.Nil(t, err)
+
+	bridgeToken, err := generated.NewBridgeToken(logEvent.Token, sim)
+	require.Nil(t, err)
+	opts = &bind.CallOpts{
+		Pending: true,
+		Context: ctx,
+	}
+
+	balance, err = bridgeToken.BalanceOf(opts, ethReceiver)
+	require.Nil(t, err)
+	require.Equal(t, balance.Int64(), int64(0))
+
+	tx, err := x2EthContracts.Oracle.NewOracleClaim(
+		authOracle,
+		events.ClaimTypeLock,
+		chain33Sender,
+		ethReceiver,
+		logEvent.Token,
+		logEvent.Symbol,
+		big.NewInt(amount),
+		claimID,
+		signature)
+	require.Nil(t, err)
+
+	sim.Commit()
+	balance, err = bridgeToken.BalanceOf(opts, ethReceiver)
+	require.Nil(t, err)
+	require.Equal(t, balance.Int64(), amount)
+	//t.Logf("The minted amount is:%d", balance.Int64())
+
+	txhash := tx.Hash().Hex()
+
+	chain33Relayer.rwLock.Lock()
+	chain33Relayer.totalTx4Chain33ToEth = 2
+	chain33Relayer.rwLock.Unlock()
+	_ = chain33Relayer.setLastestRelay2EthTxhash(relayerTx.EthTxPending.String(), txhash, 3)
+
+	time.Sleep(200 * time.Millisecond)
+
+	chain33Relayer.rwLock.Lock()
+	chain33Relayer.totalTx4Chain33ToEth = 9
+	chain33Relayer.totalTx4Chain33ToEth = 11
+	chain33Relayer.rwLock.Unlock()
+	_ = chain33Relayer.setLastestRelay2EthTxhash(relayerTx.EthTxPending.String(), "", 11)
+
+	time.Sleep(200 * time.Millisecond)
 }
 
-func (r *suiteChain33Relayer) Test_5_RestorePrivateKeys() {
+func Test_RestorePrivateKeys(t *testing.T) {
+	mock33 := newMock33("127.0.0.1:8804")
+	defer mock33.Close()
+	_, sim, _, x2EthDeployInfo, err := setup.DeployContracts()
+	require.NoError(t, err)
+	chain33Relayer := newChain33Relayer(sim, x2EthDeployInfo, "127.0.0.1:60003", "http://127.0.0.1:8804", t)
+	_, err = chain33Relayer.ImportPrivateKey(passphrase, privateKeyStr)
+	assert.NoError(t, err)
+
 	go func() {
-		for range r.chain33Relayer.unlock {
+		for range chain33Relayer.unlock {
 		}
 	}()
-	temp := r.chain33Relayer.ethSender
+	temp := chain33Relayer.ethSender
 
-	err := r.chain33Relayer.RestorePrivateKeys("123")
-	r.NotEqual(hex.EncodeToString(temp.Bytes()), hex.EncodeToString(r.chain33Relayer.ethSender.Bytes()))
-	r.NoError(err)
+	err = chain33Relayer.RestorePrivateKeys("123")
+	assert.NotEqual(t, hex.EncodeToString(temp.Bytes()), hex.EncodeToString(chain33Relayer.ethSender.Bytes()))
+	assert.NoError(t, err)
 
-	err = r.chain33Relayer.RestorePrivateKeys(passphrase)
-	r.Equal(hex.EncodeToString(temp.Bytes()), hex.EncodeToString(r.chain33Relayer.ethSender.Bytes()))
-	r.NoError(err)
+	err = chain33Relayer.RestorePrivateKeys(passphrase)
+	assert.Equal(t, hex.EncodeToString(temp.Bytes()), hex.EncodeToString(chain33Relayer.ethSender.Bytes()))
+	assert.NoError(t, err)
 
-	err = r.chain33Relayer.StoreAccountWithNewPassphase("new123", passphrase)
-	r.NoError(err)
+	err = chain33Relayer.StoreAccountWithNewPassphase("new123", passphrase)
+	assert.NoError(t, err)
 
-	err = r.chain33Relayer.RestorePrivateKeys("new123")
-	r.Equal(hex.EncodeToString(temp.Bytes()), hex.EncodeToString(r.chain33Relayer.ethSender.Bytes()))
-	r.NoError(err)
+	err = chain33Relayer.RestorePrivateKeys("new123")
+	assert.Equal(t, hex.EncodeToString(temp.Bytes()), hex.EncodeToString(chain33Relayer.ethSender.Bytes()))
+	assert.NoError(t, err)
 
 	time.Sleep(time.Second)
+
 }
 
-func (r *suiteChain33Relayer) newChain33Relayer() *Relayer4Chain33 {
+func newChain33Relayer(sim *ethinterface.SimExtend, x2EthDeployInfo *ethtxs.X2EthDeployInfo, pushBind, chain33Host string, t *testing.T) *Relayer4Chain33 {
 	cfg := initCfg(*configPath)
-	cfg.SyncTxConfig.Chain33Host = "http://127.0.0.1:8801"
-	cfg.BridgeRegistry = r.x2EthDeployInfo.BridgeRegistry.Address.String()
-	cfg.SyncTxConfig.PushBind = "127.0.0.1:60000"
+	cfg.SyncTxConfig.Chain33Host = chain33Host
+	cfg.BridgeRegistry = x2EthDeployInfo.BridgeRegistry.Address.String()
+	cfg.SyncTxConfig.PushBind = pushBind
 	cfg.SyncTxConfig.FetchHeightPeriodMs = 50
 	cfg.SyncTxConfig.Dbdriver = "memdb"
 
 	db := dbm.NewDB("relayer_db_service", cfg.SyncTxConfig.Dbdriver, cfg.SyncTxConfig.DbPath, cfg.SyncTxConfig.DbCache)
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, _ := context.WithCancel(context.Background())
 
 	relayer := &Relayer4Chain33{
-		rpcLaddr:            cfg.SyncTxConfig.Chain33Host,
+		rpcLaddr:            chain33Host,
 		fetchHeightPeriodMs: cfg.SyncTxConfig.FetchHeightPeriodMs,
 		unlock:              make(chan int),
 		db:                  db,
 		ctx:                 ctx,
-		bridgeRegistryAddr:  r.x2EthDeployInfo.BridgeRegistry.Address,
+		bridgeRegistryAddr:  x2EthDeployInfo.BridgeRegistry.Address,
 	}
 	err := relayer.setStatusCheckedIndex(1)
-	r.NoError(err)
+	assert.NoError(t, err)
 
-	relayer.ethClient = r.sim
+	relayer.ethClient = sim
 	relayer.totalTx4Chain33ToEth = relayer.getTotalTxAmount2Eth()
 	relayer.statusCheckedIndex = relayer.getStatusCheckedIndex()
-	r.Equal(relayer.statusCheckedIndex, int64(1))
+	assert.Equal(t, relayer.statusCheckedIndex, int64(1))
 
 	syncCfg := &ebTypes.SyncTxReceiptConfig{
-		Chain33Host:       cfg.SyncTxConfig.Chain33Host,
+		Chain33Host:       chain33Host,
 		PushHost:          cfg.SyncTxConfig.PushHost,
 		PushName:          cfg.SyncTxConfig.PushName,
-		PushBind:          cfg.SyncTxConfig.PushBind,
+		PushBind:          pushBind,
 		StartSyncHeight:   cfg.SyncTxConfig.StartSyncHeight,
 		StartSyncSequence: cfg.SyncTxConfig.StartSyncSequence,
 		StartSyncHash:     cfg.SyncTxConfig.StartSyncHash,
 	}
 	go relayer.syncProc(syncCfg)
 
-	var wg sync.WaitGroup
-	ch := make(chan os.Signal, 1)
-	signal.Notify(ch, syscall.SIGTERM)
-	go func() {
-		<-ch
-		cancel()
-		wg.Wait()
-		os.Exit(0)
-	}()
-
 	return relayer
 }
 
-func (r *suiteChain33Relayer) deployContracts() {
-	// 0x8AFDADFC88a1087c9A1D6c0F5Dd04634b87F303a
-	var deployerPrivateKey = "8656d2bc732a8a816a461ba5e2d8aac7c7f85c26a813df30d5327210465eb230"
-	// 0x92C8b16aFD6d423652559C6E266cBE1c29Bfd84f
-	var ethValidatorAddrKeyA = "3fa21584ae2e4fd74db9b58e2386f5481607dfa4d7ba0617aaa7858e5025dc1e"
-	var ethValidatorAddrKeyB = "a5f3063552f4483cfc20ac4f40f45b798791379862219de9e915c64722c1d400"
-	var ethValidatorAddrKeyC = "bbf5e65539e9af0eb0cfac30bad475111054b09c11d668fc0731d54ea777471e"
-	var ethValidatorAddrKeyD = "c9fa31d7984edf81b8ef3b40c761f1847f6fcd5711ab2462da97dc458f1f896b"
+func deployContracts() (*ethtxs.DeployPara, *ethinterface.SimExtend, *ethtxs.X2EthContracts, *ethtxs.X2EthDeployInfo) {
 	ethValidatorAddrKeys := make([]string, 0)
 	ethValidatorAddrKeys = append(ethValidatorAddrKeys, ethValidatorAddrKeyA)
 	ethValidatorAddrKeys = append(ethValidatorAddrKeys, ethValidatorAddrKeyB)
@@ -213,28 +313,21 @@ func (r *suiteChain33Relayer) deployContracts() {
 	ethValidatorAddrKeys = append(ethValidatorAddrKeys, ethValidatorAddrKeyD)
 
 	ctx := context.Background()
-	var backend bind.ContractBackend
-	backend, r.para = setup.PrepareTestEnvironment(deployerPrivateKey, ethValidatorAddrKeys)
-	r.sim = new(ethinterface.SimExtend)
-	r.sim.SimulatedBackend = backend.(*backends.SimulatedBackend)
-
-	balance, _ := r.sim.BalanceAt(ctx, r.para.Deployer, nil)
-	fmt.Println("deployer addr,", r.para.Deployer.String(), "balance =", balance.String())
+	//var backend bind.ContractBackend
+	backend, para := setup.PrepareTestEnvironment(deployerPrivateKey, ethValidatorAddrKeys)
+	sim := new(ethinterface.SimExtend)
+	sim.SimulatedBackend = backend.(*backends.SimulatedBackend)
 
-	/////////////////////////EstimateGas///////////////////////////
 	callMsg := ethereum.CallMsg{
-		From: r.para.Deployer,
+		From: para.Deployer,
 		Data: common.FromHex(generated.BridgeBankBin),
 	}
 
-	gas, err := r.sim.EstimateGas(ctx, callMsg)
-	r.NoError(err)
-	fmt.Printf("\nThe estimated gas=%d\n", gas)
-	////////////////////////////////////////////////////
+	_, _ = sim.EstimateGas(ctx, callMsg)
+	x2EthContracts, x2EthDeployInfo, _ := ethtxs.DeployAndInit(sim, para)
+	sim.Commit()
 
-	r.x2EthContracts, r.x2EthDeployInfo, err = ethtxs.DeployAndInit(r.sim, r.para)
-	r.NoError(err)
-	r.sim.Commit()
+	return para, sim, x2EthContracts, x2EthDeployInfo
 }
 
 func initCfg(path string) *relayerTypes.RelayerConfig {
@@ -245,3 +338,24 @@ func initCfg(path string) *relayerTypes.RelayerConfig {
 	}
 	return &cfg
 }
+
+func newMock33(JrpcBindAddr string) *testnode.Chain33Mock {
+	var ret = types.ReplySubscribePush{IsOk: true, Msg: ""}
+	var he = types.Header{Height: 10000}
+
+	mockapi := &mocks.QueueProtocolAPI{}
+	// 这里对需要mock的方法打桩,Close是必须的，其它方法根据需要
+	mockapi.On("Close").Return()
+	mockapi.On("AddPushSubscribe", mock.Anything).Return(&ret, nil)
+	mockapi.On("GetLastHeader", mock.Anything).Return(&he, nil)
+	//mockapi.On("GetConfig", mock.Anything).Return(chainTestCfg, nil)
+
+	mock33 := testnode.New("", mockapi)
+	//defer mock33.Close()
+	rpcCfg := mock33.GetCfg().RPC
+	// 这里必须设置监听端口，默认的是无效值
+	rpcCfg.JrpcBindAddr = JrpcBindAddr
+	mock33.GetRPC().Listen()
+
+	return mock33
+}

plugin/dapp/x2ethereum/ebrelayer/relayer/chain33/transceiver/sync/sync_tx_receipts.go

@@ -36,9 +36,9 @@ func StartSyncTxReceipt(cfg *relayerTypes.SyncTxReceiptConfig, db dbm.DB) *TxRec
 	return syncTxReceipts
 }
 
-func StopSyncTxReceipt() {
-	syncTxReceipts.Stop()
-}
+//func StopSyncTxReceipt() {
+//	syncTxReceipts.Stop()
+//}
 
 func startHTTPService(url string, clientHost string) {
 	listen, err := net.Listen("tcp", url)

plugin/dapp/x2ethereum/ebrelayer/relayer/ethereum/ethereum_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/hex"
 	"flag"
-	"fmt"
 	"math/big"
 	"os"
 	"testing"
@@ -132,9 +131,36 @@ func Test_ShowAddr(t *testing.T) {
 	require.Nil(t, err)
 	assert.Equal(t, addr, para.Operator.String())
 
-	_, err = ethRelayer.DeployContrcts()
-	require.Error(t, err)
+}
+
+func Test_DeployContrcts(t *testing.T) {
+	_, sim, _, _ := deployContracts()
+	cfg := initCfg(*configPath)
+	cfg.SyncTxConfig.Dbdriver = "memdb"
+
+	db := dbm.NewDB("relayer_db_service", cfg.SyncTxConfig.Dbdriver, cfg.SyncTxConfig.DbPath, cfg.SyncTxConfig.DbCache)
 
+	relayer := &Relayer4Ethereum{
+		provider:            cfg.EthProvider,
+		db:                  db,
+		unlockchan:          make(chan int, 2),
+		rpcURL2Chain33:      cfg.SyncTxConfig.Chain33Host,
+		maturityDegree:      cfg.EthMaturityDegree,
+		fetchHeightPeriodMs: cfg.EthBlockFetchPeriod,
+		deployInfo:          cfg.Deploy,
+	}
+	relayer.clientSpec = sim
+	relayer.clientChainID = big.NewInt(1)
+
+	deployPrivateKey, _ := crypto.ToECDSA(common.FromHex(relayer.deployInfo.DeployerPrivateKey))
+	deployerAddr := crypto.PubkeyToAddress(deployPrivateKey.PublicKey)
+	relayer.operatorInfo = &ethtxs.OperatorInfo{
+		PrivateKey: deployPrivateKey,
+		Address:    deployerAddr,
+	}
+
+	_, err := relayer.DeployContrcts()
+	require.NoError(t, err)
 }
 
 func Test_SetBridgeRegistryAddr(t *testing.T) {
@@ -242,7 +268,8 @@ func Test_LockEth(t *testing.T) {
 }
 
 func Test_CreateERC20Token(t *testing.T) {
-	para, sim, x2EthContracts, x2EthDeployInfo := deployContracts()
+	para, sim, x2EthContracts, x2EthDeployInfo, err := setup.DeployContracts()
+	require.NoError(t, err)
 	ethRelayer := newEthRelayer(para, sim, x2EthContracts, x2EthDeployInfo)
 	_ = ethRelayer.ImportChain33PrivateKey(passphrase, chain33PrivateKeyStr)
 	time.Sleep(time.Second)
@@ -408,16 +435,6 @@ func Test_BurnBty(t *testing.T) {
 	require.NoError(t, err)
 	sim.Commit()
 
-	time.Sleep(time.Second * 2)
-
-	fetchCnt := int32(10)
-	logs, err := ethRelayer.getNextValidEthTxEventLogs(ethRelayer.eventLogIndex.Height, ethRelayer.eventLogIndex.Index, fetchCnt)
-	require.NoError(t, err)
-
-	for _, vLog := range logs {
-		ethRelayer.procBridgeBankLogs(*vLog)
-	}
-
 	balanceNew, err = ethRelayer.GetBalance(tokenAddrbty, ethReceiver.String())
 	require.Nil(t, err)
 	require.Equal(t, balanceNew, "90")
@@ -434,8 +451,15 @@ func Test_BurnBty(t *testing.T) {
 	require.Nil(t, err)
 	require.Equal(t, balanceNew, "80")
 
+	fetchCnt := int32(10)
+	logs, err := ethRelayer.getNextValidEthTxEventLogs(ethRelayer.eventLogIndex.Height, ethRelayer.eventLogIndex.Index, fetchCnt)
+	require.NoError(t, err)
+
+	for _, vLog := range logs {
+		ethRelayer.procBridgeBankLogs(*vLog)
+	}
+
 	time.Sleep(time.Second)
-	fmt.Println("---------------------- end ----------------------")
 }
 
 func Test_RestorePrivateKeys(t *testing.T) {