Return ErrReplacementUnderpriced when price is no higher than already…

… existing one. (#1908)
0xPolygon · Sep 26, 2023 · 8aaae11 · 8aaae11
1 parent 5f6ba3e
commit 8aaae11
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/txpool/slot_gauge.go b/txpool/slot_gauge.go
@@ -3,8 +3,9 @@ package txpool
 import (
 	"sync/atomic"
 
-	"github.com/0xPolygon/polygon-edge/types"
 	"github.com/armon/go-metrics"
+
+	"github.com/0xPolygon/polygon-edge/types"
 )
 
 const (

diff --git a/txpool/txpool.go b/txpool/txpool.go
@@ -7,6 +7,12 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/armon/go-metrics"
+	"github.com/golang/protobuf/ptypes/any"
+	"github.com/hashicorp/go-hclog"
+	"github.com/libp2p/go-libp2p/core/peer"
+	"google.golang.org/grpc"
+
 	"github.com/0xPolygon/polygon-edge/blockchain"
 	"github.com/0xPolygon/polygon-edge/chain"
 	"github.com/0xPolygon/polygon-edge/forkmanager"
@@ -15,11 +21,6 @@ import (
 	"github.com/0xPolygon/polygon-edge/state/runtime"
 	"github.com/0xPolygon/polygon-edge/txpool/proto"
 	"github.com/0xPolygon/polygon-edge/types"
-	"github.com/armon/go-metrics"
-	"github.com/golang/protobuf/ptypes/any"
-	"github.com/hashicorp/go-hclog"
-	"github.com/libp2p/go-libp2p/core/peer"
-	"google.golang.org/grpc"
 )
 
 const (
@@ -824,7 +825,7 @@ func (p *TxPool) addTx(origin txOrigin, tx *types.Transaction) error {
 			// if tx with same nonce does exist and has same or better gas price -> return error
 			metrics.IncrCounter([]string{txPoolMetrics, "underpriced_tx"}, 1)
 
-			return ErrUnderpriced
+			return ErrReplacementUnderpriced
 		}
 
 		slotsFree += slotsRequired(oldTxWithSameNonce) // add old tx slots

diff --git a/txpool/txpool_test.go b/txpool/txpool_test.go
@@ -12,17 +12,18 @@ import (
 	"testing"
 	"time"
 
+	"github.com/golang/protobuf/ptypes/any"
+	"github.com/hashicorp/go-hclog"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/0xPolygon/polygon-edge/chain"
 	"github.com/0xPolygon/polygon-edge/crypto"
 	"github.com/0xPolygon/polygon-edge/helper/tests"
 	"github.com/0xPolygon/polygon-edge/state"
 	"github.com/0xPolygon/polygon-edge/state/runtime"
 	"github.com/0xPolygon/polygon-edge/txpool/proto"
 	"github.com/0xPolygon/polygon-edge/types"
-	"github.com/golang/protobuf/ptypes/any"
-	"github.com/hashicorp/go-hclog"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 const (
@@ -324,7 +325,7 @@ func TestAddTxErrors(t *testing.T) {
 
 		assert.ErrorIs(t,
 			pool.addTx(local, tx),
-			ErrUnderpriced,
+			ErrReplacementUnderpriced,
 		)
 	})
 
@@ -845,7 +846,7 @@ func TestAddTx(t *testing.T) {
 			// check the account nonce before promoting
 			assert.Equal(t, uint64(0), pool.accounts.get(addr1).getNonce())
 
-			assert.ErrorIs(t, pool.addTx(local, tx1), ErrUnderpriced)
+			assert.ErrorIs(t, pool.addTx(local, tx1), ErrReplacementUnderpriced)
 
 			//	execute the enqueue handlers
 			<-pool.promoteReqCh
@@ -919,7 +920,7 @@ func TestAddTx(t *testing.T) {
 				pool.gauge.read(),
 			)
 
-			assert.ErrorIs(t, pool.addTx(local, tx1), ErrUnderpriced)
+			assert.ErrorIs(t, pool.addTx(local, tx1), ErrReplacementUnderpriced)
 
 			acc := pool.accounts.get(addr1)
 			acc.nonceToTx.lock()
@@ -3679,7 +3680,7 @@ func TestAddTx_TxReplacement(t *testing.T) {
 
 	assert.ErrorIs(t, pool.addTx(local, tx1), ErrUnderpriced)
 	assert.ErrorIs(t, pool.addTx(local, tx2), ErrUnderpriced)
-	assert.ErrorIs(t, pool.addTx(local, tx3), ErrUnderpriced)
+	assert.ErrorIs(t, pool.addTx(local, tx3), ErrReplacementUnderpriced)
 	assert.ErrorIs(t, pool.addTx(local, tx4), ErrUnderpriced)
 
 	// Success