diff --git a/go.mod b/go.mod index da81ce2..babdf4c 100644 --- a/go.mod +++ b/go.mod @@ -125,6 +125,6 @@ require ( rsc.io/tmplfunc v0.0.3 // indirect ) -replace github.com/attestantio/go-eth2-client => github.com/pk910/go-eth2-client v0.0.0-20240923174943-8d64565c83ca +replace github.com/attestantio/go-eth2-client => github.com/pk910/go-eth2-client v0.0.0-20241004214539-f6f806861d96 replace github.com/ethereum/go-ethereum => github.com/lightclient/go-ethereum v0.0.0-20240907155054-183e7b702a00 diff --git a/go.sum b/go.sum index e4f79db..2c8bd57 100644 --- a/go.sum +++ b/go.sum @@ -319,8 +319,8 @@ github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/pk910/dynamic-ssz v0.0.5 h1:VP9heGYUwzlpyhk28P2nCAzhvGsePJOOOO5vQMDh2qQ= github.com/pk910/dynamic-ssz v0.0.5/go.mod h1:b6CrLaB2X7pYA+OSEEbkgXDEcRnjLOZIxZTsMuO/Y9c= -github.com/pk910/go-eth2-client v0.0.0-20240923174943-8d64565c83ca h1:rc6VVR79GdE58Wx1Arh9QNo+0qmXOfYjWQhrbkSeoI0= -github.com/pk910/go-eth2-client v0.0.0-20240923174943-8d64565c83ca/go.mod h1:vy5jU/uDZ2+RcVzq5BfnG+bQ3/6uu9DGwCrGsPtjJ1A= +github.com/pk910/go-eth2-client v0.0.0-20241004214539-f6f806861d96 h1:I6qQcQtxwafsolKI5pj3gbRn1kc05Tq1571gxPG1/c8= +github.com/pk910/go-eth2-client v0.0.0-20241004214539-f6f806861d96/go.mod h1:vy5jU/uDZ2+RcVzq5BfnG+bQ3/6uu9DGwCrGsPtjJ1A= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/handlers/slot.go b/handlers/slot.go index 1367b6f..52d0982 100644 --- a/handlers/slot.go +++ b/handlers/slot.go @@ -725,9 +725,9 @@ func getSlotPageBlockData(blockData *services.CombinedBlockResponse, epochStatsV if specs.ElectraForkEpoch != nil && uint64(epoch) >= *specs.ElectraForkEpoch { requests, err := blockData.Block.ExecutionRequests() if err == nil && requests != nil { - getSlotPageDepositRequests(pageData, requests.DepositRequests) - getSlotPageWithdrawalRequests(pageData, requests.WithdrawalRequests) - getSlotPageConsolidationRequests(pageData, requests.ConsolidationRequests) + getSlotPageDepositRequests(pageData, requests.Deposits) + getSlotPageWithdrawalRequests(pageData, requests.Withdrawals) + getSlotPageConsolidationRequests(pageData, requests.Consolidations) } } diff --git a/indexer/beacon/writedb.go b/indexer/beacon/writedb.go index b20bea0..0dcba97 100644 --- a/indexer/beacon/writedb.go +++ b/indexer/beacon/writedb.go @@ -490,7 +490,7 @@ func (dbw *dbWriter) buildDbDepositRequests(block *Block, orphaned bool, overrid return nil } - deposits := requests.DepositRequests + deposits := requests.Deposits dbDeposits := make([]*dbtypes.Deposit, len(deposits)) for idx, deposit := range deposits { @@ -680,7 +680,7 @@ func (dbw *dbWriter) buildDbConsolidationRequests(block *Block, orphaned bool, o return nil } - consolidations := requests.ConsolidationRequests + consolidations := requests.Consolidations if len(consolidations) == 0 { return []*dbtypes.ConsolidationRequest{} @@ -745,7 +745,7 @@ func (dbw *dbWriter) buildDbWithdrawalRequests(block *Block, orphaned bool, over return nil } - withdrawalRequests := requests.WithdrawalRequests + withdrawalRequests := requests.Withdrawals if len(withdrawalRequests) == 0 { return []*dbtypes.WithdrawalRequest{}