mirror of
https://github.com/status-im/nimbus-eth2.git
synced 2025-01-12 23:34:44 +00:00
Merge branch 'stable' into unstable
This commit is contained in:
commit
9b081e524c
.github/workflows
beacon_chain/consensus_object_pools
docker/dist
54
.github/workflows/nightly_build.yml
vendored
54
.github/workflows/nightly_build.yml
vendored
@ -35,13 +35,20 @@ jobs:
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive }}
|
||||
retention-days: 2
|
||||
|
||||
- name: Upload checksum artefact
|
||||
- name: Upload BN checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Linux_amd64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
|
||||
retention-days: 2
|
||||
|
||||
- name: Upload VC checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Linux_amd64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
|
||||
retention-days: 2
|
||||
|
||||
build-arm64:
|
||||
name: Linux ARM64 release asset
|
||||
runs-on: ubuntu-latest
|
||||
@ -79,13 +86,20 @@ jobs:
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive }}
|
||||
retention-days: 2
|
||||
|
||||
- name: Upload checksum artefact
|
||||
- name: Upload BN checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Linux_arm64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
|
||||
retention-days: 2
|
||||
|
||||
- name: Upload VC checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Linux_arm64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
|
||||
retention-days: 2
|
||||
|
||||
build-arm:
|
||||
name: Linux ARM release asset
|
||||
runs-on: ubuntu-latest
|
||||
@ -123,13 +137,20 @@ jobs:
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive }}
|
||||
retention-days: 2
|
||||
|
||||
- name: Upload checksum artefact
|
||||
- name: Upload BN checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Linux_arm_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
|
||||
retention-days: 2
|
||||
|
||||
- name: Upload VC checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Linux_arm_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
|
||||
retention-days: 2
|
||||
|
||||
build-win64:
|
||||
name: Windows AMD64 release asset
|
||||
runs-on: ubuntu-latest
|
||||
@ -159,13 +180,20 @@ jobs:
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive }}
|
||||
retention-days: 2
|
||||
|
||||
- name: Upload checksum artefact
|
||||
- name: Upload BN checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Windows_amd64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
|
||||
retention-days: 2
|
||||
|
||||
- name: Upload VC checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Windows_amd64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
|
||||
retention-days: 2
|
||||
|
||||
build-macos-amd64:
|
||||
name: macOS AMD64 release asset
|
||||
runs-on: ubuntu-latest
|
||||
@ -195,13 +223,20 @@ jobs:
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive }}
|
||||
retention-days: 2
|
||||
|
||||
- name: Upload checksum artefact
|
||||
- name: Upload BN checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: macOS_amd64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
|
||||
retention-days: 2
|
||||
|
||||
- name: Upload VC checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: macOS_amd64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
|
||||
retention-days: 2
|
||||
|
||||
build-macos-arm64:
|
||||
name: macOS ARM64 release asset
|
||||
runs-on: ubuntu-latest
|
||||
@ -231,13 +266,20 @@ jobs:
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive }}
|
||||
retention-days: 2
|
||||
|
||||
- name: Upload checksum artefact
|
||||
- name: Upload BN checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: macOS_arm64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
|
||||
retention-days: 2
|
||||
|
||||
- name: Upload VC checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: macOS_arm64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
|
||||
retention-days: 2
|
||||
|
||||
prepare-prerelease:
|
||||
name: Prepare pre-release
|
||||
needs: [build-amd64, build-arm64, build-arm, build-win64, build-macos-amd64, build-macos-arm64]
|
||||
|
54
.github/workflows/release.yml
vendored
54
.github/workflows/release.yml
vendored
@ -21,18 +21,25 @@ jobs:
|
||||
echo "::set-output name=archive::"${ARCHIVE}
|
||||
echo "::set-output name=archive_dir::"${ARCHIVE%.tar.gz}
|
||||
tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_beacon_node.sha512sum
|
||||
tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_validator_client.sha512sum
|
||||
- name: Upload archive artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Linux_amd64_archive
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive }}
|
||||
retention-days: 2
|
||||
- name: Upload checksum artefact
|
||||
- name: Upload BN checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Linux_amd64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
|
||||
retention-days: 2
|
||||
- name: Upload VC checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Linux_amd64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
|
||||
retention-days: 2
|
||||
- name: Login to Docker Hub
|
||||
uses: docker/login-action@v1
|
||||
with:
|
||||
@ -85,18 +92,25 @@ jobs:
|
||||
echo "::set-output name=archive::"${ARCHIVE}
|
||||
echo "::set-output name=archive_dir::"${ARCHIVE%.tar.gz}
|
||||
tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_beacon_node.sha512sum
|
||||
tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_validator_client.sha512sum
|
||||
- name: Upload archive artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Linux_arm64_archive
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive }}
|
||||
retention-days: 2
|
||||
- name: Upload checksum artefact
|
||||
- name: Upload BN checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Linux_arm64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
|
||||
retention-days: 2
|
||||
- name: Upload VC checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Linux_arm64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
|
||||
retention-days: 2
|
||||
- name: Login to Docker Hub
|
||||
uses: docker/login-action@v1
|
||||
with:
|
||||
@ -150,18 +164,25 @@ jobs:
|
||||
echo "::set-output name=archive::"${ARCHIVE}
|
||||
echo "::set-output name=archive_dir::"${ARCHIVE%.tar.gz}
|
||||
tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_beacon_node.sha512sum
|
||||
tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_validator_client.sha512sum
|
||||
- name: Upload archive artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Linux_arm_archive
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive }}
|
||||
retention-days: 2
|
||||
- name: Upload checksum artefact
|
||||
- name: Upload BN checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Linux_arm_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
|
||||
retention-days: 2
|
||||
- name: Upload VC checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Linux_arm_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
|
||||
retention-days: 2
|
||||
- name: Login to Docker Hub
|
||||
uses: docker/login-action@v1
|
||||
with:
|
||||
@ -208,18 +229,25 @@ jobs:
|
||||
echo "::set-output name=archive::"${ARCHIVE}
|
||||
echo "::set-output name=archive_dir::"${ARCHIVE%.tar.gz}
|
||||
tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_beacon_node.sha512sum
|
||||
tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_validator_client.sha512sum
|
||||
- name: Upload archive artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Windows_amd64_archive
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive }}
|
||||
retention-days: 2
|
||||
- name: Upload checksum artefact
|
||||
- name: Upload BN checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Windows_amd64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
|
||||
retention-days: 2
|
||||
- name: Upload VC checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Windows_amd64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
|
||||
retention-days: 2
|
||||
build-macos-amd64:
|
||||
name: macOS AMD64 release asset
|
||||
runs-on: ubuntu-latest
|
||||
@ -235,18 +263,25 @@ jobs:
|
||||
echo "::set-output name=archive::"${ARCHIVE}
|
||||
echo "::set-output name=archive_dir::"${ARCHIVE%.tar.gz}
|
||||
tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_beacon_node.sha512sum
|
||||
tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_validator_client.sha512sum
|
||||
- name: Upload archive artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: macOS_amd64_archive
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive }}
|
||||
retention-days: 2
|
||||
- name: Upload checksum artefact
|
||||
- name: Upload BN checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: macOS_amd64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
|
||||
retention-days: 2
|
||||
- name: Upload VC checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: macOS_amd64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
|
||||
retention-days: 2
|
||||
build-macos-arm64:
|
||||
name: macOS ARM64 release asset
|
||||
runs-on: ubuntu-latest
|
||||
@ -262,18 +297,25 @@ jobs:
|
||||
echo "::set-output name=archive::"${ARCHIVE}
|
||||
echo "::set-output name=archive_dir::"${ARCHIVE%.tar.gz}
|
||||
tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_beacon_node.sha512sum
|
||||
tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_validator_client.sha512sum
|
||||
- name: Upload archive artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: macOS_arm64_archive
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive }}
|
||||
retention-days: 2
|
||||
- name: Upload checksum artefact
|
||||
- name: Upload BN checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: macOS_arm64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
|
||||
retention-days: 2
|
||||
- name: Upload VC checksum artefact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: macOS_arm64_checksum
|
||||
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
|
||||
retention-days: 2
|
||||
prepare-release:
|
||||
name: Prepare release draft
|
||||
needs: [build-amd64, build-arm64, build-arm, build-win64, build-macos-amd64, build-macos-arm64]
|
||||
|
@ -577,7 +577,8 @@ proc getAttestationsForBlock*(pool: var AttestationPool,
|
||||
# Attestations are checked based on the state that we're adding the
|
||||
# attestation to - there might have been a fork between when we first
|
||||
# saw the attestation and the time that we added it
|
||||
if check_attestation(state.data, attestation, {}, cache).isErr():
|
||||
if not check_attestation(
|
||||
state.data, attestation, {skipBlsValidation}, cache).isOk():
|
||||
continue
|
||||
|
||||
let score = attCache.score(
|
||||
|
2
docker/dist/entry_point.sh
vendored
2
docker/dist/entry_point.sh
vendored
@ -17,7 +17,7 @@ if [[ -z "${1}" ]]; then
|
||||
exit 1
|
||||
fi
|
||||
PLATFORM="${1}"
|
||||
BINARIES="nimbus_beacon_node"
|
||||
BINARIES="nimbus_beacon_node nimbus_validator_client"
|
||||
|
||||
echo -e "\nPLATFORM=${PLATFORM}"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user