pending pectra

.github/workflows/ci.yml

@@ -15,6 +15,8 @@ on:
  - unstable
  pull_request:
  paths-ignore: ['media/**', 'docs/**', '**/*.md']
+ branches-ignore:
+ - stable
  workflow_dispatch:
 
 concurrency: # Cancel stale PR builds (but not push builds)
@@ -136,6 +138,10 @@ jobs:
  fi
  fi
 
+ if [[ '${{ runner.os }}' == 'Windows' ]]; then
+ export NIMFLAGS="${NIMFLAGS} --cc:clang"
+ fi
+
  export NIMFLAGS="${NIMFLAGS} ${{ matrix.nimflags-extra }}"
  echo "NIMFLAGS=${NIMFLAGS}" >> $GITHUB_ENV
 
@@ -176,7 +182,7 @@ jobs:
 
  - name: Build binaries (with trace logging enabled)
  run: |
- ${make_cmd} -j ${ncpu} V=1 NIM_COMMIT=${{ matrix.branch }} LOG_LEVEL=TRACE NIMFLAGS="-u:release --opt:none ${{ matrix.nimflags-extra }}"
+ ${make_cmd} -j ${ncpu} V=1 NIM_COMMIT=${{ matrix.branch }} LOG_LEVEL=TRACE NIMFLAGS="-u:release --opt:none ${NIMFLAGS}"
  # The Windows image runs out of disk space, so make some room
  rm -rf build nimcache
 
@@ -238,7 +244,7 @@ jobs:
  if: ${{ !cancelled() }} && github.event_name == 'pull_request'
  run: |
  excluded_files="config.yaml"
- excluded_extensions="ans|cfg|json|json\\.template|md|png|service|ssz|txt"
+ excluded_extensions="ans|cfg|json|json\\.template|md|png|service|ssz|txt|lock|nix"
 
  current_year=$(date +"%Y")
  problematic_files=()

.github/workflows/pr_block.yml

@@ -0,0 +1,30 @@
+# beacon_chain
+# Copyright (c) 2024 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.
+
+name: PR block
+on:
+ pull_request:
+ branches:
+ - stable
+
+jobs:
+ close:
+ name: "Close pull request"
+ runs-on: ubuntu-latest
+ if: github.actor != 'dependabot[bot]'
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+
+ - name: Close
+ run: |
+ gh pr close ${{ github.event.pull_request.number }} --comment \
+ 'Pull requests to the `stable` branch are not allowed.
+ Please open your pull request against the `unstable` branch.
+ See https://nimbus.guide/contribute.html#build-and-deploy'
+ env:
+ GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,5 +1,5 @@
 # beacon_chain
-# Copyright (c) 2018-2023 Status Research & Development GmbH
+# Copyright (c) 2018-2024 Status Research & Development GmbH
 # Licensed and distributed under either of
 # * MIT license (license terms in the root directory or at http://opensource.org/licenses/MIT).
 # * Apache v2 license (license terms in the root directory or at http://www.apache.org/licenses/LICENSE-2.0).
@@ -65,6 +65,7 @@ geth-*.zip
 # generated during Nim compilation
 *.nim.generated.nim
 
+result
 /dist
 /benchmark_results
 /.update.timestamp

.gitmodules

@@ -24,7 +24,7 @@
  path = vendor/nim-libp2p
  url = https://github.com/vacp2p/nim-libp2p.git
  ignore = untracked
- branch = unstable
+ branch = master
 [submodule "vendor/nimbus-build-system"]
  path = vendor/nimbus-build-system
  url = https://github.com/status-im/nimbus-build-system.git

AllTests-mainnet.md

@@ -5,6 +5,11 @@ AllTests-mainnet
 + ancestorSlot OK
 ```
 OK: 1/1 Fail: 0/1 Skip: 0/1
+## Attestation pool electra processing [Preset: mainnet]
+```diff
++ Can add and retrieve simple electra attestations [Preset: mainnet] OK
+```
+OK: 1/1 Fail: 0/1 Skip: 0/1
 ## Attestation pool processing [Preset: mainnet]
 ```diff
 + Attestation from different branch [Preset: mainnet] OK
@@ -75,6 +80,11 @@ OK: 7/7 Fail: 0/7 Skip: 0/7
 + basics OK
 ```
 OK: 2/2 Fail: 0/2 Skip: 0/2
+## Beacon validators test suite
+```diff
++ builderBetterBid(builderBoostFactor) test OK
+```
+OK: 1/1 Fail: 0/1 Skip: 0/1
 ## Blinded block conversions
 ```diff
 + Bellatrix toSignedBlindedBlock OK
@@ -891,6 +901,7 @@ OK: 1/1 Fail: 0/1 Skip: 0/1
 + /eth/v1/validator/sync_committee_selections serialization/deserialization test OK
 + bestSuccess() API timeout test OK
 + firstSuccessParallel() API timeout test OK
++ getAggregatedAttestationDataScore() default test OK
 + getAggregatedAttestationDataScore() test vectors OK
 + getAttestationDataScore() test vectors OK
 + getLiveness() response deserialization test OK
@@ -899,7 +910,7 @@ OK: 1/1 Fail: 0/1 Skip: 0/1
 + getUniqueVotes() test vectors OK
 + normalizeUri() test vectors OK
 ```
-OK: 11/11 Fail: 0/11 Skip: 0/11
+OK: 12/12 Fail: 0/12 Skip: 0/12
 ## Validator change pool testing suite
 ```diff
 + addValidatorChangeMessage/getAttesterSlashingMessage OK
@@ -1019,4 +1030,4 @@ OK: 2/2 Fail: 0/2 Skip: 0/2
 OK: 9/9 Fail: 0/9 Skip: 0/9
 
 ---TOTAL---
-OK: 684/689 Fail: 0/689 Skip: 5/689
+OK: 686/691 Fail: 0/691 Skip: 5/691