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.

Sign up for GitHub

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

Fix/original staking #322

Merged
merged 7 commits into from
May 3, 2024
Merged

Fix/original staking #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fe12720
Use original staking pallet
MRamanenkau May 2, 2024
37ec8db
Enable clippy and benchmarking build
MRamanenkau May 2, 2024
c449a94
Remove forked pallet
MRamanenkau May 2, 2024
f0269ae
Fix clippy
MRamanenkau May 2, 2024
cd07b5b
Remove executed migrations
MRamanenkau May 3, 2024
ccb83fd
Remove extra line
MRamanenkau May 3, 2024
39d101f
Use another rustc version
MRamanenkau May 3, 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
52 changes: 24 additions & 28 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,38 +55,34 @@ jobs:
- name: Run dev chain
run: |
timeout --preserve-status 30s ./target/release/cere --dev
# Disabled for one release to apply missing migrations
# https://github.com/Cerebellum-Network/blockchain-node/pull/300
# - name: Check Build for Benchmarking
# run: >
# pushd node &&
# cargo check --features=runtime-benchmarks --release
- name: Check Build for Benchmarking
run: >
pushd node &&
cargo check --features=runtime-benchmarks --release
- name: Check Build for Try-Runtime
run: |
cargo check --features=try-runtime --release
# Disabled for one release to apply missing migrations
# https://github.com/Cerebellum-Network/blockchain-node/pull/300
# clippy:
# name: Run Clippy
# needs: format
# runs-on: ubuntu-22.04
# steps:
# - uses: actions/checkout@v3
# - name: Install linux dependencies
# run: sudo apt update && sudo apt install -y cargo clang libssl-dev llvm libudev-dev protobuf-compiler
# - name: Install nightly toolchain
# uses: actions-rs/toolchain@v1
# with:
# toolchain: nightly-2023-05-23
# override: true
# target: wasm32-unknown-unknown
# components: clippy
# - name: Rust Cache
# uses: Swatinem/rust-cache@v2
# - name: Check with Clippy
# run: |
# cargo clippy --no-deps --all-targets --features runtime-benchmarks,try-runtime --workspace -- --deny warnings
clippy:
name: Run Clippy
needs: format
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Install linux dependencies
run: sudo apt update && sudo apt install -y cargo clang libssl-dev llvm libudev-dev protobuf-compiler
- name: Install nightly toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2024-03-12
override: true
target: wasm32-unknown-unknown
components: clippy
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Check with Clippy
run: |
cargo clippy --no-deps --all-targets --features runtime-benchmarks,try-runtime --workspace -- --deny warnings
tests:
name: Run tests
Expand Down
75 changes: 67 additions & 8 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ members = [
"pallets/ddc-staking",
"pallets/erc20",
"pallets/erc721",
"pallets/staking",
"primitives",
"runtime/cere",
"runtime/cere-dev",
Expand Down Expand Up @@ -84,14 +83,14 @@ pallet-nomination-pools = { git = "https://github.com/paritytech/substrate.git",
pallet-nomination-pools-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
pallet-nomination-pools-runtime-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
pallet-offences = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
pallet-preimage = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
pallet-proxy = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
pallet-recovery = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
pallet-session = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false, features = ["historical"] }
pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
# pallet-staking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
pallet-staking = { path = "pallets/staking", default-features = false }
pallet-staking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
pallet-sudo = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
pallet-timestamp = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ First, complete the [basic Rust setup instructions](./docs/rust-setup.md).
Use the following command to build the node without launching it:

```sh
cargo +nightly-2023-05-23 build --release
cargo +nightly-2024-03-12 build --release
```

## Run
Expand Down
73 changes: 0 additions & 73 deletions pallets/staking/Cargo.toml
View file
Open in desktop

This file was deleted.

Loading
Loading