Merge pull request #2356 from OffchainLabs/l2msg_length

tsahee · web-flow · commit 4b303e042e90 · 2024-05-30T10:37:26.000-06:00
MessageFromTxes: check l2message length
diff --git a/execution/gethexec/executionengine.go b/execution/gethexec/executionengine.go
@@ -234,6 +234,9 @@ func MessageFromTxes(header *arbostypes.L1IncomingMessageHeader, txes types.Tran
 			l2Message = append(l2Message, txBytes...)
 		}
 	}
+	if len(l2Message) > arbostypes.MaxL2MessageSize {
+		return nil, errors.New("l2message too long")
+	}
 	return &arbostypes.L1IncomingMessage{
 		Header: header,
 		L2msg:  l2Message,

Original file line number	Diff line number	Diff line change
`@@ -234,6 +234,9 @@ func MessageFromTxes(header *arbostypes.L1IncomingMessageHeader, txes types.Tran`
`234`	`234`	`l2Message = append(l2Message, txBytes...)`
`235`	`235`	`}`
`236`	`236`	`}`
	`237`	`+ if len(l2Message) > arbostypes.MaxL2MessageSize {`
	`238`	`+ return nil, errors.New("l2message too long")`
	`239`	`+ }`
`237`	`240`	`return &arbostypes.L1IncomingMessage{`
`238`	`241`	`Header: header,`
`239`	`242`	`L2msg: l2Message,`