Merge pull request #14 from quilt/bugfix/aa-nonce

Fix nonce issue for aa contracts
lightclient · Jun 11, 2020 · 9f83812 · 9f83812
2 parents afc79d2 + e1666e2
commit 9f83812
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/core/tx_list.go b/core/tx_list.go
@@ -277,6 +277,10 @@ func (l *txList) Add(tx *types.Transaction, priceBump uint64) (bool, *types.Tran
 // provided threshold. Every removed transaction is returned for any post-removal
 // maintenance.
 func (l *txList) Forward(threshold uint64) types.Transactions {
+	if l.isAA {
+		return types.Transactions{}
+	}
+
 	return l.txs.Forward(threshold)
 }
 

diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go
@@ -353,6 +353,7 @@ func TestAAQueue(t *testing.T) {
 
 	pool.currentState.SetCode(address1, common.FromHex(contractCode))
 	pool.currentState.AddBalance(address1, big.NewInt(1000000))
+	pool.currentState.SetNonce(address1, 1)
 
 	<-pool.requestReset(nil, nil)
 	pool.add(tx1, false)
@@ -401,6 +402,7 @@ func TestAAQueue2(t *testing.T) {
 
 	pool.currentState.SetCode(address1, common.FromHex(contractCode))
 	pool.currentState.AddBalance(address1, big.NewInt(1000000))
+	pool.currentState.SetNonce(address1, 1)
 
 	pool.reset(nil, nil)
 	pool.add(tx1, false)
@@ -433,6 +435,7 @@ func TestAAPending(t *testing.T) {
 
 	pool.currentState.SetCode(address1, common.FromHex(contractCode))
 	pool.currentState.AddBalance(address1, big.NewInt(1000000))
+	pool.currentState.SetNonce(address1, 1)
 
 	<-pool.requestReset(nil, nil)