From 41dabbc0cc1468aeaf17b7760013a4aadf838cee Mon Sep 17 00:00:00 2001 From: "Anathan (Ana) Ye" Date: Mon, 25 Dec 2023 17:22:24 +1100 Subject: [PATCH 01/11] :rocket: update `public draft releases` trigger condition (#1280) Signed-off-by: Anathan (Ana) Ye --- .github/workflows/publish_draft_releases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_draft_releases.yml b/.github/workflows/publish_draft_releases.yml index 4529ca254..96034951a 100644 --- a/.github/workflows/publish_draft_releases.yml +++ b/.github/workflows/publish_draft_releases.yml @@ -3,7 +3,7 @@ on: push: branches: [manta, release-**] tags: - - 'v[0-9]+.[0-9]+.[0-9]+*' + - 'v[0-9]+.[0-9]+.[0-9]+' concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true From 68669fa527f477c2ac94d86af641a4c2924aa6e4 Mon Sep 17 00:00:00 2001 From: Ana <134174965+anaye1997@users.noreply.github.com> Date: Mon, 25 Dec 2023 18:56:08 +1100 Subject: [PATCH 02/11] :rocket: update `public draft releases` trigger condition (#1281) Signed-off-by: Anathan (Ana) Ye --- .github/workflows/publish_draft_releases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_draft_releases.yml b/.github/workflows/publish_draft_releases.yml index 96034951a..2fc24d8aa 100644 --- a/.github/workflows/publish_draft_releases.yml +++ b/.github/workflows/publish_draft_releases.yml @@ -3,7 +3,7 @@ on: push: branches: [manta, release-**] tags: - - 'v[0-9]+.[0-9]+.[0-9]+' + - 'v[0-9]+\.[0-9]+\.[0-9]+*' concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true From b837d972c5ea0e4bbf6080ae37b1e68b9c2c72a4 Mon Sep 17 00:00:00 2001 From: Jamie Date: Mon, 25 Dec 2023 16:22:50 +0800 Subject: [PATCH 03/11] Bump srtool (#1282) Signed-off-by: Dengjianping --- .github/workflows/publish_draft_releases.yml | 4 ++-- .github/workflows/runtime_upgrade_test.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish_draft_releases.yml b/.github/workflows/publish_draft_releases.yml index 2fc24d8aa..8a297ddfc 100644 --- a/.github/workflows/publish_draft_releases.yml +++ b/.github/workflows/publish_draft_releases.yml @@ -47,10 +47,10 @@ jobs: srtool-target-${{ matrix.runtime.name }} - name: build runtime id: srtool-build - uses: chevdor/srtool-actions@v0.7.0 + uses: chevdor/srtool-actions@v0.9.1 with: image: paritytech/srtool - tag: 1.66.1 + tag: 1.74 chain: ${{ matrix.runtime.name }} - name: persist srtool digest run: > diff --git a/.github/workflows/runtime_upgrade_test.yml b/.github/workflows/runtime_upgrade_test.yml index ea2dc8a2c..20d587fdf 100644 --- a/.github/workflows/runtime_upgrade_test.yml +++ b/.github/workflows/runtime_upgrade_test.yml @@ -38,10 +38,10 @@ jobs: srtool-target-${{ env.RUNTIME }} - name: build runtime id: srtool-build - uses: chevdor/srtool-actions@v0.7.0 + uses: chevdor/srtool-actions@v0.9.1 with: image: paritytech/srtool - tag: 1.66.1 + tag: 1.74 chain: ${{ env.RUNTIME }} - name: persist srtool digest run: > From c3f14ef72667f105f0283332a7fe9099388d9581 Mon Sep 17 00:00:00 2001 From: Jamie Date: Mon, 25 Dec 2023 17:22:26 +0800 Subject: [PATCH 04/11] Fix srtool image tag (#1283) * Fix image tag Signed-off-by: Dengjianping * Bump rust Signed-off-by: Dengjianping --------- Signed-off-by: Dengjianping --- .github/workflows/publish_draft_releases.yml | 8 ++++---- .github/workflows/runtime_upgrade_test.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish_draft_releases.yml b/.github/workflows/publish_draft_releases.yml index 8a297ddfc..3e6750557 100644 --- a/.github/workflows/publish_draft_releases.yml +++ b/.github/workflows/publish_draft_releases.yml @@ -50,7 +50,7 @@ jobs: uses: chevdor/srtool-actions@v0.9.1 with: image: paritytech/srtool - tag: 1.74 + tag: 1.74.0 chain: ${{ matrix.runtime.name }} - name: persist srtool digest run: > @@ -114,8 +114,8 @@ jobs: rustup default stable rustup update rustup target add wasm32-unknown-unknown - rustup install 1.69.0 - rustup target add wasm32-unknown-unknown --toolchain 1.69.0 + rustup install 1.71.0 + rustup target add wasm32-unknown-unknown --toolchain 1.71.0 - name: cache cargo uses: Swatinem/rust-cache@v2 - name: build @@ -127,7 +127,7 @@ jobs: SCCACHE_DIR: ~/.cache/sccache run: | source ${HOME}/.cargo/env - RUSTC_BOOTSTRAP=1 cargo +1.69.0 build --profile production --verbose + RUSTC_BOOTSTRAP=1 cargo +1.71.0 build --profile production --verbose - name: stop sccache server run: sccache --stop-server || true - if: always() diff --git a/.github/workflows/runtime_upgrade_test.yml b/.github/workflows/runtime_upgrade_test.yml index 20d587fdf..de200c413 100644 --- a/.github/workflows/runtime_upgrade_test.yml +++ b/.github/workflows/runtime_upgrade_test.yml @@ -41,7 +41,7 @@ jobs: uses: chevdor/srtool-actions@v0.9.1 with: image: paritytech/srtool - tag: 1.74 + tag: 1.74.0 chain: ${{ env.RUNTIME }} - name: persist srtool digest run: > From 08dd616c6188ea699a8015f1b7a1b5890fc77c4e Mon Sep 17 00:00:00 2001 From: Elias Rad <146735585+nnsW3@users.noreply.github.com> Date: Tue, 26 Dec 2023 23:48:50 +0200 Subject: [PATCH 05/11] fix typos lib.rs Signed-off-by: Elias Rad <146735585+nnsW3@users.noreply.github.com> --- pallets/asset-manager/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pallets/asset-manager/src/lib.rs b/pallets/asset-manager/src/lib.rs index 5d03a2d98..334324574 100644 --- a/pallets/asset-manager/src/lib.rs +++ b/pallets/asset-manager/src/lib.rs @@ -121,7 +121,7 @@ pub mod pallet { /// Pallet ID type PalletId: Get; - /// Weight information for the extrinsics in this pallet. + /// Weight information for the extrinsic in this pallet. type WeightInfo: crate::weights::WeightInfo; /// AssetId where Permissionless Assets start, must be greater than `StartNonNativeAssetId` From f78632a09749b8ad0c3f18bd480596a72720ef8a Mon Sep 17 00:00:00 2001 From: Elias Rad <146735585+nnsW3@users.noreply.github.com> Date: Tue, 26 Dec 2023 23:53:08 +0200 Subject: [PATCH 06/11] fix typos lib.rs Signed-off-by: Elias Rad <146735585+nnsW3@users.noreply.github.com> --- pallets/collator-selection/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pallets/collator-selection/src/lib.rs b/pallets/collator-selection/src/lib.rs index d29ff9cb8..668769b98 100644 --- a/pallets/collator-selection/src/lib.rs +++ b/pallets/collator-selection/src/lib.rs @@ -488,9 +488,9 @@ pub mod pallet { Ok(Some(T::WeightInfo::leave_intent(current_count as u32)).into()) } - /// Remove an specified collator. + /// Remove a specified collator. /// - /// - `collator`: Who is going to be remove from collators set. + /// - `collator`: Who is going to be removed from collators set. #[pallet::call_index(6)] #[pallet::weight(T::WeightInfo::remove_collator(T::MaxCandidates::get()))] pub fn remove_collator( From 7f78821b07531dabb191e8d5df90b4e7eefb56b7 Mon Sep 17 00:00:00 2001 From: Elias Rad <146735585+nnsW3@users.noreply.github.com> Date: Tue, 26 Dec 2023 23:54:21 +0200 Subject: [PATCH 07/11] fix typos mock.rs Signed-off-by: Elias Rad <146735585+nnsW3@users.noreply.github.com> --- pallets/collator-selection/src/mock.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pallets/collator-selection/src/mock.rs b/pallets/collator-selection/src/mock.rs index 61f93b6b1..70264dcd6 100644 --- a/pallets/collator-selection/src/mock.rs +++ b/pallets/collator-selection/src/mock.rs @@ -246,7 +246,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities { }; let session = pallet_session::GenesisConfig:: { keys }; balances.assimilate_storage(&mut t).unwrap(); - // collator selection must be initialized before session. + // collator selection must be initialized before the session. collator_selection.assimilate_storage(&mut t).unwrap(); session.assimilate_storage(&mut t).unwrap(); From 53b0bb2bf07707c9aafce5bfee82f25d9faf2ee9 Mon Sep 17 00:00:00 2001 From: Elias Rad <146735585+nnsW3@users.noreply.github.com> Date: Tue, 26 Dec 2023 23:56:39 +0200 Subject: [PATCH 08/11] fix typos tests.rs Signed-off-by: Elias Rad <146735585+nnsW3@users.noreply.github.com> --- pallets/collator-selection/src/tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pallets/collator-selection/src/tests.rs b/pallets/collator-selection/src/tests.rs index 70660501c..b45e440c2 100644 --- a/pallets/collator-selection/src/tests.rs +++ b/pallets/collator-selection/src/tests.rs @@ -495,7 +495,7 @@ fn kick_mechanism_parity() { assert_eq!(CollatorSelection::candidates().len(), 2); assert_eq!(Session::validators().len(), 4); // all candidates active initialize_to_block(30); - // 4 authored all blocks in this the past session, gets to stay 3 was kicked on session change + // 4 authored all blocks in this past session, gets to stay 3 was kicked on a session change assert_eq!(CollatorSelection::candidates().len(), 1); // 3 will be kicked after 1 session delay assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 3, 4]); From f937c6f20f76087837126243b1ffcaeec5e2e7a1 Mon Sep 17 00:00:00 2001 From: Elias Rad <146735585+nnsW3@users.noreply.github.com> Date: Tue, 26 Dec 2023 23:58:56 +0200 Subject: [PATCH 09/11] fix typos lib.rs Signed-off-by: Elias Rad <146735585+nnsW3@users.noreply.github.com> --- pallets/farming/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pallets/farming/src/lib.rs b/pallets/farming/src/lib.rs index 72313a576..da86c98af 100644 --- a/pallets/farming/src/lib.rs +++ b/pallets/farming/src/lib.rs @@ -194,7 +194,7 @@ pub mod pallet { GaugePoolNotExist, /// Gauge info not exist GaugeInfoNotExist, - /// Share info is not exist + /// Share info does not exist ShareInfoNotExists, /// Pool state is invalid InvalidPoolState, From 13a7fe34e7f7adfd5954bdee50bceab3c4d0aad2 Mon Sep 17 00:00:00 2001 From: Elias Rad <146735585+nnsW3@users.noreply.github.com> Date: Tue, 26 Dec 2023 23:59:56 +0200 Subject: [PATCH 10/11] fix typos assets.rs Signed-off-by: Elias Rad <146735585+nnsW3@users.noreply.github.com> --- primitives/manta/src/assets.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/primitives/manta/src/assets.rs b/primitives/manta/src/assets.rs index 7f07cd357..79e82109d 100644 --- a/primitives/manta/src/assets.rs +++ b/primitives/manta/src/assets.rs @@ -86,7 +86,7 @@ pub trait AssetRegistry: AssetIdType + BalanceType { /// Error Type type Error; - /// Creates an new asset. + /// Creates a new asset. /// /// * `asset_id`: the asset id to be created /// * `metadata`: the metadata that the implementation layer stores From b07fff46023884d4638bbc0fb7234d64bf93b93c Mon Sep 17 00:00:00 2001 From: Elias Rad <146735585+nnsW3@users.noreply.github.com> Date: Wed, 27 Dec 2023 00:01:00 +0200 Subject: [PATCH 11/11] fix typos CONTRIBUTING.md Signed-off-by: Elias Rad <146735585+nnsW3@users.noreply.github.com> --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8d5918875..bf16aadc6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -59,7 +59,7 @@ Enhancement suggestions are tracked as [GitHub issues](https://guides.github.com * **Provide a step-by-step description of the suggested enhancement** in as many details as possible. * **Provide specific examples to demonstrate the steps**. Include copy/pasteable snippets which you use in those examples, as [Markdown code blocks](https://help.github.com/articles/markdown-basics/#multiple-lines). * **Describe the current behavior** and **explain which behavior you expected to see instead** and why. -* **Include screenshots or video** which help you demonstrate the steps or point out the part of Manta/Calamari which the suggestion is related to. +* **Include screenshots or video** which help you demonstrate the steps or point out the part of Manta/Calamari to which the suggestion is related to. * **Explain why this enhancement would be useful** to most Manta users. * **List some other places where this enhancement exists.**