Initial transitionvm PoC

go.mod

@@ -28,7 +28,7 @@ require (
 	github.com/ava-labs/avalanchego/graft/evm v1.14.2
 	github.com/ava-labs/avalanchego/graft/subnet-evm v1.14.2
 	github.com/ava-labs/libevm v1.13.15-0.20260310192938-d71b6cc8513a
-	github.com/ava-labs/strevm v0.0.0-20260402181257-eca343805711
+	github.com/ava-labs/strevm v0.0.0-20260410133722-13fb1cc9bccf
 	github.com/btcsuite/btcd/btcutil v1.1.3
 	github.com/cespare/xxhash/v2 v2.3.0
 	github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593

go.sum

@@ -339,8 +339,8 @@ github.com/ava-labs/libevm v1.13.15-0.20260310192938-d71b6cc8513a h1:rPtNc8GdAxi
 github.com/ava-labs/libevm v1.13.15-0.20260310192938-d71b6cc8513a/go.mod h1:6NxGoR1aLABnfLy+fncXRj0W6rUoUrXghnAWZ+Rhr4o=
 github.com/ava-labs/simplex v0.0.0-20250919142550-9cdfff10fd19 h1:S6oFasZsplNmw8B2S8cMJQMa62nT5ZKGzZRdCpd+5qQ=
 github.com/ava-labs/simplex v0.0.0-20250919142550-9cdfff10fd19/go.mod h1:GVzumIo3zR23/qGRN2AdnVkIPHcKMq/D89EGWZfMGQ0=
-github.com/ava-labs/strevm v0.0.0-20260402181257-eca343805711 h1:ywi93mhfgQ14PoQzGKuUOcu4hXRcWognOQEexH3gaIg=
-github.com/ava-labs/strevm v0.0.0-20260402181257-eca343805711/go.mod h1:YaV1d8LZ2K4RM0Rqzx0RWGuNoqUJDhokirwDQCFAe6s=
+github.com/ava-labs/strevm v0.0.0-20260410133722-13fb1cc9bccf h1:zL61DvsHc1qzREE0avYMLLiiZzbmTPNoZpRkf2BM5k8=
+github.com/ava-labs/strevm v0.0.0-20260410133722-13fb1cc9bccf/go.mod h1:YaV1d8LZ2K4RM0Rqzx0RWGuNoqUJDhokirwDQCFAe6s=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=

graft/coreth/plugin/evm/atomic/vm/vm.go

@@ -105,6 +105,11 @@ type VM struct {
 	bootstrapped avalancheutils.Atomic[bool]
 }
 
+// SetPreferenceWithContext implements [transitionvm.Chain].
+func (vm *VM) SetPreferenceWithContext(ctx context.Context, blkID ids.ID, _ *block.Context) error {
+	return vm.SetPreference(ctx, blkID)
+}
+
 func WrapVM(vm extension.InnerVM) *VM {
 	return &VM{InnerVM: vm}
 }

graft/coreth/plugin/evm/wrapped_block.go

@@ -346,6 +346,14 @@ func (b *wrappedBlock) semanticVerify(predicateContext *precompileconfig.Predica
 		return err
 	}
 
+	headerExtra := customtypes.GetHeaderExtra(header)
+	if headerExtra.TargetExcess != nil {
+		return fmt.Errorf("unexpected TargetExcess in header extra: %d", *headerExtra.TargetExcess)
+	}
+	if headerExtra.SettledHeight != nil {
+		return fmt.Errorf("unexpected SettledHeight in header extra: %d", *headerExtra.SettledHeight)
+	}
+
 	// If the VM is not marked as bootstrapped the other chains may also be
 	// bootstrapping and not have populated the required indices. Since
 	// bootstrapping only verifies blocks that have been canonically accepted by
@@ -498,13 +506,6 @@ func (b *wrappedBlock) syntacticVerify() error {
 		}
 	}
 
