Support avalanchego usage

builder.go

@@ -8,6 +8,7 @@ import (
 	"slices"
 
 	"github.com/arr4n/sink"
+	snowcommon "github.com/ava-labs/avalanchego/snow/engine/common"
 	"github.com/ava-labs/avalanchego/vms/components/gas"
 	"github.com/ava-labs/libevm/core/state"
 	"github.com/ava-labs/libevm/core/types"
@@ -21,7 +22,20 @@ func (vm *VM) buildBlock(ctx context.Context, timestamp uint64, parent *Block) (
 	block, err := sink.FromPriorityMutex(
 		ctx, vm.mempool, sink.MaxPriority,
 		func(_ <-chan sink.Priority, pool *queue.Priority[*pendingTx]) (*Block, error) {
-			return vm.buildBlockWithCandidateTxs(timestamp, parent, pool)
+			block, err := vm.buildBlockWithCandidateTxs(timestamp, parent, pool)
+
+			// TODO: This shouldn't be done immediately, there should be some
+			// retry delay if block building failed.
+			if pool.Len() > 0 {
+				select {
+				case vm.toEngine <- snowcommon.PendingTxs:
+				default:
+					p := snowcommon.PendingTxs
+					vm.logger().Info(fmt.Sprintf("%T(%s) dropped", p, p))
+				}
+			}
+
+			return block, err
 		},
 	)
 	if err != nil {
@@ -84,7 +98,8 @@ func (vm *VM) buildBlockWithCandidateTxs(timestamp uint64, parent *Block, candid
 		return nil, err
 	}
 	if gasUsed == 0 && len(txs) == 0 {
-		return nil, errNoopBlock
+		vm.logger().Info("Blocks must either settle or include transactions")
+		return nil, fmt.Errorf("%w: parent %#x at time %d", errNoopBlock, parent.Hash(), timestamp)
 	}
 
 	b := vm.newBlock(types.NewBlock(
@@ -179,6 +194,10 @@ func (vm *VM) buildBlockOnHistory(lastSettled, parent *Block, timestamp uint64,
 				"Unknown error from worst-case transaction checking",
 				zap.Error(err),
 			)
+
+			// TODO: It is not acceptable to return an error here, as all
+			// transactions that have been removed from the mempool will be
+			// dropped and never included.
 			return nil, 0, err
 		}
 	}

exec.go

@@ -222,7 +222,7 @@ func (e *executor) execute(ctx context.Context, b *Block) error {
 
 	header := types.CopyHeader(b.Header())
 	header.BaseFee = e.gasClock.BaseFee().ToBig()
-	e.log.Debug(
+	e.log.Info(
 		"Executing accepted block",
 		zap.Uint64("height", b.Height()),
 		zap.Uint64("timestamp", header.Time),
@@ -291,7 +291,7 @@ func (e *executor) execute(ctx context.Context, b *Block) error {
 	b.executed.Store(true)
 	e.lastExecuted.Store(b)
 
-	e.log.Debug(
+	e.log.Info(
 		"Block execution complete",
 		zap.Uint64("height", b.Height()),
 		zap.Time("gas_time", e.gasClock.AsTime()),

mempool.go

@@ -50,7 +50,7 @@ func (vm *VM) receiveTxs(preempt <-chan sink.Priority, pool *queue.Priority[*pen
 
 			from, err := types.Sender(vm.currSigner(), tx)
 			if err != nil {
-				vm.logger().Debug(
+				vm.logger().Info(
 					"Dropped tx due to failed sender recovery",
 					zap.Stringer("hash", tx.Hash()),
 					zap.Error(err),
@@ -64,7 +64,7 @@ func (vm *VM) receiveTxs(preempt <-chan sink.Priority, pool *queue.Priority[*pen
 				},
 				timePriority: time.Now(),
 			})
-			vm.logger().Debug(
+			vm.logger().Info(
 				"New tx in mempool",
 				zap.Stringer("hash", tx.Hash()),
 				zap.Stringer("from", from),
@@ -75,7 +75,7 @@ func (vm *VM) receiveTxs(preempt <-chan sink.Priority, pool *queue.Priority[*pen
 			case vm.toEngine <- snowcommon.PendingTxs:
 			default:
 				p := snowcommon.PendingTxs
-				vm.logger().Debug(fmt.Sprintf("%T(%s) dropped", p, p))
+				vm.logger().Info(fmt.Sprintf("%T(%s) dropped", p, p))
 			}
 		}
 	}

rpc/rpc.go

@@ -5,13 +5,27 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/ava-labs/avalanchego/vms/components/gas"
 	"github.com/ava-labs/avalanchego/vms/rpcchainvm"
+	"github.com/ava-labs/libevm/core/types"
 	sae "github.com/ava-labs/strevm"
 	"github.com/ava-labs/strevm/adaptor"
 )
 
+const (
+	TargetGasPerSecond = 1_000_000
+)
+
+type hooks struct{}
+
+func (*hooks) GasTarget(parent *types.Block) gas.Gas {
+	return TargetGasPerSecond
+}
+
 func main() {
-	vm := adaptor.Convert(new(sae.SinceGenesis))
+	vm := adaptor.Convert(&sae.SinceGenesis{
+		Hooks: &hooks{},
+	})
 
 	if err := rpcchainvm.Serve(context.Background(), vm); err != nil {
 		fmt.Fprintln(os.Stderr, err)

scripts/build.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+VMID="sr96zN6VeXJ4y5fY5EFziQrPSiy4LJPUMJGQsSLEW4t5bHWPw"
+BINARY_PATH="$HOME/.avalanchego/plugins/$VMID"
+echo "Building SAE EVM at $BINARY_PATH"
+go build -o "$BINARY_PATH" "./rpc/"*.go
+echo "Built SAE EVM at $BINARY_PATH"

vm.go

@@ -28,6 +28,8 @@ import (
 	"github.com/ava-labs/strevm/queue"
 )
 
+var VMID = ids.ID{'s', 't', 'r', 'e', 'v', 'm'}
+
 // VM implements Streaming Asynchronous Execution (SAE) of EVM blocks. It
 // implements all [adaptor.ChainVM] methods except for `Initialize()`, which
 // MUST be handled by a harness implementation that provides the final
@@ -178,7 +180,7 @@ func (vm *VM) SetState(ctx context.Context, state snow.State) error {
 }
 
 func (vm *VM) Shutdown(ctx context.Context) error {
-	vm.logger().Debug("Shutting down VM")
+	vm.logger().Info("Shutting down VM")
 	close(vm.quit)
 
 	vm.blocks.Close()