Remove Sender

sei-tendermint/internal/mempool/mempool.go

@@ -757,21 +757,8 @@ func (txmp *TxMempool) addNewTransaction(wtx *WrappedTx, res *abci.ResponseCheck
 		return err
 	}
 
-	sender := res.Sender
 	priority := res.Priority
 
-	if len(sender) > 0 {
-		if wtx := txmp.txStore.GetTxBySender(sender); wtx != nil {
-			txmp.logger.Error(
-				"rejected incoming good transaction; tx already exists for sender",
-				"tx", fmt.Sprintf("%X", wtx.tx.Hash()),
-				"sender", sender,
-			)
-			txmp.metrics.RejectedTxs.Add(1)
-			return nil
-		}
-	}
-
 	if err := txmp.canAddTx(wtx); err != nil {
 		evictTxs := txmp.priorityIndex.GetEvictableTxs(
 			priority,
@@ -813,7 +800,6 @@ func (txmp *TxMempool) addNewTransaction(wtx *WrappedTx, res *abci.ResponseCheck
 	wtx.gasWanted = res.GasWanted
 	wtx.estimatedGas = res.GasEstimated
 	wtx.priority = priority
-	wtx.sender = sender
 	wtx.peers = map[uint16]struct{}{
 		txInfo.SenderID: {},
 	}

sei-tendermint/internal/mempool/mempool_test.go

@@ -159,7 +159,6 @@ func (app *application) CheckTx(_ context.Context, req *abci.RequestCheckTx) (*a
 	}
 	return &abci.ResponseCheckTxV2{ResponseCheckTx: &abci.ResponseCheckTx{
 		Priority:     priority,
-		Sender:       sender,
 		Code:         code.CodeTypeOK,
 		GasWanted:    gasWanted,
 		GasEstimated: gasEstimated,

sei-tendermint/internal/mempool/tx.go

@@ -46,10 +46,6 @@ type WrappedTx struct {
 	// in the ResponseCheckTx response.
 	priority int64
 
-	// sender defines the transaction's sender as specified by the application in
-	// the ResponseCheckTx response.
-	sender string
-
 	// timestamp is the time at which the node first received the transaction from
 	// a peer. It is used as a second dimension is prioritizing transactions when
 	// two transactions have the same priority.
@@ -96,15 +92,13 @@ func (wtx *WrappedTx) Size() int {
 //     access is not allowed. Regardless, it is not expected for the mempool to
 //     need mutative access.
 type TxStore struct {
-	mtx       sync.RWMutex
-	hashTxs   map[types.TxKey]*WrappedTx // primary index
-	senderTxs map[string]*WrappedTx      // sender is defined by the ABCI application
+	mtx     sync.RWMutex
+	hashTxs map[types.TxKey]*WrappedTx // primary index
 }
 
 func NewTxStore() *TxStore {
 	return &TxStore{
-		senderTxs: make(map[string]*WrappedTx),
-		hashTxs:   make(map[types.TxKey]*WrappedTx),
+		hashTxs: make(map[types.TxKey]*WrappedTx),
 	}
 }
 
@@ -131,15 +125,6 @@ func (txs *TxStore) GetAllTxs() []*WrappedTx {
 	return wTxs
 }
 
-// GetTxBySender returns a *WrappedTx by the transaction's sender property
-// defined by the ABCI application.
-func (txs *TxStore) GetTxBySender(sender string) *WrappedTx {
-	txs.mtx.RLock()
-	defer txs.mtx.RUnlock()
-
-	return txs.senderTxs[sender]
-}
-
 // GetTxByHash returns a *WrappedTx by the transaction's hash.
 func (txs *TxStore) GetTxByHash(hash types.TxKey) *WrappedTx {
 	txs.mtx.RLock()
@@ -176,10 +161,6 @@ func (txs *TxStore) SetTx(wtx *WrappedTx) {
 	txs.mtx.Lock()
 	defer txs.mtx.Unlock()
 
-	if len(wtx.sender) > 0 {
-		txs.senderTxs[wtx.sender] = wtx
-	}
-
 	txs.hashTxs[wtx.tx.Key()] = wtx
 }
 
@@ -189,10 +170,6 @@ func (txs *TxStore) RemoveTx(wtx *WrappedTx) {
 	txs.mtx.Lock()
 	defer txs.mtx.Unlock()
 
-	if len(wtx.sender) > 0 {
-		delete(txs.senderTxs, wtx.sender)
-	}
-
 	delete(txs.hashTxs, wtx.tx.Key())
 	wtx.removed = true
 }

sei-tendermint/internal/mempool/tx_test.go

@@ -13,25 +13,6 @@ import (
 	"github.com/tendermint/tendermint/types"
 )
 
-func TestTxStore_GetTxBySender(t *testing.T) {
-	txs := NewTxStore()
-	wtx := &WrappedTx{
-		tx:        []byte("test_tx"),
-		sender:    "foo",
-		priority:  1,
-		timestamp: time.Now(),
-	}
-
-	res := txs.GetTxBySender(wtx.sender)
-	require.Nil(t, res)
-
-	txs.SetTx(wtx)
-
-	res = txs.GetTxBySender(wtx.sender)
-	require.NotNil(t, res)
-	require.Equal(t, wtx, res)
-}
-
 func TestTxStore_GetTxByHash(t *testing.T) {
 	txs := NewTxStore()
 	wtx := &WrappedTx{

sei-tendermint/proto/tendermint/abci/types.proto

@@ -310,18 +310,17 @@
   ];
 }
 
 message ResponseCheckTx {
   uint32 code = 1;
   bytes data = 2;
   string log = 3; // nondeterministic
   int64 gas_wanted = 5;
   string codespace = 8;
-  string sender = 9;
   int64 priority = 10;
   int64 gas_estimated = 12;
 
-  reserved 4, 6, 7, 11; // see https://github.com/tendermint/tendermint/issues/8543
+  reserved 4, 6, 7, 9, 11; // see https://github.com/tendermint/tendermint/issues/8543
 }
 
 message ResponseDeliverTx {
   uint32 code = 1;