update plugin path

consensus/init/init.go

 package init
 
 import (
-	_ "gitlab.33.cn/chain33/chain33/plugin/consensus/para"
-	_ "gitlab.33.cn/chain33/chain33/plugin/consensus/pbft"
-	_ "gitlab.33.cn/chain33/chain33/plugin/consensus/raft"
-	_ "gitlab.33.cn/chain33/chain33/plugin/consensus/tendermint"
-	_ "gitlab.33.cn/chain33/chain33/plugin/consensus/ticket"
+	_ "gitlab.33.cn/chain33/plugin/consensus/para"
+	_ "gitlab.33.cn/chain33/plugin/consensus/pbft"
+	_ "gitlab.33.cn/chain33/plugin/consensus/raft"
+	_ "gitlab.33.cn/chain33/plugin/consensus/tendermint"
+	_ "gitlab.33.cn/chain33/plugin/consensus/ticket"
 )

consensus/para/para.go

@@ -15,8 +15,8 @@ import (
 	"gitlab.33.cn/chain33/chain33/common"
 	"gitlab.33.cn/chain33/chain33/common/crypto"
 	"gitlab.33.cn/chain33/chain33/common/merkle"
-	paracross "gitlab.33.cn/chain33/chain33/plugin/dapp/paracross/types"
-	pt "gitlab.33.cn/chain33/chain33/plugin/dapp/paracross/types"
+	paracross "gitlab.33.cn/chain33/plugin/dapp/paracross/types"
+	pt "gitlab.33.cn/chain33/plugin/dapp/paracross/types"
 	"gitlab.33.cn/chain33/chain33/queue"
 	drivers "gitlab.33.cn/chain33/chain33/system/consensus"
 	cty "gitlab.33.cn/chain33/chain33/system/dapp/coins/types"

consensus/para/para_test.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"gitlab.33.cn/chain33/chain33/common/address"
-	pt "gitlab.33.cn/chain33/chain33/plugin/dapp/paracross/types"
+	pt "gitlab.33.cn/chain33/plugin/dapp/paracross/types"
 )
 
 var (

consensus/para/paracommitmsg.go

@@ -8,8 +8,8 @@ import (
 	"github.com/pkg/errors"
 	"gitlab.33.cn/chain33/chain33/common"
 	"gitlab.33.cn/chain33/chain33/common/crypto"
-	paracross "gitlab.33.cn/chain33/chain33/plugin/dapp/paracross/types"
-	pt "gitlab.33.cn/chain33/chain33/plugin/dapp/paracross/types"
+	paracross "gitlab.33.cn/chain33/plugin/dapp/paracross/types"
+	pt "gitlab.33.cn/chain33/plugin/dapp/paracross/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

consensus/para/paracommitmsg_test.go

@@ -14,10 +14,10 @@ import (
 	"gitlab.33.cn/chain33/chain33/mempool"
 	"gitlab.33.cn/chain33/chain33/p2p"
 
-	//_ "gitlab.33.cn/chain33/chain33/plugin/dapp/paracross"
-	pp "gitlab.33.cn/chain33/chain33/plugin/dapp/paracross/executor"
-	//"gitlab.33.cn/chain33/chain33/plugin/dapp/paracross/rpc"
-	pt "gitlab.33.cn/chain33/chain33/plugin/dapp/paracross/types"
+	//_ "gitlab.33.cn/chain33/plugin/dapp/paracross"
+	pp "gitlab.33.cn/chain33/plugin/dapp/paracross/executor"
+	//"gitlab.33.cn/chain33/plugin/dapp/paracross/rpc"
+	pt "gitlab.33.cn/chain33/plugin/dapp/paracross/types"
 	"gitlab.33.cn/chain33/chain33/queue"
 	"gitlab.33.cn/chain33/chain33/store"
 	_ "gitlab.33.cn/chain33/chain33/system"

consensus/pbft/pbft_test.go

@@ -23,8 +23,8 @@ import (
 	"gitlab.33.cn/chain33/chain33/types"
 	"gitlab.33.cn/chain33/chain33/wallet"
 
-	_ "gitlab.33.cn/chain33/chain33/plugin/dapp/init"
-	_ "gitlab.33.cn/chain33/chain33/plugin/store/init"
+	_ "gitlab.33.cn/chain33/plugin/dapp/init"
+	_ "gitlab.33.cn/chain33/plugin/store/init"
 	_ "gitlab.33.cn/chain33/chain33/system"
 )
 

consensus/raft/raft_test.go

@@ -22,9 +22,9 @@ import (
 	"gitlab.33.cn/chain33/chain33/store"
 	"gitlab.33.cn/chain33/chain33/types"
 
-	_ "gitlab.33.cn/chain33/chain33/plugin/dapp/init"
-	pty "gitlab.33.cn/chain33/chain33/plugin/dapp/norm/types"
-	_ "gitlab.33.cn/chain33/chain33/plugin/store/init"
+	_ "gitlab.33.cn/chain33/plugin/dapp/init"
+	pty "gitlab.33.cn/chain33/plugin/dapp/norm/types"
+	_ "gitlab.33.cn/chain33/plugin/store/init"
 	_ "gitlab.33.cn/chain33/chain33/system"
 )
 

consensus/raft/tools/raftPerf.go

@@ -18,7 +18,7 @@ import (
 	"gitlab.33.cn/chain33/chain33/common/address"
 	"gitlab.33.cn/chain33/chain33/common/crypto"
 	rlog "gitlab.33.cn/chain33/chain33/common/log"
-	pty "gitlab.33.cn/chain33/chain33/plugin/dapp/norm/types"
+	pty "gitlab.33.cn/chain33/plugin/dapp/norm/types"
 	"gitlab.33.cn/chain33/chain33/types"
 	"google.golang.org/grpc"
 )

consensus/tendermint/consensus_state.go

@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"gitlab.33.cn/chain33/chain33/common/merkle"
-	ttypes "gitlab.33.cn/chain33/chain33/plugin/consensus/tendermint/types"
-	tmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/valnode/types"
+	ttypes "gitlab.33.cn/chain33/plugin/consensus/tendermint/types"
+	tmtypes "gitlab.33.cn/chain33/plugin/dapp/valnode/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

consensus/tendermint/evidence.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/pkg/errors"
 	dbm "gitlab.33.cn/chain33/chain33/common/db"
-	ttypes "gitlab.33.cn/chain33/chain33/plugin/consensus/tendermint/types"
-	tmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/valnode/types"
+	ttypes "gitlab.33.cn/chain33/plugin/consensus/tendermint/types"
+	tmtypes "gitlab.33.cn/chain33/plugin/dapp/valnode/types"
 )
 
 /*

consensus/tendermint/execution.go

@@ -5,8 +5,8 @@ import (
 	"errors"
 	"fmt"
 
-	ttypes "gitlab.33.cn/chain33/chain33/plugin/consensus/tendermint/types"
-	tmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/valnode/types"
+	ttypes "gitlab.33.cn/chain33/plugin/consensus/tendermint/types"
+	tmtypes "gitlab.33.cn/chain33/plugin/dapp/valnode/types"
 )
 
 //-----------------------------------------------------------------------------

consensus/tendermint/node.go

@@ -13,8 +13,8 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"gitlab.33.cn/chain33/chain33/common/crypto"
-	ttypes "gitlab.33.cn/chain33/chain33/plugin/consensus/tendermint/types"
-	tmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/valnode/types"
+	ttypes "gitlab.33.cn/chain33/plugin/consensus/tendermint/types"
+	tmtypes "gitlab.33.cn/chain33/plugin/dapp/valnode/types"
 )
 
 const (

consensus/tendermint/peer_set.go

@@ -16,8 +16,8 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
-	ttypes "gitlab.33.cn/chain33/chain33/plugin/consensus/tendermint/types"
-	tmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/valnode/types"
+	ttypes "gitlab.33.cn/chain33/plugin/consensus/tendermint/types"
+	tmtypes "gitlab.33.cn/chain33/plugin/dapp/valnode/types"
 )
 
 // ID is a hex-encoded crypto.Address

consensus/tendermint/secret_connection.go

@@ -17,7 +17,7 @@ import (
 	"time"
 
 	"gitlab.33.cn/chain33/chain33/common/crypto"
-	"gitlab.33.cn/chain33/chain33/plugin/consensus/tendermint/types"
+	"gitlab.33.cn/chain33/plugin/consensus/tendermint/types"
 	"golang.org/x/crypto/nacl/box"
 	"golang.org/x/crypto/nacl/secretbox"
 	"golang.org/x/crypto/ripemd160"

consensus/tendermint/state.go

@@ -13,8 +13,8 @@ import (
 	"gitlab.33.cn/chain33/chain33/common"
 	"gitlab.33.cn/chain33/chain33/common/address"
 	"gitlab.33.cn/chain33/chain33/common/crypto"
-	ttypes "gitlab.33.cn/chain33/chain33/plugin/consensus/tendermint/types"
-	tmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/valnode/types"
+	ttypes "gitlab.33.cn/chain33/plugin/consensus/tendermint/types"
+	tmtypes "gitlab.33.cn/chain33/plugin/dapp/valnode/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

consensus/tendermint/tendermint.go

@@ -9,8 +9,8 @@ import (
 	"gitlab.33.cn/chain33/chain33/common/crypto"
 	dbm "gitlab.33.cn/chain33/chain33/common/db"
 	"gitlab.33.cn/chain33/chain33/common/merkle"
-	ttypes "gitlab.33.cn/chain33/chain33/plugin/consensus/tendermint/types"
-	tmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/valnode/types"
+	ttypes "gitlab.33.cn/chain33/plugin/consensus/tendermint/types"
+	tmtypes "gitlab.33.cn/chain33/plugin/dapp/valnode/types"
 	"gitlab.33.cn/chain33/chain33/queue"
 	drivers "gitlab.33.cn/chain33/chain33/system/consensus"
 	cty "gitlab.33.cn/chain33/chain33/system/dapp/coins/types"

consensus/tendermint/tendermint_test.go

@@ -18,15 +18,15 @@ import (
 	"gitlab.33.cn/chain33/chain33/executor"
 	"gitlab.33.cn/chain33/chain33/mempool"
 	"gitlab.33.cn/chain33/chain33/p2p"
-	pty "gitlab.33.cn/chain33/chain33/plugin/dapp/norm/types"
+	pty "gitlab.33.cn/chain33/plugin/dapp/norm/types"
 	"gitlab.33.cn/chain33/chain33/queue"
 	"gitlab.33.cn/chain33/chain33/rpc"
 	"gitlab.33.cn/chain33/chain33/store"
 	"gitlab.33.cn/chain33/chain33/types"
 	"google.golang.org/grpc"
 
-	_ "gitlab.33.cn/chain33/chain33/plugin/dapp/init"
-	_ "gitlab.33.cn/chain33/chain33/plugin/store/init"
+	_ "gitlab.33.cn/chain33/plugin/dapp/init"
+	_ "gitlab.33.cn/chain33/plugin/store/init"
 	_ "gitlab.33.cn/chain33/chain33/system"
 )
 

consensus/tendermint/tools/nonePerf.go

@@ -16,7 +16,7 @@ import (
 	"gitlab.33.cn/chain33/chain33/common"
 	"gitlab.33.cn/chain33/chain33/common/address"
 	"gitlab.33.cn/chain33/chain33/common/crypto"
-	ty "gitlab.33.cn/chain33/chain33/plugin/dapp/valnode/types"
+	ty "gitlab.33.cn/chain33/plugin/dapp/valnode/types"
 	rpctypes "gitlab.33.cn/chain33/chain33/rpc/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )

consensus/tendermint/types/block.go

@@ -12,7 +12,7 @@ import (
 	"github.com/inconshreveable/log15"
 	"gitlab.33.cn/chain33/chain33/common/crypto"
 	"gitlab.33.cn/chain33/chain33/common/merkle"
-	tmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/valnode/types"
+	tmtypes "gitlab.33.cn/chain33/plugin/dapp/valnode/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

consensus/tendermint/types/evidence.go

@@ -10,7 +10,7 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"gitlab.33.cn/chain33/chain33/common/crypto"
 	"gitlab.33.cn/chain33/chain33/common/merkle"
-	tmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/valnode/types"
+	tmtypes "gitlab.33.cn/chain33/plugin/dapp/valnode/types"
 )
 
 // ErrEvidenceInvalid wraps a piece of evidence and the error denoting how or why it is invalid.

consensus/tendermint/types/height_vote_set.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"sync"
 
-	tmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/valnode/types"
+	tmtypes "gitlab.33.cn/chain33/plugin/dapp/valnode/types"
 )
 
 type RoundVoteSet struct {

consensus/tendermint/types/round_state.go

@@ -5,7 +5,7 @@ import (
 
 	"reflect"
 
-	tmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/valnode/types"
+	tmtypes "gitlab.33.cn/chain33/plugin/dapp/valnode/types"
 )
 
 //-----------------------------------------------------------------------------

consensus/tendermint/types/signable.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/inconshreveable/log15"
 	"gitlab.33.cn/chain33/chain33/common/crypto"
-	tmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/valnode/types"
+	tmtypes "gitlab.33.cn/chain33/plugin/dapp/valnode/types"
 )
 
 var (

consensus/tendermint/types/util.go

@@ -14,7 +14,7 @@ import (
 	"syscall"
 	"time"
 
-	tmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/valnode/types"
+	tmtypes "gitlab.33.cn/chain33/plugin/dapp/valnode/types"
 )
 
 const (

consensus/tendermint/types/vote_set.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	"github.com/pkg/errors"
-	tmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/valnode/types"
+	tmtypes "gitlab.33.cn/chain33/plugin/dapp/valnode/types"
 )
 
 /*

consensus/ticket/ticket.go

@@ -14,7 +14,7 @@ import (
 	"gitlab.33.cn/chain33/chain33/common/address"
 	"gitlab.33.cn/chain33/chain33/common/crypto"
 	"gitlab.33.cn/chain33/chain33/common/difficulty"
-	ty "gitlab.33.cn/chain33/chain33/plugin/dapp/ticket/types"
+	ty "gitlab.33.cn/chain33/plugin/dapp/ticket/types"
 	"gitlab.33.cn/chain33/chain33/queue"
 	drivers "gitlab.33.cn/chain33/chain33/system/consensus"
 	driver "gitlab.33.cn/chain33/chain33/system/dapp"

consensus/ticket/ticket_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	_ "gitlab.33.cn/chain33/chain33/plugin/dapp/init"
-	_ "gitlab.33.cn/chain33/chain33/plugin/store/init"
+	_ "gitlab.33.cn/chain33/plugin/dapp/init"
+	_ "gitlab.33.cn/chain33/plugin/store/init"
 	_ "gitlab.33.cn/chain33/chain33/system"
 	"gitlab.33.cn/chain33/chain33/util/testnode"
 )

crypto/init/init.go

@@ -4,6 +4,6 @@ package init
 //为了安全考虑，默认情况下，我们希望只定义合约内部的签名，系统级别的签名对所有的合约都有效
 
 import (
-	_ "gitlab.33.cn/chain33/chain33/plugin/crypto/ecdsa"
-	_ "gitlab.33.cn/chain33/chain33/plugin/crypto/sm2"
+	_ "gitlab.33.cn/chain33/plugin/crypto/ecdsa"
+	_ "gitlab.33.cn/chain33/plugin/crypto/sm2"
 )

dapp/blackwhite/commands/blackwhite.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"gitlab.33.cn/chain33/chain33/common"
-	gt "gitlab.33.cn/chain33/chain33/plugin/dapp/blackwhite/types"
+	gt "gitlab.33.cn/chain33/plugin/dapp/blackwhite/types"
 	jsonrpc "gitlab.33.cn/chain33/chain33/rpc/jsonclient"
 	"gitlab.33.cn/chain33/chain33/types"
 )

dapp/blackwhite/executor/action.go

@@ -9,7 +9,7 @@ import (
 	"gitlab.33.cn/chain33/chain33/account"
 	"gitlab.33.cn/chain33/chain33/common"
 	dbm "gitlab.33.cn/chain33/chain33/common/db"
-	gt "gitlab.33.cn/chain33/chain33/plugin/dapp/blackwhite/types"
+	gt "gitlab.33.cn/chain33/plugin/dapp/blackwhite/types"
 	"gitlab.33.cn/chain33/chain33/system/dapp"
 	"gitlab.33.cn/chain33/chain33/types"
 )

dapp/blackwhite/executor/action_test.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"gitlab.33.cn/chain33/chain33/common"
-	gt "gitlab.33.cn/chain33/chain33/plugin/dapp/blackwhite/types"
+	gt "gitlab.33.cn/chain33/plugin/dapp/blackwhite/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/blackwhite/executor/blackwhite.go

@@ -5,7 +5,7 @@ import (
 
 	log "github.com/inconshreveable/log15"
 	"gitlab.33.cn/chain33/chain33/common/address"
-	gt "gitlab.33.cn/chain33/chain33/plugin/dapp/blackwhite/types"
+	gt "gitlab.33.cn/chain33/plugin/dapp/blackwhite/types"
 	drivers "gitlab.33.cn/chain33/chain33/system/dapp"
 	"gitlab.33.cn/chain33/chain33/types"
 )

dapp/blackwhite/executor/db.go

@@ -3,7 +3,7 @@ package executor
 import (
 	"fmt"
 
-	gt "gitlab.33.cn/chain33/chain33/plugin/dapp/blackwhite/types"
+	gt "gitlab.33.cn/chain33/plugin/dapp/blackwhite/types"
 )
 
 var (

dapp/blackwhite/executor/exec.go

 package executor
 
 import (
-	gt "gitlab.33.cn/chain33/chain33/plugin/dapp/blackwhite/types"
+	gt "gitlab.33.cn/chain33/plugin/dapp/blackwhite/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/blackwhite/executor/exec_del_local.go

 package executor
 
 import (
-	gt "gitlab.33.cn/chain33/chain33/plugin/dapp/blackwhite/types"
+	gt "gitlab.33.cn/chain33/plugin/dapp/blackwhite/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/blackwhite/executor/exec_local.go

 package executor
 
 import (
-	gt "gitlab.33.cn/chain33/chain33/plugin/dapp/blackwhite/types"
+	gt "gitlab.33.cn/chain33/plugin/dapp/blackwhite/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/blackwhite/executor/query.go

 package executor
 
 import (
-	gt "gitlab.33.cn/chain33/chain33/plugin/dapp/blackwhite/types"
+	gt "gitlab.33.cn/chain33/plugin/dapp/blackwhite/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/blackwhite/plugin.go

 package blackwhite
 
 import (
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/blackwhite/commands"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/blackwhite/executor"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/blackwhite/rpc"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/blackwhite/types"
-	"gitlab.33.cn/chain33/chain33/pluginmgr"
+	"gitlab.33.cn/chain33/plugin/dapp/blackwhite/commands"
+	"gitlab.33.cn/chain33/plugin/dapp/blackwhite/executor"
+	"gitlab.33.cn/chain33/plugin/dapp/blackwhite/rpc"
+	"gitlab.33.cn/chain33/plugin/dapp/blackwhite/types"
+	"gitlab.33.cn/chain33/pluginmgr"
 )
 
 func init() {

dapp/blackwhite/rpc/jrpc.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/hex"
 
-	bw "gitlab.33.cn/chain33/chain33/plugin/dapp/blackwhite/types"
+	bw "gitlab.33.cn/chain33/plugin/dapp/blackwhite/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/blackwhite/rpc/jrpc_channel_test.go

@@ -6,12 +6,12 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	commonlog "gitlab.33.cn/chain33/chain33/common/log"
-	pty "gitlab.33.cn/chain33/chain33/plugin/dapp/blackwhite/types"
+	pty "gitlab.33.cn/chain33/plugin/dapp/blackwhite/types"
 	"gitlab.33.cn/chain33/chain33/rpc/jsonclient"
 	"gitlab.33.cn/chain33/chain33/types"
 	"gitlab.33.cn/chain33/chain33/util/testnode"
 
-	_ "gitlab.33.cn/chain33/chain33/plugin"
+	_ "gitlab.33.cn/chain33/plugin"
 	_ "gitlab.33.cn/chain33/chain33/system"
 )
 

dapp/blackwhite/rpc/rpc.go

@@ -3,7 +3,7 @@ package rpc
 import (
 	context "golang.org/x/net/context"
 
-	bw "gitlab.33.cn/chain33/chain33/plugin/dapp/blackwhite/types"
+	bw "gitlab.33.cn/chain33/plugin/dapp/blackwhite/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/blackwhite/rpc/type.go

@@ -4,7 +4,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 
-	bw "gitlab.33.cn/chain33/chain33/plugin/dapp/blackwhite/types"
+	bw "gitlab.33.cn/chain33/plugin/dapp/blackwhite/types"
 	rpctypes "gitlab.33.cn/chain33/chain33/rpc/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )

dapp/cert/authority/authority.go

@@ -11,9 +11,9 @@ import (
 
 	log "github.com/inconshreveable/log15"
 	"gitlab.33.cn/chain33/chain33/common/crypto"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority/core"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority/utils"
-	ty "gitlab.33.cn/chain33/chain33/plugin/dapp/cert/types"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority/core"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority/utils"
+	ty "gitlab.33.cn/chain33/plugin/dapp/cert/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/cert/authority/authority_test.go

@@ -8,14 +8,14 @@ import (
 	"gitlab.33.cn/chain33/chain33/common"
 	"gitlab.33.cn/chain33/chain33/common/address"
 	"gitlab.33.cn/chain33/chain33/common/crypto"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority/utils"
-	ct "gitlab.33.cn/chain33/chain33/plugin/dapp/cert/types"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority/utils"
+	ct "gitlab.33.cn/chain33/plugin/dapp/cert/types"
 	drivers "gitlab.33.cn/chain33/chain33/system/dapp"
 	cty "gitlab.33.cn/chain33/chain33/system/dapp/coins/types"
 	"gitlab.33.cn/chain33/chain33/types"
 
-	_ "gitlab.33.cn/chain33/chain33/plugin"
+	_ "gitlab.33.cn/chain33/plugin"
 	_ "gitlab.33.cn/chain33/chain33/system"
 )
 

dapp/cert/authority/core/cert.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/tjfoc/gmsm/sm2"
-	ecdsa_util "gitlab.33.cn/chain33/chain33/plugin/crypto/ecdsa"
+	ecdsa_util "gitlab.33.cn/chain33/plugin/crypto/ecdsa"
 )
 
 type validity struct {

dapp/cert/authority/core/configbuilder.go

@@ -7,7 +7,7 @@ import (
 
 	"os"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority/utils"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority/utils"
 )
 
 func getPemMaterialFromDir(dir string) ([][]byte, error) {

dapp/cert/authority/core/ecdsaimpl.go

@@ -15,8 +15,8 @@ import (
 	"crypto/ecdsa"
 
 	log "github.com/inconshreveable/log15"
-	ecdsa_util "gitlab.33.cn/chain33/chain33/plugin/crypto/ecdsa"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority/utils"
+	ecdsa_util "gitlab.33.cn/chain33/plugin/crypto/ecdsa"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority/utils"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/cert/authority/core/factory.go

@@ -3,7 +3,7 @@ package core
 import (
 	"errors"
 
-	ty "gitlab.33.cn/chain33/chain33/plugin/dapp/cert/types"
+	ty "gitlab.33.cn/chain33/plugin/dapp/cert/types"
 )
 
 func GetLocalValidator(authConfig *AuthConfig, signType int) (Validator, error) {

dapp/cert/authority/core/gmimpl.go

@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/tjfoc/gmsm/sm2"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority/utils"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority/utils"
 	sm2_util "gitlab.33.cn/chain33/chain33/system/crypto/sm2"
 	"gitlab.33.cn/chain33/chain33/types"
 )

dapp/cert/authority/tools/cryptogen/cryptogen.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/BurntSushi/toml"
 	"github.com/spf13/cobra"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority/tools/cryptogen/generator"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority/tools/cryptogen/generator/impl"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority/tools/cryptogen/generator"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority/tools/cryptogen/generator/impl"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/cert/authority/tools/cryptogen/factory/csp/ecdsa.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"math/big"
 
-	auth "gitlab.33.cn/chain33/chain33/plugin/crypto/ecdsa"
+	auth "gitlab.33.cn/chain33/plugin/crypto/ecdsa"
 )
 
 type ecdsaSigner struct{}

dapp/cert/authority/tools/cryptogen/factory/csp/fileks.go

@@ -12,8 +12,8 @@ import (
 	"path/filepath"
 
 	log "github.com/inconshreveable/log15"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority/tools/cryptogen/factory/utils"
-	auth "gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority/utils"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority/tools/cryptogen/factory/utils"
+	auth "gitlab.33.cn/chain33/plugin/dapp/cert/authority/utils"
 )
 
 var logger = log.New("tools", "cryptogen")

dapp/cert/authority/tools/cryptogen/factory/signer/signer.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"io"
 
-	lccsp "gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority/tools/cryptogen/factory/csp"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority/tools/cryptogen/factory/utils"
+	lccsp "gitlab.33.cn/chain33/plugin/dapp/cert/authority/tools/cryptogen/factory/csp"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority/tools/cryptogen/factory/utils"
 )
 
 type cspCryptoSigner struct {

dapp/cert/authority/tools/cryptogen/generator/impl/generatorimpl.go

@@ -15,10 +15,10 @@ import (
 	"fmt"
 
 	"github.com/tjfoc/gmsm/sm2"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority/tools/cryptogen/factory/csp"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority/tools/cryptogen/generator"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority/tools/cryptogen/generator/utils"
-	ty "gitlab.33.cn/chain33/chain33/plugin/dapp/cert/types"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority/tools/cryptogen/factory/csp"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority/tools/cryptogen/generator"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority/tools/cryptogen/generator/utils"
+	ty "gitlab.33.cn/chain33/plugin/dapp/cert/types"
 )
 
 type EcdsaCA struct {

dapp/cert/authority/tools/cryptogen/generator/utils/certutils.go

@@ -4,7 +4,7 @@ import (
 	"crypto/x509"
 
 	"github.com/tjfoc/gmsm/sm2"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority/tools/cryptogen/factory/csp"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority/tools/cryptogen/factory/csp"
 )
 
 func CreateCertificateToMem(template, parent *sm2.Certificate, key csp.Key) (cert []byte, err error) {

dapp/cert/authority/tools/cryptogen/generator/utils/csputils.go

@@ -9,8 +9,8 @@ import (
 	"fmt"
 
 	"github.com/tjfoc/gmsm/sm2"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority/tools/cryptogen/factory/csp"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority/tools/cryptogen/factory/signer"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority/tools/cryptogen/factory/csp"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority/tools/cryptogen/factory/signer"
 )
 
 func getCSPFromOpts(KeyStorePath string) (csp.CSP, error) {

dapp/cert/authority/utils/keys.go

@@ -16,8 +16,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/tjfoc/gmsm/sm2"
 	"gitlab.33.cn/chain33/chain33/common/crypto"
-	ecdsa_util "gitlab.33.cn/chain33/chain33/plugin/crypto/ecdsa"
-	ty "gitlab.33.cn/chain33/chain33/plugin/dapp/cert/types"
+	ecdsa_util "gitlab.33.cn/chain33/plugin/crypto/ecdsa"
+	ty "gitlab.33.cn/chain33/plugin/dapp/cert/types"
 	sm2_util "gitlab.33.cn/chain33/chain33/system/crypto/sm2"
 )
 

dapp/cert/executor/cert.go

@@ -2,8 +2,8 @@ package executor
 
 import (
 	log "github.com/inconshreveable/log15"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority"
-	ct "gitlab.33.cn/chain33/chain33/plugin/dapp/cert/types"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority"
+	ct "gitlab.33.cn/chain33/plugin/dapp/cert/types"
 	drivers "gitlab.33.cn/chain33/chain33/system/dapp"
 	"gitlab.33.cn/chain33/chain33/types"
 )

dapp/cert/executor/exec_local.go

@@ -3,8 +3,8 @@ package executor
 import (
 	"fmt"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/authority"
-	ct "gitlab.33.cn/chain33/chain33/plugin/dapp/cert/types"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/authority"
+	ct "gitlab.33.cn/chain33/plugin/dapp/cert/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/cert/plugin.go

 package cert
 
 import (
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/executor"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/cert/types"
-	"gitlab.33.cn/chain33/chain33/pluginmgr"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/executor"
+	"gitlab.33.cn/chain33/plugin/dapp/cert/types"
+	"gitlab.33.cn/chain33/pluginmgr"
 )
 
 func init() {

dapp/evm/commands/evm.go

@@ -16,8 +16,8 @@ import (
 	"gitlab.33.cn/chain33/chain33/common"
 	"gitlab.33.cn/chain33/chain33/common/address"
 	"gitlab.33.cn/chain33/chain33/common/crypto/sha3"
-	common2 "gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	evmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/evm/types"
+	common2 "gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	evmtypes "gitlab.33.cn/chain33/plugin/dapp/evm/types"
 	"gitlab.33.cn/chain33/chain33/rpc/jsonclient"
 	rpctypes "gitlab.33.cn/chain33/chain33/rpc/types"
 	cty "gitlab.33.cn/chain33/chain33/system/dapp/coins/types"

dapp/evm/executor/evm.go

@@ -9,10 +9,10 @@ import (
 	"reflect"
 
 	"gitlab.33.cn/chain33/chain33/common/address"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/runtime"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/state"
-	evmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/evm/types"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/runtime"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/state"
+	evmtypes "gitlab.33.cn/chain33/plugin/dapp/evm/types"
 	drivers "gitlab.33.cn/chain33/chain33/system/dapp"
 	"gitlab.33.cn/chain33/chain33/types"
 )

dapp/evm/executor/exec.go

@@ -6,11 +6,11 @@ import (
 	"strings"
 
 	log "github.com/inconshreveable/log15"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/model"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/runtime"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/state"
-	evmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/evm/types"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/model"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/runtime"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/state"
+	evmtypes "gitlab.33.cn/chain33/plugin/dapp/evm/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/evm/executor/exec_del_local.go

 package executor
 
 import (
-	evmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/evm/types"
+	evmtypes "gitlab.33.cn/chain33/plugin/dapp/evm/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/evm/executor/exec_local.go

@@ -3,7 +3,7 @@ package executor
 import (
 	"bytes"
 
-	evmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/evm/types"
+	evmtypes "gitlab.33.cn/chain33/plugin/dapp/evm/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/evm/executor/hooks.go

@@ -3,8 +3,8 @@ package executor
 import (
 	log "github.com/inconshreveable/log15"
 	"gitlab.33.cn/chain33/chain33/client"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/state"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/state"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/evm/executor/query.go

@@ -5,11 +5,11 @@ import (
 	"math/big"
 	"strings"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/model"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/runtime"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/state"
-	evmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/evm/types"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/model"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/runtime"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/state"
+	evmtypes "gitlab.33.cn/chain33/plugin/dapp/evm/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/evm/executor/tests/base_evm_test.go

@@ -4,8 +4,8 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/model"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/model"
 )
 
 // 正常创建合约逻辑

dapp/evm/executor/tests/evm_test.go

@@ -13,11 +13,11 @@ import (
 
 	"gitlab.33.cn/chain33/chain33/account"
 	"gitlab.33.cn/chain33/chain33/common/db"
-	evm "gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common/crypto"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/runtime"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/state"
+	evm "gitlab.33.cn/chain33/plugin/dapp/evm/executor"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common/crypto"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/runtime"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/state"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/evm/executor/tests/tester.go

@@ -3,7 +3,7 @@ package tests
 import (
 	"testing"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
 )
 
 type Tester struct {

dapp/evm/executor/tests/util_test.go

@@ -9,12 +9,12 @@ import (
 	"gitlab.33.cn/chain33/chain33/common/address"
 	"gitlab.33.cn/chain33/chain33/common/crypto"
 	"gitlab.33.cn/chain33/chain33/common/db"
-	evm "gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	crypto2 "gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common/crypto"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/runtime"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/state"
-	evmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/evm/types"
+	evm "gitlab.33.cn/chain33/plugin/dapp/evm/executor"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	crypto2 "gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common/crypto"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/runtime"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/state"
+	evmtypes "gitlab.33.cn/chain33/plugin/dapp/evm/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/evm/executor/vm/common/address.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/inconshreveable/log15"
 	"gitlab.33.cn/chain33/chain33/common/address"
-	evmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/evm/types"
+	evmtypes "gitlab.33.cn/chain33/plugin/dapp/evm/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/evm/executor/vm/common/crypto/crypto.go

@@ -7,7 +7,7 @@ import (
 	"github.com/btcsuite/btcd/btcec"
 	"gitlab.33.cn/chain33/chain33/common/address"
 	"gitlab.33.cn/chain33/chain33/common/crypto"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
 	"gitlab.33.cn/chain33/chain33/types"
 	"golang.org/x/crypto/sha3"
 )

dapp/evm/executor/vm/gas/gas.go

@@ -3,7 +3,7 @@ package gas
 import (
 	"math/big"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/model"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/model"
 )
 
 const (

dapp/evm/executor/vm/gas/gas_table.go

 package gas
 
 import (
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/mm"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/model"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/params"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/mm"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/model"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/params"
 )
 
 // 本文件中定义各种操作中需要花费的Gas逻辑

dapp/evm/executor/vm/mm/memory.go

@@ -5,7 +5,7 @@ import (
 	"math/big"
 
 	"github.com/inconshreveable/log15"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
 )
 
 // 内存操作封装，在EVM中使用此对象模拟物理内存

dapp/evm/executor/vm/mm/memory_table.go

@@ -3,7 +3,7 @@ package mm
 import (
 	"math/big"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
 )
 
 // 本文件中定义各种操作下计算内存大小的逻辑

dapp/evm/executor/vm/mm/stack.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"math/big"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/params"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/params"
 )
 
 // 栈对象封装，提供常用的栈操作

dapp/evm/executor/vm/mm/stack_table.go

@@ -3,7 +3,7 @@ package mm
 import (
 	"fmt"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/params"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/params"
 )
 
 type (

dapp/evm/executor/vm/model/log.go

@@ -2,7 +2,7 @@ package model
 
 import (
 	"github.com/inconshreveable/log15"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
 )
 
 // 合约在日志，对应EVM中的Log指令，可以生成指定的日志信息

dapp/evm/executor/vm/params/params.go

@@ -3,8 +3,8 @@ package params
 import (
 	"math/big"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/state"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/state"
 )
 
 // 解释器中调用Gas计算时所传递的合约中和Gas相关的参数结构

dapp/evm/executor/vm/runtime/analysis.go

@@ -3,7 +3,7 @@ package runtime
 import (
 	"math/big"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
 )
 
 // Destinations 存储合约以及代码对应的位向量对象

dapp/evm/executor/vm/runtime/bn256.go

@@ -4,9 +4,9 @@ import (
 	"errors"
 	"math/big"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common/crypto/bn256"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/params"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common/crypto/bn256"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/params"
 )
 
 // newCurvePoint unmarshals a binary blob into a bn256 elliptic curve point,

dapp/evm/executor/vm/runtime/contract.go

 package runtime
 
 import (
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
 )
 
 // 合约对象引用

dapp/evm/executor/vm/runtime/contracts.go

@@ -5,11 +5,11 @@ import (
 	"math"
 	"math/big"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common/crypto"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/params"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common/crypto"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/params"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/model"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/model"
 	"golang.org/x/crypto/ripemd160"
 )
 

dapp/evm/executor/vm/runtime/evm.go

@@ -6,11 +6,11 @@ import (
 
 	log "github.com/inconshreveable/log15"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/gas"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/model"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/params"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/state"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/gas"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/model"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/params"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/state"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/evm/executor/vm/runtime/instructions.go

@@ -5,11 +5,11 @@ import (
 	"math/big"
 
 	"github.com/inconshreveable/log15"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common/crypto"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/mm"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/model"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/params"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common/crypto"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/mm"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/model"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/params"
 )
 
 // 加法操作

dapp/evm/executor/vm/runtime/interpreter.go

@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"sync/atomic"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/gas"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/mm"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/model"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/params"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/gas"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/mm"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/model"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/params"
 )
 
 // 解释器的配置模型

dapp/evm/executor/vm/runtime/jump_table.go

 package runtime
 
 import (
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/gas"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/mm"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/params"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/gas"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/mm"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/params"
 )
 
 type (

dapp/evm/executor/vm/runtime/logger.go

@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"io"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/mm"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/mm"
 )
 
 // Tracer接口用来在合约执行过程中收集跟踪数据。

dapp/evm/executor/vm/state/account.go

@@ -6,8 +6,8 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/inconshreveable/log15"
 	"gitlab.33.cn/chain33/chain33/common/db"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	evmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/evm/types"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	evmtypes "gitlab.33.cn/chain33/plugin/dapp/evm/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/evm/executor/vm/state/fork.go

@@ -3,8 +3,8 @@ package state
 import (
 	"fmt"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	evmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/evm/types"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	evmtypes "gitlab.33.cn/chain33/plugin/dapp/evm/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/evm/executor/vm/state/interface.go

 package state
 
 import (
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/model"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/model"
 )
 
 // 状态数据库封装，面向EVM业务执行逻辑；

dapp/evm/executor/vm/state/snapshot.go

@@ -3,8 +3,8 @@ package state
 import (
 	"sort"
 
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	evmtypes "gitlab.33.cn/chain33/chain33/plugin/dapp/evm/types"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	evmtypes "gitlab.33.cn/chain33/plugin/dapp/evm/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/evm/executor/vm/state/statedb.go

@@ -7,8 +7,8 @@ import (
 	"github.com/inconshreveable/log15"
 	"gitlab.33.cn/chain33/chain33/account"
 	"gitlab.33.cn/chain33/chain33/common/db"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/common"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor/vm/model"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/common"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor/vm/model"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/evm/plugin.go

 package evm
 
 import (
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/commands"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/executor"
-	"gitlab.33.cn/chain33/chain33/plugin/dapp/evm/types"
-	"gitlab.33.cn/chain33/chain33/pluginmgr"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/commands"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/executor"
+	"gitlab.33.cn/chain33/plugin/dapp/evm/types"
+	"gitlab.33.cn/chain33/pluginmgr"
 )
 
 func init() {

dapp/game/executor/exec.go

 package executor
 
 import (
-	gt "gitlab.33.cn/chain33/chain33/plugin/dapp/game/types"
+	gt "gitlab.33.cn/chain33/plugin/dapp/game/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/game/executor/exec_del_local.go

 package executor
 
 import (
-	gt "gitlab.33.cn/chain33/chain33/plugin/dapp/game/types"
+	gt "gitlab.33.cn/chain33/plugin/dapp/game/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/game/executor/exec_local.go

 package executor
 
 import (
-	gt "gitlab.33.cn/chain33/chain33/plugin/dapp/game/types"
+	gt "gitlab.33.cn/chain33/plugin/dapp/game/types"
 	"gitlab.33.cn/chain33/chain33/types"
 )
 

dapp/game/executor/game.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	log "github.com/inconshreveable/log15"
-	gt "gitlab.33.cn/chain33/chain33/plugin/dapp/game/types"
+	gt "gitlab.33.cn/chain33/plugin/dapp/game/types"
 	drivers "gitlab.33.cn/chain33/chain33/system/dapp"
 	"gitlab.33.cn/chain33/chain33/types"
 )