Publish release v2.129.57

bloXroute-Labs · Dec 10, 2024 · bd53ee1 · bd53ee1
1 parent 133ba19
commit bd53ee1
Show file tree

Hide file tree

Showing 11 changed files with 865 additions and 859 deletions.
diff --git a/.!38918!.DS_Store → .../test/.!27749!bsc_blob_sidecars_len_1.rlp b/.!38918!.DS_Store → .../test/.!27749!bsc_blob_sidecars_len_1.rlp
diff --git a/.!39803!.DS_Store → .../test/.!28617!bsc_blob_sidecars_len_1.rlp b/.!39803!.DS_Store → .../test/.!28617!bsc_blob_sidecars_len_1.rlp
diff --git a/blockchain/common/test/.!39341!bsc_blob_sidecars_len_1.rlp b/blockchain/common/test/.!39341!bsc_blob_sidecars_len_1.rlp
diff --git a/blockchain/common/test/.!40232!bsc_blob_sidecars_len_1.rlp b/blockchain/common/test/.!40232!bsc_blob_sidecars_len_1.rlp
diff --git a/bxmessage/mev_bundle.go b/bxmessage/mev_bundle.go
@@ -813,5 +813,8 @@ func (m *MEVBundle) Clone() *MEVBundle {
 		SentFromCloudAPI:          m.SentFromCloudAPI,
 		AvoidMixedBundles:         m.AvoidMixedBundles,
 		PriorityFeeRefund:         m.PriorityFeeRefund,
+		IncomingRefundRecipient:   m.IncomingRefundRecipient,
+		BlocksCount:               m.BlocksCount,
+		DroppingTxHashes:          m.DroppingTxHashes,
 	}
 }
diff --git a/jsonrpc/request.go b/jsonrpc/request.go
@@ -135,7 +135,7 @@ type RPCBundleSubmissionPayload struct {
 	PriorityFeeRefund       bool              `json:"priority_fee_refund"`
 	IncomingRefundRecipient string            `json:"refund_recipient,omitempty"`
 	BlocksCount             int               `json:"blocks_count,omitempty"`
-	DroppingTxHashes        []string          `json:"dropping_tx_hashes,omitempty"`
+	DroppingHashes          []string          `json:"dropping_hashes,omitempty"`
 }
 
 // Validate doing validation for blxr_submit_bundle payload
@@ -173,8 +173,8 @@ func (p RPCBundleSubmissionPayload) Validate() error {
 		}
 	}
 
-	if len(p.DroppingTxHashes) > len(p.Transaction) {
-		return fmt.Errorf("dropping txs have too many hashes, %v", p.DroppingTxHashes)
+	if len(p.DroppingHashes) > len(p.Transaction) {
+		return fmt.Errorf("dropping txs have too many hashes, %v", p.DroppingHashes)
 	}
 
 	return nil

diff --git a/protobuf/gateway.pb.go b/protobuf/gateway.pb.go
diff --git a/protobuf/gateway.proto b/protobuf/gateway.proto
@@ -110,7 +110,7 @@ message BlxrSubmitBundleRequest {
   bool priority_fee_refund = 11;
   string refund_recipient = 12;
   int64 blocks_count = 13;
-  repeated string dropping_tx_hashes = 14;
+  repeated string dropping_hashes = 14;
 }
 
 message BlxrSubmitBundleReply {

diff --git a/servers/grpc/bundle.go b/servers/grpc/bundle.go
@@ -39,7 +39,7 @@ func (g *server) BlxrSubmitBundle(ctx context.Context, req *pb.BlxrSubmitBundleR
 		PriorityFeeRefund:       req.PriorityFeeRefund,
 		IncomingRefundRecipient: req.RefundRecipient,
 		BlocksCount:             int(req.BlocksCount),
-		DroppingTxHashes:        req.DroppingTxHashes,
+		DroppingHashes:          req.DroppingHashes,
 	}
 
 	grpc := connections.NewRPCConn(*accountID, getPeerAddr(ctx), g.params.sdn.NetworkNum(), utils.GRPC)

diff --git a/servers/handler/bundle.go b/servers/handler/bundle.go
@@ -226,7 +226,7 @@ func mevBundleFromRequest(payload *jsonrpc.RPCBundleSubmissionPayload, networkNu
 		payload.PriorityFeeRefund,
 		payload.IncomingRefundRecipient,
 		payload.BlocksCount,
-		payload.DroppingTxHashes,
+		payload.DroppingHashes,
 	)
 	if err != nil {
 		// Validated before, should not happen

diff --git a/servers/http/server.go b/servers/http/server.go
@@ -106,13 +106,16 @@ func (s *Server) httpRPCHandler(w http.ResponseWriter, r *http.Request) {
 		}
 
 		payload := jsonrpc.RPCBundleSubmissionPayload{
-			Transaction:       bundlePayload[0].Txs,
-			BlockNumber:       bundlePayload[0].BlockNumber,
-			MinTimestamp:      bundlePayload[0].MinTimestamp,
-			MaxTimestamp:      bundlePayload[0].MaxTimestamp,
-			RevertingHashes:   bundlePayload[0].RevertingTxHashes,
-			UUID:              bundlePayload[0].UUID,
-			AvoidMixedBundles: bundlePayload[0].AvoidMixedBundles,
+			Transaction:             bundlePayload[0].Txs,
+			BlockNumber:             bundlePayload[0].BlockNumber,
+			MinTimestamp:            bundlePayload[0].MinTimestamp,
+			MaxTimestamp:            bundlePayload[0].MaxTimestamp,
+			RevertingHashes:         bundlePayload[0].RevertingTxHashes,
+			UUID:                    bundlePayload[0].UUID,
+			AvoidMixedBundles:       bundlePayload[0].AvoidMixedBundles,
+			IncomingRefundRecipient: bundlePayload[0].RefundRecipient,
+			BlocksCount:             bundlePayload[0].BlocksCount,
+			DroppingHashes:          bundlePayload[0].DroppingTxHashes,
 		}
 
 		s.handleRPCBundleSubmission(w, r, rpcRequest, payload)