LaconicNetwork/block-sdk
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

[ENG-704]: Decoupling the auction and global mempools (#55)

Browse Source
This commit is contained in:
David Terpay
2023-04-12 08:11:09 -04:00
committed by GitHub
parent 0579f8b1a2
commit acaf60e5b8
5 changed files with 73 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
abci/abci.go
+25 -49
View File
@@ -13,7 +13,6 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
"github.com/skip-mev/pob/mempool"
buildertypes "github.com/skip-mev/pob/x/builder/types"
)
type ProposalHandler struct {
@@ -49,9 +48,9 @@ func (h *ProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHandler {
totalTxBytes int64
)
bidTxMap := make(map[string]struct{})
bidTxIterator := h.mempool.AuctionBidSelect(ctx)
txsToRemove := make(map[sdk.Tx]struct{}, 0)
seenTxs := make(map[string]struct{}, 0)
// Attempt to select the highest bid transaction that is valid and whose
// bundled transactions are valid.
@@ -67,8 +66,8 @@ func (h *ProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHandler {
bidTxSize := int64(len(bidTxBz))
if bidTxSize <= req.MaxTxBytes {
bidMsg, ok := tmpBidTx.GetMsgs()[0].(*buildertypes.MsgAuctionBid)
if !ok {
bidMsg, err := mempool.GetMsgAuctionBidFromTx(tmpBidTx)
if err != nil {
// This should never happen, as CheckTx will ensure only valid bids
// enter the mempool, but in case it does, we need to remove the
// transaction from the mempool.
@@ -76,8 +75,7 @@ func (h *ProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHandler {
continue selectBidTxLoop
}
bundledTxsRaw := make([][]byte, len(bidMsg.Transactions))
for i, refTxRaw := range bidMsg.Transactions {
for _, refTxRaw := range bidMsg.Transactions {
refTx, err := h.txDecoder(refTxRaw)
if err != nil {
// Malformed bundled transaction, so we remove the bid transaction
@@ -92,39 +90,31 @@ func (h *ProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHandler {
txsToRemove[tmpBidTx] = struct{}{}
continue selectBidTxLoop
}
bundledTxsRaw[i] = refTxRaw
}
// At this point, both the bid transaction itself and all the bundled
// transactions are valid. So we select the bid transaction along with
// all the bundled transactions. We also mark these transactions and
// all the bundled transactions. We also mark these transactions as seen and
// update the total size selected thus far.
totalTxBytes += bidTxSize
bidTxHash := sha256.Sum256(bidTxBz)
bidTxHashStr := hex.EncodeToString(bidTxHash[:])
bidTxMap[bidTxHashStr] = struct{}{}
selectedTxs = append(selectedTxs, bidTxBz)
selectedTxs = append(selectedTxs, bidMsg.Transactions...)
for _, refTxRaw := range bundledTxsRaw {
refTxHash := sha256.Sum256(refTxRaw)
refTxHashStr := hex.EncodeToString(refTxHash[:])
bidTxMap[refTxHashStr] = struct{}{}
selectedTxs = append(selectedTxs, refTxRaw)
for _, refTxRaw := range bidMsg.Transactions {
hash := sha256.Sum256(refTxRaw)
txHash := hex.EncodeToString(hash[:])
seenTxs[txHash] = struct{}{}
}
break selectBidTxLoop
}
txsToRemove[tmpBidTx] = struct{}{}
h.logger.Info(
"failed to select auction bid tx; tx size is too large; skipping auction",
"failed to select auction bid tx; tx size is too large",
"tx_size", bidTxSize,
"max_size", req.MaxTxBytes,
)
break selectBidTxLoop
}
// Remove all invalid transactions from the mempool.
@@ -141,37 +131,32 @@ func (h *ProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHandler {
for ; iterator != nil; iterator = iterator.Next() {
memTx := iterator.Tx()
// We've already selected the highest bid transaction, so we can skip
// all other auction transactions.
isAuctionTx, err := h.isAuctionTx(memTx)
// If the transaction is already included in the proposal, then we skip it.
txBz, err := h.txEncoder(memTx)
if err != nil {
txsToRemove[memTx] = struct{}{}
continue selectTxLoop
}
if isAuctionTx {
hash := sha256.Sum256(txBz)
txHash := hex.EncodeToString(hash[:])
if _, ok := seenTxs[txHash]; ok {
continue selectTxLoop
}
txBz, err := h.txVerifier.PrepareProposalVerifyTx(memTx)
txBz, err = h.txVerifier.PrepareProposalVerifyTx(memTx)
if err != nil {
txsToRemove[memTx] = struct{}{}
continue selectTxLoop
}
// Referenced/bundled transaction may exist in the mempool, so we explicitly
// check prior to considering the transaction.
txHash := sha256.Sum256(txBz)
txHashStr := hex.EncodeToString(txHash[:])
if _, ok := bidTxMap[txHashStr]; !ok {
txSize := int64(len(txBz))
if totalTxBytes += txSize; totalTxBytes <= req.MaxTxBytes {
selectedTxs = append(selectedTxs, txBz)
} else {
// We've reached capacity per req.MaxTxBytes so we cannot select any
// more transactions.
break selectTxLoop
}
txSize := int64(len(txBz))
if totalTxBytes += txSize; totalTxBytes <= req.MaxTxBytes {
selectedTxs = append(selectedTxs, txBz)
} else {
// We've reached capacity per req.MaxTxBytes so we cannot select any
// more transactions.
break selectTxLoop
}
}
@@ -228,12 +213,3 @@ func (h *ProposalHandler) RemoveTx(tx sdk.Tx) {
panic(fmt.Errorf("failed to remove invalid transaction from the mempool: %w", err))
}
}
func (h *ProposalHandler) isAuctionTx(tx sdk.Tx) (bool, error) {
msgAuctionBid, err := mempool.GetMsgAuctionBidFromTx(tx)
if err != nil {
return false, err
}
return msgAuctionBid != nil, nil
}
abci/abci_test.go
+31 -12
View File
@@ -2,6 +2,9 @@ package abci_test
import (
"bytes"
"crypto/sha256"
"encoding/hex"
"fmt"
"math/rand"
"testing"
"time"
@@ -30,6 +33,7 @@ type ABCITestSuite struct {
logger log.Logger
encodingConfig testutils.EncodingConfig
proposalHandler *abci.ProposalHandler
txs map[string]struct{}
// auction bid setup
auctionBidAmount sdk.Coin
@@ -66,6 +70,7 @@ func (suite *ABCITestSuite) SetupTest() {
// Mempool set up
suite.mempool = mempool.NewAuctionMempool(suite.encodingConfig.TxConfig.TxDecoder(), suite.encodingConfig.TxConfig.TxEncoder(), 0)
suite.txs = make(map[string]struct{})
suite.auctionBidAmount = sdk.NewCoin("foo", sdk.NewInt(1000000000))
suite.minBidIncrement = sdk.NewCoin("foo", sdk.NewInt(1000))
@@ -116,6 +121,13 @@ func (suite *ABCITestSuite) PrepareProposalVerifyTx(tx sdk.Tx) ([]byte, error) {
return nil, err
}
hash := sha256.Sum256(txBz)
txHash := hex.EncodeToString(hash[:])
if _, ok := suite.txs[txHash]; ok {
return nil, fmt.Errorf("tx already in mempool")
}
suite.txs[txHash] = struct{}{}
return txBz, nil
}
@@ -130,6 +142,13 @@ func (suite *ABCITestSuite) ProcessProposalVerifyTx(txBz []byte) (sdk.Tx, error)
return tx, err
}
hash := sha256.Sum256(txBz)
txHash := hex.EncodeToString(hash[:])
if _, ok := suite.txs[txHash]; ok {
return nil, fmt.Errorf("tx already in mempool")
}
suite.txs[txHash] = struct{}{}
return tx, nil
}
@@ -214,11 +233,11 @@ func (suite *ABCITestSuite) createFilledMempool(numNormalTxs, numAuctionTxs, num
var totalNumTxs int
suite.Require().Equal(numAuctionTxs, suite.mempool.CountAuctionTx())
if insertRefTxs {
totalNumTxs = numNormalTxs + numAuctionTxs*(numBundledTxs+1)
totalNumTxs = numNormalTxs + numAuctionTxs*(numBundledTxs)
suite.Require().Equal(totalNumTxs, suite.mempool.CountTx())
suite.Require().Equal(totalNumTxs, numSeenGlobalTxs)
} else {
totalNumTxs = numNormalTxs + numAuctionTxs
totalNumTxs = numNormalTxs
suite.Require().Equal(totalNumTxs, suite.mempool.CountTx())
suite.Require().Equal(totalNumTxs, numSeenGlobalTxs)
}
@@ -297,7 +316,7 @@ func (suite *ABCITestSuite) TestPrepareProposal() {
insertRefTxs = true
},
4,
4,
3,
true,
},
{
@@ -309,7 +328,7 @@ func (suite *ABCITestSuite) TestPrepareProposal() {
insertRefTxs = false
},
4,
1,
0,
true,
},
{
@@ -350,7 +369,7 @@ func (suite *ABCITestSuite) TestPrepareProposal() {
insertRefTxs = false
},
4,
10,
0,
true,
},
{
@@ -362,7 +381,7 @@ func (suite *ABCITestSuite) TestPrepareProposal() {
insertRefTxs = true
},
31,
40,
30,
true,
},
{
@@ -395,7 +414,7 @@ func (suite *ABCITestSuite) TestPrepareProposal() {
numBundledTxs = 0
},
2,
2,
1,
true,
},
{
@@ -407,7 +426,7 @@ func (suite *ABCITestSuite) TestPrepareProposal() {
insertRefTxs = false
},
5,
2,
1,
true,
},
{
@@ -434,7 +453,7 @@ func (suite *ABCITestSuite) TestPrepareProposal() {
numBundledTxs = 0
},
101,
101,
100,
true,
},
{
@@ -446,7 +465,7 @@ func (suite *ABCITestSuite) TestPrepareProposal() {
insertRefTxs = true
},
104,
104,
103,
true,
},
{
@@ -458,7 +477,7 @@ func (suite *ABCITestSuite) TestPrepareProposal() {
insertRefTxs = false
},
104,
101,
100,
true,
},
{
@@ -470,7 +489,7 @@ func (suite *ABCITestSuite) TestPrepareProposal() {
insertRefTxs = true
},
201,
300,
200,
true,
},
}