Fix - Update erigon repo #2121
Fix - Update erigon repo #2121
Conversation
WalkthroughThe pull request introduces updates to various configuration files and scripts, primarily changing the Docker image for the Changes
Possibly related PRs
Suggested reviewers
Poem
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2121 +/- ##
=======================================
Coverage 23.48% 23.48%
=======================================
Files 357 357
Lines 16064 16064
Branches 12 12
=======================================
Hits 3772 3772
Misses 12121 12121
Partials 171 171
|
There was a problem hiding this comment.
Thanks @gummybera. This solve some late issues with test-e2e on CI.
Cc @nidhi-singh02
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 4
📜 Review details
Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
📒 Files selected for processing (5)
build/scripts/testing.mk(2 hunks)kurtosis/beaconkit-all.yaml(1 hunks)kurtosis/beaconkit-base-gcp.yaml(1 hunks)kurtosis/src/nodes/nodes.star(1 hunks)testing/e2e/config/config.go(1 hunks)
🔇 Additional comments (3)
kurtosis/beaconkit-all.yaml (2)
96-96: Verify Otterscan compatibility with new Erigon image.
Since the configuration indicates that Otterscan specifically requires Erigon nodes (as noted in the comment on line 143), we should ensure compatibility is maintained with the new image.
#!/bin/bash
# Description: Check Otterscan-Erigon integration configurations
# Search for Otterscan-specific configurations or version requirements
rg -g '*.{yaml,json,toml,md}' -B 3 -A 3 'otterscan.*erigon|erigon.*otterscan'96-96: LGTM! Image update aligns with repository migration.
The change from thorax/erigon to erigontech/erigon correctly reflects the repository migration while maintaining the same version tag.
Let's verify the image availability and compatibility:
kurtosis/src/nodes/nodes.star (1)
36-36: LGTM! The image update aligns with the repository migration.
The change from thorax/erigon to erigontech/erigon correctly reflects the repository migration while maintaining the same version v2.60.1.
Let's verify that this image update is consistent across all configuration files:
✅ Verification successful
✅ Image reference update is consistent across the codebase
The verification confirms:
- No remaining references to
thorax/erigonin the codebase - All Erigon image references consistently use
erigontech/erigon - Version
v2.60.1is consistently used in configuration files - Only build scripts use the
latesttag, which is appropriate for testing purposes
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Description: Verify consistent Erigon image references across the codebase
# Expected: All references should use erigontech/erigon:v2.60.1
echo "Checking for any remaining references to thorax/erigon..."
rg "thorax/erigon"
echo "Verifying consistent use of new image reference..."
rg "erigontech/erigon"
Length of output: 684
kurtosis/beaconkit-base-gcp.yaml
Outdated
| @@ -88,7 +88,7 @@ node_settings: | |||
| max_memory: 32768 | |||
| images: | |||
| besu: hyperledger/besu:latest | |||
| erigon: thorax/erigon:v2.60.1 | |||
| erigon: erigontech/erigon:v2.60.1 | |||
There was a problem hiding this comment.
💡 Codebase verification
erigontech/erigon:v2.60.1 is not available
The verification shows that while the original image thorax/erigon:v2.60.1 exists and is actively used (last pulled on Nov 1, 2024), the new image erigontech/erigon:v2.60.1 is not available on Docker Hub. This will cause deployment failures.
- The original image
thorax/erigon:v2.60.1is verified to exist - The new image
erigontech/erigon:v2.60.1is not found on Docker Hub - This change will break the deployment as the required image is missing
🔗 Analysis chain
LGTM! Repository update looks correct.
The change from thorax/erigon to erigontech/erigon aligns with the PR objective while maintaining the same version v2.60.1.
Let's verify the availability of the new image:
Let me verify the image availability through Docker Hub API directly.
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Description: Verify that the new Erigon image exists and is accessible
# Expected: The command should return details about the image manifest
# Test: Check if the new image exists
docker manifest inspect erigontech/erigon:v2.60.1 2>/dev/null || echo "Image not found"
Length of output: 92
Script:
#!/bin/bash
# Use curl to check if the image exists on Docker Hub
curl -s -f -L "https://hub.docker.com/v2/repositories/erigontech/erigon/tags/v2.60.1" || echo "Image not found on Docker Hub"
# Also check the original image for comparison
curl -s -f -L "https://hub.docker.com/v2/repositories/thorax/erigon/tags/v2.60.1" || echo "Original image not found on Docker Hub"
Length of output: 1050
| @@ -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 \ | |||
| thorax/erigon:latest init \ | |||
| erigontech/erigon:latest init \ | |||
There was a problem hiding this comment.
🛠️ Refactor suggestion
Consider using a specific version tag instead of latest.
Using the latest tag can lead to inconsistent behavior across different environments and times. Consider using a specific version tag (e.g., v2.60.1) to ensure reproducible builds and consistent behavior.
Apply this diff to align with other files:
- erigontech/erigon:latest init \
+ erigontech/erigon:v2.60.1 init \
--datadir .tmp/erigon \
${ETH_GENESIS_PATH}
docker run \
-p 30303:30303 \
-p 8545:8545 \
-p 8551:8551 \
--rm -v $(PWD)/${TESTAPP_FILES_DIR}:/${TESTAPP_FILES_DIR} \
-v $(PWD)/.tmp:/.tmp \
- erigontech/erigon:latest \
+ erigontech/erigon:v2.60.1 \
--http \Also applies to: 215-215
💡 Codebase verification
Use specific version tag v2.60.1 instead of latest for consistency
The latest tag in build/scripts/testing.mk should be updated to v2.60.1 to maintain consistency with other configuration files:
testing/e2e/config/config.gokurtosis/beaconkit-base-gcp.yamlkurtosis/src/nodes/nodes.starkurtosis/beaconkit-all.yaml
Using a specific version tag instead of latest ensures reproducible builds and consistent behavior across different environments.
🔗 Analysis chain
Repository update looks good but version tag is inconsistent.
The update from thorax/erigon to erigontech/erigon aligns with the PR objectives. However, this file uses the latest tag while other files mentioned in the AI summary use v2.60.1.
Let's verify the version tags across files:
Also applies to: 215-215
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Description: Check for inconsistent Erigon version tags
# Expected: All files should use the same version tag
echo "Checking Erigon version tags across files..."
rg -l "erigon.*:.*v2\.60\.1" || rg -l "erigon.*:.*latest"
Length of output: 249
Script:
#!/bin/bash
# Let's check the actual content to understand the version usage
echo "Checking version tags in testing.mk..."
rg "erigon.*:.*latest" build/scripts/testing.mk -A 2 -B 2
echo -e "\nChecking version tags in other files..."
rg "erigon.*:.*v2\.60\.1" kurtosis/src/nodes/nodes.star kurtosis/beaconkit-base-gcp.yaml kurtosis/beaconkit-all.yaml testing/e2e/config/config.go -A 2 -B 2
Length of output: 2105
testing/e2e/config/config.go
Outdated
| @@ -272,7 +272,7 @@ func defaultExecutionSettings() ExecutionSettings { | |||
| }, | |||
| Images: map[string]string{ | |||
| "besu": "hyperledger/besu:24.5.4", | |||
| "erigon": "thorax/erigon:v2.60.1", | |||
| "erigon": "erigontech/erigon:v2.60.1", | |||
There was a problem hiding this comment.
💡 Codebase verification
Warning: Docker image tag v2.60.1 not found in erigontech/erigon repository
The specified Docker image erigontech/erigon:v2.60.1 appears to be invalid:
- The repository exists but only contains
main-*tags - The version
v2.60.1is referenced in multiple configuration files but the tag is not available in the repository
Please verify the correct tag to use from the available ones at erigontech/erigon.
🔗 Analysis chain
LGTM! Verify the new Docker image.
The update from thorax/erigon to erigontech/erigon aligns with the PR objectives while maintaining the same version tag.
Let's verify the new Docker image exists and is accessible:
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Description: Verify the new Erigon Docker image exists and is accessible
# Expected: The image should exist with the specified tag
# Test: Check if the image exists on Docker Hub
curl -s -f -L -I "https://hub.docker.com/v2/repositories/erigontech/erigon/tags/v2.60.1" || echo "Image not found"
Length of output: 540
Script:
#!/bin/bash
# Let's verify if the repository exists and check available tags
curl -s "https://hub.docker.com/v2/repositories/erigontech/erigon/tags/?page_size=10" | jq -r '.results[].name' || echo "Repository not found"
# Also check if there's any reference to this version in the codebase
rg "v2\.60\.1" -A 2 -B 2
Length of output: 1647
kurtosis/src/nodes/nodes.star
Outdated
| @@ -33,7 +33,7 @@ EXECUTION_DEFAULT_SETTINGS = { | |||
| }, | |||
| "images": { | |||
| "besu": "hyperledger/besu:latest", | |||
| "erigon": "thorax/erigon:v2.60.1", | |||
| "erigon": "erigontech/erigon:v2.60.1", | |||
There was a problem hiding this comment.
We may want to change the docker version here, doc referenceImages before 2.60.7 are released in repository [“thorax/erigon”](https://hub.docker.com/r/thorax/erigon/tags) and will not be moved to the new repo;. The new repo has images from 2.60.8 onwards.
Erigon repo has moved from
thorax/erigontoerigontech/erigonSummary by CodeRabbit
New Features
v2.60.9, enhancing performance and compatibility.Chores