Merge branch 'dev' into e2e-address-allocation

Author: hexfusion

.github/workflows/debian/template/control

@@ -4,5 +4,5 @@ Section: misc
 Priority: optional
 Architecture: arm64 
 Depends:
-Maintainer: Fabio Barone <fabio@avalabs.org>
+Maintainer: Stephen Buttolph <stephen@avalabs.org>
 Description: The Avalanche platform binaries 

x/merkledb/maybe.go renamed to utils/maybe/maybe.go

@@ -1,7 +1,7 @@
 // Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-package merkledb
+package maybe
 
 // Maybe T = Some T | Nothing.
 // A data wrapper that allows values to be something [Some T] or nothing [Nothing].
@@ -42,23 +42,23 @@ func (m Maybe[T]) Value() T {
 	return m.value
 }
 
-// MaybeBind returns Nothing, if [m] is Nothing.
+// Bind returns Nothing iff [m] is Nothing.
 // Otherwise applies [f] to the value of [m] and returns the result as a Some.
-func MaybeBind[T, U any](m Maybe[T], f func(T) U) Maybe[U] {
+func Bind[T, U any](m Maybe[T], f func(T) U) Maybe[U] {
 	if m.IsNothing() {
 		return Nothing[U]()
 	}
 	return Some(f(m.Value()))
 }
 
-// MaybeEqual returns true if both m1 and m2 are nothing or have the same value according to the equality function
-func MaybeEqual[T any](m1 Maybe[T], m2 Maybe[T], equality func(T, T) bool) bool {
+// Equal returns true if both m1 and m2 are nothing or have the same value according to [equalFunc].
+func Equal[T any](m1 Maybe[T], m2 Maybe[T], equalFunc func(T, T) bool) bool {
 	if m1.IsNothing() {
 		return m2.IsNothing()
 	}
 
 	if m2.IsNothing() {
 		return false
 	}
-	return equality(m1.Value(), m2.Value())
+	return equalFunc(m1.Value(), m2.Value())
 }

x/merkledb/maybe_test.go renamed to utils/maybe/maybe_test.go

@@ -1,7 +1,7 @@
 // Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-package merkledb
+package maybe
 
 import (
 	"testing"
@@ -18,7 +18,7 @@ func TestMaybeClone(t *testing.T) {
 		val := []byte{1, 2, 3}
 		originalVal := slices.Clone(val)
 		m := Some(val)
-		mClone := MaybeBind(m, slices.Clone[[]byte])
+		mClone := Bind(m, slices.Clone[[]byte])
 		m.value[0] = 0
 		require.NotEqual(mClone.value, m.value)
 		require.Equal(originalVal, mClone.value)
@@ -27,23 +27,23 @@ func TestMaybeClone(t *testing.T) {
 	// Case: Value is nothing
 	{
 		m := Nothing[[]byte]()
-		mClone := MaybeBind(m, slices.Clone[[]byte])
+		mClone := Bind(m, slices.Clone[[]byte])
 		require.True(mClone.IsNothing())
 	}
 }
 
 func TestMaybeEquality(t *testing.T) {
 	require := require.New(t)
-	require.True(MaybeEqual(Nothing[int](), Nothing[int](), func(i int, i2 int) bool {
+	require.True(Equal(Nothing[int](), Nothing[int](), func(i int, i2 int) bool {
 		return i == i2
 	}))
-	require.False(MaybeEqual(Nothing[int](), Some(1), func(i int, i2 int) bool {
+	require.False(Equal(Nothing[int](), Some(1), func(i int, i2 int) bool {
 		return i == i2
 	}))
-	require.False(MaybeEqual(Some(1), Nothing[int](), func(i int, i2 int) bool {
+	require.False(Equal(Some(1), Nothing[int](), func(i int, i2 int) bool {
 		return i == i2
 	}))
-	require.True(MaybeEqual(Some(1), Some(1), func(i int, i2 int) bool {
+	require.True(Equal(Some(1), Some(1), func(i int, i2 int) bool {
 		return i == i2
 	}))
 }

vms/platformvm/config/execution_config.go

@@ -16,6 +16,7 @@ var DefaultExecutionConfig = ExecutionConfig{
 	RewardUTXOsCacheSize:         2048,
 	ChainCacheSize:               2048,
 	ChainDBCacheSize:             2048,
+	BlockIDCacheSize:             8192,
 	ChecksumsEnabled:             false,
 }
 
@@ -27,6 +28,7 @@ type ExecutionConfig struct {
 	RewardUTXOsCacheSize         int  `json:"reward-utxos-cache-size"`
 	ChainCacheSize               int  `json:"chain-cache-size"`
 	ChainDBCacheSize             int  `json:"chain-db-cache-size"`
+	BlockIDCacheSize             int  `json:"block-id-cache-size"`
 	ChecksumsEnabled             bool `json:"checksums-enabled"`
 }
 

vms/platformvm/config/execution_config_test.go

@@ -45,6 +45,7 @@ func TestExecutionConfigUnmarshal(t *testing.T) {
 			"reward-utxos-cache-size": 5,
 			"chain-cache-size": 6,
 			"chain-db-cache-size": 7,
+			"block-id-cache-size": 8,
 			"checksums-enabled": true
 		}`)
 		ec, err := GetExecutionConfig(b)
@@ -56,6 +57,7 @@ func TestExecutionConfigUnmarshal(t *testing.T) {
 			RewardUTXOsCacheSize:         5,
 			ChainCacheSize:               6,
 			ChainDBCacheSize:             7,
+			BlockIDCacheSize:             8,
 			ChecksumsEnabled:             true,
 		}
 		require.Equal(expected, ec)