Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix - Update erigon repo #2121

Merged
merged 3 commits into from
Nov 5, 2024
+6 −6
Merged

Fix - Update erigon repo #2121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af8c5e0
fix(build): erigon repo
gummybera Nov 1, 2024
023ebfd
fix(build): bump erigon to recent version
gummybera Nov 1, 2024
5fbeac0
Merge branch 'main' into fix-erigon
abi87 Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/scripts/testing.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ 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.go
  • kurtosis/beaconkit-base-gcp.yaml
  • kurtosis/src/nodes/nodes.star
  • kurtosis/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

--datadir .tmp/erigon \
${ETH_GENESIS_PATH}

Expand All @@ -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 \
thorax/erigon:latest \
erigontech/erigon:latest \
--http \
--http.addr 0.0.0.0 \
--http.api eth,net \
Expand Down
2 changes: 1 addition & 1 deletion kurtosis/beaconkit-all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ node_settings:
max_memory: 2048
images:
besu: hyperledger/besu:24.5.4
erigon: thorax/erigon:v2.60.1
erigon: erigontech/erigon:v2.60.9
ethereumjs: ethpandaops/ethereumjs:stable
geth: ethereum/client-go:latest
nethermind: nethermind/nethermind:latest
Expand Down
2 changes: 1 addition & 1 deletion kurtosis/beaconkit-base-gcp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.9
ethereumjs: ethpandaops/ethereumjs:stable
geth: ethereum/client-go:latest
nethermind: nethermind/nethermind:latest
Expand Down
2 changes: 1 addition & 1 deletion kurtosis/src/nodes/nodes.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ EXECUTION_DEFAULT_SETTINGS = {
},
"images": {
"besu": "hyperledger/besu:latest",
"erigon": "thorax/erigon:v2.60.1",
"erigon": "erigontech/erigon:v2.60.9",
"ethereumjs": "ethpandaops/ethereumjs:stable",
"geth": "ethereum/client-go:latest",
"nethermind": "nethermind/nethermind:latest",
Expand Down
2 changes: 1 addition & 1 deletion testing/e2e/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.9",
"ethereumjs": "ethpandaops/ethereumjs:stable",
"geth": "ethereum/client-go:stable",
"nethermind": "nethermind/nethermind:latest",
Expand Down
Loading