Skip to content

Commit

Permalink
Release v3.5.0-mainnet (#52)
Browse files Browse the repository at this point in the history
  • Loading branch information
mlbones666 authored Nov 25, 2024
2 parents 0c34f0a + 4345164 commit bd52227
Show file tree
Hide file tree
Showing 23 changed files with 833 additions and 157 deletions.
3 changes: 2 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ BESU_NETWORK=mainnet
ERIGON_NETWORK=mainnet
LIGHTHOUSE_NETWORK=mainnet
OPERATOR_NETWORK=mainnet
IMAGE_TAG=v3.4.0-mainnet
IMAGE_TAG=v3.5.0-mainnet
REGISTRY_CONTRACT_ADDRESS=1a1f82f0365571A0b06df0992FC4D1BCc5Fdc6aD
NETWORK_CONTRACT_ADDRESS=829f3c089fE315FCB2BC9506B237BB56b7c3335B
CONFIG_CONTRACT_ADDRESS=07FA0F7f3C67e4cdE0FC23A072dcD712CF9a06C1
API_SERVER=https://api-node.safestake.xyz/api/op/
# different chain has different ttd
TTD=10790000
Expand Down
92 changes: 71 additions & 21 deletions .github/workflows/ci_dev.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,56 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

# GitHub recommends pinning actions to a commit SHA.
# To get a newer version, you will need to update the SHA.
# You can also reference a tag or branch, but the action may change without warning.

name: UnitTest & Publish Image

name: do-the-job
on:
push:
branches:
- dev

jobs:
push_to_registry:
name: Push Docker image to Docker Hub
runs-on: self-hosted
start-runner:
name: Start self-hosted EC2 runner
runs-on: ubuntu-latest
outputs:
label: ${{ steps.start-ec2-runner.outputs.label }}
ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ secrets.AWS_REGION }}
- name: Start EC2 runner
id: start-ec2-runner
uses: machulav/[email protected]
with:
mode: start
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
ec2-image-id: ami-0a2d071e715c3a808
ec2-instance-type: c6a.4xlarge
subnet-id: subnet-9aa9c8e1
security-group-id: sg-0c35d2e12fe165fbb
aws-resource-tags: > # optional, requires additional permissions
[
{"Key": "Name", "Value": "ec2-github-runner"},
{"Key": "GitHubRepository", "Value": "${{ github.repository }}"}
]
do-the-job:
name: UnitTest & Build & Publish Image
needs: start-runner # required to start the main job when the runner is ready
runs-on: ${{ needs.start-runner.outputs.label }} # run the job on the newly created runner
steps:
- name: Hello World1
run: |
echo 'Hello World!'
/root/.cargo/bin/cargo version
- name: Check out the repo
uses: actions/checkout@v3
- name: Log in to Docker Hub

- name: Login to Docker Hub
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
Expand All @@ -37,9 +60,10 @@ jobs:
- name: Checkout submodules
run: git submodule update --init --recursive

- name: Unit Test
run: sudo runuser -f ubuntu -c '/home/ubuntu/.cargo/bin/cargo test test_dkg_secure_net -- --show-output'

- name: Unit Testing
run: |
/root/.cargo/bin/cargo test test_dkg_secure_net -- --show-output
- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
Expand All @@ -49,3 +73,29 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
build-args: |
CPU_NUM=16
- name: Bye
run: echo 'Congratulations!'

stop-runner:
name: Stop self-hosted EC2 runner
needs:
- start-runner # required to get output from the start-runner job
- do-the-job # required to wait when the main job is done
runs-on: ubuntu-latest
if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs
steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ secrets.AWS_REGION }}
- name: Stop EC2 runner
uses: machulav/ec2-github-runner@v2
with:
mode: stop
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
label: ${{ needs.start-runner.outputs.label }}
ec2-instance-id: ${{ needs.start-runner.outputs.ec2-instance-id }}

90 changes: 69 additions & 21 deletions .github/workflows/ci_main.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,56 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

# GitHub recommends pinning actions to a commit SHA.
# To get a newer version, you will need to update the SHA.
# You can also reference a tag or branch, but the action may change without warning.

name: Publish Docker image

name: do-the-job
on:
push:
tags:
- '**-mainnet'

jobs:
push_to_registry:
name: Push Docker image to Docker Hub
runs-on: self-hosted
start-runner:
name: Start self-hosted EC2 runner
runs-on: ubuntu-latest
outputs:
label: ${{ steps.start-ec2-runner.outputs.label }}
ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ secrets.AWS_REGION }}
- name: Start EC2 runner
id: start-ec2-runner
uses: machulav/[email protected]
with:
mode: start
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
ec2-image-id: ami-0a2d071e715c3a808
ec2-instance-type: c6a.4xlarge
subnet-id: subnet-9aa9c8e1
security-group-id: sg-0c35d2e12fe165fbb
aws-resource-tags: > # optional, requires additional permissions
[
{"Key": "Name", "Value": "ec2-github-runner"},
{"Key": "GitHubRepository", "Value": "${{ github.repository }}"}
]
do-the-job:
name: UnitTest & Build & Publish Image
needs: start-runner # required to start the main job when the runner is ready
runs-on: ${{ needs.start-runner.outputs.label }} # run the job on the newly created runner
steps:
- name: Hello World1
run: |
echo 'Hello World!'
/root/.cargo/bin/cargo version
- name: Check out the repo
uses: actions/checkout@v3
- name: Log in to Docker Hub

- name: Login to Docker Hub
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
Expand All @@ -36,10 +59,9 @@ jobs:
flavor: |
latest=false
- name: Checkout submodules
run: git submodule update --init --recursive

- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
Expand All @@ -48,4 +70,30 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
CPU_NUM=16
CPU_NUM=16
- name: Bye
run: echo 'Congratulations!'

stop-runner:
name: Stop self-hosted EC2 runner
needs:
- start-runner # required to get output from the start-runner job
- do-the-job # required to wait when the main job is done
runs-on: ubuntu-latest
if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs
steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ secrets.AWS_REGION }}
- name: Stop EC2 runner
uses: machulav/ec2-github-runner@v2
with:
mode: stop
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
label: ${{ needs.start-runner.outputs.label }}
ec2-instance-id: ${{ needs.start-runner.outputs.ec2-instance-id }}

7 changes: 6 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,12 @@ sysinfo = "0.26"
default = ["hotstuff_committee"]
fake_committee = []
hotstuff_committee = []

spec-minimal = []
gnosis = []
jemalloc = []
# Compiles the BLS crypto code so that the binary is portable across machines.
portable = ["bls/supranational-portable"]
modern = ["bls/supranational-force-adx"]
[dev-dependencies]
tokio-test = "*"

6 changes: 5 additions & 1 deletion common/dvf_version/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@ pub const MAJOR_VERSION: u64 = 3;
/// Up to 1 million
pub const MINOR_VERSION: u64 = 4;

pub static VERSION: u64 = ROOT_VERSION * 1000_000_000_000 + MAJOR_VERSION * 1000_000 + MINOR_VERSION;
pub static VERSION: u64 = ROOT_VERSION * 1_000_000_000_000 + MAJOR_VERSION * 1_000_000 + MINOR_VERSION;


pub const SOFTWARE_MINOR_VERSION: u64 = 5;
pub static SOFTWARE_VERSION: u64 = ROOT_VERSION * 1_000_000_000_000 + MAJOR_VERSION * 1_000_000 + SOFTWARE_MINOR_VERSION;
Loading

0 comments on commit bd52227

Please sign in to comment.