-	if headerExtra.TargetExcess != nil {
-		return fmt.Errorf("unexpected TargetExcess in header extra: %d", *headerExtra.TargetExcess)
-	}
-	if headerExtra.SettledHeight != nil {
-		return fmt.Errorf("unexpected SettledHeight in header extra: %d", *headerExtra.SettledHeight)
-	}
-
 	if b.extension != nil {
 		if err := b.extension.SyntacticVerify(*rulesExtra); err != nil {
 			return err

node/node.go

@@ -83,8 +83,10 @@ import (
 	"github.com/ava-labs/avalanchego/vms/registry"
 	"github.com/ava-labs/avalanchego/vms/rpcchainvm/runtime"
 	"github.com/ava-labs/avalanchego/vms/saevm"
+	"github.com/ava-labs/avalanchego/vms/transitionvm"
 
 	databasefactory "github.com/ava-labs/avalanchego/database/factory"
+	coreth "github.com/ava-labs/avalanchego/graft/coreth/plugin/factory"
 	avmconfig "github.com/ava-labs/avalanchego/vms/avm/config"
 	platformconfig "github.com/ava-labs/avalanchego/vms/platformvm/config"
 )
@@ -1224,7 +1226,11 @@ func (n *Node) initVMs() error {
 				CreateAssetTxFee: n.Config.CreateAssetTxFee,
 			},
 		}),
-		n.VMManager.RegisterFactory(context.TODO(), constants.EVMID, &saevm.Factory{}),
+		n.VMManager.RegisterFactory(context.TODO(), constants.EVMID, &transitionvm.Factory{
+			PreFactory:     &coreth.Factory{},
+			PostFactory:    &saevm.Factory{},
+			TransitionTime: time.Date(2026, time.April, 10, 12+5, 34, 0, 0, time.Local),
+		}),
 	)
 	if err != nil {
 		return err

vms/saevm/hook/block_builder.go

@@ -110,9 +110,7 @@ func (b *blockBuilder) BuildHeader(parent *types.Header) (*types.Header, error)
 	), nil
 }
 
