rename x2Ethereum to x2ethereum

plugin/dapp/init/init.go

@@ -30,5 +30,5 @@ import (
 	_ "github.com/33cn/plugin/plugin/dapp/trade"          //auto gen
 	_ "github.com/33cn/plugin/plugin/dapp/unfreeze"       //auto gen
 	_ "github.com/33cn/plugin/plugin/dapp/valnode"        //auto gen
-	_ "github.com/33cn/plugin/plugin/dapp/x2Ethereum"     //auto gen
+	_ "github.com/33cn/plugin/plugin/dapp/x2ethereum"     //auto gen
 )

plugin/dapp/x2Ethereum/Makefile → plugin/dapp/x2ethereum/Makefile

@@ -5,8 +5,8 @@
 # 3. make build
 # ...
 
-SRC_EBCLI := github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebcli
-SRC_EBRELAYER := github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer
+SRC_EBCLI := github.com/33cn/plugin/plugin/dapp/x2ethereum/ebcli
+SRC_EBRELAYER := github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer
 CLI_A := build/ebcli_A
 CLI_B := build/ebcli_B
 CLI_C := build/ebcli_C

plugin/dapp/x2Ethereum/cmd/build.sh → plugin/dapp/x2ethereum/cmd/build.sh

@@ -4,8 +4,8 @@ strpwd=$(pwd)
 strcmd=${strpwd##*dapp/}
 strapp=${strcmd%/cmd*}
 
-SRC_EBCLI=github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebcli
-SRC_EBRELAYER=github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer
+SRC_EBCLI=github.com/33cn/plugin/plugin/dapp/x2ethereum/ebcli
+SRC_EBRELAYER=github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer
 OUT_DIR="${1}/$strapp"
 FLAG=$2
 

plugin/dapp/x2Ethereum/commands/commands.go → plugin/dapp/x2ethereum/commands/commands.go

@@ -10,9 +10,9 @@ import (
 	types2 "github.com/33cn/chain33/rpc/types"
 	"github.com/33cn/chain33/system/dapp/commands"
 	"github.com/33cn/chain33/types"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebcli/buildflags"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/utils"
-	types3 "github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebcli/buildflags"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/utils"
+	types3 "github.com/33cn/plugin/plugin/dapp/x2ethereum/types"
 	"github.com/spf13/cobra"
 )
 

plugin/dapp/x2Ethereum/commands/query.go → plugin/dapp/x2ethereum/commands/query.go

@@ -8,8 +8,8 @@ import (
 	"github.com/33cn/chain33/rpc/jsonclient"
 	rpctypes "github.com/33cn/chain33/rpc/types"
 	"github.com/33cn/chain33/types"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/utils"
-	types2 "github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/utils"
+	types2 "github.com/33cn/plugin/plugin/dapp/x2ethereum/types"
 	"github.com/spf13/cobra"
 )
 

plugin/dapp/x2Ethereum/ebcli/chain33RelayerCmd.go → plugin/dapp/x2ethereum/ebcli/chain33RelayerCmd.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/33cn/chain33/rpc/jsonclient"
 	rpctypes "github.com/33cn/chain33/rpc/types"
-	ebTypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/types"
+	ebTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
 	"github.com/spf13/cobra"
 )
 

plugin/dapp/x2Ethereum/ebcli/command.go → plugin/dapp/x2ethereum/ebcli/command.go

@@ -6,7 +6,7 @@ package main
 import (
 	"github.com/33cn/chain33/rpc/jsonclient"
 	rpctypes "github.com/33cn/chain33/rpc/types"
-	relayerTypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/types"
+	relayerTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
 	"github.com/spf13/cobra"
 )
 

plugin/dapp/x2Ethereum/ebcli/ethereumRelayerCmd.go → plugin/dapp/x2ethereum/ebcli/ethereumRelayerCmd.go

@@ -6,9 +6,9 @@ import (
 	"github.com/33cn/chain33/common"
 	"github.com/33cn/chain33/rpc/jsonclient"
 	rpctypes "github.com/33cn/chain33/rpc/types"
-	ebTypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/types"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/utils"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
+	ebTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/utils"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/types"
 	ethTypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/spf13/cobra"
 )

plugin/dapp/x2Ethereum/ebcli/main.go → plugin/dapp/x2ethereum/ebcli/main.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/33cn/chain33/common/log"
 	"github.com/33cn/chain33/pluginmgr"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebcli/buildflags"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebcli/buildflags"
 	"github.com/spf13/cobra"
 )
 

