56c4f2bfd4
The bulk of this PR is authored by @lightclient , in the original EOF-work. More recently, the code has been picked up and reworked for the new EOF specification, by @MariusVanDerWijden , in https://github.com/ethereum/go-ethereum/pull/29518, and also @shemnon has contributed with fixes. This PR is an attempt to start eating the elephant one small bite at a time, by selecting only the eof-validation as a standalone piece which can be merged without interfering too much in the core stuff. In this PR: - [x] Validation of eof containers, lifted from #29518, along with test-vectors from consensus-tests and fuzzing, to ensure that the move did not lose any functionality. - [x] Definition of eof opcodes, which is a prerequisite for validation - [x] Addition of `undefined` to a jumptable entry item. I'm not super-happy with this, but for the moment it seems the least invasive way to do it. A better way might be to go back and allowing nil-items or nil execute-functions to denote "undefined". - [x] benchmarks of eof validation speed --------- Co-authored-by: lightclient <lightclient@protonmail.com> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: Danno Ferrin <danno.ferrin@shemnon.com>
120 lines
3.4 KiB
Go
120 lines
3.4 KiB
Go
// Copyright 2022 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package vm
|
|
|
|
import (
|
|
"encoding/hex"
|
|
"fmt"
|
|
"reflect"
|
|
"testing"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
)
|
|
|
|
func TestEOFMarshaling(t *testing.T) {
|
|
for i, test := range []struct {
|
|
want Container
|
|
err error
|
|
}{
|
|
{
|
|
want: Container{
|
|
types: []*functionMetadata{{inputs: 0, outputs: 0x80, maxStackHeight: 1}},
|
|
codeSections: [][]byte{common.Hex2Bytes("604200")},
|
|
data: []byte{0x01, 0x02, 0x03},
|
|
dataSize: 3,
|
|
},
|
|
},
|
|
{
|
|
want: Container{
|
|
types: []*functionMetadata{{inputs: 0, outputs: 0x80, maxStackHeight: 1}},
|
|
codeSections: [][]byte{common.Hex2Bytes("604200")},
|
|
data: []byte{0x01, 0x02, 0x03},
|
|
dataSize: 3,
|
|
},
|
|
},
|
|
{
|
|
want: Container{
|
|
types: []*functionMetadata{
|
|
{inputs: 0, outputs: 0x80, maxStackHeight: 1},
|
|
{inputs: 2, outputs: 3, maxStackHeight: 4},
|
|
{inputs: 1, outputs: 1, maxStackHeight: 1},
|
|
},
|
|
codeSections: [][]byte{
|
|
common.Hex2Bytes("604200"),
|
|
common.Hex2Bytes("6042604200"),
|
|
common.Hex2Bytes("00"),
|
|
},
|
|
data: []byte{},
|
|
},
|
|
},
|
|
} {
|
|
var (
|
|
b = test.want.MarshalBinary()
|
|
got Container
|
|
)
|
|
t.Logf("b: %#x", b)
|
|
if err := got.UnmarshalBinary(b, true); err != nil && err != test.err {
|
|
t.Fatalf("test %d: got error \"%v\", want \"%v\"", i, err, test.err)
|
|
}
|
|
if !reflect.DeepEqual(got, test.want) {
|
|
t.Fatalf("test %d: got %+v, want %+v", i, got, test.want)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestEOFSubcontainer(t *testing.T) {
|
|
var subcontainer = new(Container)
|
|
if err := subcontainer.UnmarshalBinary(common.Hex2Bytes("ef000101000402000100010400000000800000fe"), true); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
container := Container{
|
|
types: []*functionMetadata{{inputs: 0, outputs: 0x80, maxStackHeight: 1}},
|
|
codeSections: [][]byte{common.Hex2Bytes("604200")},
|
|
subContainers: []*Container{subcontainer},
|
|
data: []byte{0x01, 0x02, 0x03},
|
|
dataSize: 3,
|
|
}
|
|
var (
|
|
b = container.MarshalBinary()
|
|
got Container
|
|
)
|
|
if err := got.UnmarshalBinary(b, true); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
fmt.Print(got)
|
|
if res := got.MarshalBinary(); !reflect.DeepEqual(res, b) {
|
|
t.Fatalf("invalid marshalling, want %v got %v", b, res)
|
|
}
|
|
}
|
|
|
|
func TestMarshaling(t *testing.T) {
|
|
tests := []string{
|
|
"EF000101000402000100040400000000800000E0000000",
|
|
"ef0001010004020001000d04000000008000025fe100055f5fe000035f600100",
|
|
}
|
|
for i, test := range tests {
|
|
s, err := hex.DecodeString(test)
|
|
if err != nil {
|
|
t.Fatalf("test %d: error decoding: %v", i, err)
|
|
}
|
|
var got Container
|
|
if err := got.UnmarshalBinary(s, true); err != nil {
|
|
t.Fatalf("test %d: got error %v", i, err)
|
|
}
|
|
}
|
|
}
|