Merge pull request #937 from icehawk-hyb/issues-971

go.mod

@@ -2,8 +2,9 @@ module github.com/33cn/plugin
 
 go 1.12
 
+
 require (
-	github.com/33cn/chain33 v1.65.1-0.20210108070140-55a047ad003f
+	github.com/33cn/chain33 v1.65.1-0.20210115070259-1e4df1700e2e
 	github.com/BurntSushi/toml v0.3.1
 	github.com/NebulousLabs/Sia v1.3.7
 	github.com/NebulousLabs/errors v0.0.0-20181203160057-9f787ce8f69e // indirect
@@ -41,6 +42,7 @@ require (
 	github.com/tjfoc/gmsm v1.3.2
 	github.com/valyala/fasthttp v1.5.0
 	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
+	go.uber.org/zap v1.16.0 // indirect
 	golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9
 	golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7
 	golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1

plugin/consensus/dpos/dpos_test.go

@@ -124,7 +124,7 @@ func DposPerf() {
 	fmt.Println("=======start NormPut!=======")
 
 	for i := 0; i < loopCount; i++ {
-		NormPut()
+		NormPut(cfg)
 		time.Sleep(time.Second)
 	}
 
@@ -462,7 +462,7 @@ func getprivkey(key string) crypto.PrivKey {
 	return priv
 }
 
-func prepareTxList() *types.Transaction {
+func prepareTxList(cfg *types.Chain33Config) *types.Transaction {
 	var key string
 	var value string
 	var i int
@@ -475,6 +475,7 @@ func prepareTxList() *types.Transaction {
 	tx := &types.Transaction{Execer: []byte("norm"), Payload: types.Encode(action), Fee: fee}
 	tx.To = address.ExecAddress("norm")
 	tx.Nonce = random.Int63()
+	tx.ChainID = cfg.GetChainID()
 	tx.Sign(types.SECP256K1, getprivkey("CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"))
 	return tx
 }
@@ -489,8 +490,8 @@ func clearTestData() {
 	fmt.Println("test data clear successfully!")
 }
 
-func NormPut() {
-	tx := prepareTxList()
+func NormPut(cfg *types.Chain33Config) {
+	tx := prepareTxList(cfg)
 
 	reply, err := c.SendTransaction(context.Background(), tx)
 	if err != nil {

plugin/consensus/pbft/pbft_test.go

@@ -93,7 +93,7 @@ func sendReplyList(q queue.Queue) {
 	for msg := range client.Recv() {
 		if msg.Ty == types.EventTxList {
 			count++
-			createReplyList("test" + strconv.Itoa(count))
+			createReplyList(client.GetConfig(), "test"+strconv.Itoa(count))
 			msg.Reply(client.NewMessage("consensus", types.EventReplyTxList,
 				&types.ReplyTxList{Txs: transactions}))
 			if count == 5 {
@@ -122,7 +122,8 @@ func getprivkey(key string) crypto.PrivKey {
 	return priv
 }
 
-func createReplyList(account string) {
+func createReplyList(cfg *types.Chain33Config, account string) {
+
 	var result []*types.Transaction
 	for j := 0; j < txSize; j++ {
 		//tx := &types.Transaction{}
@@ -132,6 +133,7 @@ func createReplyList(account string) {
 		tx.To = "14qViLJfdGaP4EeHnDyJbEGQysnCpwn1gZ"
 
 		tx.Nonce = random.Int63()
+		tx.ChainID = cfg.GetChainID()
 
 		tx.Sign(types.SECP256K1, getprivkey("CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"))
 		result = append(result, tx)

plugin/consensus/raft/tools/raftPerf.go

@@ -334,6 +334,8 @@ func NormPut(privkey string, key string, value string) {
 	tx := &types.Transaction{Execer: []byte("norm"), Payload: types.Encode(action), Fee: fee}
 	tx.To = address.ExecAddress("norm")
 	tx.Nonce = r.Int63()
+	version, _ := c.Version(context.Background(), nil)
+	tx.ChainID = version.ChainID
 	tx.Sign(types.SECP256K1, getprivkey(privkey))
 
 	reply, err := c.SendTransaction(context.Background(), tx)

plugin/consensus/tendermint/state.go

@@ -440,6 +440,7 @@ func LoadProposer(source *tmtypes.Validator) (*ttypes.Validator, error) {
 
 // CreateBlockInfoTx make blockInfo to the first transaction of the block and execer is valnode
 func CreateBlockInfoTx(pubkey string, state *tmtypes.State, block *tmtypes.TendermintBlock) *types.Transaction {
+
 	blockSave := *block
 	blockSave.Data = nil
 	blockInfo := &tmtypes.TendermintBlockInfo{

plugin/consensus/tendermint/tendermint_test.go

@@ -74,13 +74,13 @@ func TendermintPerf(t *testing.T) {
 	time.Sleep(2 * time.Second)
 	ConfigManager()
 	for i := 0; i < loopCount; i++ {
-		NormPut()
+		NormPut(q.GetConfig().GetChainID())
 		time.Sleep(time.Second)
 	}
 	CheckState(t, cs.(*Client))
 	AddNode()
 	for i := 0; i < loopCount*3; i++ {
-		NormPut()
+		NormPut(q.GetConfig().GetChainID())
 		time.Sleep(time.Second)
 	}
 	time.Sleep(2 * time.Second)
@@ -148,7 +148,7 @@ func generateValue(i, valI int) string {
 	return string(value)
 }
 
-func prepareTxList() *types.Transaction {
+func prepareTxList(chainid int32) *types.Transaction {
 	var key string
 	var value string
 	var i int
@@ -161,6 +161,7 @@ func prepareTxList() *types.Transaction {
 	tx := &types.Transaction{Execer: []byte("norm"), Payload: types.Encode(action), Fee: fee}
 	tx.To = address.ExecAddress("norm")
 	tx.Nonce = r.Int63()
+	tx.ChainID = chainid
 	tx.Sign(types.SECP256K1, getprivkey("CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"))
 	return tx
 }
@@ -173,8 +174,8 @@ func clearTestData() {
 	fmt.Println("test data clear successfully!")
 }
 
-func NormPut() {
-	tx := prepareTxList()
+func NormPut(chainid int32) {
+	tx := prepareTxList(chainid)
 
 	reply, err := c.SendTransaction(context.Background(), tx)
 	if err != nil {
@@ -199,6 +200,10 @@ func AddNode() {
 	tx := &types.Transaction{Execer: []byte("valnode"), Payload: types.Encode(action), Fee: fee}
 	tx.To = address.ExecAddress("valnode")
 	tx.Nonce = r.Int63()
+	version, _ := c.Version(context.Background(), nil)
+	if version != nil {
+		tx.ChainID = version.ChainID
+	}
 	tx.Sign(types.SECP256K1, getprivkey("CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"))
 
 	reply, err := c.SendTransaction(context.Background(), tx)
@@ -221,6 +226,11 @@ func ConfigManager() {
 	tx := &types.Transaction{Execer: []byte("manage"), Payload: types.Encode(modify), Fee: fee}
 	tx.To = address.ExecAddress("manage")
 	tx.Nonce = r.Int63()
+	version, _ := c.Version(context.Background(), nil)
+	if version != nil {
+		tx.ChainID = version.ChainID
+
+	}
 	tx.Sign(types.SECP256K1, getprivkey("CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"))
 
 	reply, err := c.SendTransaction(context.Background(), tx)

plugin/dapp/dposvote/commands/vote_test.go

@@ -238,7 +238,7 @@ func DposPerf() {
 	}
 	time.Sleep(2 * time.Second)
 	for i := 0; i < loopCount; i++ {
-		NormPut()
+		NormPut(q.GetConfig())
 		time.Sleep(time.Second)
 	}
 	time.Sleep(2 * time.Second)
@@ -336,8 +336,8 @@ func getprivkey(key string) crypto.PrivKey {
 	return priv
 }
 
-func NormPut() {
-	tx := prepareTxList()
+func NormPut(cfg *types.Chain33Config) {
+	tx := prepareTxList(cfg)
 
 	reply, err := c.SendTransaction(context.Background(), tx)
 	if err != nil {
@@ -350,7 +350,8 @@ func NormPut() {
 	}
 }
 
-func prepareTxList() *types.Transaction {
+func prepareTxList(cfg *types.Chain33Config) *types.Transaction {
+
 	var key string
 	var value string
 	var i int
@@ -363,6 +364,7 @@ func prepareTxList() *types.Transaction {
 	tx := &types.Transaction{Execer: []byte("norm"), Payload: types.Encode(action), Fee: fee}
 	tx.To = address.ExecAddress("norm")
 	tx.Nonce = random.Int63()
+	tx.ChainID = cfg.GetChainID()
 	tx.Sign(types.SECP256K1, getprivkey(genesisKey))
 	return tx
 }

plugin/dapp/echo/types/echo/echo.go

@@ -43,6 +43,7 @@ func createPingTx(cfg *types.Chain33Config, op string, parm *Tx) (*types.Transac
 		Payload: types.Encode(action),
 		Nonce:   rand.New(rand.NewSource(time.Now().UnixNano())).Int63(),
 		To:      address.ExecAddress(cfg.ExecName(EchoX)),
+		ChainID: cfg.GetChainID(),
 	}
 	return tx, nil
 }

plugin/dapp/evm/commands/evm.go

@@ -296,7 +296,7 @@ func createEvmTx(cfg *types.Chain33Config, action proto.Message, execer, caller,
 
 	random := rand.New(rand.NewSource(time.Now().UnixNano()))
 	tx.Nonce = random.Int63()
-
+	tx.ChainID = cfg.GetChainID()
 	txHex := types.Encode(tx)
 	rawTx := hex.EncodeToString(txHex)
 
@@ -348,7 +348,7 @@ func createEvmTransferTx(cfg *types.Chain33Config, cmd *cobra.Command, caller, e
 
 	random := rand.New(rand.NewSource(time.Now().UnixNano()))
 	tx.Nonce = random.Int63()
-
+	tx.ChainID = cfg.GetChainID()
 	txHex := types.Encode(tx)
 	rawTx := hex.EncodeToString(txHex)
 

plugin/dapp/evm/rpc/rpc.go

@@ -40,7 +40,7 @@ func (c *channelClient) Create(ctx context.Context, in evmtypes.EvmContractCreat
 
 	random := rand.New(rand.NewSource(time.Now().UnixNano()))
 	tx.Nonce = random.Int63()
-
+	tx.ChainID = cfg.GetChainID()
 	txHex := types.Encode(tx)
 
 	return &types.UnsignTx{Data: txHex}, nil
@@ -69,7 +69,7 @@ func (c *channelClient) Call(ctx context.Context, in evmtypes.EvmContractCallReq
 
 	random := rand.New(rand.NewSource(time.Now().UnixNano()))
 	tx.Nonce = random.Int63()
-
+	tx.ChainID = cfg.GetChainID()
 	txHex := types.Encode(tx)
 
 	return &types.UnsignTx{Data: txHex}, nil
@@ -103,7 +103,7 @@ func (c *channelClient) Transfer(ctx context.Context, in evmtypes.EvmContractTra
 
 	random := rand.New(rand.NewSource(time.Now().UnixNano()))
 	tx.Nonce = random.Int63()
-
+	tx.ChainID = cfg.GetChainID()
 	txHex := types.Encode(tx)
 
 	return &types.UnsignTx{Data: txHex}, nil

plugin/dapp/guess/commands/game_test.go

@@ -361,7 +361,7 @@ func testGuessImp(t *testing.T) {
 	fmt.Println("=======start NormPut!=======")
 
 	for i := 0; i < loopCount; i++ {
-		NormPut()
+		NormPut(cfg)
 		time.Sleep(time.Second)
 	}
 
@@ -503,7 +503,7 @@ func getprivkey(key string) crypto.PrivKey {
 	return priv
 }
 
-func prepareTxList() *types.Transaction {
+func prepareTxList(cfg *types.Chain33Config) *types.Transaction {
 	var key string
 	var value string
 	var i int
@@ -516,12 +516,13 @@ func prepareTxList() *types.Transaction {
 	tx := &types.Transaction{Execer: []byte("norm"), Payload: types.Encode(action), Fee: fee}
 	tx.To = address.ExecAddress("norm")
 	tx.Nonce = random.Int63()
+	tx.ChainID = cfg.GetChainID()
 	tx.Sign(types.SECP256K1, getprivkey("CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"))
 	return tx
 }
 
-func NormPut() {
-	tx := prepareTxList()
+func NormPut(cfg *types.Chain33Config) {
+	tx := prepareTxList(cfg)
 
 	reply, err := c.SendTransaction(context.Background(), tx)
 	if err != nil {

plugin/dapp/guess/rpc/guess_test.go

@@ -363,7 +363,7 @@ func testGuessImp(t *testing.T) {
 	fmt.Println("=======start NormPut!=======")
 
 	for i := 0; i < loopCount; i++ {
-		NormPut()
+		NormPut(cfg)
 		time.Sleep(time.Second)
 	}
 
@@ -721,7 +721,7 @@ func getprivkey(key string) crypto.PrivKey {
 	return priv
 }
 
-func prepareTxList() *types.Transaction {
+func prepareTxList(cfg *types.Chain33Config) *types.Transaction {
 	var key string
 	var value string
 	var i int
@@ -734,12 +734,13 @@ func prepareTxList() *types.Transaction {
 	tx := &types.Transaction{Execer: []byte("norm"), Payload: types.Encode(action), Fee: fee}
 	tx.To = address.ExecAddress("norm")
 	tx.Nonce = random.Int63()
+	tx.ChainID = cfg.GetChainID()
 	tx.Sign(types.SECP256K1, getprivkey("CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"))
 	return tx
 }
 
-func NormPut() {
-	tx := prepareTxList()
+func NormPut(cfg *types.Chain33Config) {
+	tx := prepareTxList(cfg)
 
 	reply, err := c.SendTransaction(context.Background(), tx)
 	if err != nil {

plugin/dapp/paracross/types/paracross.go

@@ -260,6 +260,7 @@ func CreateRawMinerTx(cfg *types.Chain33Config, value *ParacrossMinerAction) (*t
 		Payload: types.Encode(action),
 		Nonce:   0, //for consensus purpose, block hash need same, different auth node need keep totally same vote tx
 		To:      address.ExecAddress(cfg.ExecName(ParaX)),
+		ChainID: cfg.GetChainID(),
 	}
 	err := tx.SetRealFee(cfg.GetMinTxFeeRate())
 	if err != nil {

plugin/dapp/privacy/wallet/privacy.go

@@ -537,6 +537,7 @@ func (policy *privacyPolicy) createPublic2PrivacyTx(req *privacytypes.ReqCreateP
 		Payload: types.Encode(action),
 		Nonce:   policy.getWalletOperate().Nonce(),
 		To:      address.ExecAddress(cfg.ExecName(privacytypes.PrivacyX)),
+		ChainID: cfg.GetChainID(),
 	}
 	tx.SetExpire(cfg, time.Duration(req.Expire))
 	tx.Signature = &types.Signature{
@@ -621,6 +622,7 @@ func (policy *privacyPolicy) createPrivacy2PrivacyTx(req *privacytypes.ReqCreate
 		Fee:     privacytypes.PrivacyTxFee,
 		Nonce:   policy.getWalletOperate().Nonce(),
 		To:      address.ExecAddress(cfg.ExecName(privacytypes.PrivacyX)),
+		ChainID: cfg.GetChainID(),
 	}
 	tx.SetExpire(cfg, time.Duration(req.Expire))
 	if !isMainetCoins {
@@ -711,6 +713,7 @@ func (policy *privacyPolicy) createPrivacy2PublicTx(req *privacytypes.ReqCreateP
 		Fee:     privacytypes.PrivacyTxFee,
 		Nonce:   policy.getWalletOperate().Nonce(),
 		To:      address.ExecAddress(cfg.ExecName(privacytypes.PrivacyX)),
+		ChainID: cfg.GetChainID(),
 	}
 	tx.SetExpire(cfg, time.Duration(req.Expire))
 	if !isMainetCoins {

plugin/dapp/privacy/wallet/privacy_test.go

@@ -190,6 +190,7 @@ func (mock *PrivacyMock) CreateUTXOs(sender string, pubkeypair string, amount in
 }
 
 func (mock *PrivacyMock) createPublic2PrivacyTx(req *ty.ReqCreatePrivacyTx) *types.Transaction {
+	cfg := mock.walletOp.GetAPI().GetConfig()
 	viewPubSlice, spendPubSlice, err := parseViewSpendPubKeyPair(req.GetPubkeypair())
 	if err != nil {
 		return nil
@@ -217,8 +218,8 @@ func (mock *PrivacyMock) createPublic2PrivacyTx(req *ty.ReqCreatePrivacyTx) *typ
 		Payload: types.Encode(action),
 		Nonce:   mock.walletOp.Nonce(),
 		To:      address.ExecAddress(ty.PrivacyX),
+		ChainID: cfg.GetChainID(),
 	}
-	cfg := mock.walletOp.GetAPI().GetConfig()
 	txSize := types.Size(tx) + ty.SignatureSize
 	realFee := int64((txSize+1023)>>ty.Size1Kshiftlen) * cfg.GetMinTxFeeRate()
 	tx.Fee = realFee

plugin/dapp/relay/cmd/relayd/relayd/relayd.go

@@ -318,17 +318,23 @@ func (r *Relayd) syncBlockHeaders() {
 }
 
 func (r *Relayd) transaction(payload []byte) *types.Transaction {
+	var chainID int32
+	minFee := types.DefaultMinFee
+
+	//chain33的配置中获取chainID和minFee
+	if r.config.Chain33Cfg != nil {
+		chainID = r.config.Chain33Cfg.GetChainID()
+		minFee = r.config.Chain33Cfg.GetMinTxFeeRate()
+	}
+
 	tx := &types.Transaction{
 		Execer:  []byte(ty.RelayX),
 		Payload: payload,
 		Nonce:   rand.Int63(),
 		To:      address.ExecAddress(ty.RelayX),
+		ChainID: chainID,
 	}
 
-	minFee := types.DefaultMinFee
-	if r.config.Chain33Cfg != nil {
-		minFee = r.config.Chain33Cfg.GetMinTxFeeRate()
-	}
 	fee, _ := tx.GetRealFee(minFee)
 	tx.Fee = fee
 	tx.Sign(types.SECP256K1, r.privateKey)

plugin/dapp/relay/executor/relay_test.go

@@ -139,6 +139,7 @@ func (s *suiteRelay) TestExec_1() {
 	tx.Execer = []byte(ty.RelayX)
 	tx.To = address.ExecAddress(ty.RelayX)
 	tx.Nonce = 1 //for different order id
+	tx.ChainID = chainTestCfg.GetChainID()
 	tx.Payload = types.Encode(sell)
 	tx.Sign(types.SECP256K1, privFrom)
 
@@ -489,6 +490,8 @@ func (s *suiteBtcHeader) TestSaveBtcHead_1() {
 	tx.Execer = []byte(ty.RelayX)
 	tx.To = address.ExecAddress(ty.RelayX)
 	tx.Nonce = 2 //for different order id
+	tx.ChainID = chainTestCfg.GetChainID()
+
 	tx.Payload = types.Encode(sell)
 	tx.Sign(types.SECP256K1, privFrom)
 

plugin/dapp/token/executor/token_new_test.go

@@ -164,12 +164,14 @@ func TestPrecreate(t *testing.T) {
 		Ty:    pty.TokenActionPreCreate,
 		Value: &pty.TokenAction_TokenPreCreate{TokenPreCreate: v},
 	}
+	version, _ := mainClient.Version(context.Background(), nil)
 	tx := &types.Transaction{
 		Execer:  []byte(execName),
 		Payload: types.Encode(precreate),
 		Fee:     feeForToken,
 		Nonce:   r.Int63(),
 		To:      address.ExecAddress(execName),
+		ChainID: version.GetChainID(),
 	}
 	tx.Sign(types.SECP256K1, privkey)
 
@@ -205,12 +207,15 @@ func TestFinish(t *testing.T) {
 		Ty:    pty.TokenActionFinishCreate,
 		Value: &pty.TokenAction_TokenFinishCreate{TokenFinishCreate: v},
 	}
+	version, _ := mainClient.Version(context.Background(), nil)
+
 	tx := &types.Transaction{
 		Execer:  []byte(execName),
 		Payload: types.Encode(finish),
 		Fee:     feeForToken,
 		Nonce:   r.Int63(),
 		To:      address.ExecAddress(execName),
+		ChainID: version.GetChainID(),
 	}
 	tx.Sign(types.SECP256K1, privkey)
 
@@ -246,6 +251,9 @@ func TestTransferToken(t *testing.T) {
 
 	tx := &types.Transaction{Execer: []byte(execName), Payload: types.Encode(transfer), Fee: fee, To: addrexec}
 	tx.Nonce = r.Int63()
+
+	version, _ := mainClient.Version(context.Background(), nil)
+	tx.ChainID = version.GetChainID()
 	tx.Sign(types.SECP256K1, privkey)
 
 	reply, err := mainClient.SendTransaction(context.Background(), tx)
@@ -326,6 +334,10 @@ func TestTokenMint(t *testing.T) {
 
 	tx := &types.Transaction{Execer: []byte(execName), Payload: types.Encode(transfer), Fee: fee, To: addrexec}
 	tx.Nonce = r.Int63()
+
+	version, _ := mainClient.Version(context.Background(), nil)
+	tx.ChainID = version.GetChainID()
+
 	tx.Sign(types.SECP256K1, privkey)
 
 	reply, err := mainClient.SendTransaction(context.Background(), tx)

plugin/dapp/unfreeze/types/types.go

@@ -147,6 +147,7 @@ func CreateUnfreezeCreateTx(cfg *types.Chain33Config, title string, parm *Unfree
 		Payload: types.Encode(create),
 		Nonce:   rand.New(rand.NewSource(time.Now().UnixNano())).Int63(),
 		To:      address.ExecAddress(getRealExecName(cfg, cfg.GetParaName())),
+		ChainID: cfg.GetChainID(),
 	}
 	tx.SetRealFee(cfg.GetMinTxFeeRate())
 	return tx, nil
@@ -176,6 +177,7 @@ func CreateUnfreezeWithdrawTx(cfg *types.Chain33Config, title string, parm *Unfr
 		Payload: types.Encode(withdraw),
 		Nonce:   rand.New(rand.NewSource(time.Now().UnixNano())).Int63(),
 		To:      address.ExecAddress(getRealExecName(cfg, cfg.GetParaName())),
+		ChainID: cfg.GetChainID(),
 	}
 	tx.SetRealFee(cfg.GetMinTxFeeRate())
 	return tx, nil
@@ -205,6 +207,7 @@ func CreateUnfreezeTerminateTx(cfg *types.Chain33Config, title string, parm *Unf
 		Payload: types.Encode(terminate),
 		Nonce:   rand.New(rand.NewSource(time.Now().UnixNano())).Int63(),
 		To:      address.ExecAddress(getRealExecName(cfg, cfg.GetParaName())),
+		ChainID: cfg.GetChainID(),
 	}
 	tx.SetRealFee(cfg.GetMinTxFeeRate())
 	return tx, nil

plugin/dapp/x2ethereum/executor/exec_test.go

@@ -75,6 +75,7 @@ func (x *suiteX2Ethereum) SetupSuite() {
 	tx.Execer = []byte(types2.X2ethereumX)
 	tx.To = address.ExecAddress(types2.X2ethereumX)
 	tx.Nonce = 1
+	tx.ChainID = chainTestCfg.GetChainID()
 	tx.Sign(types.SECP256K1, privFrom)
 
 	x.action = newAction(x2eth, tx, 0)