Change gwei math to primitives package for ePBS state

prysmaticlabs · May 24, 2024 · 77a113a · 77a113a
1 parent d110677
commit 77a113a
Show file tree

Hide file tree

Showing 9 changed files with 222 additions and 220 deletions.
diff --git a/beacon-chain/core/helpers/BUILD.bazel b/beacon-chain/core/helpers/BUILD.bazel
@@ -81,6 +81,7 @@ go_test(
         "//container/slice:go_default_library",
         "//crypto/hash:go_default_library",
         "//encoding/bytesutil:go_default_library",
+        "//math:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
         "//testing/assert:go_default_library",
         "//testing/require:go_default_library",

diff --git a/proto/engine/v1/generated.ssz.go b/proto/engine/v1/generated.ssz.go
diff --git a/proto/eth/v1/generated.ssz.go b/proto/eth/v1/generated.ssz.go
diff --git a/proto/eth/v2/generated.ssz.go b/proto/eth/v2/generated.ssz.go
diff --git a/proto/prysm/v1alpha1/beacon_state.pb.go b/proto/prysm/v1alpha1/beacon_state.pb.go
diff --git a/proto/prysm/v1alpha1/beacon_state.proto b/proto/prysm/v1alpha1/beacon_state.proto
@@ -462,10 +462,10 @@ message BeaconStateEPBS {
 
   // Fields introduced in Electra fork [12001-13000]
   uint64 deposit_receipts_start_index = 12001;
-  uint64 deposit_balance_to_consume = 12002 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v5/math.Gwei"];
-  uint64 exit_balance_to_consume = 12003 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v5/math.Gwei"];
+  uint64 deposit_balance_to_consume = 12002 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives.Gwei"];
+  uint64 exit_balance_to_consume = 12003 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives.Gwei"];
   uint64 earliest_exit_epoch = 12004 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives.Epoch"];
-  uint64 consolidation_balance_to_consume = 12005 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v5/math.Gwei"];
+  uint64 consolidation_balance_to_consume = 12005 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives.Gwei"];
   uint64 earliest_consolidation_epoch = 12006 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives.Epoch"];
   repeated PendingBalanceDeposit pending_balance_deposits = 12007 [(ethereum.eth.ext.ssz_max) = "pending_balance_deposits_limit"];
   repeated PendingPartialWithdrawal pending_partial_withdrawals = 12008 [(ethereum.eth.ext.ssz_max) = "pending_partial_withdrawals_limit"];

diff --git a/proto/prysm/v1alpha1/generated.ssz.go b/proto/prysm/v1alpha1/generated.ssz.go
diff --git a/testing/util/random/BUILD.bazel b/testing/util/random/BUILD.bazel
@@ -9,7 +9,6 @@ go_library(
         "//config/fieldparams:go_default_library",
         "//config/params:go_default_library",
         "//consensus-types/primitives:go_default_library",
-        "//math:go_default_library",
         "//proto/engine/v1:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
         "@com_github_prysmaticlabs_go_bitfield//:go_default_library",

diff --git a/testing/util/random/epbs.go b/testing/util/random/epbs.go
@@ -10,7 +10,6 @@ import (
 	fieldparams "github.com/prysmaticlabs/prysm/v5/config/fieldparams"
 	"github.com/prysmaticlabs/prysm/v5/config/params"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	"github.com/prysmaticlabs/prysm/v5/math"
 	enginev1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
 	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 )
@@ -242,10 +241,10 @@ func BeaconState(t *testing.T) *ethpb.BeaconStateEPBS {
 			StateSummaryRoot: randomBytes(32, t),
 		}},
 		DepositReceiptsStartIndex:     randomUint64(t),
-		DepositBalanceToConsume:       math.Gwei(randomUint64(t)),
-		ExitBalanceToConsume:          math.Gwei(randomUint64(t)),
+		DepositBalanceToConsume:       primitives.Gwei(randomUint64(t)),
+		ExitBalanceToConsume:          primitives.Gwei(randomUint64(t)),
 		EarliestExitEpoch:             primitives.Epoch(randomUint64(t)),
-		ConsolidationBalanceToConsume: math.Gwei(randomUint64(t)),
+		ConsolidationBalanceToConsume: primitives.Gwei(randomUint64(t)),
 		EarliestConsolidationEpoch:    primitives.Epoch(randomUint64(t)),
 		PendingBalanceDeposits: []*ethpb.PendingBalanceDeposit{
 			{