chore(consensus-types): Make slashings use math.Gwei (#2038)

berachain · Oct 3, 2024 · 455762b · 455762b
1 parent 88fe7a0
commit 455762b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/mod/consensus-types/pkg/types/state.go b/mod/consensus-types/pkg/types/state.go
@@ -69,7 +69,7 @@ type BeaconState[
 	NextWithdrawalValidatorIndex math.ValidatorIndex
 
 	// Slashing
-	Slashings     []uint64
+	Slashings     []math.Gwei
 	TotalSlashing math.Gwei
 }
 
@@ -97,7 +97,7 @@ func (st *BeaconState[
 	randaoMixes []common.Bytes32,
 	nextWithdrawalIndex uint64,
 	nextWithdrawalValidatorIndex math.ValidatorIndex,
-	slashings []uint64,
+	slashings []math.Gwei,
 	totalSlashing math.Gwei,
 ) (*BeaconState[
 	BeaconBlockHeaderT,
@@ -378,7 +378,7 @@ func (st *BeaconState[
 	}
 	subIndx = hh.Index()
 	for _, i := range st.Slashings {
-		hh.AppendUint64(i)
+		hh.AppendUint64(uint64(i))
 	}
 	hh.FillUpTo32()
 	numItems = uint64(len(st.Slashings))

diff --git a/mod/consensus-types/pkg/types/state_test.go b/mod/consensus-types/pkg/types/state_test.go
@@ -100,7 +100,7 @@ func generateValidBeaconState() *types.BeaconState[
 		},
 		Balances:                     []uint64{32000000000, 31000000000},
 		RandaoMixes:                  generateRandomBytes32(65536),
-		Slashings:                    []uint64{1000000000, 2000000000},
+		Slashings:                    []math.Gwei{1000000000, 2000000000},
 		NextWithdrawalIndex:          7,
 		NextWithdrawalValidatorIndex: 8,
 		TotalSlashing:                3000000000,

diff --git a/mod/node-api/handlers/proof/merkle/mock/beacon_state.go b/mod/node-api/handlers/proof/merkle/mock/beacon_state.go
@@ -97,7 +97,7 @@ func NewBeaconState(
 		[]common.Bytes32{},
 		0,
 		0,
-		[]uint64{},
+		[]math.Gwei{},
 		0,
 	)
 	return &BeaconState{BeaconStateMarshallable: bsm}, err

diff --git a/mod/node-core/pkg/components/interfaces.go b/mod/node-core/pkg/components/interfaces.go
@@ -207,7 +207,7 @@ type (
 			randaoMixes []common.Bytes32,
 			nextWithdrawalIndex uint64,
 			nextWithdrawalValidatorIndex math.U64,
-			slashings []uint64, totalSlashing math.U64,
+			slashings []math.U64, totalSlashing math.U64,
 		) (T, error)
 	}
 
@@ -894,7 +894,7 @@ type (
 		// GetRandaoMixAtIndex retrieves the randao mix at the given index.
 		GetRandaoMixAtIndex(index uint64) (common.Bytes32, error)
 		// GetSlashings retrieves all slashings.
-		GetSlashings() ([]uint64, error)
+		GetSlashings() ([]math.Gwei, error)
 		// SetSlashingAtIndex sets the slashing at the given index.
 		SetSlashingAtIndex(index uint64, amount math.Gwei) error
 		// GetSlashingAtIndex retrieves the slashing at the given index.

diff --git a/mod/state-transition/pkg/core/state/interfaces.go b/mod/state-transition/pkg/core/state/interfaces.go
@@ -107,7 +107,7 @@ type KVStore[
 	// GetRandaoMixAtIndex retrieves the randao mix at the given index.
 	GetRandaoMixAtIndex(index uint64) (common.Bytes32, error)
 	// GetSlashings retrieves all slashings.
-	GetSlashings() ([]uint64, error)
+	GetSlashings() ([]math.Gwei, error)
 	// SetSlashingAtIndex sets the slashing at the given index.
 	SetSlashingAtIndex(index uint64, amount math.Gwei) error
 	// GetSlashingAtIndex retrieves the slashing at the given index.

diff --git a/mod/state-transition/pkg/core/state/types.go b/mod/state-transition/pkg/core/state/types.go
@@ -54,7 +54,7 @@ type BeaconStateMarshallable[
 		randaoMixes []common.Bytes32,
 		nextWithdrawalIndex uint64,
 		nextWithdrawalValidatorIndex math.U64,
-		slashings []uint64, totalSlashing math.U64,
+		slashings []math.U64, totalSlashing math.U64,
 	) (T, error)
 }
 

diff --git a/mod/storage/pkg/beacondb/slashing.go b/mod/storage/pkg/beacondb/slashing.go
@@ -29,8 +29,8 @@ import (
 func (kv *KVStore[
 	BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT,
 	ForkT, ValidatorT, ValidatorsT,
-]) GetSlashings() ([]uint64, error) {
-	var slashings []uint64
+]) GetSlashings() ([]math.Gwei, error) {
+	var slashings []math.Gwei
 	iter, err := kv.slashings.Iterate(kv.ctx, nil)
 	if err != nil {
 		return nil, err
@@ -41,7 +41,7 @@ func (kv *KVStore[
 		if err != nil {
 			return nil, err
 		}
-		slashings = append(slashings, slashing)
+		slashings = append(slashings, math.Gwei(slashing))
 		iter.Next()
 	}
 	return slashings, nil