Merge pull request #67 from bloXroute-Labs/v2.129.43

Publish release v2.129.43

blockchain/beacon/node.go

@@ -21,6 +21,7 @@ import (
 	"github.com/libp2p/go-libp2p/core/protocol"
 	"github.com/libp2p/go-libp2p/p2p/net/swarm"
 	"github.com/libp2p/go-libp2p/p2p/transport/tcp"
+	ma "github.com/multiformats/go-multiaddr"
 	fastssz "github.com/prysmaticlabs/fastssz"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/p2p"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/p2p/encoder"
@@ -251,7 +252,10 @@ func newNode(params NodeParams, clock utils.Clock) (*Node, error) {
 		ConnectedF: func(net libp2pNetwork.Network, conn libp2pNetwork.Conn) {
 			n.log.Tracef("peer %s connected", conn.RemoteMultiaddr())
 
-			peer := n.peers.add(net.Peerstore().PeerInfo(conn.RemotePeer()))
+			peer := n.peers.add(libp2pPeer.AddrInfo{
+				ID:    conn.RemotePeer(),
+				Addrs: []ma.Multiaddr{conn.RemoteMultiaddr()},
+			})
 			peerEndpoint := utils.MultiaddrToNodeEndoint(conn.RemoteMultiaddr(), n.networkName)
 
 			if conn.Stat().Direction == libp2pNetwork.DirInbound {

constants.go

@@ -119,7 +119,6 @@ const WSProviderTimeout = 10 * time.Second
 // SDNAccountRequestTimeout - duration after which SDN account requests are deleted if no response received
 const SDNAccountRequestTimeout = time.Minute * 2
 
-
 const (
 	// InternalError - status Code for an unexpected condition was encountered
 	InternalError = 500

nodes/gateway.go

@@ -148,7 +148,6 @@ type gateway struct {
 
 	intentsManager services.IntentsManager
 	blobsManager   *beacon.BlobSidecarCacheManager
-
 }
 
 // GeneratePeers generate string peers separated by comma
@@ -227,7 +226,6 @@ func NewGateway(parent context.Context,
 	}
 	g.chainID = int64(bxgateway.NetworkNumToChainID[sdn.NetworkNum()])
 
-
 	g.blockProposer = bsc.NewNoopBlockProposer(g.TxStore, log.WithField("service", "noop-block-proposer"))
 
 	if polygonHeimdallEndpoints != "" {
@@ -2061,7 +2059,6 @@ func (g *gateway) handleMEVBundleMessage(mevBundle bxmessage.MEVBundle, source c
 	g.stats.AddGatewayBundleEvent(event, source, start, mevBundle.BundleHash, mevBundle.GetNetworkNum(), mevBundle.Names(), mevBundle.UUID, blockNumber, mevBundle.MinTimestamp, mevBundle.MaxTimestamp)
 }
 
-
 func (g *gateway) getHeaderFromGateway() string {
 	accountID := g.sdn.AccountModel().AccountID
 	secretHash := g.sdn.AccountModel().SecretHash

nodes/gateway_test.go

@@ -1286,7 +1286,6 @@ func TestGateway_ConnectionStatus(t *testing.T) {
 	require.True(t, g.bdnStats.NodeStats()["123.45.6.78 1234"].IsConnected)
 }
 
-
 func createPeerData(timeNodeConnected string) ([]*types.NodeEndpoint, map[string]*bxmessage.BdnPerformanceStatsData) {
 	endpoints := []*types.NodeEndpoint{
 		{

servers/grpc/grpc.go

@@ -44,26 +44,26 @@ type server struct {
 
 // grpcParams server params
 type grpcParams struct {
-	node                           connections.BxListener
-	sdn                            connections.SDNHTTP
-	accService                     account.Accounter
-	bridge                         blockchain.Bridge
-	blockchainPeers                []types.NodeEndpoint
-	wsManager                      blockchain.WSManager
-	bdnStats                       *bxmessage.BdnPerformanceStats
-	timeStarted                    time.Time
-	txsQueue                       *services.MessageQueue
-	txsOrderQueue                  *services.MessageQueue
-	gatewayPublicKey               string
-	connector                      Connector
-	validatorsManager              *validator.Manager
-	txFromFieldIncludable          bool
-	blockProposer                  bsc.BlockProposer
-	allowIntroductoryTierAccess    bool
-	intentsManager                 services.IntentsManager
-	feedManager                    feedManager
-	txStore                        services.TxStore
-	chainID                        types.NetworkID
+	node                        connections.BxListener
+	sdn                         connections.SDNHTTP
+	accService                  account.Accounter
+	bridge                      blockchain.Bridge
+	blockchainPeers             []types.NodeEndpoint
+	wsManager                   blockchain.WSManager
+	bdnStats                    *bxmessage.BdnPerformanceStats
+	timeStarted                 time.Time
+	txsQueue                    *services.MessageQueue
+	txsOrderQueue               *services.MessageQueue
+	gatewayPublicKey            string
+	connector                   Connector
+	validatorsManager           *validator.Manager
+	txFromFieldIncludable       bool
+	blockProposer               bsc.BlockProposer
+	allowIntroductoryTierAccess bool
+	intentsManager              services.IntentsManager
+	feedManager                 feedManager
+	txStore                     services.TxStore
+	chainID                     types.NetworkID
 }
 
 // newServer return new server object

servers/grpc/server.go

@@ -96,25 +96,25 @@ func NewGRPCServer(
 	txStore services.TxStore,
 ) *Server {
 	params := grpcParams{
-		node:                           node,
-		sdn:                            sdn,
-		accService:                     accService,
-		bridge:                         bridge,
-		blockchainPeers:                blockchainPeers,
-		wsManager:                      wsManager,
-		bdnStats:                       bdnStats,
-		timeStarted:                    timeStarted,
-		txsQueue:                       txsQueue,
-		txsOrderQueue:                  txsOrderQueue,
-		gatewayPublicKey:               gatewayPublicKey,
-		connector:                      connector,
-		validatorsManager:              validatorsManager,
-		blockProposer:                  blockProposer,
-		allowIntroductoryTierAccess:    config.AllowIntroductoryTierAccess,
-		intentsManager:                 intentsManager,
-		feedManager:                    feedManager,
-		txStore:                        txStore,
-		chainID:                        bxgateway.NetworkNumToChainID[sdn.NetworkNum()],
+		node:                        node,
+		sdn:                         sdn,
+		accService:                  accService,
+		bridge:                      bridge,
+		blockchainPeers:             blockchainPeers,
+		wsManager:                   wsManager,
+		bdnStats:                    bdnStats,
+		timeStarted:                 timeStarted,
+		txsQueue:                    txsQueue,
+		txsOrderQueue:               txsOrderQueue,
+		gatewayPublicKey:            gatewayPublicKey,
+		connector:                   connector,
+		validatorsManager:           validatorsManager,
+		blockProposer:               blockProposer,
+		allowIntroductoryTierAccess: config.AllowIntroductoryTierAccess,
+		intentsManager:              intentsManager,
+		feedManager:                 feedManager,
+		txStore:                     txStore,
+		chainID:                     bxgateway.NetworkNumToChainID[sdn.NetworkNum()],
 	}
 
 	grpcHostPort := fmt.Sprintf("%v:%v", config.Host, config.Port)

utils/flags.go

@@ -497,4 +497,3 @@ var (
 		Value:  false,
 	}
 )
-