plugin/dapp/x2Ethereum/ebcli/statics.go → plugin/dapp/x2ethereum/ebcli/statics.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/33cn/chain33/rpc/jsonclient"
-	ebTypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/types"
+	ebTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
 	"github.com/spf13/cobra"
 )
 

plugin/dapp/x2Ethereum/ebrelayer/ethcontract/test/bridgeBank_test.go → plugin/dapp/x2ethereum/ebrelayer/ethcontract/test/bridgeBank_test.go

@@ -7,10 +7,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/ethcontract/generated"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/ethcontract/test/setup"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/ethtxs"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/events"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethcontract/generated"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethcontract/test/setup"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethtxs"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/events"
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"

plugin/dapp/x2Ethereum/ebrelayer/ethcontract/test/setup/setupTestEnv.go → plugin/dapp/x2ethereum/ebrelayer/ethcontract/test/setup/setupTestEnv.go

@@ -4,7 +4,7 @@ import (
 	"crypto/ecdsa"
 	"math/big"
 
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/ethtxs"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethtxs"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
 	"github.com/ethereum/go-ethereum/common"

plugin/dapp/x2Ethereum/ebrelayer/ethtxs/abi.go → plugin/dapp/x2ethereum/ebrelayer/ethtxs/abi.go

@@ -3,7 +3,7 @@ package ethtxs
 import (
 	"strings"
 
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/ethcontract/generated"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethcontract/generated"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 )
 

plugin/dapp/x2Ethereum/ebrelayer/ethtxs/auxiliary.go → plugin/dapp/x2ethereum/ebrelayer/ethtxs/auxiliary.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/ethcontract/generated"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/events"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethcontract/generated"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/events"
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"

plugin/dapp/x2Ethereum/ebrelayer/ethtxs/deploy.go → plugin/dapp/x2ethereum/ebrelayer/ethtxs/deploy.go

@@ -12,7 +12,7 @@ import (
 	"github.com/ethereum/go-ethereum/ethclient"
 
 	"github.com/33cn/chain33/common/log/log15"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/ethcontract/generated"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethcontract/generated"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 )

plugin/dapp/x2Ethereum/ebrelayer/ethtxs/parser.go → plugin/dapp/x2ethereum/ebrelayer/ethtxs/parser.go

@@ -15,9 +15,9 @@ import (
 	"strings"
 
 	chain33Types "github.com/33cn/chain33/types"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/events"
-	ebrelayerTypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/types"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/events"
+	ebrelayerTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/types"
 	"github.com/ethereum/go-ethereum/common"
 )
 

plugin/dapp/x2Ethereum/ebrelayer/ethtxs/queryFromEth.go → plugin/dapp/x2ethereum/ebrelayer/ethtxs/queryFromEth.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/ethcontract/generated"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethcontract/generated"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"

plugin/dapp/x2Ethereum/ebrelayer/ethtxs/recover.go → plugin/dapp/x2ethereum/ebrelayer/ethtxs/recover.go

@@ -3,7 +3,7 @@ package ethtxs
 import (
 	"errors"
 
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/ethcontract/generated"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethcontract/generated"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 )

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

@@ -8,8 +8,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 
-	bridgeRegistry "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/ethcontract/generated"
-	ebrelayerTypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/types"
+	bridgeRegistry "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethcontract/generated"
+	ebrelayerTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
 )
 
 // ContractRegistry :

plugin/dapp/x2Ethereum/ebrelayer/ethtxs/relayToChain33.go → plugin/dapp/x2ethereum/ebrelayer/ethtxs/relayToChain33.go

@@ -14,8 +14,8 @@ import (
 	"github.com/33cn/chain33/rpc/jsonclient"
 	rpctypes "github.com/33cn/chain33/rpc/types"
 	chain33Types "github.com/33cn/chain33/types"
-	ebrelayerTypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/types"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
+	ebrelayerTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/types"
 )
 
 // RelayLockToChain33 : RelayLockToChain33 applies validator's signature to an EthBridgeClaim message

plugin/dapp/x2Ethereum/ebrelayer/ethtxs/relayToEthereum.go → plugin/dapp/x2ethereum/ebrelayer/ethtxs/relayToEthereum.go

@@ -6,8 +6,8 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 
 	"github.com/33cn/chain33/common/log/log15"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/ethcontract/generated"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/events"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethcontract/generated"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/events"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 )

