Snow VM

api/dependencies.go

@@ -35,12 +35,11 @@ type VM interface {
 		ctx context.Context,
 		txs []*chain.Transaction,
 	) (errs []error)
-	LastAcceptedBlockResult() *chain.ExecutedBlock
+	LastAcceptedBlock(ctx context.Context) *chain.StatelessBlock
 	UnitPrices(context.Context) (fees.Dimensions, error)
 	CurrentValidators(
 		context.Context,
 	) (map[ids.NodeID]*validators.GetValidatorOutput, map[string]struct{})
-	GetVerifyAuth() bool
 	ReadState(ctx context.Context, keys [][]byte) ([][]byte, []error)
 	ImmutableState(ctx context.Context) (state.Immutable, error)
 	BalanceHandler() chain.BalanceHandler

api/jsonrpc/server.go

@@ -116,11 +116,11 @@ type LastAcceptedReply struct {
 	Timestamp int64  `json:"timestamp"`
 }
 
-func (j *JSONRPCServer) LastAccepted(_ *http.Request, _ *struct{}, reply *LastAcceptedReply) error {
-	blk := j.vm.LastAcceptedBlockResult()
-	reply.Height = blk.Block.Hght
-	reply.BlockID = blk.Block.ID()
-	reply.Timestamp = blk.Block.Tmstmp
+func (j *JSONRPCServer) LastAccepted(req *http.Request, _ *struct{}, reply *LastAcceptedReply) error {
+	blk := j.vm.LastAcceptedBlock(req.Context())
+	reply.Height = blk.Hght
+	reply.BlockID = blk.ID()
+	reply.Timestamp = blk.Tmstmp
 	return nil
 }
 

api/state/server.go

@@ -53,8 +53,11 @@ func (s *JSONRPCStateServer) ReadState(req *http.Request, args *ReadStateRequest
 
 	var errs []error
 	res.Values, errs = s.stateReader.ReadState(ctx, args.Keys)
-	for _, err := range errs {
-		res.Errors = append(res.Errors, err.Error())
+	res.Errors = make([]string, len(errs))
+	for i, err := range errs {
+		if err != nil {
+			res.Errors[i] = err.Error()
+		}
 	}
 	return nil
 }

auth/provider.go

@@ -7,8 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-
-	"github.com/ava-labs/avalanchego/utils/wrappers"
 )
 
 var (
@@ -17,8 +15,8 @@ var (
 )
 
 // WithDefaultPrivateKeyFactories registers the default PrivateKeyFactories
-func WithDefaultPrivateKeyFactories(authProvider *AuthProvider, errs *wrappers.Errs) {
-	errs.Add(
+func WithDefaultPrivateKeyFactories(authProvider *AuthProvider) error {
+	return errors.Join(
 		authProvider.Register(ED25519Key, NewED25519PrivateKeyFactory()),
 		authProvider.Register(Secp256r1Key, NewSECP256R1PrivateKeyFactory()),
 		authProvider.Register(BLSKey, NewBLSPrivateKeyFactory()),

chain/base.go

@@ -35,9 +35,9 @@ func (b *Base) Execute(r Rules, timestamp int64) error {
 		// TODO: make this modulus configurable
 		return fmt.Errorf("%w: timestamp=%d", ErrMisalignedTime, b.Timestamp)
 	case b.Timestamp < timestamp: // tx: 100 block: 110
-		return ErrTimestampTooLate
+		return fmt.Errorf("%w: tx timestamp (%d) < block timestamp (%d)", ErrTimestampTooLate, b.Timestamp, timestamp)
 	case b.Timestamp > timestamp+r.GetValidityWindow(): // tx: 100 block 10
-		return ErrTimestampTooEarly
+		return fmt.Errorf("%w: tx timestamp (%d) > block timestamp (%d) + validity window (%d)", ErrTimestampTooEarly, b.Timestamp, timestamp, r.GetValidityWindow())
 	case b.ChainID != r.GetChainID():
 		return ErrInvalidChainID
 	default:

chain/builder.go

@@ -15,7 +15,6 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/trace"
 	"github.com/ava-labs/avalanchego/utils/logging"
-	"github.com/ava-labs/avalanchego/x/merkledb"
 	"go.opentelemetry.io/otel/attribute"
 	"go.uber.org/zap"
 
@@ -45,8 +44,6 @@ func HandlePreExecute(log logging.Logger, err error) bool {
 		return true
 	case errors.Is(err, ErrTimestampTooLate):
 		return false
-	case errors.Is(err, ErrInvalidBalance):
-		return false
 	case errors.Is(err, ErrAuthNotActivated):
 		return false
 	case errors.Is(err, ErrAuthFailed):
@@ -96,16 +93,19 @@ func NewBuilder(
 	}
 }
 
-func (c *Builder) BuildBlock(ctx context.Context, parentView state.View, parent *ExecutionBlock) (*ExecutionBlock, *ExecutedBlock, merkledb.View, error) {
+func (c *Builder) BuildBlock(ctx context.Context, parentOutputBlock *OutputBlock) (*ExecutionBlock, *OutputBlock, error) {
 	ctx, span := c.tracer.Start(ctx, "Chain.BuildBlock")
 	defer span.End()
 
+	parent := parentOutputBlock.ExecutionBlock
+	parentView := parentOutputBlock.View
+
 	// Select next timestamp
 	nextTime := time.Now().UnixMilli()
 	r := c.ruleFactory.GetRules(nextTime)
 	if nextTime < parent.Tmstmp+r.GetMinBlockGap() {
 		c.log.Debug("block building failed", zap.Error(ErrTimestampTooEarly))
-		return nil, nil, nil, ErrTimestampTooEarly
+		return nil, nil, fmt.Errorf("%w: proposed build block time (%d) < parentTimestamp (%d) + minBlockGap (%d)", ErrTimestampTooEarly, nextTime, parent.Tmstmp, r.GetMinBlockGap())
 	}
 	var (
 		parentID          = parent.ID()
@@ -118,12 +118,12 @@ func (c *Builder) BuildBlock(ctx context.Context, parentView state.View, parent
 	feeKey := FeeKey(c.metadataManager.FeePrefix())
 	feeRaw, err := parentView.GetValue(ctx, feeKey)
 	if err != nil {
-		return nil, nil, nil, err
+		return nil, nil, err
 	}
 	parentFeeManager := fees.NewManager(feeRaw)
 	feeManager, err := parentFeeManager.ComputeNext(nextTime, r)
 	if err != nil {
-		return nil, nil, nil, err
+		return nil, nil, err
 	}
 	maxUnits := r.GetMaxBlockUnits()
 	targetUnits := r.GetWindowTargetUnits()
@@ -366,7 +366,7 @@ func (c *Builder) BuildBlock(ctx context.Context, parentView state.View, parent
 					c.log.Debug("transactions restored to mempool", zap.Int("count", restored))
 				}()
 				c.log.Warn("build failed", zap.Error(execErr))
-				return nil, nil, nil, execErr
+				return nil, nil, execErr
 			}
 			break
 		}
@@ -392,7 +392,7 @@ func (c *Builder) BuildBlock(ctx context.Context, parentView state.View, parent
 	// Perform basic validity checks to make sure the block is well-formatted
 	if len(blockTransactions) == 0 {
 		if nextTime < parent.Tmstmp+r.GetMinEmptyBlockGap() {
-			return nil, nil, nil, fmt.Errorf("%w: allowed in %d ms", ErrNoTxs, parent.Tmstmp+r.GetMinEmptyBlockGap()-nextTime) //nolint:spancheck
+			return nil, nil, fmt.Errorf("%w: allowed in %d ms", ErrNoTxs, parent.Tmstmp+r.GetMinEmptyBlockGap()-nextTime) //nolint:spancheck
 		}
 		c.metrics.emptyBlockBuilt.Inc()
 	}
@@ -414,27 +414,27 @@ func (c *Builder) BuildBlock(ctx context.Context, parentView state.View, parent
 		feeKeyStr:       parentFeeManager.Bytes(),
 	})
 	if err := tsv.Insert(ctx, heightKey, binary.BigEndian.AppendUint64(nil, height)); err != nil {
-		return nil, nil, nil, fmt.Errorf("%w: unable to insert height", err)
+		return nil, nil, fmt.Errorf("%w: unable to insert height", err)
 	}
 	if err := tsv.Insert(ctx, timestampKey, binary.BigEndian.AppendUint64(nil, uint64(timestamp))); err != nil {
-		return nil, nil, nil, fmt.Errorf("%w: unable to insert timestamp", err)
+		return nil, nil, fmt.Errorf("%w: unable to insert timestamp", err)
 	}
 	if err := tsv.Insert(ctx, feeKey, feeManager.Bytes()); err != nil {
-		return nil, nil, nil, fmt.Errorf("%w: unable to insert fees", err)
+		return nil, nil, fmt.Errorf("%w: unable to insert fees", err)
 	}
 	tsv.Commit()
 
 	// Fetch [parentView] root as late as possible to allow
 	// for async processing to complete
 	parentStateRoot, err := parentView.GetMerkleRoot(ctx)
 	if err != nil {
-		return nil, nil, nil, err
+		return nil, nil, err
 	}
 
 	// Get view from [tstate] after writing all changed keys
 	view, err := ts.ExportMerkleDBView(ctx, c.tracer, parentView)
 	if err != nil {
-		return nil, nil, nil, err
+		return nil, nil, err
 	}
 
 	// Initialize finalized metadata fields
@@ -446,7 +446,7 @@ func (c *Builder) BuildBlock(ctx context.Context, parentView state.View, parent
 		parentStateRoot,
 	)
 	if err != nil {
-		return nil, nil, nil, err
+		return nil, nil, err
 	}
 
 	// Kickoff root generation
@@ -478,12 +478,15 @@ func (c *Builder) BuildBlock(ctx context.Context, parentView state.View, parent
 	)
 	execBlock, err := NewExecutionBlock(blk)
 	if err != nil {
-		return nil, nil, nil, err
+		return nil, nil, err
 	}
-	return execBlock, &ExecutedBlock{
-		Block:         blk,
-		Results:       results,
-		UnitPrices:    feeManager.UnitPrices(),
-		UnitsConsumed: feeManager.UnitsConsumed(),
-	}, view, nil
+	return execBlock, &OutputBlock{
+		ExecutionBlock: execBlock,
+		View:           view,
+		ExecutionResults: ExecutionResults{
+			Results:       results,
+			UnitPrices:    feeManager.UnitPrices(),
+			UnitsConsumed: feeManager.UnitsConsumed(),
+		},
+	}, nil
 }

chain/chain.go

@@ -22,7 +22,6 @@ type ValidityWindow = *validitywindow.TimeValidityWindow[*Transaction]
 type Chain struct {
 	builder     *Builder
 	processor   *Processor
-	accepter    *Accepter
 	preExecutor *PreExecutor
 	blockParser *BlockParser
 }
@@ -69,11 +68,6 @@ func NewChain(
 			metrics,
 			config,
 		),
-		accepter: NewAccepter(
-			tracer,
-			validityWindow,
-			metrics,
-		),
 		preExecutor: NewPreExecutor(
 			ruleFactory,
 			validityWindow,
@@ -84,15 +78,15 @@ func NewChain(
 	}, nil
 }
 
-func (c *Chain) BuildBlock(ctx context.Context, parentView state.View, parent *ExecutionBlock) (*ExecutionBlock, *ExecutedBlock, merkledb.View, error) {
-	return c.builder.BuildBlock(ctx, parentView, parent)
+func (c *Chain) BuildBlock(ctx context.Context, parentOutputBlock *OutputBlock) (*ExecutionBlock, *OutputBlock, error) {
+	return c.builder.BuildBlock(ctx, parentOutputBlock)
 }
 
 func (c *Chain) Execute(
 	ctx context.Context,
-	parentView state.View,
+	parentView merkledb.View,
 	b *ExecutionBlock,
-) (*ExecutedBlock, merkledb.View, error) {
+) (*OutputBlock, error) {
 	return c.processor.Execute(ctx, parentView, b)
 }
 
@@ -103,18 +97,13 @@ func (c *Chain) AsyncVerify(
 	return c.processor.AsyncVerify(ctx, b)
 }
 
-func (c *Chain) AcceptBlock(ctx context.Context, blk *ExecutionBlock) error {
-	return c.accepter.AcceptBlock(ctx, blk)
-}
-
 func (c *Chain) PreExecute(
 	ctx context.Context,
 	parentBlk *ExecutionBlock,
 	view state.View,
 	tx *Transaction,
-	verifyAuth bool,
 ) error {
-	return c.preExecutor.PreExecute(ctx, parentBlk, view, tx, verifyAuth)
+	return c.preExecutor.PreExecute(ctx, parentBlk, view, tx)
 }
 
 func (c *Chain) ParseBlock(ctx context.Context, bytes []byte) (*ExecutionBlock, error) {