fix(cannon): Correctly calculate slot (#189)

ethpandaops · Sep 13, 2023 · 5f0bfe8 · 5f0bfe8
1 parent 99f2e42
commit 5f0bfe8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/pkg/cannon/deriver/beacon/eth/v2/attester_slashing.go b/pkg/cannon/deriver/beacon/eth/v2/attester_slashing.go
@@ -156,7 +156,7 @@ func (a *AttesterSlashingDeriver) processEpoch(ctx context.Context, epoch phase0
 	allEvents := []*xatu.DecoratedEvent{}
 
 	for i := uint64(0); i <= uint64(sp.SlotsPerEpoch); i++ {
-		slot := phase0.Slot(i + uint64(epoch))
+		slot := phase0.Slot(i + uint64(epoch)*uint64(sp.SlotsPerEpoch))
 
 		events, err := a.processSlot(ctx, slot)
 		if err != nil {

diff --git a/pkg/cannon/deriver/beacon/eth/v2/bls_to_execution_change.go b/pkg/cannon/deriver/beacon/eth/v2/bls_to_execution_change.go
@@ -159,7 +159,7 @@ func (b *BLSToExecutionChangeDeriver) processEpoch(ctx context.Context, epoch ph
 	allEvents := []*xatu.DecoratedEvent{}
 
 	for i := uint64(0); i <= uint64(sp.SlotsPerEpoch); i++ {
-		slot := phase0.Slot(i + uint64(epoch))
+		slot := phase0.Slot(i + uint64(epoch)*uint64(sp.SlotsPerEpoch))
 
 		events, err := b.processSlot(ctx, slot)
 		if err != nil {

diff --git a/pkg/cannon/deriver/beacon/eth/v2/execution_transaction.go b/pkg/cannon/deriver/beacon/eth/v2/execution_transaction.go
@@ -160,7 +160,7 @@ func (b *ExecutionTransactionDeriver) processEpoch(ctx context.Context, epoch ph
 	allEvents := []*xatu.DecoratedEvent{}
 
 	for i := uint64(0); i <= uint64(sp.SlotsPerEpoch); i++ {
-		slot := phase0.Slot(i + uint64(epoch))
+		slot := phase0.Slot(i + uint64(epoch)*uint64(sp.SlotsPerEpoch))
 
 		events, err := b.processSlot(ctx, slot)
 		if err != nil {

diff --git a/pkg/cannon/deriver/beacon/eth/v2/proposer_slashing.go b/pkg/cannon/deriver/beacon/eth/v2/proposer_slashing.go
@@ -156,7 +156,7 @@ func (b *ProposerSlashingDeriver) processEpoch(ctx context.Context, epoch phase0
 	allEvents := []*xatu.DecoratedEvent{}
 
 	for i := uint64(0); i <= uint64(sp.SlotsPerEpoch); i++ {
-		slot := phase0.Slot(i + uint64(epoch))
+		slot := phase0.Slot(i + uint64(epoch)*uint64(sp.SlotsPerEpoch))
 
 		events, err := b.processSlot(ctx, slot)
 		if err != nil {

diff --git a/pkg/cannon/deriver/beacon/eth/v2/voluntary_exit.go b/pkg/cannon/deriver/beacon/eth/v2/voluntary_exit.go
@@ -157,7 +157,7 @@ func (b *VoluntaryExitDeriver) processEpoch(ctx context.Context, epoch phase0.Ep
 	allEvents := []*xatu.DecoratedEvent{}
 
 	for i := uint64(0); i <= uint64(sp.SlotsPerEpoch); i++ {
-		slot := phase0.Slot(i + uint64(epoch))
+		slot := phase0.Slot(i + uint64(epoch)*uint64(sp.SlotsPerEpoch))
 
 		events, err := b.processSlot(ctx, slot)
 		if err != nil {