return error when UnmarshalBinary fails

flashbots · Aug 13, 2024 · fd07061 · fd07061
1 parent e1c790a
commit fd07061
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/op-node/node/node.go b/op-node/node/node.go
@@ -614,7 +614,11 @@ func (n *OpNode) PublishL2Payload(ctx context.Context, envelope *eth.ExecutionPa
 }
 
 func (n *OpNode) PublishL2Attributes(ctx context.Context, attrs *derive.AttributesWithParent) error {
-	builderAttrs := attrs.ToBuilderPayloadAttributes()
+	builderAttrs, err := attrs.ToBuilderPayloadAttributes()
+	if err != nil {
+		n.log.Warn("failed to convert attributes to builder attributes", "err", err)
+		return err
+	}
 	jsonBytes, err := json.Marshal(builderAttrs)
 	if err != nil {
 		n.log.Warn("failed to marshal payload attributes", "err", err)

diff --git a/op-node/rollup/derive/attributes_queue.go b/op-node/rollup/derive/attributes_queue.go
@@ -36,11 +36,14 @@ type AttributesWithParent struct {
 	IsLastInSpan bool
 }
 
-func (a *AttributesWithParent) ToBuilderPayloadAttributes() *BuilderPayloadAttributes {
+func (a *AttributesWithParent) ToBuilderPayloadAttributes() (*BuilderPayloadAttributes, error) {
 	transactions := make([]*types.Transaction, len(a.Attributes.Transactions))
 	for i, txBytes := range a.Attributes.Transactions {
 		var ttx types.Transaction
-		ttx.UnmarshalBinary(txBytes)
+		err := ttx.UnmarshalBinary(txBytes)
+		if err != nil {
+			return nil, err
+		}
 		transactions[i] = &ttx
 	}
 
@@ -54,7 +57,7 @@ func (a *AttributesWithParent) ToBuilderPayloadAttributes() *BuilderPayloadAttri
 		ParentBeaconBlockRoot: a.Attributes.ParentBeaconBlockRoot,
 		Transactions:          transactions,
 		GasLimit:              uint64(*a.Attributes.GasLimit),
-	}
+	}, nil
 }
 
 type BuilderPayloadAttributes struct {

diff --git a/op-service/events/server.go b/op-service/events/server.go
@@ -91,7 +91,10 @@ func (s *Server) StreamEvents(w http.ResponseWriter, r *http.Request) {
 }
 
 func (s *Server) sendPayloadAttributes(ctx context.Context, w http.ResponseWriter, flusher http.Flusher, attrs *derive.AttributesWithParent) error {
-	builderAttrs := attrs.ToBuilderPayloadAttributes()
+	builderAttrs, err := attrs.ToBuilderPayloadAttributes()
+	if err != nil {
+		return err
+	}
 	jsonBytes, err := json.Marshal(builderAttrs)
 	if err != nil {
 		return err