add slot data from electra (#13042)

shotasilagadze · shotasilagadzetaal · web-flow · commit 98545dc661c6 · 2024-12-10T22:20:52.000+01:00
Adding slot data to support to Antiquary

Co-authored-by: shota.silagadze &lt;shota.silagadze@taal.com&gt;
diff --git a/cl/antiquary/state_antiquary_test.go b/cl/antiquary/state_antiquary_test.go
@@ -48,6 +48,11 @@ func runTest(t *testing.T, blocks []*cltypes.SignedBeaconBlock, preState, postSt
 	require.NoError(t, a.IncrementBeaconState(ctx, blocks[len(blocks)-1].Block.Slot+33))
 }
 
+func TestStateAntiquaryElectra(t *testing.T) {
+	blocks, preState, postState := tests.GetElectraRandom()
+	runTest(t, blocks, preState, postState)
+}
+
 func TestStateAntiquaryCapella(t *testing.T) {
 	blocks, preState, postState := tests.GetCapellaRandom()
 	runTest(t, blocks, preState, postState)
diff --git a/cl/antiquary/tests/test_data/electra/blocks_0.ssz_snappy b/cl/antiquary/tests/test_data/electra/blocks_0.ssz_snappy
diff --git a/cl/antiquary/tests/test_data/electra/blocks_1.ssz_snappy b/cl/antiquary/tests/test_data/electra/blocks_1.ssz_snappy
diff --git a/cl/antiquary/tests/test_data/electra/meta.yaml b/cl/antiquary/tests/test_data/electra/meta.yaml
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:73018ecc96aa42f2d6baef211fb8d504750ad1ab638d94705d3d1b051b4ad71e
+size 34
diff --git a/cl/antiquary/tests/test_data/electra/post.ssz_snappy b/cl/antiquary/tests/test_data/electra/post.ssz_snappy
diff --git a/cl/antiquary/tests/test_data/electra/pre.ssz_snappy b/cl/antiquary/tests/test_data/electra/pre.ssz_snappy
diff --git a/cl/antiquary/tests/tests.go b/cl/antiquary/tests/tests.go
@@ -33,6 +33,18 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+//go:embed test_data/electra/blocks_0.ssz_snappy
+var electra_blocks_0_ssz_snappy []byte
+
+//go:embed test_data/electra/blocks_1.ssz_snappy
+var electra_blocks_1_ssz_snappy []byte
+
+//go:embed test_data/electra/pre.ssz_snappy
+var electra_pre_state_ssz_snappy []byte
+
+//go:embed test_data/electra/post.ssz_snappy
+var electra_post_state_ssz_snappy []byte
+
 //go:embed test_data/capella/blocks_0.ssz_snappy
 var capella_blocks_0_ssz_snappy []byte
 
@@ -126,6 +138,30 @@ func LoadChain(blocks []*cltypes.SignedBeaconBlock, s *state.CachingBeaconState,
 	return m
 }
 
+func GetElectraRandom() ([]*cltypes.SignedBeaconBlock, *state.CachingBeaconState, *state.CachingBeaconState) {
+	block1 := cltypes.NewSignedBeaconBlock(&clparams.MainnetBeaconConfig, clparams.ElectraVersion)
+	block2 := cltypes.NewSignedBeaconBlock(&clparams.MainnetBeaconConfig, clparams.ElectraVersion)
+
+	// Lets do te
+	if err := utils.DecodeSSZSnappy(block1, electra_blocks_0_ssz_snappy, int(clparams.ElectraVersion)); err != nil {
+		panic(err)
+	}
+	if err := utils.DecodeSSZSnappy(block2, electra_blocks_1_ssz_snappy, int(clparams.ElectraVersion)); err != nil {
+		panic(err)
+	}
+
+	preState := state.New(&clparams.MainnetBeaconConfig)
+	if err := utils.DecodeSSZSnappy(preState, electra_pre_state_ssz_snappy, int(clparams.ElectraVersion)); err != nil {
+		panic(err)
+
+	}
+	postState := state.New(&clparams.MainnetBeaconConfig)
+	if err := utils.DecodeSSZSnappy(postState, electra_post_state_ssz_snappy, int(clparams.ElectraVersion)); err != nil {
+		panic(err)
+	}
+	return []*cltypes.SignedBeaconBlock{block1, block2}, preState, postState
+}
+
 func GetCapellaRandom() ([]*cltypes.SignedBeaconBlock, *state.CachingBeaconState, *state.CachingBeaconState) {
 	block1 := cltypes.NewSignedBeaconBlock(&clparams.MainnetBeaconConfig, clparams.CapellaVersion)
 	block2 := cltypes.NewSignedBeaconBlock(&clparams.MainnetBeaconConfig, clparams.CapellaVersion)
diff --git a/cl/beacon/handler/rewards.go b/cl/beacon/handler/rewards.go
@@ -86,7 +86,7 @@ func (a *ApiHandler) GetEthV1BeaconRewardsBlocks(w http.ResponseWriter, r *http.
 	defer snRoTx.Close()
 
 	stateGetter := state_accessors.GetValFnTxAndSnapshot(tx, snRoTx)
-	slotData, err := state_accessors.ReadSlotData(stateGetter, slot)
+	slotData, err := state_accessors.ReadSlotData(stateGetter, slot, a.beaconChainCfg)
 	if err != nil {
 		return nil, err
 	}
diff --git a/cl/persistence/state/historical_states_reader/historical_states_reader.go b/cl/persistence/state/historical_states_reader/historical_states_reader.go
@@ -114,7 +114,7 @@ func (r *HistoricalStatesReader) ReadHistoricalState(ctx context.Context, tx kv.
 	blockHeader := block.SignedBeaconBlockHeader().Header
 	blockHeader.Root = common.Hash{}
 	// Read the epoch and per-slot data.
-	slotData, err := state_accessors.ReadSlotData(kvGetter, slot)
+	slotData, err := state_accessors.ReadSlotData(kvGetter, slot, r.cfg)
 	if err != nil {
 		return nil, err
 	}
@@ -673,7 +673,7 @@ func (r *HistoricalStatesReader) ReconstructUint64ListDump(kvGetter state_access
 
 func (r *HistoricalStatesReader) ReadValidatorsForHistoricalState(tx kv.Tx, kvGetter state_accessors.GetValFn, slot uint64) (*solid.ValidatorSet, error) {
 	// Read the minimal beacon state which have the small fields.
-	sd, err := state_accessors.ReadSlotData(kvGetter, slot)
+	sd, err := state_accessors.ReadSlotData(kvGetter, slot, r.cfg)
 	if err != nil {
 		return nil, err
 	}
@@ -777,7 +777,7 @@ func (r *HistoricalStatesReader) ReadParticipations(tx kv.Tx, kvGetter state_acc
 	}
 
 	// Read the minimal beacon state which have the small fields.
-	sd, err := state_accessors.ReadSlotData(kvGetter, slot)
+	sd, err := state_accessors.ReadSlotData(kvGetter, slot, r.cfg)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -900,7 +900,7 @@ func (r *HistoricalStatesReader) tryCachingEpochsInParallell(tx kv.Tx, kvGetter
 }
 
 func (r *HistoricalStatesReader) ReadValidatorsBalances(tx kv.Tx, kvGetter state_accessors.GetValFn, slot uint64) (solid.Uint64ListSSZ, error) {
-	sd, err := state_accessors.ReadSlotData(kvGetter, slot)
+	sd, err := state_accessors.ReadSlotData(kvGetter, slot, r.cfg)
 	if err != nil {
 		return nil, err
 	}
diff --git a/cl/persistence/state/slot_data.go b/cl/persistence/state/slot_data.go
@@ -23,6 +23,7 @@ import (
 
 	"github.com/erigontech/erigon/cl/clparams"
 	"github.com/erigontech/erigon/cl/cltypes"
+	"github.com/erigontech/erigon/cl/cltypes/solid"
 	"github.com/erigontech/erigon/cl/phase1/core/state"
 	ssz2 "github.com/erigontech/erigon/cl/ssz"
 )
@@ -40,6 +41,16 @@ type SlotData struct {
 	// Capella
 	NextWithdrawalIndex          uint64
 	NextWithdrawalValidatorIndex uint64
+	// Electra
+	DepositRequestsStartIndex     uint64
+	DepositBalanceToConsume       uint64
+	ExitBalanceToConsume          uint64
+	EarliestExitEpoch             uint64
+	ConsolidationBalanceToConsume uint64
+	EarliestConsolidationEpoch    uint64
+	PendingDeposits               *solid.ListSSZ[*solid.PendingDeposit]
+	PendingPartialWithdrawals     *solid.ListSSZ[*solid.PendingPartialWithdrawal]
+	PendingConsolidations         *solid.ListSSZ[*solid.PendingConsolidation]
 
 	// BlockRewards for proposer
 	AttestationsRewards  uint64
@@ -56,12 +67,21 @@ func SlotDataFromBeaconState(s *state.CachingBeaconState) *SlotData {
 		ValidatorLength: uint64(s.ValidatorLength()),
 		Eth1DataLength:  uint64(s.Eth1DataVotes().Len()),
 
-		Version:                      s.Version(),
-		Eth1Data:                     s.Eth1Data(),
-		Eth1DepositIndex:             s.Eth1DepositIndex(),
-		NextWithdrawalIndex:          s.NextWithdrawalIndex(),
-		NextWithdrawalValidatorIndex: s.NextWithdrawalValidatorIndex(),
-		Fork:                         s.Fork(),
+		Version:                       s.Version(),
+		Eth1Data:                      s.Eth1Data(),
+		Eth1DepositIndex:              s.Eth1DepositIndex(),
+		NextWithdrawalIndex:           s.NextWithdrawalIndex(),
+		NextWithdrawalValidatorIndex:  s.NextWithdrawalValidatorIndex(),
+		DepositRequestsStartIndex:     s.DepositRequestsStartIndex(),
+		DepositBalanceToConsume:       s.DepositBalanceToConsume(),
+		ExitBalanceToConsume:          s.ExitBalanceToConsume(),
+		EarliestExitEpoch:             s.EarliestExitEpoch(),
+		ConsolidationBalanceToConsume: s.ConsolidationBalanceToConsume(),
+		EarliestConsolidationEpoch:    s.EarliestConsolidationEpoch(),
+		PendingDeposits:               s.PendingDeposits(),
+		PendingPartialWithdrawals:     s.PendingPartialWithdrawals(),
+		PendingConsolidations:         s.PendingConsolidations(),
+		Fork:                          s.Fork(),
 	}
 }
 
@@ -87,7 +107,7 @@ func (m *SlotData) WriteTo(w io.Writer) error {
 }
 
 // Deserialize deserializes the state from a byte slice with zstd compression.
-func (m *SlotData) ReadFrom(r io.Reader) error {
+func (m *SlotData) ReadFrom(r io.Reader, cfg *clparams.BeaconChainConfig) error {
 	m.Eth1Data = &cltypes.Eth1Data{}
 	m.Fork = &cltypes.Fork{}
 	var err error
@@ -98,6 +118,12 @@ func (m *SlotData) ReadFrom(r io.Reader) error {
 	}
 	m.Version = clparams.StateVersion(versionByte[0])
 
+	if m.Version >= clparams.ElectraVersion {
+		m.PendingDeposits = solid.NewPendingDepositList(cfg)
+		m.PendingPartialWithdrawals = solid.NewPendingWithdrawalList(cfg)
+		m.PendingConsolidations = solid.NewPendingConsolidationList(cfg)
+	}
+
 	lenB := make([]byte, 8)
 	if _, err = r.Read(lenB); err != nil {
 		return err
@@ -122,5 +148,19 @@ func (m *SlotData) getSchema() []interface{} {
 	if m.Version >= clparams.CapellaVersion {
 		schema = append(schema, &m.NextWithdrawalIndex, &m.NextWithdrawalValidatorIndex)
 	}
+
+	if m.Version >= clparams.ElectraVersion {
+		schema = append(schema,
+			&m.DepositRequestsStartIndex,
+			&m.DepositBalanceToConsume,
+			&m.ExitBalanceToConsume,
+			&m.EarliestExitEpoch,
+			&m.ConsolidationBalanceToConsume,
+			&m.EarliestConsolidationEpoch,
+			m.PendingDeposits,
+			m.PendingPartialWithdrawals,
+			m.PendingConsolidations,
+		)
+	}
 	return schema
 }
diff --git a/cl/persistence/state/slot_data_test.go b/cl/persistence/state/slot_data_test.go
@@ -21,25 +21,38 @@ import (
 	"testing"
 
 	"github.com/erigontech/erigon/cl/clparams"
+	"github.com/erigontech/erigon/cl/clparams/initial_state"
 	"github.com/erigontech/erigon/cl/cltypes"
+	"github.com/erigontech/erigon/cl/cltypes/solid"
 	"github.com/stretchr/testify/require"
 )
 
 func TestSlotData(t *testing.T) {
+	s, err := initial_state.GetGenesisState(clparams.MainnetNetwork)
+	require.NoError(t, err)
 	m := &SlotData{
-		Version:                      clparams.CapellaVersion,
-		Eth1Data:                     &cltypes.Eth1Data{},
-		Eth1DepositIndex:             0,
-		NextWithdrawalIndex:          0,
-		NextWithdrawalValidatorIndex: 0,
-		Fork:                         &cltypes.Fork{Epoch: 12},
+		Version:                       clparams.ElectraVersion,
+		Eth1Data:                      &cltypes.Eth1Data{},
+		Eth1DepositIndex:              1,
+		NextWithdrawalIndex:           2,
+		NextWithdrawalValidatorIndex:  3,
+		DepositRequestsStartIndex:     4,
+		DepositBalanceToConsume:       5,
+		ExitBalanceToConsume:          6,
+		EarliestExitEpoch:             7,
+		ConsolidationBalanceToConsume: 8,
+		EarliestConsolidationEpoch:    9,
+		PendingDeposits:               solid.NewPendingDepositList(s.BeaconConfig()),
+		PendingPartialWithdrawals:     solid.NewPendingWithdrawalList(s.BeaconConfig()),
+		PendingConsolidations:         solid.NewPendingConsolidationList(s.BeaconConfig()),
+		Fork:                          &cltypes.Fork{Epoch: 12},
 	}
 	var b bytes.Buffer
 	if err := m.WriteTo(&b); err != nil {
 		t.Fatal(err)
 	}
 	m2 := &SlotData{}
-	if err := m2.ReadFrom(&b); err != nil {
+	if err := m2.ReadFrom(&b, s.BeaconConfig()); err != nil {
 		t.Fatal(err)
 	}
 
diff --git a/cl/persistence/state/state_accessors.go b/cl/persistence/state/state_accessors.go
@@ -21,6 +21,7 @@ import (
 	"encoding/binary"
 
 	"github.com/erigontech/erigon-lib/kv"
+	"github.com/erigontech/erigon/cl/clparams"
 	"github.com/erigontech/erigon/cl/cltypes/solid"
 	"github.com/erigontech/erigon/cl/persistence/base_encoding"
 	"github.com/erigontech/erigon/turbo/snapshotsync"
@@ -56,7 +57,7 @@ func SetStateProcessingProgress(tx kv.RwTx, progress uint64) error {
 	return tx.Put(kv.StatesProcessingProgress, kv.StatesProcessingKey, base_encoding.Encode64ToBytes4(progress))
 }
 
-func ReadSlotData(getFn GetValFn, slot uint64) (*SlotData, error) {
+func ReadSlotData(getFn GetValFn, slot uint64, cfg *clparams.BeaconChainConfig) (*SlotData, error) {
 	sd := &SlotData{}
 	v, err := getFn(kv.SlotData, base_encoding.Encode64ToBytes4(slot))
 	if err != nil {
@@ -67,7 +68,7 @@ func ReadSlotData(getFn GetValFn, slot uint64) (*SlotData, error) {
 	}
 	buf := bytes.NewBuffer(v)
 
-	return sd, sd.ReadFrom(buf)
+	return sd, sd.ReadFrom(buf, cfg)
 }
 
 func ReadEpochData(getFn GetValFn, slot uint64) (*EpochData, error) {
diff --git a/cl/phase1/core/state/raw/getters.go b/cl/phase1/core/state/raw/getters.go
@@ -323,6 +323,34 @@ func (b *BeaconState) NextWithdrawalValidatorIndex() uint64 {
 	return b.nextWithdrawalValidatorIndex
 }
 
+func (b *BeaconState) DepositRequestsStartIndex() uint64 {
+	return b.depositRequestsStartIndex
+}
+
+func (b *BeaconState) DepositBalanceToConsume() uint64 {
+	return b.depositBalanceToConsume
+}
+
+func (b *BeaconState) ConsolidationBalanceToConsume() uint64 {
+	return b.consolidationBalanceToConsume
+}
+
+func (b *BeaconState) EarliestConsolidationEpoch() uint64 {
+	return b.earliestConsolidationEpoch
+}
+
+func (b *BeaconState) PendingDeposits() *solid.ListSSZ[*solid.PendingDeposit] {
+	return b.pendingDeposits
+}
+
+func (b *BeaconState) PendingPartialWithdrawals() *solid.ListSSZ[*solid.PendingPartialWithdrawal] {
+	return b.pendingPartialWithdrawals
+}
+
+func (b *BeaconState) PendingConsolidations() *solid.ListSSZ[*solid.PendingConsolidation] {
+	return b.pendingConsolidations
+}
+
 // more compluicated ones
 
 // GetBlockRootAtSlot returns the block root at a given slot

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:73018ecc96aa42f2d6baef211fb8d504750ad1ab638d94705d3d1b051b4ad71e`
	`3`	`+size 34`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ func (a ApiHandler) GetEthV1BeaconRewardsBlocks(w http.ResponseWriter, r http.`
`86`	`86`	`defer snRoTx.Close()`
`87`	`87`
`88`	`88`	`stateGetter := state_accessors.GetValFnTxAndSnapshot(tx, snRoTx)`
`89`		`- slotData, err := state_accessors.ReadSlotData(stateGetter, slot)`
	`89`	`+ slotData, err := state_accessors.ReadSlotData(stateGetter, slot, a.beaconChainCfg)`
`90`	`90`	`if err != nil {`
`91`	`91`	`return nil, err`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ func (r *HistoricalStatesReader) ReadHistoricalState(ctx context.Context, tx kv.`
`114`	`114`	`blockHeader := block.SignedBeaconBlockHeader().Header`
`115`	`115`	`blockHeader.Root = common.Hash{}`
`116`	`116`	`// Read the epoch and per-slot data.`
`117`		`- slotData, err := state_accessors.ReadSlotData(kvGetter, slot)`
	`117`	`+ slotData, err := state_accessors.ReadSlotData(kvGetter, slot, r.cfg)`
`118`	`118`	`if err != nil {`
`119`	`119`	`return nil, err`
`120`	`120`	`}`
`@@ -673,7 +673,7 @@ func (r *HistoricalStatesReader) ReconstructUint64ListDump(kvGetter state_access`
`673`	`673`
`674`	`674`	`func (r HistoricalStatesReader) ReadValidatorsForHistoricalState(tx kv.Tx, kvGetter state_accessors.GetValFn, slot uint64) (solid.ValidatorSet, error) {`
`675`	`675`	`// Read the minimal beacon state which have the small fields.`
`676`		`- sd, err := state_accessors.ReadSlotData(kvGetter, slot)`
	`676`	`+ sd, err := state_accessors.ReadSlotData(kvGetter, slot, r.cfg)`
`677`	`677`	`if err != nil {`
`678`	`678`	`return nil, err`
`679`	`679`	`}`
`@@ -777,7 +777,7 @@ func (r *HistoricalStatesReader) ReadParticipations(tx kv.Tx, kvGetter state_acc`
`777`	`777`	`}`
`778`	`778`
`779`	`779`	`// Read the minimal beacon state which have the small fields.`
`780`		`- sd, err := state_accessors.ReadSlotData(kvGetter, slot)`
	`780`	`+ sd, err := state_accessors.ReadSlotData(kvGetter, slot, r.cfg)`
`781`	`781`	`if err != nil {`
`782`	`782`	`return nil, nil, err`
`783`	`783`	`}`
`@@ -900,7 +900,7 @@ func (r *HistoricalStatesReader) tryCachingEpochsInParallell(tx kv.Tx, kvGetter`
`900`	`900`	`}`
`901`	`901`
`902`	`902`	`func (r *HistoricalStatesReader) ReadValidatorsBalances(tx kv.Tx, kvGetter state_accessors.GetValFn, slot uint64) (solid.Uint64ListSSZ, error) {`
`903`		`- sd, err := state_accessors.ReadSlotData(kvGetter, slot)`
	`903`	`+ sd, err := state_accessors.ReadSlotData(kvGetter, slot, r.cfg)`
`904`	`904`	`if err != nil {`
`905`	`905`	`return nil, err`
`906`	`906`	`}`