Enable Ethereum prefixed signatures on X-chain

Author: mboben

avalanchego/genesis/genesis.go

@@ -547,9 +547,12 @@ func VMGenesis(genesisBytes []byte, vmID ids.ID) (*pchaintxs.Tx, error) {
 }
 
 func AVAXAssetID(avmGenesisBytes []byte) (ids.ID, error) {
-	parser, err := xchaintxs.NewParser([]fxs.Fx{
-		&secp256k1fx.Fx{},
-	})
+	parser, err := xchaintxs.NewParser(
+		time.Time{},
+		[]fxs.Fx{
+			&secp256k1fx.Fx{},
+		},
+	)
 	if err != nil {
 		return ids.Empty, err
 	}

avalanchego/scripts/versions.sh

@@ -7,5 +7,5 @@
 
 # Set up the versions to be used
 # Don't export them as their used in the context of other calls
-coreth_version=${CORETH_VERSION:-'v0.11.0-rc.4'}
-avalanche_version=${AVALANCHE_VERSION:-'v1.9.0'}
+coreth_version=${CORETH_VERSION:-'v0.12.0-rc.2'}
+avalanche_version=${AVALANCHE_VERSION:-'v1.10.0'}

avalanchego/vms/avm/blocks/block_test.go

@@ -29,9 +29,12 @@ func TestStandardBlocks(t *testing.T) {
 	// check standard block can be built and parsed
 	require := require.New(t)
 
-	parser, err := NewParser([]fxs.Fx{
-		&secp256k1fx.Fx{},
-	})
+	parser, err := NewParser(
+		time.Time{},
+		[]fxs.Fx{
+			&secp256k1fx.Fx{},
+		},
+	)
 	require.NoError(err)
 
 	blkTimestamp := time.Now()

avalanchego/vms/avm/blocks/builder/builder_test.go

@@ -519,9 +519,12 @@ func TestBlockBuilderAddLocalTx(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	parser, err := blocks.NewParser([]fxs.Fx{
-		&secp256k1fx.Fx{},
-	})
+	parser, err := blocks.NewParser(
+		time.Time{},
+		[]fxs.Fx{
+			&secp256k1fx.Fx{},
+		},
+	)
 	require.NoError(err)
 
 	backend := &txexecutor.Backend{

avalanchego/vms/avm/blocks/parser.go

@@ -6,6 +6,7 @@ package blocks
 import (
 	"fmt"
 	"reflect"
+	"time"
 
 	"github.com/ava-labs/avalanchego/codec"
 	"github.com/ava-labs/avalanchego/utils/logging"
@@ -34,8 +35,8 @@ type parser struct {
 	txs.Parser
 }
 
-func NewParser(fxs []fxs.Fx) (Parser, error) {
-	p, err := txs.NewParser(fxs)
+func NewParser(cortinaTime time.Time, fxs []fxs.Fx) (Parser, error) {
+	p, err := txs.NewParser(cortinaTime, fxs)
 	if err != nil {
 		return nil, err
 	}
@@ -53,12 +54,13 @@ func NewParser(fxs []fxs.Fx) (Parser, error) {
 }
 
 func NewCustomParser(
+	cortinaTime time.Time,
 	typeToFxIndex map[reflect.Type]int,
 	clock *mockable.Clock,
 	log logging.Logger,
 	fxs []fxs.Fx,
 ) (Parser, error) {
-	p, err := txs.NewCustomParser(typeToFxIndex, clock, log, fxs)
+	p, err := txs.NewCustomParser(cortinaTime, typeToFxIndex, clock, log, fxs)
 	if err != nil {
 		return nil, err
 	}

avalanchego/vms/avm/network/network_test.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"errors"
 	"testing"
+	"time"
 
 	"github.com/golang/mock/gomock"
 
@@ -41,9 +42,13 @@ func TestNetworkAppGossip(t *testing.T) {
 		},
 	}
 
-	parser, err := txs.NewParser([]fxs.Fx{
-		&secp256k1fx.Fx{},
-	})
+	parser, err := txs.NewParser(
+		time.Time{},
+		[]fxs.Fx{
+			&secp256k1fx.Fx{},
+		},
+	)
+
 	require.NoError(t, err)
 	require.NoError(t, parser.InitializeTx(testTx))
 
@@ -142,11 +147,14 @@ func TestNetworkAppGossip(t *testing.T) {
 			ctrl := gomock.NewController(t)
 			defer ctrl.Finish()
 
-			parser, err := txs.NewParser([]fxs.Fx{
-				&secp256k1fx.Fx{},
-				&nftfx.Fx{},
-				&propertyfx.Fx{},
-			})
+			parser, err := txs.NewParser(
+				time.Time{},
+				[]fxs.Fx{
+					&secp256k1fx.Fx{},
+					&nftfx.Fx{},
+					&propertyfx.Fx{},
+				},
+			)
 			require.NoError(err)
 
 			n := New(
@@ -283,11 +291,14 @@ func TestNetworkIssueTx(t *testing.T) {
 			ctrl := gomock.NewController(t)
 			defer ctrl.Finish()
 
-			parser, err := txs.NewParser([]fxs.Fx{
-				&secp256k1fx.Fx{},
-				&nftfx.Fx{},
-				&propertyfx.Fx{},
-			})
+			parser, err := txs.NewParser(
+				time.Time{},
+				[]fxs.Fx{
+					&secp256k1fx.Fx{},
+					&nftfx.Fx{},
+					&propertyfx.Fx{},
+				},
+			)
 			require.NoError(err)
 
 			n := New(
@@ -310,9 +321,12 @@ func TestNetworkGossipTx(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	parser, err := txs.NewParser([]fxs.Fx{
-		&secp256k1fx.Fx{},
-	})
+	parser, err := txs.NewParser(
+		time.Time{},
+		[]fxs.Fx{
+			&secp256k1fx.Fx{},
+		},
+	)
 	require.NoError(err)
 
 	appSender := common.NewMockSender(ctrl)

avalanchego/vms/avm/states/state_test.go

@@ -36,9 +36,12 @@ var (
 
 func init() {
 	var err error
-	parser, err = blocks.NewParser([]fxs.Fx{
-		&secp256k1fx.Fx{},
-	})
+	parser, err = blocks.NewParser(
+		time.Time{},
+		[]fxs.Fx{
+			&secp256k1fx.Fx{},
+		},
+	)
 	if err != nil {
 		panic(err)
 	}

avalanchego/vms/avm/static_service.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"time"
 
 	stdjson "encoding/json"
 
@@ -77,11 +78,14 @@ type BuildGenesisReply struct {
 // BuildGenesis returns the UTXOs such that at least one address in [args.Addresses] is
 // referenced in the UTXO.
 func (*StaticService) BuildGenesis(_ *http.Request, args *BuildGenesisArgs, reply *BuildGenesisReply) error {
-	parser, err := txs.NewParser([]fxs.Fx{
-		&secp256k1fx.Fx{},
-		&nftfx.Fx{},
-		&propertyfx.Fx{},
-	})
+	parser, err := txs.NewParser(
+		time.Time{},
+		[]fxs.Fx{
+			&secp256k1fx.Fx{},
+			&nftfx.Fx{},
+			&propertyfx.Fx{},
+		},
+	)
 	if err != nil {
 		return err
 	}

avalanchego/vms/avm/txs/base_tx_test.go

@@ -5,6 +5,7 @@ package txs
 
 import (
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 
@@ -125,9 +126,12 @@ func TestBaseTxSerialization(t *testing.T) {
 		Memo: []byte{0x00, 0x01, 0x02, 0x03},
 	}}}
 
-	parser, err := NewParser([]fxs.Fx{
-		&secp256k1fx.Fx{},
-	})
+	parser, err := NewParser(
+		time.Time{},
+		[]fxs.Fx{
+			&secp256k1fx.Fx{},
+		},
+	)
 	require.NoError(err)
 
 	require.NoError(parser.InitializeTx(tx))

avalanchego/vms/avm/txs/codec.go

@@ -5,6 +5,7 @@ package txs
 
 import (
 	"reflect"
+	"time"
 
 	"github.com/ava-labs/avalanchego/codec"
 	"github.com/ava-labs/avalanchego/utils/logging"
@@ -41,6 +42,8 @@ type fxVM struct {
 	clock         *mockable.Clock
 	log           logging.Logger
 	codecRegistry codec.Registry
+
+	cortinaTime time.Time
 }
 
 func (vm *fxVM) Clock() *mockable.Clock {
@@ -56,5 +59,5 @@ func (vm *fxVM) Logger() logging.Logger {
 }
 
 func (vm *fxVM) EthVerificationEnabled() bool {
-	return false
+	return !vm.clock.Time().Before(vm.cortinaTime)
 }