Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
07d374d
update version of mev-boost
mlbones666 Aug 11, 2024
eb4259d
add not leader error handle
jianlinjiang Aug 26, 2024
de3edcd
add log
jianlinjiang Aug 28, 2024
d38f3e6
add log
jianlinjiang Aug 28, 2024
8455eda
add log
jianlinjiang Aug 28, 2024
6aa6121
add graffiti
jianlinjiang Aug 28, 2024
fe69e45
add debug log
jianlinjiang Aug 29, 2024
d73447c
use block v3
jianlinjiang Aug 29, 2024
ff7bbef
add monitor tool
jianlinjiang Oct 15, 2024
dbc3fa4
add config contract
jianlinjiang Oct 27, 2024
0ed34c1
verify fee recipient address
jianlinjiang Oct 28, 2024
7c63ebe
fix fee recipient
jianlinjiang Oct 29, 2024
f5b3e8a
Merge branch 'dev' into dev-fee-recipient
jianlinjiang Oct 29, 2024
afc3d1c
custom fee recipient (#33)
PayFv Oct 29, 2024
72952f5
update event name
jianlinjiang Oct 29, 2024
565b8ee
add monitoring doc
mlbones666 Oct 29, 2024
d29f443
add monitoring doc (#35)
azaliasmee Oct 29, 2024
ebd0f20
fix parse log error
jianlinjiang Oct 31, 2024
8d3d378
add debug log
jianlinjiang Nov 3, 2024
1346a41
fix change va owner
jianlinjiang Nov 3, 2024
3b5f133
remove fee recipient check
jianlinjiang Nov 4, 2024
c85caec
restart when fee recipient changed (#40)
jianlinjiang Nov 5, 2024
6538bcd
update va registrtion timestamp when fee recipient changed
jianlinjiang Nov 6, 2024
e3cd9ff
don't need restart when fee recipient changed
jianlinjiang Nov 7, 2024
db767dc
don't need restart when fee recipient changed (#42)
azaliasmee Nov 14, 2024
622c175
bump version to 1.3.5
jianlinjiang Nov 14, 2024
7b15962
reserve check
jianlinjiang Nov 15, 2024
2321816
add software version
jianlinjiang Nov 15, 2024
e52bba7
add some features to remove warnings
jianlinjiang Nov 15, 2024
2d0acd6
change git runner to dynamic one-off job
azaliasmee Nov 17, 2024
56c27a3
change git runner to dynamic one-off job (#45)
PayFv Nov 17, 2024
781bc69
use option to support mainnet
jianlinjiang Nov 20, 2024
bb8c474
fix mainnet
jianlinjiang Nov 20, 2024
a1fc188
query own fee from contract
jianlinjiang Nov 21, 2024
1f3ac67
update CONFIG_CONTRACT_ADDRESS
mlbones666 Nov 25, 2024
638d3ef
update version
mlbones666 Nov 25, 2024
4d4590b
Update config contract (#50)
azaliasmee Nov 25, 2024
4345164
upgrade prod build pipeline
azaliasmee Nov 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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/ec2-github-runner@v2.3.7
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/ec2-github-runner@v2.3.7
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
Loading