Merge branch 'unstable' into lUc

status-im · Nov 8, 2023 · 8d95db5 · 8d95db5
2 parents 6962b9b + aa6c13c
commit 8d95db5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -215,7 +215,7 @@ jobs:
         if: ${{ !cancelled() }} && github.event_name == 'pull_request'
         run: |
           excluded_files="config.yaml"
-          excluded_extensions="ans|json|md|png|service|ssz|txt"
+          excluded_extensions="ans|json|json\\.template|md|png|service|ssz|txt"
 
           current_year=$(date +"%Y")
           outdated_files=()

diff --git a/scripts/execution_genesis.json.template b/scripts/execution_genesis.json.template
@@ -12,15 +12,18 @@
     "muirGlacierBlock":0,
     "berlinBlock":0,
     "londonBlock":0,
-    "shanghaiTime": SHANGHAI_FORK_TIME,
-    "shardingForkTime": SHARDING_FORK_TIME,
-    "terminalTotalDifficulty":0
+    "shanghaiTime": 0,
+    "shardingForkTime": 0,
+    "mergeForkBlock":0,
+    "mergeNetsplitBlock":0,
+    "terminalTotalDifficulty":0,
+    "terminalTotalDifficultyPassed":true
   },
   "nonce":"0x42",
   "timestamp":"0x00",
   "extraData":"",
   "gasLimit":"0x1C9C380",
-  "difficulty":"0x400000000",
+  "difficulty":"0x000000000",
   "mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
   "coinbase":"0x0000000000000000000000000000000000000000",
   "alloc":{

diff --git a/scripts/geth_binaries.sh b/scripts/geth_binaries.sh
@@ -1,3 +1,10 @@
+# beacon_chain
+# Copyright (c) 2023 Status Research & Development GmbH
+# Licensed and distributed under either of
+#   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
+#   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
+# at your option. This file may not be copied, modified, or distributed except according to those terms.
+
 if [ -z "${GETH_BINARIES_SOURCED:-}" ]; then
 GETH_BINARIES_SOURCED=1
 
@@ -9,12 +16,12 @@ source "${SCRIPTS_DIR}/bash_utils.sh"
 
 : ${CURL_BINARY:="curl"}
 : ${STABLE_GETH_BINARY:="${BUILD_DIR}/downloads/geth$EXE_EXTENSION"}
-: ${GETH_CAPELLA_BINARY:="${BUILD_DIR}/downloads/geth_capella$EXE_EXTENSION"}
+: ${GETH_CAPELLA_BINARY:="$STABLE_GETH_BINARY"}
 : ${GETH_DENEB_BINARY:="${BUILD_DIR}/downloads/geth_deneb$EXE_EXTENSION"}
 
 download_geth_stable() {
   if [[ ! -e "${STABLE_GETH_BINARY}" ]]; then
-    GETH_VERSION="1.10.26-e5eb32ac"
+    GETH_VERSION="1.13.5-unstable-f20b334f"  # not actually a stable version but first with macOS ARM64
     GETH_URL="https://gethstore.blob.core.windows.net/builds/"
 
     case "${OS}-${ARCH}" in
@@ -28,9 +35,7 @@ download_geth_stable() {
         GETH_TARBALL="geth-darwin-amd64-${GETH_VERSION}.tar.gz"
         ;;
       macos-arm64|macos-aarch64)
-        # There is no official binary for macOS/ARM at the moment
-        # The AMD64 binary should work under Rosetta
-        GETH_TARBALL="geth-darwin-amd64-${GETH_VERSION}.tar.gz"
+        GETH_TARBALL="geth-darwin-arm64-${GETH_VERSION}.tar.gz"
         ;;
       windows-amd64|windows-x86_64)
         GETH_TARBALL="geth-windows-amd64-${GETH_VERSION}.zip"
@@ -102,11 +107,11 @@ download_status_geth_binary() {
 }
 
 download_geth_capella() {
-  download_status_geth_binary withdrawals-timestamp "$GETH_CAPELLA_BINARY"
+  download_geth_stable
 }
 
 download_geth_deneb() {
-  download_status_geth_binary eip-4844 "$GETH_DENEB_BINARY"
+  download_status_geth_binary deneb "$GETH_DENEB_BINARY"
 }
 
 fi