Misc Ports from #136 and #159

builder/time.go

@@ -8,12 +8,11 @@ import (
 	"time"
 
 	"github.com/ava-labs/avalanchego/snow/engine/common"
-	"github.com/ava-labs/hypersdk/consts"
 	"github.com/ava-labs/hypersdk/window"
 	"go.uber.org/zap"
 )
 
-const buildCheck = 200 * time.Millisecond
+const buildCheck = 50 * time.Millisecond
 
 var _ Builder = (*Time)(nil)
 
@@ -67,11 +66,8 @@ func (b *Time) shouldBuild(ctx context.Context) (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	if since < window.WindowSize {
-		slot := window.WindowSize - 1 - since
-		start := slot * consts.Uint64Len
-		window.Update(&newRollupWindow, start, 1)
-	}
+	// [preferredBlk.BlockWindow] already includes the preferred block, so we
+	// don't need to add 1 before determining if we should build another block.
 	return window.Last(&newRollupWindow) < b.cfg.PreferredBlocksPerSecond, nil
 }
 

chain/block.go

@@ -22,6 +22,7 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/ava-labs/hypersdk/codec"
+	"github.com/ava-labs/hypersdk/consts"
 	"github.com/ava-labs/hypersdk/utils"
 	"github.com/ava-labs/hypersdk/window"
 	"github.com/ava-labs/hypersdk/workers"
@@ -33,17 +34,6 @@ var (
 	_ block.StateSummary      = &SyncableBlock{}
 )
 
-const (
-	// AvalancheGo imposes a limit of 2 MiB on the network, so we limit at
-	// 2 MiB - ProposerVM header - Protobuf encoding overhead (we assume this is
-	// no more than 50 KiB of overhead but is likely much less)
-	NetworkSizeLimit = 2_044_723 // 1.95 MiB
-
-	// MaxWarpMessages is the maximum number of warp messages allows in a single
-	// block.
-	MaxWarpMessages = 64
-)
-
 type StatefulBlock struct {
 	Prnt   ids.ID `json:"parent"`
 	Tmstmp int64  `json:"timestamp"`
@@ -816,7 +806,7 @@ func (b *StatefulBlock) Marshal(
 	actionRegistry ActionRegistry,
 	authRegistry AuthRegistry,
 ) ([]byte, error) {
-	p := codec.NewWriter(NetworkSizeLimit)
+	p := codec.NewWriter(consts.NetworkSizeLimit)
 
 	p.PackID(b.Prnt)
 	p.PackInt64(b.Tmstmp)
@@ -844,7 +834,7 @@ func (b *StatefulBlock) Marshal(
 
 func UnmarshalBlock(raw []byte, parser Parser) (*StatefulBlock, error) {
 	var (
-		p = codec.NewReader(raw, NetworkSizeLimit)
+		p = codec.NewReader(raw, consts.NetworkSizeLimit)
 		b StatefulBlock
 	)
 

chain/consts.go

@@ -12,4 +12,7 @@ import (
 const (
 	FutureBound        = 10 * time.Second
 	MaxWarpMessageSize = 256 * units.KiB
+	// MaxWarpMessages is the maximum number of warp messages allows in a single
+	// block.
+	MaxWarpMessages = 64
 )

chain/transaction.go

@@ -68,7 +68,7 @@ func (t *Transaction) Digest(
 	if !ok {
 		return nil, fmt.Errorf("unknown action type %T", t.Action)
 	}
-	p := codec.NewWriter(NetworkSizeLimit)
+	p := codec.NewWriter(consts.NetworkSizeLimit)
 	t.Base.Marshal(p)
 	var warpBytes []byte
 	if t.WarpMessage != nil {
@@ -98,7 +98,7 @@ func (t *Transaction) Sign(
 
 	// Ensure transaction is fully initialized and correct by reloading it from
 	// bytes
-	p := codec.NewWriter(NetworkSizeLimit)
+	p := codec.NewWriter(consts.NetworkSizeLimit)
 	if err := t.Marshal(p, actionRegistry, authRegistry); err != nil {
 		return nil, err
 	}
@@ -367,7 +367,10 @@ func MarshalTxs(
 	actionRegistry ActionRegistry,
 	authRegistry AuthRegistry,
 ) ([]byte, error) {
-	p := codec.NewWriter(NetworkSizeLimit)
+	if len(txs) == 0 {
+		return nil, ErrNoTxs
+	}
+	p := codec.NewWriter(consts.NetworkSizeLimit)
 	p.PackInt(len(txs))
 	for _, tx := range txs {
 		if err := tx.Marshal(p, actionRegistry, authRegistry); err != nil {
@@ -383,7 +386,7 @@ func UnmarshalTxs(
 	actionRegistry ActionRegistry,
 	authRegistry AuthRegistry,
 ) ([]*Transaction, error) {
-	p := codec.NewReader(raw, NetworkSizeLimit)
+	p := codec.NewReader(raw, consts.NetworkSizeLimit)
 	txCount := p.UnpackInt(true)
 	if txCount > maxCount {
 		return nil, ErrTooManyTxs

consts/consts.go

@@ -15,4 +15,9 @@ const (
 	Uint64Len       = 8
 	MaxUint64Offset = 63
 	MaxUint64       = ^uint64(0)
+
+	// AvalancheGo imposes a limit of 2 MiB on the network, so we limit at
+	// 2 MiB - ProposerVM header - Protobuf encoding overhead (we assume this is
+	// no more than 50 KiB of overhead but is likely much less)
+	NetworkSizeLimit = 2_044_723 // 1.95 MiB
 )