upgrade to polkadot 1.6.0 (#370)

* bump crate major version. leave space for ontermediate version if needed as we're skipping 6 releases * upgrade deps to polkadot-v1.6.0
encointer · Feb 20, 2024 · ae8647d · ae8647d
1 parent aacb5e4
commit ae8647d
Show file tree

Hide file tree

Showing 35 changed files with 569 additions and 1,335 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,22 +28,22 @@ members = [
 
 [workspace.dependencies]
 # local pin
-encointer-ceremonies-assignment = { path = "ceremonies/assignment", default-features = false, version = "3.0.2" }
-encointer-meetup-validation = { path = "ceremonies/meetup-validation", default-features = false, version = "3.0.2" }
-encointer-primitives = { path = "primitives", default-features = false, features = ["serde_derive"], version = "3.0.2" }
-encointer-rpc = { path = "rpc", version = "3.0.2" }
-ep-core = { path = "primitives/core", default-features = false, version = "3.0.2" }
-pallet-encointer-balances = { path = "balances", default-features = false, version = "3.0.2" }
-pallet-encointer-ceremonies = { path = "ceremonies", default-features = false, version = "3.0.2" }
-pallet-encointer-communities = { path = "communities", default-features = false, version = "3.0.3" }
-pallet-encointer-reputation-commitments = { path = "reputation-commitments", default-features = false, version = "3.0.2" }
-pallet-encointer-scheduler = { path = "scheduler", default-features = false, version = "3.0.3" }
+encointer-ceremonies-assignment = { path = "ceremonies/assignment", default-features = false, version = "5.0.0" }
+encointer-meetup-validation = { path = "ceremonies/meetup-validation", default-features = false, version = "5.0.0" }
+encointer-primitives = { path = "primitives", default-features = false, features = ["serde_derive"], version = "5.0.0" }
+encointer-rpc = { path = "rpc", version = "5.0.0" }
+ep-core = { path = "primitives/core", default-features = false, version = "5.0.0" }
+pallet-encointer-balances = { path = "balances", default-features = false, version = "5.0.0" }
+pallet-encointer-ceremonies = { path = "ceremonies", default-features = false, version = "5.0.0" }
+pallet-encointer-communities = { path = "communities", default-features = false, version = "5.0.0" }
+pallet-encointer-reputation-commitments = { path = "reputation-commitments", default-features = false, version = "5.0.0" }
+pallet-encointer-scheduler = { path = "scheduler", default-features = false, version = "5.0.0" }
 test-utils = { path = "test-utils" }
 # rpc apis
-encointer-balances-tx-payment-rpc-runtime-api = { path = "balances-tx-payment/rpc/runtime-api", version = "3.0.2" }
-pallet-encointer-bazaar-rpc-runtime-api = { path = "bazaar/rpc/runtime-api", version = "3.0.2" }
-pallet-encointer-ceremonies-rpc-runtime-api = { path = "ceremonies/rpc/runtime-api", version = "3.0.2" }
-pallet-encointer-communities-rpc-runtime-api = { path = "communities/rpc/runtime-api", version = "3.0.2" }
+encointer-balances-tx-payment-rpc-runtime-api = { path = "balances-tx-payment/rpc/runtime-api", version = "5.0.0" }
+pallet-encointer-bazaar-rpc-runtime-api = { path = "bazaar/rpc/runtime-api", version = "5.0.0" }
+pallet-encointer-ceremonies-rpc-runtime-api = { path = "ceremonies/rpc/runtime-api", version = "5.0.0" }
+pallet-encointer-communities-rpc-runtime-api = { path = "communities/rpc/runtime-api", version = "5.0.0" }
 
 # various
 array-bytes = "6.1.0"
@@ -54,47 +54,47 @@ geohash = { package = "substrate-geohash", version = "0.13.0" }
 impl-serde = { version = "0.4.0", default-features = false }
 impl-trait-for-tuples = { version = "0.2.2", default-features = false }
 log = { version = "0.4.20", default-features = false }
-parity-scale-codec = { version = "3.6.4", default-features = false, features = ["derive", "max-encoded-len"] }
-parking_lot = "0.12.0"
+parity-scale-codec = { version = "3.6.5", default-features = false, features = ["derive", "max-encoded-len"] }
+parking_lot = "0.12.1"
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"] }
-thiserror = "1.0.31"
+serde = { version = "1.0.195", default-features = false, features = ["derive", "alloc"] }
+thiserror = "1.0.50"
 
 # polkadot-sdk [no_std]
-frame-benchmarking = { default-features = false, version = "25.0.0" }
-frame-support = { default-features = false, version = "25.0.0" }
-frame-system = { default-features = false, version = "25.0.0" }
-pallet-asset-tx-payment = { default-features = false, version = "25.0.0" }
-pallet-balances = { default-features = false, version = "25.0.0" }
-pallet-timestamp = { default-features = false, version = "24.0.0" }
-pallet-transaction-payment = { default-features = false, version = "25.0.0" }
-pallet-treasury = { default-features = false, version = "24.0.0" }
-sp-api = { default-features = false, version = "23.0.0" }
-sp-application-crypto = { default-features = false, version = "27.0.0" }
-sp-arithmetic = { default-features = false, version = "20.0.0" }
-sp-core = { default-features = false, version = "25.0.0" }
-sp-io = { default-features = false, version = "27.0.0" }
-sp-runtime = { default-features = false, version = "28.0.0" }
-sp-std = { default-features = false, version = "12.0.0" }
+frame-benchmarking = { default-features = false, version = "28.0.0" }
+frame-support = { default-features = false, version = "28.0.0" }
+frame-system = { default-features = false, version = "28.0.0" }
+pallet-asset-tx-payment = { default-features = false, version = "28.0.0" }
+pallet-balances = { default-features = false, version = "28.0.0" }
+pallet-timestamp = { default-features = false, version = "27.0.0" }
+pallet-transaction-payment = { default-features = false, version = "28.0.0" }
+pallet-treasury = { default-features = false, version = "27.0.0" }
+sp-api = { default-features = false, version = "26.0.0" }
+sp-application-crypto = { default-features = false, version = "30.0.0" }
+sp-arithmetic = { default-features = false, version = "23.0.0" }
+sp-core = { default-features = false, version = "28.0.0" }
+sp-io = { default-features = false, version = "30.0.0" }
+sp-runtime = { default-features = false, version = "31.0.0" }
+sp-std = { default-features = false, version = "14.0.0" }
 
 # rpc stuff [std]
 jsonrpsee = { version = "0.16.3", features = ["client-core", "server", "macros"] }
 jsonrpsee-core = { version = "0.16.3" }
 jsonrpsee-types = { version = "0.16.3" }
-pallet-transaction-payment-rpc = { version = "27.0.0" }
-sc-rpc = "26.0.0"
-sc-rpc-api = "0.30.0"
-sp-blockchain = "25.0.0"
-sp-rpc = "23.0.0"
+pallet-transaction-payment-rpc = { version = "30.0.0" }
+sc-rpc = "29.0.0"
+sc-rpc-api = "0.33.0"
+sp-blockchain = "28.0.0"
+sp-rpc = "26.0.0"
 
 # dev deps
 approx = "0.5.1"
-itertools = "0.10.3"
+itertools = "0.10.5"
 rstest = "0.12.0"
-serde_json = "1.0.105"
-sp-inherents = "23.0.0"
-sp-keyring = "28.0.0"
-sp-keystore = "0.31.0"
+serde_json = "1.0.111"
+sp-inherents = "26.0.0"
+sp-keyring = "31.0.0"
+sp-keystore = "0.34.0"
 
 #[patch."https://github.com/encointer/substrate-fixed"]
 #substrate-fixed = { path = "../substrate-fixed"}

diff --git a/balances-tx-payment/Cargo.toml b/balances-tx-payment/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "encointer-balances-tx-payment"
-version = "3.0.2"
+version = "5.0.0"
 authors = ["Encointer Association <[email protected]>"]
 edition = "2021"
 description = "Balances tx payment for the Encointer blockchain runtime"

diff --git a/balances-tx-payment/rpc/Cargo.toml b/balances-tx-payment/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "encointer-balances-tx-payment-rpc"
-version = "3.0.2"
+version = "5.0.0"
 authors = ["Encointer Association <[email protected]>"]
 edition = "2021"
 description = "Balances tx payment rpc for the Encointer blockchain runtime"

diff --git a/balances-tx-payment/rpc/runtime-api/Cargo.toml b/balances-tx-payment/rpc/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "encointer-balances-tx-payment-rpc-runtime-api"
-version = "3.0.2"
+version = "5.0.0"
 authors = ["Encointer Association <[email protected]>"]
 edition = "2021"
 description = "Balances tx payment rpc runtime api for the Encointer blockchain runtime"

diff --git a/balances-tx-payment/rpc/runtime-api/src/lib.rs b/balances-tx-payment/rpc/runtime-api/src/lib.rs
@@ -20,7 +20,7 @@
 
 use core::fmt;
 use frame_support::pallet_prelude::TypeInfo;
-use sp_api::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 #[cfg(not(feature = "std"))]
 use sp_std::vec::Vec;
 

diff --git a/balances-tx-payment/rpc/src/lib.rs b/balances-tx-payment/rpc/src/lib.rs
@@ -27,7 +27,8 @@ pub use pallet_transaction_payment::RuntimeDispatchInfo;
 use pallet_transaction_payment::{FeeDetails, InclusionFee};
 use pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi;
 use parity_scale_codec::Codec;
-use sp_api::{Decode, Encode, ProvideRuntimeApi};
+use parity_scale_codec::{Decode, Encode};
+use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
 use sp_core::Bytes;
 use sp_rpc::number::NumberOrHex;

diff --git a/balances/Cargo.toml b/balances/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-balances"
-version = "3.0.2"
+version = "5.0.0"
 authors = ["Encointer Association <[email protected]>"]
 edition = "2021"
 description = "Balances pallet for the Encointer blockchain runtime"

diff --git a/bazaar/Cargo.toml b/bazaar/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-bazaar"
-version = "3.0.3"
+version = "5.0.0"
 authors = ["Encointer Association <[email protected]>"]
 edition = "2021"
 description = "Bazaar pallet for the Encointer blockchain runtime"

diff --git a/bazaar/rpc/Cargo.toml b/bazaar/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-bazaar-rpc"
-version = "3.0.2"
+version = "5.0.0"
 authors = ["Encointer Association <[email protected]>"]
 edition = "2021"
 description = "Bazaar rpc for the Encointer blockchain runtime"
@@ -11,6 +11,7 @@ license = "GPL-3.0-or-later"
 [dependencies]
 jsonrpsee = { workspace = true }
 log = { workspace = true, features = ["std"] }
+parity-scale-codec = { workspace = true }
 parking_lot = { workspace = true }
 thiserror = { workspace = true }
 

diff --git a/bazaar/rpc/runtime-api/Cargo.toml b/bazaar/rpc/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-bazaar-rpc-runtime-api"
-version = "3.0.2"
+version = "5.0.0"
 authors = ["Encointer Association <[email protected]>"]
 edition = "2021"
 description = "Bazaar rpc runtime API for the Encointer blockchain runtime"
@@ -14,6 +14,7 @@ encointer-primitives = { workspace = true }
 
 # substrate deps
 frame-support = { workspace = true }
+parity-scale-codec = { workspace = true }
 sp-api = { workspace = true }
 sp-std = { workspace = true }
 

diff --git a/bazaar/rpc/runtime-api/src/lib.rs b/bazaar/rpc/runtime-api/src/lib.rs
@@ -25,7 +25,7 @@ use encointer_primitives::{
 	bazaar::{BusinessData, BusinessIdentifier, OfferingData},
 	communities::CommunityIdentifier,
 };
-use sp_api::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 
 sp_api::decl_runtime_apis! {
 	pub trait BazaarApi<AccountId>

diff --git a/bazaar/rpc/src/lib.rs b/bazaar/rpc/src/lib.rs
@@ -16,7 +16,8 @@
 
 use encointer_rpc::Error;
 use jsonrpsee::{core::RpcResult, proc_macros::rpc};
-use sp_api::{Decode, Encode, ProvideRuntimeApi};
+use parity_scale_codec::{Decode, Encode};
+use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
 use sp_runtime::traits::Block as BlockT;
 use std::sync::Arc;

diff --git a/ceremonies/Cargo.toml b/ceremonies/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-ceremonies"
-version = "3.0.4"
+version = "5.0.0"
 authors = ["Encointer Association <[email protected]>"]
 edition = "2021"
 description = "Ceremonies pallet for the Encointer blockchain runtime"

diff --git a/ceremonies/assignment/Cargo.toml b/ceremonies/assignment/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "encointer-ceremonies-assignment"
-version = "3.0.2"
+version = "5.0.0"
 authors = ["Encointer Association <[email protected]>"]
 edition = "2021"
 description = "Ceremonies assignments for the Encointer blockchain runtime"

diff --git a/ceremonies/meetup-validation/Cargo.toml b/ceremonies/meetup-validation/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "encointer-meetup-validation"
-version = "3.0.2"
+version = "5.0.0"
 authors = ["Encointer Association <[email protected]>"]
 edition = "2021"
 description = "Meetup validation for the Encointer blockchain runtime"

diff --git a/ceremonies/rpc/Cargo.toml b/ceremonies/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-ceremonies-rpc"
-version = "3.0.2"
+version = "5.0.0"
 authors = ["Encointer Association <[email protected]>"]
 edition = "2021"
 description = "Ceremonies rpc for the Encointer blockchain runtime"
@@ -11,6 +11,7 @@ license = "GPL-3.0-or-later"
 [dependencies]
 jsonrpsee = { workspace = true }
 log = { workspace = true, features = ["std"] }
+parity-scale-codec = { workspace = true }
 parking_lot = { workspace = true }
 thiserror = { workspace = true }
 

diff --git a/ceremonies/rpc/runtime-api/Cargo.toml b/ceremonies/rpc/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-ceremonies-rpc-runtime-api"
-version = "3.0.2"
+version = "5.0.0"
 authors = ["Encointer Association <[email protected]>"]
 edition = "2021"
 description = "Ceremonies rpc runtime API for the Encointer blockchain runtime"
@@ -14,6 +14,7 @@ encointer-primitives = { workspace = true }
 
 # substrate deps
 frame-support = { workspace = true }
+parity-scale-codec = { workspace = true }
 sp-api = { workspace = true }
 sp-std = { workspace = true }
 

diff --git a/ceremonies/rpc/runtime-api/src/lib.rs b/ceremonies/rpc/runtime-api/src/lib.rs
@@ -25,7 +25,7 @@ use encointer_primitives::{
 	ceremonies::{AggregatedAccountData, CeremonyIndexType, CeremonyInfo, CommunityReputation},
 	communities::CommunityIdentifier,
 };
-use sp_api::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 
 sp_api::decl_runtime_apis! {
 	pub trait CeremoniesApi<AccountId, Moment>

diff --git a/ceremonies/rpc/src/lib.rs b/ceremonies/rpc/src/lib.rs
@@ -16,12 +16,12 @@
 
 use encointer_rpc::Error;
 use jsonrpsee::{core::RpcResult, proc_macros::rpc};
+use parity_scale_codec::{Decode, Encode};
 use parking_lot::RwLock;
-use sp_api::{
-	offchain::{OffchainStorage, STORAGE_PREFIX},
-	Decode, Encode, ProvideRuntimeApi,
-};
+use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
+use sp_core::offchain::{OffchainStorage, STORAGE_PREFIX};
+use sp_runtime::app_crypto::sp_core;
 use sp_runtime::traits::Block as BlockT;
 use std::sync::Arc;
 
@@ -71,7 +71,7 @@ pub struct CeremoniesRpc<Client, Block, AccountId, Moment, S> {
 impl<Client, Block, AccountId, Moment, S> CeremoniesRpc<Client, Block, AccountId, Moment, S>
 where
 	S: 'static + OffchainStorage,
-	Block: sp_api::BlockT,
+	Block: BlockT,
 	AccountId: 'static + Encode + Decode + Send + Sync,
 	Moment: 'static + Encode + Decode + Send + Sync,
 	Client: Send + Sync + 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,

diff --git a/communities/Cargo.toml b/communities/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-communities"
-version = "3.0.3"
+version = "5.0.0"
 authors = ["Encointer Association <[email protected]>"]
 edition = "2021"
 description = "Communities pallet for the Encointer blockchain runtime"

diff --git a/communities/rpc/Cargo.toml b/communities/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-communities-rpc"
-version = "3.0.2"
+version = "5.0.0"
 authors = ["Encointer Association <[email protected]>"]
 edition = "2021"
 description = "Communities rpc for the Encointer blockchain runtime"
@@ -11,6 +11,7 @@ license = "GPL-3.0-or-later"
 [dependencies]
 jsonrpsee = { workspace = true }
 log = { workspace = true, features = ["std"] }
+parity-scale-codec = { workspace = true }
 parking_lot = { workspace = true }
 thiserror = { workspace = true }
 
@@ -24,6 +25,7 @@ sc-rpc = { workspace = true }
 sc-rpc-api = { workspace = true }
 sp-api = { workspace = true, features = ["std"] }
 sp-blockchain = { workspace = true }
+sp-core = { workspace = true, features = ["std"] }
 sp-runtime = { workspace = true, features = ["std"] }
 
 [dev-dependencies]

diff --git a/communities/rpc/runtime-api/Cargo.toml b/communities/rpc/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-communities-rpc-runtime-api"
-version = "3.0.2"
+version = "5.0.0"
 authors = ["Encointer Association <[email protected]>"]
 edition = "2021"
 description = "Communities rpc runtime api for the Encointer blockchain runtime"
@@ -13,6 +13,7 @@ license = "GPL-3.0-or-later"
 encointer-primitives = { workspace = true }
 
 # substrate deps
+parity-scale-codec = { workspace = true }
 sp-api = { workspace = true }
 sp-std = { workspace = true }
 

diff --git a/communities/rpc/runtime-api/src/lib.rs b/communities/rpc/runtime-api/src/lib.rs
@@ -26,7 +26,7 @@ use encointer_primitives::{
 	common::PalletString,
 	communities::{CommunityIdentifier, Location},
 };
-use sp_api::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 
 sp_api::decl_runtime_apis! {