From 349dc64617a6e180f5874cddc3077086331562ad Mon Sep 17 00:00:00 2001 From: "Bill.W" <0xbillw@gmail.com> Date: Fri, 17 Jan 2025 14:29:56 +0800 Subject: [PATCH 1/6] bump `cess-node` version to `0.9.0` --- standalone/chain/node/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standalone/chain/node/Cargo.toml b/standalone/chain/node/Cargo.toml index d1a38424..a12a57e4 100644 --- a/standalone/chain/node/Cargo.toml +++ b/standalone/chain/node/Cargo.toml @@ -6,7 +6,7 @@ edition = '2021' license = 'Unlicense' name = 'cess-node' repository = 'https://github.com/CESSProject/cess' -version = '0.8.2' +version = '0.9.0' [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] From 580bffb76ebcc1d76c7e2d17f7efa6b26ff5fd6e Mon Sep 17 00:00:00 2001 From: "Bill.W" <0xbillw@gmail.com> Date: Fri, 17 Jan 2025 14:30:39 +0800 Subject: [PATCH 2/6] bump `ceseal` version to `0.4.0` --- standalone/teeworker/ceseal/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standalone/teeworker/ceseal/Cargo.toml b/standalone/teeworker/ceseal/Cargo.toml index ce5a0844..cd083460 100644 --- a/standalone/teeworker/ceseal/Cargo.toml +++ b/standalone/teeworker/ceseal/Cargo.toml @@ -1,7 +1,7 @@ [package] edition = "2021" name = "ceseal" -version = "0.3.4" +version = "0.4.0" build = "build.rs" [profile.release] From e3fd12e6343944e21d0a637635a5ca73f0f68c8c Mon Sep 17 00:00:00 2001 From: "Bill.W" <0xbillw@gmail.com> Date: Fri, 17 Jan 2025 14:42:40 +0800 Subject: [PATCH 3/6] bump `cifrost` version to `0.3.0` --- standalone/teeworker/cifrost/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standalone/teeworker/cifrost/Cargo.toml b/standalone/teeworker/cifrost/Cargo.toml index 448f8965..a92ba0e9 100644 --- a/standalone/teeworker/cifrost/Cargo.toml +++ b/standalone/teeworker/cifrost/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cifrost" -version = "0.2.3" +version = "0.3.0" authors = ["CESS Network"] edition = "2021" From ed887888793e552332e66b35b9706e55296f060a Mon Sep 17 00:00:00 2001 From: "Bill.W" <0xbillw@gmail.com> Date: Fri, 17 Jan 2025 14:43:18 +0800 Subject: [PATCH 4/6] bump `handover` version to `0.2.0` --- standalone/teeworker/handover/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standalone/teeworker/handover/Cargo.toml b/standalone/teeworker/handover/Cargo.toml index 61e0587d..58831eef 100644 --- a/standalone/teeworker/handover/Cargo.toml +++ b/standalone/teeworker/handover/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "handover" -version = "0.1.1" +version = "0.2.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From 067d9d450c790ffef59203a509b71020502632ca Mon Sep 17 00:00:00 2001 From: "Bill.W" <0xbillw@gmail.com> Date: Fri, 17 Jan 2025 15:02:05 +0800 Subject: [PATCH 5/6] update Cargo.lock due as version changed --- Cargo.lock | 6 +++--- standalone/teeworker/ceseal/Cargo.lock | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 03e7becc..8b42c6ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2163,7 +2163,7 @@ dependencies = [ [[package]] name = "cess-node" -version = "0.8.2" +version = "0.9.0" dependencies = [ "array-bytes", "async-trait", @@ -2649,7 +2649,7 @@ dependencies = [ [[package]] name = "cifrost" -version = "0.2.3" +version = "0.3.0" dependencies = [ "anyhow", "async-trait", @@ -6360,7 +6360,7 @@ dependencies = [ [[package]] name = "handover" -version = "0.1.1" +version = "0.2.0" dependencies = [ "clap", "tokio", diff --git a/standalone/teeworker/ceseal/Cargo.lock b/standalone/teeworker/ceseal/Cargo.lock index 0122daa7..352f149a 100644 --- a/standalone/teeworker/ceseal/Cargo.lock +++ b/standalone/teeworker/ceseal/Cargo.lock @@ -1637,7 +1637,7 @@ dependencies = [ [[package]] name = "ceseal" -version = "0.3.4" +version = "0.4.0" dependencies = [ "anyhow", "base64 0.13.1", @@ -1681,7 +1681,7 @@ dependencies = [ [[package]] name = "cess-node-runtime" -version = "0.9.1" +version = "0.10.0" dependencies = [ "ces-pallet-mq", "ces-pallet-mq-runtime-api", @@ -6801,6 +6801,7 @@ dependencies = [ "frame-support", "frame-system", "hex", + "impl-trait-for-tuples", "log", "pallet-balances", "pallet-cess-staking", From c1fad4201822edb72899daa9e833f9276e8cfe42 Mon Sep 17 00:00:00 2001 From: "Bill.W" <0xbillw@gmail.com> Date: Fri, 17 Jan 2025 15:05:25 +0800 Subject: [PATCH 6/6] fix: compile warnings on normal and try-runtime features --- pallets/file-bank/src/functions.rs | 2 ++ pallets/file-bank/src/lib.rs | 2 +- pallets/file-bank/src/migration.rs | 10 +++++++--- pallets/sminer/src/lib.rs | 2 +- pallets/sminer/src/migration.rs | 3 ++- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pallets/file-bank/src/functions.rs b/pallets/file-bank/src/functions.rs index 4e4e2797..b3d7f374 100644 --- a/pallets/file-bank/src/functions.rs +++ b/pallets/file-bank/src/functions.rs @@ -332,6 +332,8 @@ impl Pallet { false } + // FIXME: Will this function still be used? + #[allow(dead_code)] pub(super) fn check_name_spec(name: Vec) -> bool { let mut point_flag: bool = false; let mut count = 0; diff --git a/pallets/file-bank/src/lib.rs b/pallets/file-bank/src/lib.rs index ad35aa9e..bbb8b729 100755 --- a/pallets/file-bank/src/lib.rs +++ b/pallets/file-bank/src/lib.rs @@ -54,7 +54,7 @@ use frame_support::{ PalletId, dispatch::DispatchResult, pallet_prelude::*, - weights::{Weight, WeightMeter}, + weights::Weight, }; use frame_system::pallet_prelude::*; use scale_info::TypeInfo; diff --git a/pallets/file-bank/src/migration.rs b/pallets/file-bank/src/migration.rs index 83ccf198..48730e52 100644 --- a/pallets/file-bank/src/migration.rs +++ b/pallets/file-bank/src/migration.rs @@ -1,13 +1,17 @@ use super::*; -use sp_std::collections::btree_map::BTreeMap; -use sp_runtime::{TryRuntimeError}; use frame_support::{ - storage_alias, weights::WeightMeter, + storage_alias, migrations::{MigrationId, SteppedMigration, SteppedMigrationError}, }; #[cfg(feature = "try-runtime")] use sp_runtime::Vec; +#[cfg(feature = "try-runtime")] +use sp_std::collections::btree_map::BTreeMap; +#[cfg(feature = "try-runtime")] +use sp_runtime::{TryRuntimeError}; +#[cfg(feature = "try-runtime")] +use frame_support::weights::WeightMeter; pub const PALLET_MIGRATIONS_ID: &[u8; 26] = b"pallet-file-bank-migration"; diff --git a/pallets/sminer/src/lib.rs b/pallets/sminer/src/lib.rs index 2cfd19b5..399217f6 100644 --- a/pallets/sminer/src/lib.rs +++ b/pallets/sminer/src/lib.rs @@ -23,7 +23,7 @@ use cp_bloom_filter::BloomFilter; use cp_cess_common::*; use frame_support::{ dispatch::DispatchResult, - ensure, weights::{Weight, WeightMeter}, + ensure, weights::Weight, pallet_prelude::DispatchError, storage::bounded_vec::BoundedVec, traits::{ diff --git a/pallets/sminer/src/migration.rs b/pallets/sminer/src/migration.rs index 2356644a..0632647d 100644 --- a/pallets/sminer/src/migration.rs +++ b/pallets/sminer/src/migration.rs @@ -1,4 +1,5 @@ use super::*; +#[cfg(feature = "try-runtime")] use sp_runtime::{TryRuntimeError}; #[cfg(feature = "try-runtime")] use sp_std::collections::btree_map::BTreeMap; @@ -110,7 +111,7 @@ impl SteppedMigration for SteppedSminer } pub mod v2 { - use super::{*, MinerItems as NewMinerItems}; + use super::*; #[storage_alias] pub type MinerItems = StorageMap, Blake2_128Concat, AccountOf, OldMinerInfo>;