add change legacetx as default evm to accesslist tx

ChainSafe · Jul 8, 2021 · 5a65432 · 5a65432
1 parent 126d6ac
commit 5a65432
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/chains/evm/evmclient/evm-client.go b/chains/evm/evmclient/evm-client.go
@@ -154,6 +154,8 @@ func (c *EVMClient) PendingCallContract(ctx context.Context, callArgs map[string
 	return hex, nil
 }
 
+//func (c *EVMClient) ChainID()
+
 func (c *EVMClient) SignAndSendTransaction(ctx context.Context, tx CommonTransaction) (common.Hash, error) {
 	id, err := c.ChainID(ctx)
 	if err != nil {

diff --git a/chains/evm/evmtransaction/evm-tx.go b/chains/evm/evmtransaction/evm-tx.go
@@ -35,8 +35,16 @@ func (a *TX) RawWithSignature(key *ecdsa.PrivateKey, chainID *big.Int) ([]byte,
 	return rawTX, nil
 }
 
-func NewTransaction(nonce uint64, to common.Address, amount *big.Int, gasLimit uint64, gasPrice *big.Int, data []byte) *TX {
-	tx := types.NewTransaction(nonce, to, amount, gasLimit, gasPrice, data)
+func NewTransaction(chainID *big.Int, nonce uint64, to common.Address, amount *big.Int, gasLimit uint64, gasPrice *big.Int, data []byte) *TX {
+	tx := types.NewTx(&types.AccessListTx{
+		ChainID:  chainID,
+		Nonce:    nonce,
+		To:       &to,
+		Value:    amount,
+		Gas:      gasLimit,
+		GasPrice: gasPrice,
+		Data:     data})
+	//_ = types.NewTransaction(nonce, to, amount, gasLimit, gasPrice, data)
 	return &TX{tx}
 }
 

diff --git a/chains/evm/voter/proposal.go b/chains/evm/voter/proposal.go
@@ -102,12 +102,12 @@ func (p *Proposal) Execute(client ChainClient) error {
 	if err != nil {
 		return err
 	}
+	log.Debug().Str("hash", h.Hex()).Uint64("nonce", n.Uint64()).Msgf("Executed")
 	err = client.UnsafeIncreaseNonce()
 	if err != nil {
 		return err
 	}
 	client.UnlockNonce()
-	log.Debug().Str("hash", h.Hex()).Uint64("nonce", n.Uint64()).Msgf("Executed")
 	return nil
 }
 
@@ -132,17 +132,21 @@ func (p *Proposal) Vote(client ChainClient) error {
 	if err != nil {
 		return err
 	}
-	tx := evmtransaction.NewTransaction(n.Uint64(), p.BridgeAddress, big.NewInt(0), gasLimit, gp, input)
-	h, err := client.SignAndSendTransaction(context.TODO(), tx)
+	cid, err := client.ChainID(context.Background())
+	if err != nil {
+		return err
+	}
+	tx := evmtransaction.NewTransaction(cid, n.Uint64(), p.BridgeAddress, big.NewInt(0), gasLimit, gp, input)
+	_, err = client.SignAndSendTransaction(context.TODO(), tx)
 	if err != nil {
 		return err
 	}
+	log.Debug().Str("hash", tx.Hash().String()).Uint64("nonce", n.Uint64()).Str("chainID", cid.String()).Msgf("Voted")
 	err = client.UnsafeIncreaseNonce()
 	if err != nil {
 		return err
 	}
 	client.UnlockNonce()
-	log.Debug().Str("hash", h.Hex()).Uint64("nonce", n.Uint64()).Msgf("Voted")
 	return nil
 }
 

diff --git a/chains/evm/voter/voter.go b/chains/evm/voter/voter.go
@@ -27,6 +27,7 @@ type ChainClient interface {
 	UnlockNonce()
 	UnsafeIncreaseNonce() error
 	GasPrice() (*big.Int, error)
+	ChainID(ctx context.Context) (*big.Int, error)
 }
 
 type Proposer interface {