Add new methods and types for FEVM

abi/cbor_bytes.go

@@ -0,0 +1,51 @@
+package abi
+
+import (
+	"fmt"
+	"io"
+
+	cbg "github.com/whyrusleeping/cbor-gen"
+	"golang.org/x/xerrors"
+)
+
+type CborBytes []byte
+
+func (t *CborBytes) MarshalCBOR(w io.Writer) error {
+	if len(*t) > cbg.ByteArrayMaxLen {
+		return xerrors.Errorf("byte array was too long")
+	}
+
+	if err := cbg.WriteMajorTypeHeader(w, cbg.MajByteString, uint64(len(*t))); err != nil {
+		return err
+	}
+
+	_, err := w.Write((*t)[:])
+	return err
+}
+
+func (t *CborBytes) UnmarshalCBOR(r io.Reader) error {
+
+	br := cbg.GetPeeker(r)
+	maj, extra, err := cbg.CborReadHeader(br)
+	if err != nil {
+		return err
+	}
+
+	if extra > cbg.ByteArrayMaxLen {
+		return fmt.Errorf("byte array too large (%d)", extra)
+	}
+	if maj != cbg.MajByteString {
+		return fmt.Errorf("expected byte array")
+	}
+
+	if extra > 0 {
+		ret := make([]byte, extra)
+		if _, err := io.ReadFull(br, ret[:]); err != nil {
+			return err
+		}
+
+		*t = ret
+	}
+
+	return nil
+}

builtin/methods.go

@@ -386,3 +386,13 @@ var MethodsEAM = struct {
 	2,
 	3,
 }
+
+var MethodsEmbryo = struct {
+	Constructor abi.MethodNum
+}{}
+
+var MethodsEthAccount = struct {
+	Constructor abi.MethodNum
+}{
+	MethodConstructor,
+}

builtin/v10/eam/methods.go

@@ -0,0 +1,12 @@
+package eam
+
+import (
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/go-state-types/builtin"
+)
+
+var Methods = map[abi.MethodNum]builtin.MethodMeta{
+	1: {"Constructor", *new(func(*abi.EmptyValue) *abi.EmptyValue)}, // Constructor
+	2: {"Create", *new(func(*CreateParams) *CreateReturn)},          // Create
+	3: {"Create2", *new(func(*Create2Params) *Create2Return)},       // Create2
+}

builtin/v10/embryo/methods.go

@@ -0,0 +1,9 @@
+package embryo
+
+import (
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/go-state-types/builtin"
+)
+
+// Placeholder has no methods, not even a constructor
+var Methods = map[abi.MethodNum]builtin.MethodMeta{}

builtin/v10/ethaccount/methods.go

@@ -0,0 +1,10 @@
+package ethaccount
+
+import (
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/go-state-types/builtin"
+)
+
+var Methods = map[abi.MethodNum]builtin.MethodMeta{
+	1: {"Constructor", *new(func(value *abi.EmptyValue) *abi.EmptyValue)},
+}

builtin/v10/evm/evm_actor_params.go → builtin/v10/evm/evm_types.go

@@ -1,5 +1,7 @@
 package evm
 
+import "github.com/ipfs/go-cid"
+
 type ConstructorParams struct {
 	Creator  []byte
 	Initcode []byte
@@ -8,3 +10,8 @@ type ConstructorParams struct {
 type GetStorageAtParams struct {
 	StorageKey []byte
 }
+
+type DelegateCallParams struct {
+	Code  cid.Cid
+	Input []byte
+}

builtin/v10/evm/methods.go

@@ -0,0 +1,17 @@
+package evm
+
+import (
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/go-state-types/big"
+	"github.com/filecoin-project/go-state-types/builtin"
+	typegen "github.com/whyrusleeping/cbor-gen"
+)
+
+var Methods = map[abi.MethodNum]builtin.MethodMeta{
+	1: {"Constructor", *new(func(*ConstructorParams) *abi.EmptyValue)},
+	2: {"InvokeContract", *new(func(bytes *abi.CborBytes) *abi.CborBytes)},
+	3: {"GetBytecode", *new(func(*abi.EmptyValue) *typegen.CborCid)},
+	4: {"GetStorageAt", *new(func(*GetStorageAtParams) *big.Int)},
+	5: {"InvokeContractDelegate", *new(func(params *DelegateCallParams) *abi.CborBytes)},
+	6: {"GetBytecodeHash", *new(func(*abi.EmptyValue) *typegen.CborCid)},
+}

builtin/v10/gen/gen.go

@@ -291,6 +291,7 @@ func main() {
 		// method params and returns
 		evm.ConstructorParams{},
 		evm.GetStorageAtParams{},
+		evm.DelegateCallParams{},
 	); err != nil {
 		panic(err)
 	}