Bump to Geth v1.13.12 and Prysm v4.2.1 (#17)

rzmahmood · Feb 16, 2024 · 0ec8c8f · 0ec8c8f
1 parent ea424d7
commit 0ec8c8f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/.github/workflows/testnet-deployment.yml b/.github/workflows/testnet-deployment.yml
@@ -26,6 +26,9 @@ jobs:
     - name: Install JQ
       run: sudo apt-get install jq
 
+    - name: Install Bazel
+      uses: bazelbuild/setup-bazelisk@v3
+
     - name: Build dependencies
       run: ./build-dependencies.sh
 

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 
 [![license](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE)
 [![stability-experimental](https://img.shields.io/badge/stability-experimental-orange.svg)](https://github.com/mkenney/software-guides/blob/master/STABILITY-BADGES.md#experimental)
-![testnet-deployment](https://github.com/rzmahmood/ethereum-pos-testnet/actions/workflows/testnet-deployment.yml/badge.svg)
+![testnet-deployment](https://github.com/rzmahmood/ethereum-pos-testnet/actions/workflows/testnet-deployment.yml/badge.svg) [![Ceasefire Now](https://badge.techforpalestine.org/default)](https://techforpalestine.org/learn-more)
 
 
 </div>
@@ -20,7 +20,7 @@ This setup can is can serve as a reference for building your own production depl
 This project utilizes Git submodules to reference the client code, notably Go-Ethereum and Prysm.
 However, the scripts can be configured to reference binaries you build locally, making development quicker.
 
- **You will need Go 1.20 and JQ installed**. 
+ **You will need Go 1.20, JQ and Bazel installed**. 
 
 ```bash
 git clone --recursive https://github.com/rzmahmood/ethereum-pos-testnet.git

diff --git a/build-dependencies.sh b/build-dependencies.sh
@@ -11,6 +11,12 @@ if ! command -v go &> /dev/null; then
     exit 1
 fi
 
+# Check if bazel is installed (see https://docs.prylabs.network/docs/install/install-with-bazel#install-bazel-using-bazelisk)
+if ! command -v bazel &> /dev/null; then
+    echo "Error: bazel is not installed. Please install bazel first. See https://docs.prylabs.network/docs/install/install-with-bazel#install-bazel-using-bazelisk"
+    exit 1
+fi
+
 go version
 
 # Check fo version is greater than 1.20
@@ -25,6 +31,6 @@ fi
 PRYSM_DIR=./dependencies/prysm
 GETH_DIR=./dependencies/go-ethereum
 
-( cd $PRYSM_DIR && go build -o=./out/beacon-chain ./cmd/beacon-chain && go build -o=./out/validator ./cmd/validator && go build -o=./out/prysmctl ./cmd/prysmctl )
+( cd $PRYSM_DIR && bazel build //cmd/beacon-chain:beacon-chain && bazel build //cmd/validator:validator && bazel build //cmd/prysmctl:prysmctl )
 
 ( cd $GETH_DIR && make all )
diff --git a/dependencies/go-ethereum b/dependencies/go-ethereum
diff --git a/dependencies/prysm b/dependencies/prysm
diff --git a/testnet.sh b/testnet.sh
@@ -64,9 +64,10 @@ pkill bootnode || echo "No existing bootnode processes"
 # if you're developing on a local fork of geth/prysm
 GETH_BINARY=./dependencies/go-ethereum/build/bin/geth
 GETH_BOOTNODE_BINARY=./dependencies/go-ethereum/build/bin/bootnode
-PRYSM_CTL_BINARY=./dependencies/prysm/out/prysmctl
-PRYSM_BEACON_BINARY=./dependencies/prysm/out/beacon-chain
-PRYSM_VALIDATOR_BINARY=./dependencies/prysm/out/validator
+
+PRYSM_CTL_BINARY=./dependencies/prysm/bazel-bin/cmd/prysmctl/prysmctl_/prysmctl
+PRYSM_BEACON_BINARY=./dependencies/prysm/bazel-bin/cmd/beacon-chain/beacon-chain_/beacon-chain
+PRYSM_VALIDATOR_BINARY=./dependencies/prysm/bazel-bin/cmd/validator/validator_/validator
 
 # Create the bootnode for execution client peer discovery. 
 # Not a production grade bootnode. Does not do peer discovery for consensus client