chore(all): Cumulative branch - attempt 2 #2127
+1,885
−717
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,11 +57,9 @@ func DefaultComponents() []any { | |
| *BlobSidecar, *BlobSidecars, *Logger, | ||
| ], | ||
| components.ProvideBlobProofVerifier, | ||
| components.ProvideChainService[ | ||
| *AvailabilityStore, | ||
| *ConsensusBlock, *BeaconBlock, *BeaconBlockBody, | ||
| *BeaconBlockHeader, *BeaconState, *BeaconStateMarshallable, | ||
| *BlobSidecars, *BlockStore, *Deposit, *DepositStore, | ||
| *ExecutionPayload, *ExecutionPayloadHeader, *Genesis, | ||
|
|
@@ -91,7 +89,7 @@ func DefaultComponents() []any { | |
| ], | ||
| components.ProvideDepositStore[*Deposit], | ||
| components.ProvideDispatcher[ | ||
| *ConsensusBlock, *BeaconBlock, *BlobSidecars, *Genesis, *Logger, | ||
| ], | ||
| components.ProvideEngineClient[ | ||
| *ExecutionPayload, *ExecutionPayloadHeader, *Logger, | ||
|
|
@@ -107,7 +105,8 @@ func DefaultComponents() []any { | |
| components.ProvideReportingService[*Logger], | ||
| components.ProvideCometBFTService[*Logger], | ||
| components.ProvideServiceRegistry[ | ||
| *AvailabilityStore, | ||
| *ConsensusBlock, *BeaconBlock, *BeaconBlockBody, | ||
|
Comment on lines
+108
to
+109
There was a problem hiding this comment. 🧹 Nitpick (assertive) LGTM: Consider documenting the parameter grouping pattern. The parameter additions to Consider adding a comment above the function to explain the parameter grouping pattern, making it easier for future maintainers to follow the same convention when adding new parameters. |
||
| *BeaconBlockHeader, *BlockStore, *BeaconState, | ||
| *BeaconStateMarshallable, *BlobSidecar, *BlobSidecars, | ||
| *Deposit, *DepositStore, *ExecutionPayload, *ExecutionPayloadHeader, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,7 +26,6 @@ import ( | |
| "github.com/berachain/beacon-kit/mod/beacon/validator" | ||
| "github.com/berachain/beacon-kit/mod/consensus-types/pkg/types" | ||
| cometbft "github.com/berachain/beacon-kit/mod/consensus/pkg/cometbft/service" | ||
| consruntimetypes "github.com/berachain/beacon-kit/mod/consensus/pkg/types" | ||
| dablob "github.com/berachain/beacon-kit/mod/da/pkg/blob" | ||
| "github.com/berachain/beacon-kit/mod/da/pkg/da" | ||
|
|
@@ -63,14 +62,6 @@ import ( | |
| /* -------------------------------------------------------------------------- */ | ||
|
|
||
| type ( | ||
| // AttributesFactory is a type alias for the attributes factory. | ||
| AttributesFactory = attributes.Factory[ | ||
| *BeaconState, | ||
|
|
@@ -87,19 +78,13 @@ type ( | |
| *BlobSidecars, | ||
| ] | ||
|
|
||
| // BlockStoreService is a type alias for the block store service. | ||
| BlockStoreService = blockstore.Service[*BeaconBlock, *BlockStore] | ||
|
|
||
| // ChainService is a type alias for the chain service. | ||
| ChainService = blockchain.Service[ | ||
| *AvailabilityStore, | ||
| *ConsensusBlock, | ||
| *BeaconBlock, | ||
| *BeaconBlockBody, | ||
| *BeaconBlockHeader, | ||
|
|
@@ -114,9 +99,6 @@ type ( | |
| // CometBFTService is a type alias for the CometBFT service. | ||
| CometBFTService = cometbft.Service[*Logger] | ||
|
|
||
| // DAService is a type alias for the DA service. | ||
| DAService = da.Service[*AvailabilityStore, *BlobSidecars] | ||
|
|
||
|
|
@@ -245,6 +227,7 @@ type ( | |
| AvailabilityStore = dastore.Store[*BeaconBlockBody] | ||
|
|
||
| // BeaconBlock type aliases. | ||
| ConsensusBlock = consruntimetypes.ConsensusBlock[*BeaconBlock] | ||
| BeaconBlock = types.BeaconBlock | ||
| BeaconBlockBody = types.BeaconBlockBody | ||
| BeaconBlockHeader = types.BeaconBlockHeader | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -121,7 +121,7 @@ require ( | |
| github.com/felixge/httpsnoop v1.0.4 // indirect | ||
| github.com/ferranbt/fastssz v0.1.4-0.20240629094022-eac385e6ee79 // indirect | ||
| github.com/fsnotify/fsnotify v1.7.0 // indirect | ||
| github.com/gabriel-vasile/mimetype v1.4.6 // indirect | ||
| github.com/getsentry/sentry-go v0.28.1 // indirect | ||
| github.com/go-faster/xor v1.0.0 // indirect | ||
| github.com/go-kit/kit v0.13.0 // indirect | ||
|
|
@@ -236,13 +236,13 @@ require ( | |
| gitlab.com/yawning/secp256k1-voi v0.0.0-20230925100816-f2616030848b // indirect | ||
| gitlab.com/yawning/tuplehash v0.0.0-20230713102510-df83abbf9a02 // indirect | ||
| go.opencensus.io v0.24.0 // indirect | ||
| golang.org/x/crypto v0.28.0 // indirect | ||
| golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect | ||
| golang.org/x/net v0.30.0 // indirect | ||
| golang.org/x/sync v0.8.0 // indirect | ||
| golang.org/x/sys v0.26.0 // indirect | ||
| golang.org/x/term v0.25.0 // indirect | ||
| golang.org/x/text v0.19.0 // indirect | ||
| golang.org/x/time v0.5.0 // indirect | ||
| google.golang.org/genproto v0.0.0-20240617180043-68d350f18fd4 // indirect | ||
| google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 // indirect | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -248,8 +248,8 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4 | |
| github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= | ||
| github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= | ||
| github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= | ||
| github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc= | ||
| github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc= | ||
| github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 h1:f6D9Hr8xV8uYKlyuj8XIruxlh9WjVjdh1gIicAS7ays= | ||
| github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= | ||
| github.com/getsentry/sentry-go v0.28.1 h1:zzaSm/vHmGllRM6Tpx1492r0YDzauArdBfkJRtY6P5k= | ||
|
|
@@ -688,8 +688,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk | |
| golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | ||
| golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | ||
| golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | ||
| golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= | ||
| golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= | ||
| golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= | ||
| golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= | ||
| golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= | ||
|
|
@@ -718,8 +718,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b | |
| golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= | ||
| golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= | ||
| golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= | ||
| golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= | ||
| golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= | ||
| golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= | ||
| golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= | ||
| golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||
|
|
@@ -771,19 +771,19 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | |
| golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||
| golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | ||
| golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | ||
| golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= | ||
| golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | ||
| golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= | ||
| golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= | ||
| golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= | ||
| golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= | ||
| golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | ||
| golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | ||
| golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | ||
| golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | ||
| golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= | ||
| golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= | ||
| golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= | ||
| golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= | ||
| golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= | ||
| golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -202,7 +202,7 @@ start-erigon: ## start an ephemeral `erigon` node | |||||||||||||
| docker run \ | ||||||||||||||
| --rm -v $(PWD)/${TESTAPP_FILES_DIR}:/${TESTAPP_FILES_DIR} \ | ||||||||||||||
| -v $(PWD)/.tmp:/.tmp \ | ||||||||||||||
| erigontech/erigon:latest init \ | ||||||||||||||
|
There was a problem hiding this comment. 🛠️ Refactor suggestion Consider using a specific version tag instead of 'latest'. Good move switching to the official - erigontech/erigon:latest init \
+ erigontech/erigon:v2.60.9 init \
...
- erigontech/erigon:latest \
+ erigontech/erigon:v2.60.9 \Also applies to: 215-215 |
||||||||||||||
| --datadir .tmp/erigon \ | ||||||||||||||
| ${ETH_GENESIS_PATH} | ||||||||||||||
|
Comment on lines
+205
to
207
There was a problem hiding this comment. 🧹 Nitpick (assertive) Consider using a specific version tag instead of 'latest'. The change to use the official - erigontech/erigon:latest init \
+ erigontech/erigon:v2.60.9 init \📝 Committable suggestion
Suggested change
|
||||||||||||||
|
|
||||||||||||||
|
|
@@ -212,7 +212,7 @@ start-erigon: ## start an ephemeral `erigon` node | |||||||||||||
| -p 8551:8551 \ | ||||||||||||||
| --rm -v $(PWD)/${TESTAPP_FILES_DIR}:/${TESTAPP_FILES_DIR} \ | ||||||||||||||
| -v $(PWD)/.tmp:/.tmp \ | ||||||||||||||
| erigontech/erigon:latest \ | ||||||||||||||
| --http \ | ||||||||||||||
| --http.addr 0.0.0.0 \ | ||||||||||||||
| --http.api eth,net \ | ||||||||||||||
|
|
||||||||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -93,7 +93,7 @@ node_settings: | |
| max_memory: 2048 | ||
| images: | ||
| besu: hyperledger/besu:24.5.4 | ||
| erigon: erigontech/erigon:v2.60.9 | ||
|
There was a problem hiding this comment. 🧹 Nitpick (assertive) Document the repository change from 'thorax' to 'erigontech'. While switching to the official repository is a good practice, please document the rationale for this change in the commit message or PR description to help with future maintenance. |
||
| ethereumjs: ethpandaops/ethereumjs:stable | ||
| geth: ethereum/client-go:latest | ||
| nethermind: nethermind/nethermind:latest | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -88,7 +88,7 @@ node_settings: | |
| max_memory: 32768 | ||
| images: | ||
| besu: hyperledger/besu:latest | ||
| erigon: erigontech/erigon:v2.60.9 | ||
| ethereumjs: ethpandaops/ethereumjs:stable | ||
| geth: ethereum/client-go:latest | ||
| nethermind: nethermind/nethermind:latest | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,7 +39,7 @@ def start(persistent_peers, is_seed, validator_index, config_settings, app_setti | |
| --beacon-kit.kzg.implementation={} \ | ||
| --beacon-kit.engine.rpc-dial-url {} \ | ||
| --beacon-kit.block-store-service.enabled \ | ||
| --beacon-kit.node-api.enabled --beacon-kit.node-api.logging --beacon-kit.node-api.address 0.0.0.0:3500 \ | ||
|
There was a problem hiding this comment. 🧹 Nitpick (assertive) Consider parameterizing the node API configuration. The addition of the node API configuration is consistent with the test environment setup. However, binding to Consider:
There was a problem hiding this comment. 🧹 Nitpick (assertive) 💡 Codebase verification Based on the code analysis, I can now generate the final response: API security needs to be enhanced before exposing to external networks The current implementation:
While binding to
🔗 Analysis chainConsider security implications and configuration flexibility of the node API. The hardcoded API address
Let's verify if this API endpoint is protected elsewhere in the codebase: Let me analyze the search results to verify the security implications of exposing the node API:
[beacon-kit.node-api]
enabled = "false"
address = "0.0.0.0:3500"
Let me verify if there are any authentication/authorization mechanisms: 🏁 Scripts executedThe following scripts were executed for the analysis: Script: #!/bin/bash
# Search for any authentication/security middleware for the node API
rg -A 5 "node-api"
Length of output: 50121 Script: #!/bin/bash
# Search for auth middleware or security-related code
rg -A 5 "middleware|auth|security" mod/node-api/
Length of output: 1302 |
||
| --pruning=nothing \ | ||
| {} {}".format(kzg_impl, "$BEACOND_ENGINE_DIAL_URL", seed_option, persistent_peers_option) | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,7 +33,7 @@ EXECUTION_DEFAULT_SETTINGS = { | |
| }, | ||
| "images": { | ||
| "besu": "hyperledger/besu:latest", | ||
| "erigon": "erigontech/erigon:v2.60.9", | ||
| "ethereumjs": "ethpandaops/ethereumjs:stable", | ||
| "geth": "ethereum/client-go:latest", | ||
| "nethermind": "nethermind/nethermind:latest", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,17 +23,16 @@ package blockchain | |
| import ( | ||
| "context" | ||
|
|
||
| engineprimitives "github.com/berachain/beacon-kit/mod/engine-primitives/pkg/engine-primitives" | ||
| ) | ||
|
|
||
| // sendPostBlockFCU sends a forkchoice update to the execution client. | ||
| func (s *Service[ | ||
| _, ConsensusBlockT, _, _, _, BeaconStateT, _, _, _, _, _, | ||
| ]) sendPostBlockFCU( | ||
| ctx context.Context, | ||
| st BeaconStateT, | ||
| blk ConsensusBlockT, | ||
| ) { | ||
| lph, err := st.GetLatestExecutionPayloadHeader() | ||
| if err != nil { | ||
|
|
@@ -54,18 +53,19 @@ func (s *Service[ | |
| // sendNextFCUWithAttributes sends a forkchoice update to the execution | ||
| // client with attributes. | ||
| func (s *Service[ | ||
| _, ConsensusBlockT, _, _, _, BeaconStateT, | ||
| _, _, ExecutionPayloadHeaderT, _, _, | ||
| ]) sendNextFCUWithAttributes( | ||
| ctx context.Context, | ||
| st BeaconStateT, | ||
| blk ConsensusBlockT, | ||
| lph ExecutionPayloadHeaderT, | ||
| ) { | ||
| beaconBlk := blk.GetBeaconBlock() | ||
|
|
||
|
Comment on lines
+64
to
+65
There was a problem hiding this comment. 🧹 Nitpick (assertive) Consider adding a helper method for beacon block retrieval Multiple methods perform the same block retrieval operation. Consider extracting this into a helper method with consistent error handling. +func (s *Service[_, ConsensusBlockT, ...]) getBeaconBlockWithLogging(
+ blk ConsensusBlockT,
+) (BeaconBlockT, error) {
+ beaconBlk, err := blk.GetBeaconBlock()
+ if err != nil {
+ s.logger.Error("failed to get beacon block", "error", err)
+ return nil, err
+ }
+ return beaconBlk, nil
+}Also applies to: 105-106 Add error handling for GetBeaconBlock The -beaconBlk := blk.GetBeaconBlock()
+beaconBlk, err := blk.GetBeaconBlock()
+if err != nil {
+ s.logger.Error("failed to get beacon block", "error", err)
+ return
+}
|
||
| stCopy := st.Copy() | ||
| if _, err := s.stateProcessor.ProcessSlots( | ||
| stCopy, beaconBlk.GetSlot()+1, | ||
| ); err != nil { | ||
| s.logger.Error( | ||
| "failed to process slots in non-optimistic payload", | ||
|
|
@@ -74,13 +74,12 @@ func (s *Service[ | |
| return | ||
| } | ||
|
|
||
| prevBlockRoot := beaconBlk.HashTreeRoot() | ||
| if _, err := s.localBuilder.RequestPayloadAsync( | ||
| ctx, | ||
| stCopy, | ||
| beaconBlk.GetSlot()+1, | ||
| blk.GetNextPayloadTimestamp().Unwrap(), | ||
| prevBlockRoot, | ||
| lph.GetBlockHash(), | ||
| lph.GetParentHash(), | ||
|
|
@@ -96,13 +95,15 @@ func (s *Service[ | |
| // sendNextFCUWithoutAttributes sends a forkchoice update to the | ||
| // execution client without attributes. | ||
| func (s *Service[ | ||
| _, ConsensusBlockT, _, _, _, _, _, _, | ||
| ExecutionPayloadHeaderT, _, PayloadAttributesT, | ||
| ]) sendNextFCUWithoutAttributes( | ||
| ctx context.Context, | ||
| blk ConsensusBlockT, | ||
| lph ExecutionPayloadHeaderT, | ||
| ) { | ||
| beaconBlk := blk.GetBeaconBlock() | ||
|
|
||
|
Comment on lines
+105
to
+106
There was a problem hiding this comment. Add error handling for GetBeaconBlock Similar to the previous method, add error handling for the GetBeaconBlock call. -beaconBlk := blk.GetBeaconBlock()
+beaconBlk, err := blk.GetBeaconBlock()
+if err != nil {
+ s.logger.Error("failed to get beacon block", "error", err)
+ return
+}
|
||
| if _, _, err := s.executionEngine.NotifyForkchoiceUpdate( | ||
| ctx, | ||
| // TODO: Switch to New(). | ||
|
|
@@ -113,7 +114,7 @@ func (s *Service[ | |
| SafeBlockHash: lph.GetParentHash(), | ||
| FinalizedBlockHash: lph.GetParentHash(), | ||
| }, | ||
| s.chainSpec.ActiveForkVersionForSlot(beaconBlk.GetSlot()), | ||
| ), | ||
| ); err != nil { | ||
| s.logger.Error( | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Codebase verification
Package path in mockery config needs correction
The ExecutionEngine interface is defined in
mod/beacon/blockchainpackage, but the mockery configuration is targetinggithub.com/berachain/beacon-kit/mod/state-transition/pkg/core. This mismatch means the mock generation will not find the intended interface..mockery.yamlto target the correct location:github.com/berachain/beacon-kit/mod/beacon/blockchain🔗 Analysis chain
LGTM! Configuration follows established patterns.
The new package configuration is well-structured and consistent with other entries. The settings are appropriate for generating focused mocks of execution engine interfaces.
Let's verify that the regex pattern matches the intended interfaces:
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
Length of output: 92
Script:
Length of output: 524