ACP-103: Finalize parameterization (#3549)

ava-labs · Nov 15, 2024 · 480add4 · 480add4
1 parent 5a188b8
commit 480add4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 27 deletions.
diff --git a/genesis/genesis_fuji.go b/genesis/genesis_fuji.go
@@ -34,23 +34,22 @@ var (
 				AddSubnetValidatorFee:         units.MilliAvax,
 				AddSubnetDelegatorFee:         units.MilliAvax,
 			},
-			// TODO: Set these values to something more reasonable
 			DynamicFeeConfig: gas.Config{
 				Weights: gas.Dimensions{
-					gas.Bandwidth: 1,
-					gas.DBRead:    1,
-					gas.DBWrite:   1,
-					gas.Compute:   1,
+					gas.Bandwidth: 1,     // Max block size ~1MB
+					gas.DBRead:    1_000, // Max reads per block 1,000
+					gas.DBWrite:   1_000, // Max writes per block 1,000
+					gas.Compute:   4,     // Max compute time per block ~250ms
 				},
-				MaxCapacity:     1_000_000, // Max block size ~1MB
-				MaxPerSecond:    250_000,
-				TargetPerSecond: 125_000, // Target block size ~125KB
+				MaxCapacity:     1_000_000,
+				MaxPerSecond:    100_000, // Refill time 10s
+				TargetPerSecond: 50_000,  // Target is half of max
 				MinPrice:        1,
 				// ExcessConversionConstant = (MaxPerSecond - TargetPerSecond) * NumberOfSecondsPerDoubling / ln(2)
 				//
 				// ln(2) is a float and the result is consensus critical, so we
 				// hardcode the result.
-				ExcessConversionConstant: 5_410_106, // Double every 30s
+				ExcessConversionConstant: 2_164_043, // Double every 30s
 			},
 			ValidatorFeeConfig: validatorfee.Config{
 				Capacity: 20_000,

diff --git a/genesis/genesis_local.go b/genesis/genesis_local.go
@@ -52,23 +52,22 @@ var (
 				AddSubnetValidatorFee:         units.MilliAvax,
 				AddSubnetDelegatorFee:         units.MilliAvax,
 			},
-			// TODO: Set these values to something more reasonable
 			DynamicFeeConfig: gas.Config{
 				Weights: gas.Dimensions{
-					gas.Bandwidth: 1,
-					gas.DBRead:    1,
-					gas.DBWrite:   1,
-					gas.Compute:   1,
+					gas.Bandwidth: 1,     // Max block size ~1MB
+					gas.DBRead:    1_000, // Max reads per block 1,000
+					gas.DBWrite:   1_000, // Max writes per block 1,000
+					gas.Compute:   4,     // Max compute time per block ~250ms
 				},
-				MaxCapacity:     1_000_000, // Max block size ~1MB
-				MaxPerSecond:    250_000,
-				TargetPerSecond: 125_000, // Target block size ~125KB
+				MaxCapacity:     1_000_000,
+				MaxPerSecond:    100_000, // Refill time 10s
+				TargetPerSecond: 50_000,  // Target is half of max
 				MinPrice:        1,
 				// ExcessConversionConstant = (MaxPerSecond - TargetPerSecond) * NumberOfSecondsPerDoubling / ln(2)
 				//
 				// ln(2) is a float and the result is consensus critical, so we
 				// hardcode the result.
-				ExcessConversionConstant: 5_410_106, // Double every 30s
+				ExcessConversionConstant: 2_164_043, // Double every 30s
 			},
 			ValidatorFeeConfig: validatorfee.Config{
 				Capacity: 20_000,

diff --git a/genesis/genesis_mainnet.go b/genesis/genesis_mainnet.go
@@ -34,23 +34,22 @@ var (
 				AddSubnetValidatorFee:         units.MilliAvax,
 				AddSubnetDelegatorFee:         units.MilliAvax,
 			},
-			// TODO: Set these values to something more reasonable
 			DynamicFeeConfig: gas.Config{
 				Weights: gas.Dimensions{
-					gas.Bandwidth: 1,
-					gas.DBRead:    1,
-					gas.DBWrite:   1,
-					gas.Compute:   1,
+					gas.Bandwidth: 1,     // Max block size ~1MB
+					gas.DBRead:    1_000, // Max reads per block 1,000
+					gas.DBWrite:   1_000, // Max writes per block 1,000
+					gas.Compute:   4,     // Max compute time per block ~250ms
 				},
-				MaxCapacity:     1_000_000, // Max block size ~1MB
-				MaxPerSecond:    250_000,
-				TargetPerSecond: 125_000, // Target block size ~125KB
+				MaxCapacity:     1_000_000,
+				MaxPerSecond:    100_000, // Refill time 10s
+				TargetPerSecond: 50_000,  // Target is half of max
 				MinPrice:        1,
 				// ExcessConversionConstant = (MaxPerSecond - TargetPerSecond) * NumberOfSecondsPerDoubling / ln(2)
 				//
 				// ln(2) is a float and the result is consensus critical, so we
 				// hardcode the result.
-				ExcessConversionConstant: 5_410_106, // Double every 30s
+				ExcessConversionConstant: 2_164_043, // Double every 30s
 			},
 			ValidatorFeeConfig: validatorfee.Config{
 				Capacity: 20_000,