unsafe nonce store

Author: tolak

chains/ethereum/chain.go

@@ -52,6 +52,7 @@ type Connection interface {
 	CallOpts() *bind.CallOpts
 	LockAndUpdateOpts() error
 	UnlockOpts()
+	IncreaseNonce()
 	Client() *ethclient.Client
 	EnsureHasBytecode(address common.Address) error
 	LatestBlock() (*big.Int, error)

chains/ethereum/writer_methods.go

@@ -9,9 +9,9 @@ import (
 	"math/big"
 	"time"
 
+	log "github.com/ChainSafe/log15"
 	utils "github.com/Phala-Network/ChainBridge/shared/ethereum"
 	"github.com/Phala-Network/chainbridge-utils/msg"
-	log "github.com/ChainSafe/log15"
 )
 
 // Number of blocks to wait for an finalization event
@@ -265,6 +265,7 @@ func (w *writer) voteProposal(m msg.Message, dataHash [32]byte) {
 			w.conn.UnlockOpts()
 
 			if err == nil {
+				w.conn.IncreaseNonce()
 				w.log.Info("Submitted proposal vote", "tx", tx.Hash(), "src", m.Source, "depositNonce", m.DepositNonce)
 				if w.metrics != nil {
 					w.metrics.VotesSubmitted.Inc()
@@ -312,6 +313,7 @@ func (w *writer) executeProposal(m msg.Message, data []byte, dataHash [32]byte)
 			w.conn.UnlockOpts()
 
 			if err == nil {
+				w.conn.IncreaseNonce()
 				w.log.Info("Submitted proposal execution", "tx", tx.Hash(), "src", m.Source, "dst", m.Destination, "nonce", m.DepositNonce)
 				return
 			} else if err.Error() == ErrNonceTooLow.Error() || err.Error() == ErrTxUnderpriced.Error() {

connections/ethereum/connection.go

@@ -11,8 +11,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Phala-Network/chainbridge-utils/crypto/secp256k1"
 	"github.com/ChainSafe/log15"
+	"github.com/Phala-Network/chainbridge-utils/crypto/secp256k1"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	ethcommon "github.com/ethereum/go-ethereum/common"
 	ethcrypto "github.com/ethereum/go-ethereum/crypto"
@@ -31,12 +31,13 @@ type Connection struct {
 	gasMultiplier *big.Float
 	conn          *ethclient.Client
 	// signer    ethtypes.Signer
-	opts     *bind.TransactOpts
-	callOpts *bind.CallOpts
-	nonce    uint64
-	optsLock sync.Mutex
-	log      log15.Logger
-	stop     chan int // All routines should exit when this channel is closed
+	opts      *bind.TransactOpts
+	callOpts  *bind.CallOpts
+	nonce     uint64
+	nonceLock sync.Mutex
+	optsLock  sync.Mutex
+	log       log15.Logger
+	stop      chan int // All routines should exit when this channel is closed
 }
 
 // NewConnection returns an uninitialized connection, must call Connection.Connect() before using.
@@ -80,12 +81,34 @@ func (c *Connection) Connect() error {
 	return nil
 }
 
+func (c *Connection) unsafeNonce(address ethcommon.Address) (uint64, error) {
+	// Sync on-chain nonce
+	nonce, err := c.conn.NonceAt(context.Background(), address, nil)
+	if err != nil {
+		return 0, err
+	}
+	if c.nonce >= nonce {
+		return c.nonce, nil
+	} else {
+		c.nonce = nonce
+		return nonce, nil
+	}
+}
+
+// LockAndIncreaseNonce acquires a lock on the opts before increase nonce by 1
+// and gas price.
+func (c *Connection) IncreaseNonce() {
+	c.nonceLock.Lock()
+	c.nonce += 1
+	c.nonceLock.Unlock()
+}
+
 // newTransactOpts builds the TransactOpts for the connection's keypair.
 func (c *Connection) newTransactOpts(value, gasLimit, gasPrice *big.Int) (*bind.TransactOpts, uint64, error) {
 	privateKey := c.kp.PrivateKey()
 	address := ethcrypto.PubkeyToAddress(privateKey.PublicKey)
 
-	nonce, err := c.conn.PendingNonceAt(context.Background(), address)
+	nonce, err := c.unsafeNonce(address)
 	if err != nil {
 		return nil, 0, err
 	}
@@ -167,12 +190,13 @@ func (c *Connection) LockAndUpdateOpts() error {
 	}
 	c.opts.GasPrice = gasPrice
 
-	nonce, err := c.conn.PendingNonceAt(context.Background(), c.opts.From)
+	nonce, err := c.unsafeNonce(c.opts.From)
 	if err != nil {
 		c.optsLock.Unlock()
 		return err
 	}
 	c.opts.Nonce.SetUint64(nonce)
+	c.log.Info("LockAndUpdateOpts: update opts nonce to: ", nonce)
 	return nil
 }