@@ -377,46 +377,47 @@ func ExportSlot(client rpc.Client, slot uint64, isHeadEpoch bool, tx *sqlx.Tx) e
377377
378378 if block .EpochAssignments != nil { // export the epoch assignments as they are included in the first slot of an epoch
379379 epoch := utils .EpochOfSlot (block .Slot )
380- if epoch > utils .Config .ClConfig .ElectraForkEpoch {
381- log .Infof ("checking that events have been loaded for epoch %v" , epoch )
382- exported , err := db .HasEventsForEpoch (epoch )
383- if err != nil {
384- return fmt .Errorf ("error retrieving events for epoch %v: %w" , epoch , err )
385- }
386- if ! exported {
387- return fmt .Errorf ("events for epoch %v have not been loaded yet" , epoch )
388- // log.Infof("ERROR: events for epoch %v have not been loaded yet, RE-EXPORT events manually!!!", epoch)
389- } else {
390- log .Infof ("events for epoch %v have been loaded, transforming consolidations & deposits" , epoch )
391-
392- firstSlot := (epoch - 1 ) * utils .Config .Chain .ClConfig .SlotsPerEpoch
393- lastSlot := (epoch * utils .Config .Chain .ClConfig .SlotsPerEpoch ) - 1
394-
395- switchToCompoundingRequestsProcessed , err := db .TransformSwitchToCompoundingRequests (firstSlot , lastSlot , tx )
380+ /*
381+ if epoch > utils.Config.ClConfig.ElectraForkEpoch {
382+ log.Infof("checking that events have been loaded for epoch %v", epoch)
383+ exported, err := db.HasEventsForEpoch(epoch)
396384 if err != nil {
397- return fmt .Errorf ("error transforming consolidation requests for epoch %v: %w" , epoch , err )
385+ return fmt.Errorf("error retrieving events for epoch %v: %w", epoch, err)
398386 }
399- log .Infof ("transformed switch to compounding requests for epoch %v, processed %d requests" , epoch , switchToCompoundingRequestsProcessed )
387+ if !exported {
388+ return fmt.Errorf("events for epoch %v have not been loaded yet", epoch)
389+ // log.Infof("ERROR: events for epoch %v have not been loaded yet, RE-EXPORT events manually!!!", epoch)
390+ } else {
391+ log.Infof("events for epoch %v have been loaded, transforming consolidations & deposits", epoch)
400392
401- consolidationRequestsProcessed , err := db .TransformConsolidationRequests (firstSlot , lastSlot , tx )
402- if err != nil {
403- return fmt .Errorf ("error transforming consolidation requests for epoch %v: %w" , epoch , err )
404- }
405- log .Infof ("transformed consolidations for epoch %v, processed %d requests" , epoch , consolidationRequestsProcessed )
393+ firstSlot := (epoch - 1) * utils.Config.Chain.ClConfig.SlotsPerEpoch
394+ lastSlot := (epoch * utils.Config.Chain.ClConfig.SlotsPerEpoch) - 1
406395
407- depositRequestsProcessed , err := db .TransformDepositRequests (firstSlot , lastSlot , tx )
408- if err != nil {
409- return fmt .Errorf ("error transforming deposit requests for epoch %v: %w" , epoch , err )
410- }
411- log .Infof ("transformed deposits for epoch %v, processed %d requests" , epoch , depositRequestsProcessed )
396+ switchToCompoundingRequestsProcessed , err := db.TransformSwitchToCompoundingRequests (firstSlot, lastSlot, tx)
397+ if err != nil {
398+ return fmt.Errorf("error transforming consolidation requests for epoch %v: %w", epoch, err)
399+ }
400+ log.Infof("transformed switch to compounding requests for epoch %v, processed %d requests", epoch, switchToCompoundingRequestsProcessed )
412401
413- removedExcessBalanceProcessed , err := db .TransformRemovedExcessBalanceEvents (firstSlot , lastSlot , tx )
414- if err != nil {
415- return fmt .Errorf ("error transforming removed excess balance events for epoch %v: %w" , epoch , err )
402+ consolidationRequestsProcessed, err := db.TransformConsolidationRequests(firstSlot, lastSlot, tx)
403+ if err != nil {
404+ return fmt.Errorf("error transforming consolidation requests for epoch %v: %w", epoch, err)
405+ }
406+ log.Infof("transformed consolidations for epoch %v, processed %d requests", epoch, consolidationRequestsProcessed)
407+
408+ depositRequestsProcessed, err := db.TransformDepositRequests(firstSlot, lastSlot, tx)
409+ if err != nil {
410+ return fmt.Errorf("error transforming deposit requests for epoch %v: %w", epoch, err)
411+ }
412+ log.Infof("transformed deposits for epoch %v, processed %d requests", epoch, depositRequestsProcessed)
413+
414+ removedExcessBalanceProcessed, err := db.TransformRemovedExcessBalanceEvents(firstSlot, lastSlot, tx)
415+ if err != nil {
416+ return fmt.Errorf("error transforming removed excess balance events for epoch %v: %w", epoch, err)
417+ }
418+ log.Infof("transformed removed excess balance events for epoch %v, processed %d events", epoch, removedExcessBalanceProcessed)
416419 }
417- log .Infof ("transformed removed excess balance events for epoch %v, processed %d events" , epoch , removedExcessBalanceProcessed )
418- }
419- }
420+ }*/
420421
421422 log .Infof ("exporting duties & balances for epoch %v" , epoch )
422423 // prepare the duties for export to bigtable
0 commit comments