From 34dff6a4cf2cb27b6a16fb97cdda0cc5a62e84b0 Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Mon, 16 Sep 2024 11:31:20 +0200 Subject: [PATCH] core/vm: remove unnecessary check --- cmd/eofdump/testdata/results.initcode.txt | 2 +- cmd/eofdump/testdata/results.regular.txt | 4 ++-- core/vm/eof.go | 11 ++++++++--- core/vm/validate.go | 3 --- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/cmd/eofdump/testdata/results.initcode.txt b/cmd/eofdump/testdata/results.initcode.txt index 74404872ed..1f333b8144 100644 --- a/cmd/eofdump/testdata/results.initcode.txt +++ b/cmd/eofdump/testdata/results.initcode.txt @@ -1906,7 +1906,7 @@ ERR: unreachable code: arg 253, last 1, pos 13 ERR: invalid magic: want ef00 in sub container 0 ERR: missing data header: found section fe instead in sub container 0 ERR: invalid type content, max stack height exceeds limit for section 0: have 65007 in sub container 0 -ERR: section already referenced, arg :0 +ERR: stack underflow (0 <=> 4): at pos 0 ERR: subcontainer not referenced at all ERR: truncated immediate: op PUSH20, pos 6 ERR: invalid jump destination: out-of-bounds offset: offset 12336, dest 12342, pos 4 diff --git a/cmd/eofdump/testdata/results.regular.txt b/cmd/eofdump/testdata/results.regular.txt index 869196e039..c64b4a44aa 100644 --- a/cmd/eofdump/testdata/results.regular.txt +++ b/cmd/eofdump/testdata/results.regular.txt @@ -1906,14 +1906,14 @@ ERR: unreachable code: arg 253, last 1, pos 13 ERR: invalid container size: have 24594, want 24591 ERR: missing data header: found section fe instead in sub container 0 ERR: invalid type content, max stack height exceeds limit for section 0: have 65007 in sub container 0 -ERR: section already referenced, arg :0 +ERR: stack underflow (0 <=> 4): at pos 0 ERR: subcontainer not referenced at all ERR: truncated immediate: op PUSH20, pos 6 ERR: invalid jump destination: out-of-bounds offset: offset 12336, dest 12342, pos 4 ERR: invalid backward jump want 4 as current min got 5 at pos 12, ERR: invalid backward jump want 0 as current min got 1 at pos 12, ERR: unreachable code: arg 48, last 1, pos 13 -ERR: section already referenced, arg :0 +ERR: invalid code termination: end with ADDRESS, pos 17 ERR: unreachable code: arg 48, last 2, pos 8 ERR: invalid code termination: end with ADDRESS, pos 1 ERR: invalid section argument: arg 12336, last 1, pos 14 diff --git a/core/vm/eof.go b/core/vm/eof.go index d09f65fca7..20181db983 100644 --- a/core/vm/eof.go +++ b/core/vm/eof.go @@ -127,10 +127,15 @@ func (c *Container) MarshalBinary() []byte { // UnmarshalBinary decodes an EOF container. func (c *Container) UnmarshalBinary(b []byte, isInitcode bool) error { - return c.unmarshalSubContainer(b, isInitcode, true) + return c.unmarshalContainer(b, isInitcode, true) } -func (c *Container) unmarshalSubContainer(b []byte, isInitcode bool, topLevel bool) error { +// UnmarshalSubContainer decodes an EOF container that is inside another container. +func (c *Container) UnmarshalSubContainer(b []byte, isInitcode bool) error { + return c.unmarshalContainer(b, isInitcode, false) +} + +func (c *Container) unmarshalContainer(b []byte, isInitcode bool, topLevel bool) error { if !hasEOFMagic(b) { return fmt.Errorf("%w: want %x", ErrInvalidMagic, eofMagic) } @@ -275,7 +280,7 @@ func (c *Container) unmarshalSubContainer(b []byte, isInitcode bool, topLevel bo } subC := new(Container) end := min(idx+size, len(b)) - if err := subC.unmarshalSubContainer(b[idx:end], isInitcode, false); err != nil { + if err := subC.unmarshalContainer(b[idx:end], isInitcode, false); err != nil { if topLevel { return fmt.Errorf("%w in sub container %d", err, i) } diff --git a/core/vm/validate.go b/core/vm/validate.go index 7f804b0239..5a8aac45e3 100644 --- a/core/vm/validate.go +++ b/core/vm/validate.go @@ -182,9 +182,6 @@ func validateCode(code []byte, section int, container *Container, jt *JumpTable, if visitedSubcontainers == nil { visitedSubcontainers = make(map[int]int) } - if _, ok := visitedSubcontainers[arg]; ok { - return nil, fmt.Errorf("section already referenced, arg :%d", arg) - } // We need to store per subcontainer how it was referenced if v, ok := visitedSubcontainers[arg]; ok && v != refByEOFCreate { return nil, fmt.Errorf("section already referenced, arg :%d", arg)