feat: gRPC mempool service

.gitignore

@@ -13,6 +13,7 @@ profile.out
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 build/
+tests/.testappd
 
 # Dependency directories (remove the comment below to include it)
 # vendor/

Makefile

@@ -9,6 +9,9 @@ BUILD_DIR ?= $(CURDIR)/build
 PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git)
 HTTPS_GIT := https://github.com/skip-mev/block-sdk.git
 DOCKER := $(shell which docker)
+HOMEDIR ?= $(CURDIR)/tests/.testappd
+GENESIS ?= $(HOMEDIR)/config/genesis.json
+GENESIS_TMP ?= $(HOMEDIR)/config/genesis_tmp.json
 
 ###############################################################################
 ###                                Test App                                 ###
@@ -75,13 +78,15 @@ $(BUILD_DIR)/:
 # other addresses using "genesis add-genesis-account address 10000000000000000000000000stake".
 # This will allow users to bootstrap their wallet with a balance.
 build-and-start-app: build-test-app
-	./build/testappd init validator1 --chain-id chain-id-0
-	./build/testappd keys add validator1
-	./build/testappd genesis add-genesis-account validator1 10000000000000000000000000stake
-	./build/testappd genesis add-genesis-account cosmos1see0htr47uapjvcvh0hu6385rp8lw3em24hysg 10000000000000000000000000stake
-	./build/testappd genesis gentx validator1 1000000000stake --chain-id chain-id-0
-	./build/testappd genesis collect-gentxs
-	./build/testappd start --api.enable true --api.enabled-unsafe-cors true --log_level info
+	rm -rf $(HOMEDIR)
+
+	./build/testappd init validator1 --chain-id chain-id-0 --home $(HOMEDIR)
+	./build/testappd keys add validator1 --home $(HOMEDIR) --keyring-backend test
+	./build/testappd genesis add-genesis-account validator1 10000000000000000000000000stake --home $(HOMEDIR) --keyring-backend test
+	./build/testappd genesis add-genesis-account cosmos1see0htr47uapjvcvh0hu6385rp8lw3em24hysg 10000000000000000000000000stake --home $(HOMEDIR) --keyring-backend test
+	./build/testappd genesis gentx validator1 1000000000stake --chain-id chain-id-0 --home $(HOMEDIR) --keyring-backend test
+	./build/testappd genesis collect-gentxs --home $(HOMEDIR)
+	./build/testappd start --api.enable false --api.enabled-unsafe-cors false --log_level info --home $(HOMEDIR)
 
 .PHONY: build-test-app build-and-start-app
 

block/mempool.go

@@ -32,7 +32,7 @@ type (
 		Contains(tx sdk.Tx) bool
 
 		// GetTxDistribution returns the number of transactions in each lane.
-		GetTxDistribution() map[string]int
+		GetTxDistribution() map[string]uint64
 	}
 
 	// LanedMempool defines the Block SDK mempool implementation. It contains a registry
@@ -86,11 +86,11 @@ func (m *LanedMempool) CountTx() int {
 }
 
 // GetTxDistribution returns the number of transactions in each lane.