plugin/dapp/x2Ethereum/ebrelayer/ethtxs/types.go → plugin/dapp/x2ethereum/ebrelayer/ethtxs/types.go

@@ -3,7 +3,7 @@ package ethtxs
 import (
 	"math/big"
 
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/events"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/events"
 	"github.com/ethereum/go-ethereum/common"
 )
 

plugin/dapp/x2Ethereum/ebrelayer/ethtxs/utils.go → plugin/dapp/x2ethereum/ebrelayer/ethtxs/utils.go

@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	ebrelayerTypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/types"
+	ebrelayerTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"

plugin/dapp/x2Ethereum/ebrelayer/events/ethereumEvent.go → plugin/dapp/x2ethereum/ebrelayer/events/ethereumEvent.go

@@ -8,7 +8,7 @@ package events
 import (
 	"math/big"
 
-	ebrelayerTypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/types"
+	ebrelayerTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 )

plugin/dapp/x2Ethereum/ebrelayer/main.go → plugin/dapp/x2ethereum/ebrelayer/main.go

@@ -19,10 +19,10 @@ import (
 	logf "github.com/33cn/chain33/common/log"
 	"github.com/33cn/chain33/common/log/log15"
 	chain33Types "github.com/33cn/chain33/types"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/relayer"
-	chain33Relayer "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/relayer/chain33"
-	ethRelayer "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/relayer/ethereum"
-	relayerTypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/types"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/relayer"
+	chain33Relayer "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/relayer/chain33"
+	ethRelayer "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/relayer/ethereum"
+	relayerTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
 	tml "github.com/BurntSushi/toml"
 	"github.com/btcsuite/btcd/limits"
 	"github.com/prometheus/common/log"

plugin/dapp/x2Ethereum/ebrelayer/relayer/chain33/account.go → plugin/dapp/x2ethereum/ebrelayer/relayer/chain33/account.go

@@ -7,7 +7,7 @@ import (
 	//dbm "github.com/33cn/chain33/common/db"
 	chain33Types "github.com/33cn/chain33/types"
 	wcom "github.com/33cn/chain33/wallet/common"
-	x2ethTypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/types"
+	x2ethTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
 )
 
 var (

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

@@ -19,13 +19,13 @@ import (
 	"github.com/33cn/chain33/rpc/jsonclient"
 	rpctypes "github.com/33cn/chain33/rpc/types"
 	chain33Types "github.com/33cn/chain33/types"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/ethcontract/generated"
-	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"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/utils"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethcontract/generated"
+	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"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/utils"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/types"
 	ethCommon "github.com/ethereum/go-ethereum/common"
 )
 

plugin/dapp/x2Ethereum/ebrelayer/relayer/chain33/store.go → plugin/dapp/x2ethereum/ebrelayer/relayer/chain33/store.go

@@ -5,8 +5,8 @@ import (
 	"sync/atomic"
 
 	"github.com/33cn/chain33/types"
-	ebTypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/types"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/utils"
+	ebTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/utils"
 	"github.com/ethereum/go-ethereum/common"
 )
 

plugin/dapp/x2Ethereum/ebrelayer/relayer/chain33/transceiver/sync/proc.go → plugin/dapp/x2ethereum/ebrelayer/relayer/chain33/transceiver/sync/proc.go

@@ -7,7 +7,7 @@ import (
 
 	dbm "github.com/33cn/chain33/common/db"
 	"github.com/33cn/chain33/types"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/utils"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/utils"
 	"github.com/pkg/errors"
 )
 

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

@@ -14,9 +14,9 @@ import (
 	dbm "github.com/33cn/chain33/common/db"
 	l "github.com/33cn/chain33/common/log/log15"
 	"github.com/33cn/chain33/rpc/jsonclient"
-	rpctypes "github.com/33cn/chain33/rpc/types"
 	"github.com/33cn/chain33/types"
-	relayerTypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/types"
+	"github.com/33cn/chain33/blockchain"
+	relayerTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
 	"github.com/rs/cors"
 )
 
@@ -120,17 +120,20 @@ func checkClient(addr string, expectClient string) bool {
 //首次注册功能，如果没有进行过注册，则进行首次注册
 //如果已经注册，则继续推送
 func bindOrResumePush(cfg *relayerTypes.SyncTxReceiptConfig) {
-	params := types.SubscribeTxReceipt{
+	contract := make(map[string]bool)
+	contract["x2ethereum"] = true
+	params := types.PushSubscribeReq{
 		Name:          cfg.PushName,
 		URL:           cfg.PushHost,
 		Encode:        "proto",
 		LastSequence:  cfg.StartSyncSequence,
 		LastHeight:    cfg.StartSyncHeight,
 		LastBlockHash: cfg.StartSyncHash,
-		Contract:      "x2ethereum",
+		Type:          blockchain.PushTxReceipt,
+		Contract:      contract,
 	}
-	var res rpctypes.Reply
-	ctx := jsonclient.NewRPCCtx(cfg.Chain33Host, "Chain33.AddSubscribeTxReceipt", params, &res)
+	var res types.ReplySubscribePush
+	ctx := jsonclient.NewRPCCtx(cfg.Chain33Host, "Chain33.AddPushSubscribe", params, &res)
 	_, err := ctx.RunResult()
 	if err != nil {
 		fmt.Println("Failed to AddSubscribeTxReceipt to  rpc addr:", cfg.Chain33Host, "ReplySubTxReceipt", res)
@@ -138,7 +141,7 @@ func bindOrResumePush(cfg *relayerTypes.SyncTxReceiptConfig) {
 	}
 	if !res.IsOk {
 		fmt.Println("Failed to AddSubscribeTxReceipt to  rpc addr:", cfg.Chain33Host, "ReplySubTxReceipt", res)
-		panic("bindOrResumePush client failed due to:" + res.Msg)
+		panic("bindOrResumePush client failed due to:" + string(res.Msg))
 	}
 	log.Info("bindOrResumePush", "Succeed to AddSubscribeTxReceipt for rpc address:", cfg.Chain33Host)
 	fmt.Println("Succeed to AddSubscribeTxReceipt")

plugin/dapp/x2Ethereum/ebrelayer/relayer/ethereum/account.go → plugin/dapp/x2ethereum/ebrelayer/relayer/ethereum/account.go

@@ -13,7 +13,7 @@ import (
 	"github.com/33cn/chain33/system/crypto/secp256k1"
 	chain33Types "github.com/33cn/chain33/types"
 	wcom "github.com/33cn/chain33/wallet/common"
-	x2ethTypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/types"
+	x2ethTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/math"
 	"github.com/ethereum/go-ethereum/crypto"

plugin/dapp/x2Ethereum/ebrelayer/relayer/ethereum/ethereum.go → plugin/dapp/x2ethereum/ebrelayer/relayer/ethereum/ethereum.go

@@ -19,8 +19,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/ethcontract/generated"
-	x2ethTypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethcontract/generated"
+	x2ethTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/types"
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/crypto"
@@ -33,9 +33,9 @@ import (
 	chain33Crypto "github.com/33cn/chain33/common/crypto"
 	dbm "github.com/33cn/chain33/common/db"
 	log "github.com/33cn/chain33/common/log/log15"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/ethtxs"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/events"
-	ebTypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/types"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethtxs"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/events"
+	ebTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
 )
 
 type Relayer4Ethereum struct {

plugin/dapp/x2Ethereum/ebrelayer/relayer/ethereum/store.go → plugin/dapp/x2ethereum/ebrelayer/relayer/ethereum/store.go

@@ -7,8 +7,8 @@ import (
 
 	dbm "github.com/33cn/chain33/common/db"
 	chain33Types "github.com/33cn/chain33/types"
-	ebTypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/types"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/utils"
+	ebTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/utils"
 	"github.com/ethereum/go-ethereum/core/types"
 )
 

plugin/dapp/x2Ethereum/ebrelayer/relayer/manager.go → plugin/dapp/x2ethereum/ebrelayer/relayer/manager.go

@@ -12,12 +12,12 @@ import (
 	"github.com/33cn/chain33/common/log/log15"
 	rpctypes "github.com/33cn/chain33/rpc/types"
 	chain33Types "github.com/33cn/chain33/types"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/ethtxs"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/relayer/chain33"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/relayer/ethereum"
-	relayerTypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/types"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/ebrelayer/utils"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/ethtxs"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/relayer/chain33"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/relayer/ethereum"
+	relayerTypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/types"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/ebrelayer/utils"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/types"
 	"github.com/ethereum/go-ethereum/common"
 	lru "github.com/hashicorp/golang-lru"
 )

plugin/dapp/x2Ethereum/executor/exec.go → plugin/dapp/x2ethereum/executor/exec.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/33cn/chain33/common/address"
 	"github.com/33cn/chain33/types"
-	x2eTy "github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
+	x2eTy "github.com/33cn/plugin/plugin/dapp/x2ethereum/types"
 )
 
 /*

plugin/dapp/x2Ethereum/executor/exec_local.go → plugin/dapp/x2ethereum/executor/exec_local.go

@@ -4,7 +4,7 @@ import (
 	"strconv"
 
 	"github.com/33cn/chain33/types"
-	x2eTy "github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
+	x2eTy "github.com/33cn/plugin/plugin/dapp/x2ethereum/types"
 )
 
 /*

plugin/dapp/x2Ethereum/executor/exec_test.go → plugin/dapp/x2ethereum/executor/exec_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/33cn/chain33/types"
 	chain33types "github.com/33cn/chain33/types"
 	"github.com/33cn/chain33/util"
-	types2 "github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
+	types2 "github.com/33cn/plugin/plugin/dapp/x2ethereum/types"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
 )

plugin/dapp/x2Ethereum/executor/prophecy.go → plugin/dapp/x2ethereum/executor/prophecy.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 
 	"github.com/33cn/chain33/types"
-	x2eTy "github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
+	x2eTy "github.com/33cn/plugin/plugin/dapp/x2ethereum/types"
 )
 
 func NewProphecy(id string) *x2eTy.ReceiptEthProphecy {

plugin/dapp/x2Ethereum/executor/query.go → plugin/dapp/x2ethereum/executor/query.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/33cn/chain33/account"
 	"github.com/33cn/chain33/types"
-	x2eTy "github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
+	x2eTy "github.com/33cn/plugin/plugin/dapp/x2ethereum/types"
 )
 
 func (x *x2ethereum) Query_GetEthProphecy(in *x2eTy.QueryEthProphecyParams) (types.Message, error) {

plugin/dapp/x2Ethereum/executor/x2ethereum.go → plugin/dapp/x2ethereum/executor/x2ethereum.go

@@ -4,7 +4,7 @@ import (
 	log "github.com/33cn/chain33/common/log/log15"
 	drivers "github.com/33cn/chain33/system/dapp"
 	"github.com/33cn/chain33/types"
-	x2eTy "github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
+	x2eTy "github.com/33cn/plugin/plugin/dapp/x2ethereum/types"
 )
 
 /*

plugin/dapp/x2Ethereum/executor/x2ethereumaction.go → plugin/dapp/x2ethereum/executor/x2ethereumaction.go

@@ -9,7 +9,7 @@ import (
 	"github.com/33cn/chain33/common/address"
 	dbm "github.com/33cn/chain33/common/db"
 	"github.com/33cn/chain33/types"
-	x2eTy "github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
+	x2eTy "github.com/33cn/plugin/plugin/dapp/x2ethereum/types"
 	"github.com/pkg/errors"
 )
 

plugin/dapp/x2Ethereum/executor/x2ethereumdb.go → plugin/dapp/x2ethereum/executor/x2ethereumdb.go

@@ -8,7 +8,7 @@ import (
 	"github.com/33cn/chain33/common/address"
 	dbm "github.com/33cn/chain33/common/db"
 	"github.com/33cn/chain33/types"
-	x2eTy "github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
+	x2eTy "github.com/33cn/plugin/plugin/dapp/x2ethereum/types"
 )
 
 type Oracle struct {

plugin/dapp/x2Ethereum/plugin.go → plugin/dapp/x2ethereum/plugin.go

@@ -2,10 +2,10 @@ package x2ethereum
 
 import (
 	"github.com/33cn/chain33/pluginmgr"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/commands"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/executor"
-	"github.com/33cn/plugin/plugin/dapp/x2Ethereum/rpc"
-	x2ethereumtypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/commands"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/executor"
+	"github.com/33cn/plugin/plugin/dapp/x2ethereum/rpc"
+	x2ethereumtypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/types"
 )
 
 /*

plugin/dapp/x2Ethereum/rpc/types.go → plugin/dapp/x2ethereum/rpc/types.go

@@ -2,7 +2,7 @@ package rpc
 
 import (
 	rpctypes "github.com/33cn/chain33/rpc/types"
-	x2ethereumtypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
+	x2ethereumtypes "github.com/33cn/plugin/plugin/dapp/x2ethereum/types"
 )
 
 /*