-func (b *blockBuilder) PotentialEndOfBlockOps(header *types.Header, settledHash common.Hash, source saetypes.BlockSource) iter.Seq[*txpool.Tx] {
-	ctx := context.TODO()
-
+func (b *blockBuilder) PotentialEndOfBlockOps(ctx context.Context, header *types.Header, settledHash common.Hash, source saetypes.BlockSource) iter.Seq[*txpool.Tx] {
 	seq := b.potentialTxs()
 	return func(yield func(*txpool.Tx) bool) {
 		// Transactions are verified against the last executed state. We must

vms/saevm/state/genesis.go

@@ -0,0 +1,23 @@
+// Copyright (C) 2019, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package state
+
+import (
+	"github.com/ava-labs/avalanchego/database"
+	"github.com/ava-labs/avalanchego/database/prefixdb"
+)
+
+var lastSyncKey = prefixdb.MakePrefix([]byte("lastSync"))
+
+func ReadLastSync(db database.KeyValueReader) ([]byte, error) {
+	return db.Get(lastSyncKey)
+}
+
+func HasLastSync(db database.KeyValueReader) (bool, error) {
+	return db.Has(lastSyncKey)
+}
+
+func WriteLastSync(db database.KeyValueWriter, b []byte) error {
+	return db.Put(lastSyncKey, b)
+}

vms/saevm/vm.go

@@ -8,20 +8,21 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"math/big"
 	"net/http"
 	"slices"
 	"sync"
 	"sync/atomic"
 	"time"
 
-	"github.com/ava-labs/libevm/core"
+	"github.com/ava-labs/avalanchego/graft/coreth/core"
 	"github.com/ava-labs/libevm/core/rawdb"
 	"github.com/ava-labs/libevm/core/types"
+	"github.com/ava-labs/libevm/rlp"
 	"github.com/ava-labs/libevm/triedb"
 	"github.com/ava-labs/strevm/blocks"
 	"github.com/ava-labs/strevm/sae"
 	"github.com/prometheus/client_golang/prometheus"
+	"go.uber.org/zap"
 
 	"github.com/ava-labs/avalanchego/cache/lru"
 	"github.com/ava-labs/avalanchego/database/prefixdb"
@@ -41,6 +42,7 @@ import (
 	"github.com/ava-labs/avalanchego/vms/saevm/api"
 	"github.com/ava-labs/avalanchego/vms/saevm/hook"
 	"github.com/ava-labs/avalanchego/vms/saevm/hook/acp176"
+	"github.com/ava-labs/avalanchego/vms/saevm/state"
 	"github.com/ava-labs/avalanchego/vms/saevm/tx"
 	"github.com/ava-labs/avalanchego/vms/saevm/txpool"
 
@@ -101,55 +103,49 @@ func (vm *SinceGenesis) Initialize(
 	db := rawdb.NewDatabase(database.New(prefixdb.NewNested(ethDBPrefix, avaDB)))
 	tdb := triedb.NewDatabase(db, vm.config.DBConfig.TrieDBConfig)
 
-	genesis := new(core.Genesis)
-	if err := json.Unmarshal(genesisBytes, genesis); err != nil {
+	snowCtx.Log.Info("parsing genesis")
+
+	genesis, err := parseGenesis(snowCtx, genesisBytes)
+	if err != nil {
 		return fmt.Errorf("json.Unmarshal(%T): %w", genesis, err)
 	}
 
-	{
-		c := genesis.Config
-		u := snowCtx.NetworkUpgrades
-
-		c.HomesteadBlock = big.NewInt(0)
-		c.DAOForkBlock = big.NewInt(0)
-		c.DAOForkSupport = true
-		c.EIP150Block = big.NewInt(0)
-		c.EIP155Block = big.NewInt(0)
-		c.EIP158Block = big.NewInt(0)
-		c.ByzantiumBlock = big.NewInt(0)
-		c.ConstantinopleBlock = big.NewInt(0)
-		c.PetersburgBlock = big.NewInt(0)
-		c.IstanbulBlock = big.NewInt(0)
-		c.MuirGlacierBlock = big.NewInt(0)
-		c.BerlinBlock = big.NewInt(0)
-		c.LondonBlock = big.NewInt(0)
-		c.ShanghaiTime = utils.PointerTo(uint64(u.DurangoTime.Unix()))
-		c.CancunTime = utils.PointerTo(uint64(u.EtnaTime.Unix()))
-
-		chainConfigExtra := &extras.ChainConfig{
-			NetworkUpgrades: extras.GetNetworkUpgrades(u),
-			AvalancheContext: extras.AvalancheContext{
-				SnowCtx: snowCtx,
-			},
-		}
-		if chainConfigExtra.DurangoBlockTimestamp != nil {
-			chainConfigExtra.PrecompileUpgrades = append(chainConfigExtra.PrecompileUpgrades, extras.PrecompileUpgrade{
-				Config: warpcontract.NewDefaultConfig(chainConfigExtra.DurangoBlockTimestamp),
-			})
+	snowCtx.Log.Info("establishing last synchronous block")
+
+	var lastSync *types.Block
+	lastSyncBytes, err := state.ReadLastSync(avaDB)
+	switch {
+	case err == nil:
+		lastSync = new(types.Block)
+		if err := rlp.DecodeBytes(lastSyncBytes, lastSync); err != nil {
+			return fmt.Errorf("rlp.DecodeBytes(..., %T): %v", lastSync, err)
 		}
-		corethparams.WithExtra(c, chainConfigExtra)
+	case errors.Is(err, avadb.ErrNotFound):
+		lastSync = genesis.ToBlock()
+	default:
+		return err
 	}
 
-	config, _, err := core.SetupGenesisBlock(db, tdb, genesis)
+	snowCtx.Log.Info("setting up the genesis",
+		zap.Stringer("lastID", ids.ID(lastSync.Hash())),
+		zap.Uint64("lastHeight", lastSync.NumberU64()),
+	)
+
+	// TODO: Are these reasonable?
+	config, _, err := core.SetupGenesisBlock(db, tdb, genesis, lastSync.Hash(), false)
 	if err != nil {
 		return fmt.Errorf("core.SetupGenesisBlock(...): %w", err)
 	}
 
+	snowCtx.Log.Info("parsing user config")
+
 	userConfig, err := ParseConfig(configBytes)
 	if err != nil {
 		return err
 	}
 
+	snowCtx.Log.Info("parsing warp message overrides")
+
 	warpMessages, err := userConfig.WarpMessages()
 	if err != nil {
 		return err
@@ -177,7 +173,10 @@ func (vm *SinceGenesis) Initialize(
 		txs,
 		warpStorage,
 	)
-	inner, err := sae.NewVM(ctx, hooks, vm.config, snowCtx, config, db, genesis.ToBlock(), appSender)
+
+	snowCtx.Log.Info("constructing the sae VM")
+
+	inner, err := sae.NewVM(ctx, hooks, vm.config, snowCtx, config, db, lastSync, appSender)
 	if err != nil {
 		return err
 	}
@@ -187,11 +186,15 @@ func (vm *SinceGenesis) Initialize(
 	vm.mempool = txpool.New(txs, snowCtx, inner.GethRPCBackends())
 	vm.onClose = append(vm.onClose, vm.mempool.Close)
 
+	snowCtx.Log.Info("registering coreth metrics")
+
 	metrics := prometheus.NewRegistry()
 	if err := snowCtx.Metrics.Register("coreth", metrics); err != nil {
 		return fmt.Errorf("failed to register metrics: %w", err)
 	}
 
+	snowCtx.Log.Info("p2p gossip")
+
 	{ // ==========  P2P Gossip  ==========
 		gossipSet, err := gossip.NewBloomSet(vm.mempool, gossip.BloomSetConfig{})
 		if err != nil {
@@ -239,6 +242,8 @@ func (vm *SinceGenesis) Initialize(
 		})
 	}
 
+	snowCtx.Log.Info("warp handlers")
+
 	{ // ==========  Warp Handler  ==========
 		vm.warpVerifier = saewarp.NewVerifier(&blockClient{vm: inner}, warpStorage)
 		warpHandler := acp118.NewCachedHandler(
@@ -251,9 +256,42 @@ func (vm *SinceGenesis) Initialize(
 		}
 	}
 
+	snowCtx.Log.Info("initialized saevm")
+
 	return nil
 }
 
+// TODO: copied from coreth
+func parseGenesis(ctx *snow.Context, bytes []byte) (*core.Genesis, error) {
+	g := new(core.Genesis)
+	if err := json.Unmarshal(bytes, g); err != nil {
+		return nil, fmt.Errorf("parsing genesis: %w", err)
+	}
+
+	// Populate the Avalanche config extras.
+	configExtra := corethparams.GetExtra(g.Config)
+	configExtra.AvalancheContext = extras.AvalancheContext{
+		SnowCtx: ctx,
+	}
+	configExtra.NetworkUpgrades = extras.GetNetworkUpgrades(ctx.NetworkUpgrades)
+
+	// If Durango is scheduled, schedule the Warp Precompile at the same time.
+	if configExtra.DurangoBlockTimestamp != nil {
+		configExtra.PrecompileUpgrades = append(configExtra.PrecompileUpgrades, extras.PrecompileUpgrade{
+			Config: warpcontract.NewDefaultConfig(configExtra.DurangoBlockTimestamp),
+		})
+	}
+	if err := configExtra.Verify(); err != nil {
+		return nil, fmt.Errorf("invalid chain config: %w", err)
+	}
+
+	// Align all the Ethereum upgrades to the Avalanche upgrades
+	if err := corethparams.SetEthUpgrades(g.Config); err != nil {
+		return nil, fmt.Errorf("setting eth upgrades: %w", err)
+	}
+	return g, nil
+}
+
 const (
 	avaxServiceName       = "avax"
 	avaxHTTPExtensionPath = "/" + avaxServiceName

vms/transitionvm/factory.go

@@ -0,0 +1,53 @@
+// Copyright (C) 2019, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package transitionvm
+
+import (
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/ava-labs/avalanchego/utils/logging"
+	"github.com/ava-labs/avalanchego/vms"
+)
+
+var _ vms.Factory = (*Factory)(nil)
+
+type Factory struct {
+	PreFactory     vms.Factory
+	PostFactory    vms.Factory
+	TransitionTime time.Time
+}
+
+var errInvalidVMType = errors.New("invalid VM type")
+
+func (f *Factory) New(log logging.Logger) (interface{}, error) {
+	preIntf, err := f.PreFactory.New(log)
+	if err != nil {
+		return nil, err
+	}
+	pre, ok := preIntf.(Chain)
+	if !ok {
+		return nil, fmt.Errorf("pre: %w: %T", errInvalidVMType, preIntf)
+	}
+
+	postIntf, err := f.PostFactory.New(log)
+	if err != nil {
+		return nil, err
+	}
+	post, ok := postIntf.(Chain)
+	if !ok {
+		return nil, fmt.Errorf("post: %w: %T", errInvalidVMType, postIntf)
+	}
+
+	return &VM{
+		preTransitionChain:  pre,
+		postTransitionChain: post,
+		transitionTime:      f.TransitionTime,
+
+		current: &current{
+			chain: pre,
+		},
+	}, nil
+}