-func (m *LanedMempool) GetTxDistribution() map[string]int {
-	counts := make(map[string]int, len(m.registry))
+func (m *LanedMempool) GetTxDistribution() map[string]uint64 {
+	counts := make(map[string]uint64, len(m.registry))
 
 	for _, lane := range m.registry {
-		counts[lane.Name()] = lane.CountTx()
+		counts[lane.Name()] = uint64(lane.CountTx())
 	}
 
 	return counts

block/mempool_test.go

@@ -288,64 +288,64 @@ func (suite *BlockBusterTestSuite) TestNewMempool() {
 func (suite *BlockBusterTestSuite) TestInsert() {
 	cases := []struct {
 		name               string
-		insertDistribution map[string]int
+		insertDistribution map[string]uint64
 	}{
 		{
 			"insert 1 mev tx",
-			map[string]int{
+			map[string]uint64{
 				suite.mevLane.Name(): 1,
 			},
 		},
 		{
 			"insert 10 mev txs",
-			map[string]int{
+			map[string]uint64{
 				suite.mevLane.Name(): 10,
 			},
 		},
 		{
 			"insert 1 base tx",
-			map[string]int{
+			map[string]uint64{
 				suite.baseLane.Name(): 1,
 			},
 		},
 		{
 			"insert 10 base txs and 10 mev txs",
-			map[string]int{
+			map[string]uint64{
 				suite.baseLane.Name(): 10,
 				suite.mevLane.Name():  10,
 			},
 		},
 		{
 			"insert 100 base txs and 100 mev txs",
-			map[string]int{
+			map[string]uint64{
 				suite.baseLane.Name(): 100,
 				suite.mevLane.Name():  100,
 			},
 		},
 		{
 			"insert 100 base txs, 100 mev txs, and 100 free txs",
-			map[string]int{
+			map[string]uint64{
 				suite.baseLane.Name(): 100,
 				suite.mevLane.Name():  100,
 				suite.freeLane.Name(): 100,
 			},
 		},
 		{
 			"insert 10 free txs",
-			map[string]int{
+			map[string]uint64{
 				suite.freeLane.Name(): 10,
 			},
 		},
 		{
 			"insert 10 free txs and 10 base txs",
-			map[string]int{
+			map[string]uint64{
 				suite.freeLane.Name(): 10,
 				suite.baseLane.Name(): 10,
 			},
 		},
 		{
 			"insert 10 mev txs and 10 free txs",
-			map[string]int{
+			map[string]uint64{
 				suite.mevLane.Name():  10,
 				suite.freeLane.Name(): 10,
 			},
@@ -365,18 +365,18 @@ func (suite *BlockBusterTestSuite) TestInsert() {
 			// Fill the Free lane with numFreeTxs transactions
 			suite.fillFreeLane(tc.insertDistribution[suite.freeLane.Name()])
 
-			sum := 0
+			sum := uint64(0)
 			for _, v := range tc.insertDistribution {
 				sum += v
 			}
 
 			// Validate the mempool
-			suite.Require().Equal(sum, suite.mempool.CountTx())
+			suite.Require().Equal(int(sum), suite.mempool.CountTx())
 
 			// Validate the lanes
-			suite.Require().Equal(tc.insertDistribution[suite.mevLane.Name()], suite.mevLane.CountTx())
-			suite.Require().Equal(tc.insertDistribution[suite.baseLane.Name()], suite.baseLane.CountTx())
-			suite.Require().Equal(tc.insertDistribution[suite.freeLane.Name()], suite.freeLane.CountTx())
+			suite.Require().Equal(tc.insertDistribution[suite.mevLane.Name()], uint64(suite.mevLane.CountTx()))
+			suite.Require().Equal(tc.insertDistribution[suite.baseLane.Name()], uint64(suite.baseLane.CountTx()))
+			suite.Require().Equal(tc.insertDistribution[suite.freeLane.Name()], uint64(suite.freeLane.CountTx()))
 
 			// Validate the lane counts
 			laneCounts := suite.mempool.GetTxDistribution()
@@ -392,8 +392,8 @@ func (suite *BlockBusterTestSuite) TestInsert() {
 func (suite *BlockBusterTestSuite) TestRemove() {
 	cases := []struct {
 		name       string
-		numTobTxs  int
-		numBaseTxs int
+		numTobTxs  uint64
+		numBaseTxs uint64
 	}{
 		{
 			"insert 1 mev tx",
@@ -446,7 +446,7 @@ func (suite *BlockBusterTestSuite) TestRemove() {
 
 				// Ensure the number of transactions in the lane is correct
 				baseCount--
-				suite.Require().Equal(suite.baseLane.CountTx(), baseCount)
+				suite.Require().Equal(suite.baseLane.CountTx(), int(baseCount))
 
 				distribution := suite.mempool.GetTxDistribution()
 				suite.Require().Equal(distribution[suite.baseLane.Name()], baseCount)
@@ -455,7 +455,7 @@ func (suite *BlockBusterTestSuite) TestRemove() {
 			}
 
 			suite.Require().Equal(0, suite.baseLane.CountTx())
-			suite.Require().Equal(mevCount, suite.mevLane.CountTx())
+			suite.Require().Equal(int(mevCount), suite.mevLane.CountTx())
 
 			// Remove all transactions from the lanes
 			for iterator := suite.mevLane.Select(suite.ctx, nil); iterator != nil; {
@@ -469,7 +469,7 @@ func (suite *BlockBusterTestSuite) TestRemove() {
 
 				// Ensure the number of transactions in the lane is correct
 				mevCount--
-				suite.Require().Equal(suite.mevLane.CountTx(), mevCount)
+				suite.Require().Equal(suite.mevLane.CountTx(), int(mevCount))
 
 				distribution := suite.mempool.GetTxDistribution()
 				suite.Require().Equal(distribution[suite.mevLane.Name()], mevCount)
@@ -485,15 +485,15 @@ func (suite *BlockBusterTestSuite) TestRemove() {
 			distribution := suite.mempool.GetTxDistribution()
 
 			// Ensure that the lane counts are correct
-			suite.Require().Equal(distribution[suite.mevLane.Name()], 0)
-			suite.Require().Equal(distribution[suite.baseLane.Name()], 0)
+			suite.Require().Equal(distribution[suite.mevLane.Name()], uint64(0))
+			suite.Require().Equal(distribution[suite.baseLane.Name()], uint64(0))
 		})
 	}
 }
 
 // fillBaseLane fills the base lane with numTxs transactions that are randomly created.
-func (suite *BlockBusterTestSuite) fillBaseLane(numTxs int) {
-	for i := 0; i < numTxs; i++ {
+func (suite *BlockBusterTestSuite) fillBaseLane(numTxs uint64) {
+	for i := uint64(0); i < numTxs; i++ {
 		// randomly select an account to create the tx
 		randomIndex := suite.random.Intn(len(suite.accounts))
 		acc := suite.accounts[randomIndex]
@@ -512,8 +512,8 @@ func (suite *BlockBusterTestSuite) fillBaseLane(numTxs int) {
 }
 
 // fillTOBLane fills the TOB lane with numTxs transactions that are randomly created.
-func (suite *BlockBusterTestSuite) fillTOBLane(numTxs int) {
-	for i := 0; i < numTxs; i++ {
+func (suite *BlockBusterTestSuite) fillTOBLane(numTxs uint64) {
+	for i := uint64(0); i < numTxs; i++ {
 		// randomly select a bidder to create the tx
 		randomIndex := suite.random.Intn(len(suite.accounts))
 		acc := suite.accounts[randomIndex]
@@ -532,8 +532,8 @@ func (suite *BlockBusterTestSuite) fillTOBLane(numTxs int) {
 }
 
 // filleFreeLane fills the free lane with numTxs transactions that are randomly created.
-func (suite *BlockBusterTestSuite) fillFreeLane(numTxs int) {
-	for i := 0; i < numTxs; i++ {
+func (suite *BlockBusterTestSuite) fillFreeLane(numTxs uint64) {
+	for i := uint64(0); i < numTxs; i++ {
 		// randomly select an account to create the tx
 		randomIndex := suite.random.Intn(len(suite.accounts))
 		acc := suite.accounts[randomIndex]

block/service/README.md

@@ -0,0 +1 @@
+# TODO

block/service/service.go

@@ -0,0 +1,54 @@
+package service
+
+import (
+	"context"
+
+	gogogrpc "github.com/cosmos/gogoproto/grpc"
+	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+
+	"github.com/skip-mev/block-sdk/block"
+	"github.com/skip-mev/block-sdk/block/service/types"
+)
+
+var _ types.ServiceServer = (*QueryService)(nil)
+
+// QueryService defines the service used by the gRPC query server to query the
+// Block SDK mempool.
+type QueryService struct {
+	types.UnimplementedServiceServer
+
+	// mempool is the mempool instance to query.
+	mempool block.Mempool
+}
+
+// NewQueryService creates a new QueryService instance.
+func NewQueryService(mempool block.Mempool) *QueryService {
+	return &QueryService{
+		mempool: mempool,
+	}
+}
+
+// GetTxDistribution returns the current distribution of transactions in the
+// mempool.
+func (s *QueryService) GetTxDistribution(
+	_ context.Context,
+	_ *types.GetTxDistributionRequest,
+) (*types.GetTxDistributionResponse, error) {
+	distribution := s.mempool.GetTxDistribution()
+	return &types.GetTxDistributionResponse{Distribution: distribution}, nil
+}
+
+// RegisterMempoolService registers the Block SDK mempool queries on the gRPC server.
+
+func RegisterMempoolService(
+	server gogogrpc.Server,
+	mempool block.Mempool,
+) {
+	types.RegisterServiceServer(server, NewQueryService(mempool))
+}
+
+// RegisterGRPCGatewayRoutes mounts the Block SDK mempool service's GRPC-gateway routes on the
+// given Mux.
+func RegisterGRPCGatewayRoutes(clientConn gogogrpc.ClientConn, mux *runtime.ServeMux) {
+	_ = types.RegisterServiceHandlerClient(context.Background(), mux, types.NewServiceClient(clientConn))
+}