From 9b2ed6479c6a2fa484782e908bbd49c9a3eafe58 Mon Sep 17 00:00:00 2001 From: Oleg Date: Thu, 16 Jan 2025 12:07:50 +0400 Subject: [PATCH 1/4] Disable `DID`'s extrinsics --- .github/workflows/lint.yml | 2 ++ .github/workflows/test.yml | 2 ++ Cargo.lock | 4 ++-- node/Cargo.toml | 4 ++-- runtime/Cargo.toml | 2 +- runtime/src/lib.rs | 22 +++++++++++----------- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a791ab498..dc6c6ff17 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,6 +17,8 @@ jobs: toolchain: nightly-2023-03-09 override: true components: rustfmt + - name: Install rustfmt + run: rustup component add --toolchain nightly-2023-03-09 rustfmt - name: Ensure Standard Formatting run: cargo +nightly-2023-03-09 fmt --all -- --check diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8c6b9bb2a..7af25e744 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,6 +20,8 @@ jobs: run: rustup target add wasm32-unknown-unknown --toolchain nightly-2023-03-09 - name: Ensure docs are buildable run: cargo doc --no-deps + - name: Install rustfmt + run: rustup component add --toolchain nightly-2023-03-09 rustfmt - name: Run tests run: cargo test --release --all diff --git a/Cargo.lock b/Cargo.lock index 236c52d25..9d07efc08 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1582,7 +1582,7 @@ dependencies = [ [[package]] name = "dock-node" -version = "0.32.0" +version = "0.33.0" dependencies = [ "async-trait", "beefy-gadget", @@ -1808,7 +1808,7 @@ dependencies = [ [[package]] name = "dock-runtime" -version = "0.32.0" +version = "0.33.0" dependencies = [ "beefy-merkle-tree", "beefy-primitives", diff --git a/node/Cargo.toml b/node/Cargo.toml index dacbe1b19..7c67e2a2d 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -3,7 +3,7 @@ authors = ["Dock.io"] build = "build.rs" edition = "2021" name = "dock-node" -version = "0.32.0" +version = "0.33.0" [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] @@ -28,7 +28,7 @@ optional = true [dependencies.dock-runtime] path = "../runtime" -version = "0.32.0" +version = "0.33.0" [dependencies.beefy-primitives] git = "https://github.com/paritytech/substrate.git" diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index ebd393a24..d89ebc724 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Dock.io"] edition = "2021" name = "dock-runtime" -version = "0.32.0" +version = "0.33.0" license = "Apache-2.0" [package.metadata.docs.rs] diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 3776eb0e0..9d224904e 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -200,7 +200,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("dock-pos-dev-runtime"), impl_name: create_runtime_str!("Dock"), authoring_version: 1, - spec_version: 66, + spec_version: 67, impl_version: 2, transaction_version: 2, apis: RUNTIME_API_VERSIONS, @@ -1781,15 +1781,15 @@ construct_runtime!( Authorship: pallet_authorship::{Pallet, Call, Storage} = 6, TransactionPayment: transaction_payment::{Pallet, Storage, Event} = 7, Utility: pallet_utility::{Pallet, Call, Event} = 8, - OffchainSignatures: offchain_signatures::{Pallet, Call, Storage, Event} = 9, - DIDModule: did::{Pallet, Call, Storage, Event, Config} = 10, - Revoke: revoke::{Pallet, Call, Storage, Event} = 11, - BlobStore: blob::{Pallet, Call, Storage} = 12, - Master: master::{Pallet, Call, Storage, Event, Config} = 13, + OffchainSignatures: offchain_signatures::{Pallet, Storage, Event} = 9, + DIDModule: did::{Pallet, Storage, Event, Config} = 10, + Revoke: revoke::{Pallet, Storage, Event} = 11, + BlobStore: blob::{Pallet, Storage} = 12, + Master: master::{Pallet, Storage, Event, Config} = 13, Sudo: sudo::{Pallet, Call, Storage, Event, Config} = 14, MigrationModule: dock_token_migration::{Pallet, Call, Storage, Event} = 15, - Anchor: anchor::{Pallet, Call, Storage, Event} = 16, - Attest: attest::{Pallet, Call, Storage} = 17, + Anchor: anchor::{Pallet, Storage, Event} = 16, + Attest: attest::{Pallet, Storage} = 17, Democracy: pallet_democracy::{Pallet, Call, Storage, Event} = 18, Council: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 19, TechnicalCommittee: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 20, @@ -1812,10 +1812,10 @@ construct_runtime!( Elections: pallet_elections_phragmen::{Pallet, Call, Storage, Event, Config} = 37, Tips: pallet_tips::{Pallet, Call, Storage, Event} = 38, Identity: pallet_identity::{Pallet, Call, Storage, Event} = 39, - Accumulator: accumulator::{Pallet, Call, Storage, Event} = 40, + Accumulator: accumulator::{Pallet, Storage, Event} = 40, BaseFee: pallet_base_fee::{Pallet, Call, Storage, Config, Event} = 41, - StatusListCredential: status_list_credential::{Pallet, Call, Storage, Event} = 42, - TrustRegistry: trust_registry::{Pallet, Call, Storage, Event} = 43, + StatusListCredential: status_list_credential::{Pallet, Storage, Event} = 42, + TrustRegistry: trust_registry::{Pallet, Storage, Event} = 43, Agreement: dock_agreement::{Pallet, Call, Event} = 44, CheqdMigration: dock_cheqd_migration::{Pallet, Call, Event} = 45 } From 222fb6723f42a8f16aab7e263dcdb137da181dcb Mon Sep 17 00:00:00 2001 From: Oleg Date: Thu, 16 Jan 2025 23:43:17 +0400 Subject: [PATCH 2/4] Fix setup --- .github/workflows/lint.yml | 2 ++ .github/workflows/test.yml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index dc6c6ff17..fdd49b43b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -34,5 +34,7 @@ jobs: components: clippy - name: Install WASM run: rustup target add wasm32-unknown-unknown --toolchain nightly-2023-03-09 + - name: Install rustfmt + run: rustup component add --toolchain nightly-2023-03-09 rustfmt - name: Ensure `clippy` is happy run: cargo +nightly-2023-03-09 clippy --all diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7af25e744..246dc3e7d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,10 +18,10 @@ jobs: override: true - name: Install WASM run: rustup target add wasm32-unknown-unknown --toolchain nightly-2023-03-09 - - name: Ensure docs are buildable - run: cargo doc --no-deps - name: Install rustfmt run: rustup component add --toolchain nightly-2023-03-09 rustfmt + - name: Ensure docs are buildable + run: cargo doc --no-deps - name: Run tests run: cargo test --release --all From 2d2ceccee1ed532babfcddca4c03181b5b44d0f7 Mon Sep 17 00:00:00 2001 From: Oleg Date: Fri, 17 Jan 2025 11:15:57 +0400 Subject: [PATCH 3/4] Fix CI --- .github/workflows/lint.yml | 13 ++++--------- .github/workflows/test.yml | 17 +++++++---------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index fdd49b43b..9f5fc20ac 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,7 +8,7 @@ on: jobs: fmt: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - name: Install rust toolchain @@ -17,24 +17,19 @@ jobs: toolchain: nightly-2023-03-09 override: true components: rustfmt - - name: Install rustfmt - run: rustup component add --toolchain nightly-2023-03-09 rustfmt - name: Ensure Standard Formatting run: cargo +nightly-2023-03-09 fmt --all -- --check clippy: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - - name: Install rust toolchain + - name: Install nightly-2023-03-09 and WASM target uses: actions-rs/toolchain@v1 with: toolchain: nightly-2023-03-09 override: true components: clippy - - name: Install WASM - run: rustup target add wasm32-unknown-unknown --toolchain nightly-2023-03-09 - - name: Install rustfmt - run: rustup component add --toolchain nightly-2023-03-09 rustfmt + targets: wasm32-unknown-unknown - name: Ensure `clippy` is happy run: cargo +nightly-2023-03-09 clippy --all diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 246dc3e7d..68acec928 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,33 +8,30 @@ on: jobs: unit-tests: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - - name: Install nightly-2023-03-09 + - name: Install nightly-2023-03-09 and WASM target uses: actions-rs/toolchain@v1 with: toolchain: nightly-2023-03-09 override: true - - name: Install WASM - run: rustup target add wasm32-unknown-unknown --toolchain nightly-2023-03-09 - - name: Install rustfmt - run: rustup component add --toolchain nightly-2023-03-09 rustfmt + components: rustfmt + targets: wasm32-unknown-unknown - name: Ensure docs are buildable run: cargo doc --no-deps - name: Run tests run: cargo test --release --all integration-tests: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - - name: Install nightly-2023-03-09 + - name: Install nightly-2023-03-09 and WASM target uses: actions-rs/toolchain@v1 with: toolchain: nightly-2023-03-09 override: true - - name: Install WASM - run: rustup target add wasm32-unknown-unknown --toolchain nightly-2023-03-09 + targets: wasm32-unknown-unknown # Temporary solution: disk space is exceeded on the runner machine # - run: ./scripts/integration_tests From dfa3fca16cb9a0a20f175357415b07f7bdbc12be Mon Sep 17 00:00:00 2001 From: Oleg Date: Fri, 17 Jan 2025 12:44:54 +0400 Subject: [PATCH 4/4] Fix CI --- .github/workflows/lint.yml | 3 ++- .github/workflows/test.yml | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9f5fc20ac..7af388766 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -30,6 +30,7 @@ jobs: toolchain: nightly-2023-03-09 override: true components: clippy - targets: wasm32-unknown-unknown + - name: Install WASM + run: rustup target add wasm32-unknown-unknown --toolchain nightly-2023-03-09 - name: Ensure `clippy` is happy run: cargo +nightly-2023-03-09 clippy --all diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 68acec928..c6646d1af 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,8 @@ jobs: toolchain: nightly-2023-03-09 override: true components: rustfmt - targets: wasm32-unknown-unknown + - name: Install WASM + run: rustup target add wasm32-unknown-unknown --toolchain nightly-2023-03-09 - name: Ensure docs are buildable run: cargo doc --no-deps - name: Run tests @@ -27,11 +28,12 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - - name: Install nightly-2023-03-09 and WASM target + - name: Install nightly-2023-03-09 uses: actions-rs/toolchain@v1 with: toolchain: nightly-2023-03-09 override: true - targets: wasm32-unknown-unknown + - name: Install WASM + run: rustup target add wasm32-unknown-unknown --toolchain nightly-2023-03-09 # Temporary solution: disk space is exceeded on the runner machine # - run: ./scripts/integration_tests