addressed G's second round of comments

Layr-Labs · Feb 6, 2024 · 75a55e2 · 75a55e2
1 parent abcae34
commit 75a55e2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 37 deletions.
diff --git a/beacon/versioned_beacon_state.go b/beacon/versioned_beacon_state.go
@@ -8,7 +8,7 @@ import (
 	"github.com/attestantio/go-eth2-client/spec/deneb"
 )
 
-func HistoricalSummaries(state *spec.VersionedBeaconState) ([]*capella.HistoricalSummary, error) {
+func GetHistoricalSummaries(state *spec.VersionedBeaconState) ([]*capella.HistoricalSummary, error) {
 	switch state.Version {
 	case spec.DataVersionCapella:
 		return state.Capella.HistoricalSummaries, nil
@@ -19,7 +19,7 @@ func HistoricalSummaries(state *spec.VersionedBeaconState) ([]*capella.Historica
 	}
 }
 
-func GenesisTime(state *spec.VersionedBeaconState) (uint64, error) {
+func GetGenesisTime(state *spec.VersionedBeaconState) (uint64, error) {
 	switch state.Version {
 	case spec.DataVersionCapella:
 		return state.Capella.GenesisTime, nil

diff --git a/prove_withdrawal.go b/prove_withdrawal.go
@@ -260,7 +260,7 @@ func (epp *EigenPodProofs) ProveWithdrawal(
 		return nil, nil, errors.New("unsupported version")
 	}
 
-	oracleBeaconStateHistoricalSummaries, err := beacon.HistoricalSummaries(oracleBeaconState)
+	oracleBeaconStateHistoricalSummaries, err := beacon.GetHistoricalSummaries(oracleBeaconState)
 	if err != nil {
 		return nil, nil, err
 	}

diff --git a/solidityProofGen/main.go b/solidityProofGen/main.go
@@ -185,9 +185,9 @@ func GenerateWithdrawalFieldsProof(index, historicalSummariesIndex, blockHeaderI
 
 	beaconBlockHeaderToVerifyIndex := blockHeaderIndex
 
-	versionedOracleState := createVersionedState(spec.DataVersionDeneb)
+	versionedOracleState := beacon.CreateVersionedState(spec.DataVersionDeneb)
 	versionedOracleState.Deneb = &oracleState
-	versionedWithdrawalBlock := createVersionedSignedBlock(spec.DataVersionDeneb)
+	versionedWithdrawalBlock := beacon.CreateVersionedSignedBlock(spec.DataVersionDeneb)
 	versionedWithdrawalBlock.Deneb.Message = &withdrawalBlock
 
 	validatorIndex := phase0.ValidatorIndex(index)
@@ -298,10 +298,8 @@ func GenerateWithdrawalFieldsProofCapella(index, historicalSummariesIndex, block
 
 	beaconBlockHeaderToVerifyIndex := blockHeaderIndex
 
-	versionedOracleState := createVersionedState(spec.DataVersionCapella)
-	versionedOracleState.Deneb = &oracleState
-	versionedWithdrawalBlock := createVersionedSignedBlock(spec.DataVersionCapella)
-	versionedWithdrawalBlock.Capella.Message = &withdrawalBlock
+	versionedOracleState := beacon.CreateVersionedState(oracleState)
+	versionedWithdrawalBlock := beacon.CreateVersionedSignedBlock(withdrawalBlock)
 
 	validatorIndex := phase0.ValidatorIndex(index)
 	beaconStateRoot, _ := oracleState.HashTreeRoot()

diff --git a/solidityProofGen/utils.go b/solidityProofGen/utils.go
@@ -10,7 +10,6 @@ import (
 	eigenpodproofs "github.com/Layr-Labs/eigenpod-proofs-generation"
 	ssz "github.com/ferranbt/fastssz"
 
-	"github.com/attestantio/go-eth2-client/spec"
 	"github.com/attestantio/go-eth2-client/spec/altair"
 	"github.com/attestantio/go-eth2-client/spec/capella"
 	"github.com/attestantio/go-eth2-client/spec/deneb"
@@ -482,29 +481,3 @@ func GetWithdrawalFields(w *capella.Withdrawal) []string {
 
 	return withdrawalFields
 }
-
-func createVersionedState(version spec.DataVersion) spec.VersionedBeaconState {
-	var versionedState spec.VersionedBeaconState
-	switch version {
-	case spec.DataVersionDeneb:
-		versionedState.Deneb = &deneb.BeaconState{}
-	case spec.DataVersionAltair:
-		versionedState.Altair = &altair.BeaconState{}
-	case spec.DataVersionCapella:
-		versionedState.Capella = &capella.BeaconState{}
-	}
-	versionedState.Version = version
-	return versionedState
-}
-
-func createVersionedSignedBlock(version spec.DataVersion) spec.VersionedSignedBeaconBlock {
-	var versionedBlock spec.VersionedSignedBeaconBlock
-	switch version {
-	case spec.DataVersionDeneb:
-		versionedBlock.Deneb.Message = &deneb.BeaconBlock{}
-	case spec.DataVersionCapella:
-		versionedBlock.Capella.Message = &capella.BeaconBlock{}
-	}
-	versionedBlock.Version = version
-	return versionedBlock
-}
diff --git a/utils.go b/utils.go
@@ -92,7 +92,7 @@ func NextPowerOfTwo(v uint64) uint {
 }
 
 func GetSlotTimestamp(beaconState *spec.VersionedBeaconState, blockHeader *phase0.BeaconBlockHeader) (uint64, error) {
-	genesisTime, err := beacon.GenesisTime(beaconState)
+	genesisTime, err := beacon.GetGenesisTime(beaconState)
 	if err != nil {
 		return 0, err
 	}