Merge conflicts

2026-01-09 17:23:08 +00:00 · 2022-07-27 10:16:04 +02:00 · 2022-07-27 10:16:04 +02:00 · ac68ce62c2
commit ac68ce62c2
parent fbfe0ad62a
1 changed files with 1 additions and 0 deletions
--- a/evm/src/memory/segments.rs
+++ b/evm/src/memory/segments.rs
@ -69,6 +69,7 @@ impl Segment {
            Segment::Returndata => 8,
            Segment::Metadata => 256,
            Segment::KernelGeneral => 256,
+            Segment::TxnFields => 256,
            Segment::TxnData => 256,
            Segment::RlpRaw => 8,
        }