temp merge

ava-labs · Mar 11, 2024 · f37699e · f37699e
2 parents 5ecde55 + ddf66ea
commit f37699e
Show file tree

Hide file tree

Showing 109 changed files with 534 additions and 1,286 deletions.
diff --git a/api/keystore/codec.go b/api/keystore/codec.go
@@ -4,8 +4,6 @@
 package keystore
 
 import (
-	"time"
-
 	"github.com/ava-labs/avalanchego/codec"
 	"github.com/ava-labs/avalanchego/codec/linearcodec"
 	"github.com/ava-labs/avalanchego/utils/units"
@@ -20,7 +18,7 @@ const (
 var Codec codec.Manager
 
 func init() {
-	lc := linearcodec.NewDefault(time.Time{})
+	lc := linearcodec.NewDefault()
 	Codec = codec.NewManager(maxPackerSize)
 	if err := Codec.RegisterCodec(CodecVersion, lc); err != nil {
 		panic(err)

diff --git a/chains/atomic/codec.go b/chains/atomic/codec.go
@@ -5,7 +5,6 @@ package atomic
 
 import (
 	"math"
-	"time"
 
 	"github.com/ava-labs/avalanchego/codec"
 	"github.com/ava-labs/avalanchego/codec/linearcodec"
@@ -17,7 +16,7 @@ const CodecVersion = 0
 var Codec codec.Manager
 
 func init() {
-	lc := linearcodec.NewDefault(time.Time{})
+	lc := linearcodec.NewDefault()
 	Codec = codec.NewManager(math.MaxInt)
 	if err := Codec.RegisterCodec(CodecVersion, lc); err != nil {
 		panic(err)

diff --git a/chains/manager.go b/chains/manager.go
@@ -6,7 +6,6 @@ package chains
 import (
 	"context"
 	"crypto"
-	"crypto/tls"
 	"errors"
 	"fmt"
 	"os"
@@ -173,7 +172,8 @@ type ChainConfig struct {
 
 type ManagerConfig struct {
 	SybilProtectionEnabled bool
-	StakingTLSCert         tls.Certificate // needed to sign snowman++ blocks
+	StakingTLSSigner       crypto.Signer
+	StakingTLSCert         *staking.Certificate
 	StakingBLSKey          *bls.SecretKey
 	TracingEnabled         bool
 	// Must not be used unless [TracingEnabled] is true as this may be nil.
@@ -239,9 +239,6 @@ type manager struct {
 	ids.Aliaser
 	ManagerConfig
 
-	stakingSigner crypto.Signer
-	stakingCert   *staking.Certificate
-
 	// Those notified when a chain is created
 	registrants []Registrant
 
@@ -268,8 +265,6 @@ func New(config *ManagerConfig) Manager {
 	return &manager{
 		Aliaser:                ids.NewAliaser(),
 		ManagerConfig:          *config,
-		stakingSigner:          config.StakingTLSCert.PrivateKey.(crypto.Signer),
-		stakingCert:            staking.CertificateFromX509(config.StakingTLSCert.Leaf),
 		chains:                 make(map[ids.ID]handler.Handler),
 		chainsQueue:            buffer.NewUnboundedBlockingDeque[ChainParameters](initialQueueSize),
 		unblockChainCreatorCh:  make(chan struct{}),
@@ -725,8 +720,8 @@ func (m *manager) createAvalancheChain(
 			MinimumPChainHeight: m.ApricotPhase4MinPChainHeight,
 			MinBlkDelay:         minBlockDelay,
 			NumHistoricalBlocks: numHistoricalBlocks,
-			StakingLeafSigner:   m.stakingSigner,
-			StakingCertLeaf:     m.stakingCert,
+			StakingLeafSigner:   m.StakingTLSSigner,
+			StakingCertLeaf:     m.StakingTLSCert,
 		},
 	)
 
@@ -1062,8 +1057,8 @@ func (m *manager) createSnowmanChain(
 			MinimumPChainHeight: m.ApricotPhase4MinPChainHeight,
 			MinBlkDelay:         minBlockDelay,
 			NumHistoricalBlocks: numHistoricalBlocks,
-			StakingLeafSigner:   m.stakingSigner,
-			StakingCertLeaf:     m.stakingCert,
+			StakingLeafSigner:   m.StakingTLSSigner,
+			StakingCertLeaf:     m.StakingTLSCert,
 		},
 	)
 

diff --git a/codec/hierarchycodec/codec.go b/codec/hierarchycodec/codec.go
@@ -7,19 +7,13 @@ import (
 	"fmt"
 	"reflect"
 	"sync"
-	"time"
 
 	"github.com/ava-labs/avalanchego/codec"
 	"github.com/ava-labs/avalanchego/codec/reflectcodec"
 	"github.com/ava-labs/avalanchego/utils/bimap"
 	"github.com/ava-labs/avalanchego/utils/wrappers"
 )
 
-const (
-	// default max length of a slice being marshalled by Marshal(). Should be <= math.MaxUint32.
-	defaultMaxSliceLength = 256 * 1024
-)
-
 var (
 	_ Codec              = (*hierarchyCodec)(nil)
 	_ codec.Codec        = (*hierarchyCodec)(nil)
@@ -51,19 +45,19 @@ type hierarchyCodec struct {
 }
 
 // New returns a new, concurrency-safe codec
-func New(durangoTime time.Time, tagNames []string, maxSliceLen uint32) Codec {
+func New(tagNames []string) Codec {
 	hCodec := &hierarchyCodec{
 		currentGroupID:  0,
 		nextTypeID:      0,
 		registeredTypes: bimap.New[typeID, reflect.Type](),
 	}
-	hCodec.Codec = reflectcodec.New(hCodec, tagNames, durangoTime, maxSliceLen)
+	hCodec.Codec = reflectcodec.New(hCodec, tagNames)
 	return hCodec
 }
 
 // NewDefault returns a new codec with reasonable default values
-func NewDefault(durangoTime time.Time) Codec {
-	return New(durangoTime, []string{reflectcodec.DefaultTagName}, defaultMaxSliceLength)
+func NewDefault() Codec {
+	return New([]string{reflectcodec.DefaultTagName})
 }
 
 // SkipRegistrations some number of type IDs

diff --git a/codec/hierarchycodec/codec_test.go b/codec/hierarchycodec/codec_test.go
@@ -5,41 +5,25 @@ package hierarchycodec
 
 import (
 	"testing"
-	"time"
 
 	"github.com/ava-labs/avalanchego/codec"
-	"github.com/ava-labs/avalanchego/utils/timer/mockable"
 )
 
 func TestVectors(t *testing.T) {
 	for _, test := range codec.Tests {
-		c := NewDefault(mockable.MaxTime)
+		c := NewDefault()
 		test(c, t)
 	}
 }
 
 func TestMultipleTags(t *testing.T) {
 	for _, test := range codec.MultipleTagsTests {
-		c := New(mockable.MaxTime, []string{"tag1", "tag2"}, defaultMaxSliceLength)
-		test(c, t)
-	}
-}
-
-func TestEnforceSliceLen(t *testing.T) {
-	for _, test := range codec.EnforceSliceLenTests {
-		c := NewDefault(mockable.MaxTime)
-		test(c, t)
-	}
-}
-
-func TestIgnoreSliceLen(t *testing.T) {
-	for _, test := range codec.IgnoreSliceLenTests {
-		c := NewDefault(time.Time{})
+		c := New([]string{"tag1", "tag2"})
 		test(c, t)
 	}
 }
 
 func FuzzStructUnmarshalHierarchyCodec(f *testing.F) {
-	c := NewDefault(mockable.MaxTime)
+	c := NewDefault()
 	codec.FuzzStructUnmarshal(c, f)
 }
diff --git a/codec/linearcodec/codec.go b/codec/linearcodec/codec.go
@@ -7,19 +7,13 @@ import (
 	"fmt"
 	"reflect"
 	"sync"
-	"time"
 
 	"github.com/ava-labs/avalanchego/codec"
 	"github.com/ava-labs/avalanchego/codec/reflectcodec"
 	"github.com/ava-labs/avalanchego/utils/bimap"
 	"github.com/ava-labs/avalanchego/utils/wrappers"
 )
 
-const (
-	// default max length of a slice being marshalled by Marshal(). Should be <= math.MaxUint32.
-	DefaultMaxSliceLength = 256 * 1024
-)
-
 var (
 	_ Codec              = (*linearCodec)(nil)
 	_ codec.Codec        = (*linearCodec)(nil)
@@ -43,25 +37,20 @@ type linearCodec struct {
 	registeredTypes *bimap.BiMap[uint32, reflect.Type]
 }
 
-// New returns a new, concurrency-safe codec; it allow to specify
-// both tagNames and maxSlicelenght
-func New(durangoTime time.Time, tagNames []string, maxSliceLen uint32) Codec {
+// New returns a new, concurrency-safe codec; it allow to specify tagNames.
+func New(tagNames []string) Codec {
 	hCodec := &linearCodec{
 		nextTypeID:      0,
 		registeredTypes: bimap.New[uint32, reflect.Type](),
 	}
-	hCodec.Codec = reflectcodec.New(hCodec, tagNames, durangoTime, maxSliceLen)
+	hCodec.Codec = reflectcodec.New(hCodec, tagNames)
 	return hCodec
 }
 
-// NewDefault is a convenience constructor; it returns a new codec with reasonable default values
-func NewDefault(durangoTime time.Time) Codec {
-	return New(durangoTime, []string{reflectcodec.DefaultTagName}, DefaultMaxSliceLength)
-}
-
-// NewCustomMaxLength is a convenience constructor; it returns a new codec with custom max length and default tags
-func NewCustomMaxLength(durangoTime time.Time, maxSliceLen uint32) Codec {
-	return New(durangoTime, []string{reflectcodec.DefaultTagName}, maxSliceLen)
+// NewDefault is a convenience constructor; it returns a new codec with default
+// tagNames.
+func NewDefault() Codec {
+	return New([]string{reflectcodec.DefaultTagName})
 }
 
 // Skip some number of type IDs

diff --git a/codec/linearcodec/codec_test.go b/codec/linearcodec/codec_test.go
@@ -5,41 +5,25 @@ package linearcodec
 
 import (
 	"testing"
-	"time"
 
 	"github.com/ava-labs/avalanchego/codec"
-	"github.com/ava-labs/avalanchego/utils/timer/mockable"
 )
 
 func TestVectors(t *testing.T) {
 	for _, test := range codec.Tests {
-		c := NewDefault(mockable.MaxTime)
+		c := NewDefault()
 		test(c, t)
 	}
 }
 
 func TestMultipleTags(t *testing.T) {
 	for _, test := range codec.MultipleTagsTests {
-		c := New(mockable.MaxTime, []string{"tag1", "tag2"}, DefaultMaxSliceLength)
-		test(c, t)
-	}
-}
-
-func TestEnforceSliceLen(t *testing.T) {
-	for _, test := range codec.EnforceSliceLenTests {
-		c := NewDefault(mockable.MaxTime)
-		test(c, t)
-	}
-}
-
-func TestIgnoreSliceLen(t *testing.T) {
-	for _, test := range codec.IgnoreSliceLenTests {
-		c := NewDefault(time.Time{})
+		c := New([]string{"tag1", "tag2"})
 		test(c, t)
 	}
 }
 
 func FuzzStructUnmarshalLinearCodec(f *testing.F) {
-	c := NewDefault(mockable.MaxTime)
+	c := NewDefault()
 	codec.FuzzStructUnmarshal(c, f)
 }
diff --git a/codec/reflectcodec/type_codec.go b/codec/reflectcodec/type_codec.go
@@ -10,7 +10,6 @@ import (
 	"math"
 	"reflect"
 	"slices"
-	"time"
 
 	"github.com/ava-labs/avalanchego/codec"
 	"github.com/ava-labs/avalanchego/utils/set"
@@ -71,19 +70,15 @@ type TypeCodec interface {
 //  6. Serialized fields must be exported
 //  7. nil slices are marshaled as empty slices
 type genericCodec struct {
-	typer       TypeCodec
-	durangoTime time.Time // Time after which [maxSliceLen] will be ignored
-	maxSliceLen uint32
-	fielder     StructFielder
+	typer   TypeCodec
+	fielder StructFielder
 }
 
 // New returns a new, concurrency-safe codec
-func New(typer TypeCodec, tagNames []string, durangoTime time.Time, maxSliceLen uint32) codec.Codec {
+func New(typer TypeCodec, tagNames []string) codec.Codec {
 	return &genericCodec{
-		typer:       typer,
-		durangoTime: durangoTime,
-		maxSliceLen: maxSliceLen,
-		fielder:     NewStructFielder(tagNames),
+		typer:   typer,
+		fielder: NewStructFielder(tagNames),
 	}
 }
 
@@ -378,13 +373,6 @@ func (c *genericCodec) marshal(
 				math.MaxInt32,
 			)
 		}
-		if time.Now().Before(c.durangoTime) && uint32(numElts) > c.maxSliceLen {
-			return fmt.Errorf("%w; slice length, %d, exceeds maximum length, %d",
-				codec.ErrMaxSliceLenExceeded,
-				numElts,
-				c.maxSliceLen,
-			)
-		}
 		p.PackInt(uint32(numElts)) // pack # elements
 		if p.Err != nil {
 			return p.Err
@@ -445,13 +433,6 @@ func (c *genericCodec) marshal(
 				math.MaxInt32,
 			)
 		}
-		if time.Now().Before(c.durangoTime) && uint32(numElts) > c.maxSliceLen {
-			return fmt.Errorf("%w; map length, %d, exceeds maximum length, %d",
-				codec.ErrMaxSliceLenExceeded,
-				numElts,
-				c.maxSliceLen,
-			)
-		}
 		p.PackInt(uint32(numElts)) // pack # elements
 		if p.Err != nil {
 			return p.Err
@@ -619,13 +600,6 @@ func (c *genericCodec) unmarshal(
 				math.MaxInt32,
 			)
 		}
-		if time.Now().Before(c.durangoTime) && numElts32 > c.maxSliceLen {
-			return fmt.Errorf("%w; array length, %d, exceeds maximum length, %d",
-				codec.ErrMaxSliceLenExceeded,
-				numElts32,
-				c.maxSliceLen,
-			)
-		}
 		numElts := int(numElts32)
 
 		sliceType := value.Type()
@@ -732,13 +706,6 @@ func (c *genericCodec) unmarshal(
 				math.MaxInt32,
 			)
 		}
-		if time.Now().Before(c.durangoTime) && numElts32 > c.maxSliceLen {
-			return fmt.Errorf("%w; map length, %d, exceeds maximum length, %d",
-				codec.ErrMaxSliceLenExceeded,
-				numElts32,
-				c.maxSliceLen,
-			)
-		}
 
 		var (
 			numElts      = int(numElts32)