Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Intial bip34 like for versioning #3578

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
0ff214e
Add initial state machine for versioning
Feb 14, 2023
bdae4e1
Add initial code for VersioningFactory && VersioningFactoryArgs
Feb 20, 2023
06cbb66
Add serializer for versioning structs
Feb 20, 2023
aac2535
Add deserializer for versioning structs + unit tests
Feb 21, 2023
d75abeb
Add some doc + use const for ser / der
Feb 21, 2023
27a9f82
Initial code to transfer VersioningStore in bootstrap
Feb 21, 2023
6332e07
feat: add bootstrap banning client message
aoudiamoncef Feb 8, 2023
5d6d724
fix: reset whitelist config file
aoudiamoncef Feb 8, 2023
4b0d0fb
fix: skip check whether IP is allowed
aoudiamoncef Feb 9, 2023
3720265
refactor: improve server binder usage
aoudiamoncef Feb 13, 2023
2173471
refactor: switch to if let else version
aoudiamoncef Feb 13, 2023
a6e8b7f
refactor: small format
aoudiamoncef Feb 13, 2023
3db53af
refactor: scope test macro
aoudiamoncef Feb 13, 2023
5ca4831
fix: silent the compiler even in test mode
aoudiamoncef Feb 14, 2023
79f2330
Add `sha256_hash` ABI (#3498)
aoudiamoncef Feb 14, 2023
8a55ecf
Update new timestamp
AurelienFT Feb 9, 2023
8c12e9c
Fix deadlock
Eitu33 Feb 10, 2023
3d7821e
Update test nested call.
AurelienFT Feb 10, 2023
d57b504
New version
AurelienFT Feb 10, 2023
93571ce
Update wasm unit test.
AurelienFT Feb 10, 2023
018cfd5
Comment gas calib fail
AurelienFT Feb 10, 2023
a82a74b
Fix comment
AurelienFT Feb 10, 2023
e10cefe
Fix bootstrap client side.
AurelienFT Feb 14, 2023
47f6f4f
Update unit test version.
AurelienFT Feb 15, 2023
7381cb0
Fix doctest
AurelienFT Feb 15, 2023
1d68f9f
Added announced_version in BlockHeader struct
Leo-Besancon Feb 15, 2023
3be70d6
Adding VersioningMiddleware for some versioning management
Leo-Besancon Feb 16, 2023
ce978a0
fmt + check + clippy
Leo-Besancon Feb 16, 2023
4f87262
Created 2 new crates for versioning: worker and exports
Leo-Besancon Feb 17, 2023
f224ec5
fmt
Leo-Besancon Feb 17, 2023
2efdb70
instanciate the versioning module from main + cleaning
Leo-Besancon Feb 17, 2023
6c878bb
Query finalized block versions
Leo-Besancon Feb 17, 2023
baa98ef
Making some progress on merging with state machine. Needs additional …
Leo-Besancon Feb 21, 2023
fee9935
added comms with protocol and factory workers
Leo-Besancon Feb 21, 2023
86b07b7
finished merging with state machine, but test fails
Leo-Besancon Feb 21, 2023
6aa4ec2
Test passes
Leo-Besancon Feb 22, 2023
daf367d
added a comment
Leo-Besancon Feb 22, 2023
0e4d347
Add VersionStore bootstrap unit tests
Feb 22, 2023
0b8339f
Fixed some merge issues after rebase
Leo-Besancon Feb 23, 2023
1b65d5b
Merge branch 'test/versioning_test_transition_fsm_1' into intial_bip3…
Leo-Besancon Feb 23, 2023
76a242d
Made test pass
Leo-Besancon Feb 23, 2023
506208b
Merge branch 'intial_bip34_like_for_versioning' of https://github.com…
Leo-Besancon Feb 23, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2022-12-24
toolchain: nightly-2023-02-14
target: ${{ matrix.target }}
override: true
- uses: Swatinem/rust-cache@v2
Expand Down
34 changes: 15 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ jobs:
- uses: Swatinem/rust-cache@v2
with:
shared-key: "sanity"
save-if: ${{ github.ref_name == 'testnet_20' }}
save-if: ${{ github.ref == 'refs/heads/main' }}
- uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check

check:
if: github.ref != 'refs/heads/staging'
needs: sanity
Expand All @@ -55,7 +55,7 @@ jobs:
- uses: Swatinem/rust-cache@v2
with:
shared-key: "check"
save-if: ${{ github.ref_name == 'testnet_20' }}
save-if: ${{ github.ref == 'refs/heads/main' }}
- uses: actions-rs/cargo@v1
with:
command: check
Expand All @@ -78,7 +78,7 @@ jobs:
- uses: Swatinem/rust-cache@v2
with:
shared-key: "clippy"
save-if: ${{ github.ref_name == 'testnet_20' }}
save-if: ${{ github.ref == 'refs/heads/main' }}
- uses: actions-rs/clippy-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
- uses: Swatinem/rust-cache@v2
with:
shared-key: "massa"
save-if: ${{ github.ref_name == 'testnet_20' }}
save-if: ${{ github.ref == 'refs/heads/main' }}
- uses: actions-rs/cargo@v1
with:
command: install
Expand All @@ -117,10 +117,6 @@ jobs:
with:
command: nextest
args: run --features testing --retries 10
- uses: actions-rs/cargo@v1
with:
command: test
args: --features testing --doc

build: # quick hack because bors wrongly detect matrix jobs status
needs: full
Expand All @@ -132,7 +128,7 @@ jobs:
gas-costs-check:
if: github.ref != 'refs/heads/staging' && github.ref != 'refs/heads/main'
runs-on: ubuntu-latest
steps:
steps:
- uses: actions/checkout@v3
with:
submodules: "recursive"
Expand All @@ -155,15 +151,15 @@ jobs:
# Replace the branch in the dependencies in gas-calibration project by the current branch
# Special case for massa-sc-runtime: we use the branch referenced in the Cargo.toml of massa-execution-worker.
- name: "Use the current branch as dependency for gas-calibration"
run: >
cd gas-calibration &&
sed -i 's!main!${{ github.head_ref || github.ref_name }}!g' Cargo.toml &&
run: >
cd gas-calibration &&
sed -i 's!main!${{ github.head_ref || github.ref_name }}!g' Cargo.toml &&
sed -i 's!massa-sc-runtime = { git = "https://github.com/massalabs/massa-sc-runtime", features = \["gas_calibration"\] }!'"$(cat ../massa-execution-worker/Cargo.toml | grep 'massalabs/massa-sc-runtime' | sed 's!/!\\/!g' | sed 's!}!, features = ["gas_calibration"]}!g' )"'!g' Cargo.toml
- name: "Launch gas-calibration with one SC per ABI in massa-as-sdk to see if there is an ABI missing"
run: >
cd gas-calibration &&
cargo run -r -- --nb-scs-by-abi=1 --as-sdk-env-path=../massa-as-sdk/assembly/env/env.ts --only-generate

#- name: "Launch gas-calibration with one SC per ABI in massa-as-sdk to see if there is an ABI missing"
# run: >
# cd gas-calibration &&
# cargo run -r -- --nb-scs-by-abi=1 --as-sdk-env-path=../massa-as-sdk/assembly/env/env.ts --only-generate

doc:
runs-on: ubuntu-latest
Expand All @@ -180,7 +176,7 @@ jobs:
- uses: Swatinem/rust-cache@v2
with:
shared-key: "doc"
save-if: ${{ github.ref_name == 'testnet_20' }}
save-if: ${{ github.ref == 'refs/heads/main' }}
- uses: actions-rs/cargo@v1
with:
command: doc
Expand Down
Loading