Merge branch 'master' into ab/tolerate-noshows

encointer · Feb 27, 2024 · d3e7cd8 · d3e7cd8
2 parents 7c482b9 + 6673f41
commit d3e7cd8
Show file tree

Hide file tree

Showing 29 changed files with 293 additions and 345 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,26 +28,26 @@ members = [
 
 [workspace.dependencies]
 # local pin
-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" }
+encointer-ceremonies-assignment = { path = "ceremonies/assignment", default-features = false, version = "6.0.0" }
+encointer-meetup-validation = { path = "ceremonies/meetup-validation", default-features = false, version = "6.0.0" }
+encointer-primitives = { path = "primitives", default-features = false, features = ["serde_derive"], version = "6.0.0" }
+encointer-rpc = { path = "rpc", version = "6.0.0" }
+ep-core = { path = "primitives/core", default-features = false, version = "6.0.0" }
+pallet-encointer-balances = { path = "balances", default-features = false, version = "6.0.0" }
+pallet-encointer-ceremonies = { path = "ceremonies", default-features = false, version = "6.0.0" }
+pallet-encointer-communities = { path = "communities", default-features = false, version = "6.0.0" }
+pallet-encointer-reputation-commitments = { path = "reputation-commitments", default-features = false, version = "6.0.0" }
+pallet-encointer-scheduler = { path = "scheduler", default-features = false, version = "6.0.0" }
 test-utils = { path = "test-utils" }
 # rpc apis
-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" }
+encointer-balances-tx-payment-rpc-runtime-api = { path = "balances-tx-payment/rpc/runtime-api", version = "6.0.0" }
+pallet-encointer-bazaar-rpc-runtime-api = { path = "bazaar/rpc/runtime-api", version = "6.0.0" }
+pallet-encointer-ceremonies-rpc-runtime-api = { path = "ceremonies/rpc/runtime-api", version = "6.0.0" }
+pallet-encointer-communities-rpc-runtime-api = { path = "communities/rpc/runtime-api", version = "6.0.0" }
 
 # various
 array-bytes = "6.1.0"
-bs58 = { version = "0.4.0", default-features = false, features = ["alloc"] }
+bs58 = { version = "0.5.0", default-features = false, features = ["alloc"] }
 crc = "2.1.0"
 fixed = { package = "substrate-fixed", default-features = false, version = "0.5.9" }
 geohash = { package = "substrate-geohash", version = "0.13.0" }
@@ -61,40 +61,40 @@ serde = { version = "1.0.195", default-features = false, features = ["derive", "
 thiserror = "1.0.50"
 
 # polkadot-sdk [no_std]
-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" }
+frame-benchmarking = { default-features = false, version = "29.0.0" }
+frame-support = { default-features = false, version = "29.0.0" }
+frame-system = { default-features = false, version = "29.0.0" }
+pallet-asset-tx-payment = { default-features = false, version = "29.0.0" }
+pallet-balances = { default-features = false, version = "29.0.0" }
+pallet-timestamp = { default-features = false, version = "28.0.0" }
+pallet-transaction-payment = { default-features = false, version = "29.0.0" }
+pallet-treasury = { default-features = false, version = "28.0.0" }
+sp-api = { default-features = false, version = "27.0.0" }
+sp-application-crypto = { default-features = false, version = "31.0.0" }
+sp-arithmetic = { default-features = false, version = "24.0.0" }
+sp-core = { default-features = false, version = "29.0.0" }
+sp-io = { default-features = false, version = "31.0.0" }
+sp-runtime = { default-features = false, version = "32.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 = "30.0.0" }
-sc-rpc = "29.0.0"
-sc-rpc-api = "0.33.0"
-sp-blockchain = "28.0.0"
-sp-rpc = "26.0.0"
+jsonrpsee = { version = "0.20.3", features = ["client-core", "server", "macros"] }
+jsonrpsee-core = { version = "0.20.3" }
+jsonrpsee-types = { version = "0.20.3" }
+pallet-transaction-payment-rpc = { version = "31.0.0" }
+sc-rpc = "30.0.0"
+sc-rpc-api = "0.34.0"
+sp-blockchain = "29.0.0"
+sp-rpc = "27.0.0"
 
 # dev deps
 approx = "0.5.1"
 itertools = "0.10.5"
 rstest = "0.12.0"
 serde_json = "1.0.111"
-sp-inherents = "26.0.0"
-sp-keyring = "31.0.0"
-sp-keystore = "0.34.0"
+sp-inherents = "27.0.0"
+sp-keyring = "32.0.0"
+sp-keystore = "0.35.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 = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 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 = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 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 = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 edition = "2021"
 description = "Balances tx payment rpc runtime api for the Encointer blockchain runtime"

diff --git a/balances-tx-payment/rpc/src/lib.rs b/balances-tx-payment/rpc/src/lib.rs
@@ -18,11 +18,8 @@ use core::fmt::Display;
 use encointer_balances_tx_payment_rpc_runtime_api::{
 	BalancesTxPaymentApi as BalancesTxPaymentApiRuntimeApi, Error,
 };
-use jsonrpsee::{
-	core::RpcResult,
-	proc_macros::rpc,
-	types::error::{CallError, ErrorObject},
-};
+use jsonrpsee::types::ErrorObjectOwned;
+use jsonrpsee::{core::RpcResult, proc_macros::rpc, types::error::ErrorObject};
 pub use pallet_transaction_payment::RuntimeDispatchInfo;
 use pallet_transaction_payment::{FeeDetails, InclusionFee};
 use pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi;
@@ -94,18 +91,18 @@ where
 		let encoded_len = encoded_xt.len() as u32;
 
 		let uxt: Block::Extrinsic = Decode::decode(&mut &*encoded_xt).map_err(|e| {
-			CallError::Custom(ErrorObject::owned(
+			ErrorObject::owned(
 				Error::DecodeError.into(),
 				"Unable to query fee details.",
 				Some(format!("{e:?}")),
-			))
+			)
 		})?;
 		let fee_details = api.query_fee_details(at, uxt, encoded_len).map_err(|e| {
-			CallError::Custom(ErrorObject::owned(
+			ErrorObject::owned(
 				Error::RuntimeError.into(),
 				"Unable to query fee details.",
 				Some(e.to_string()),
-			))
+			)
 		})?;
 
 		Ok(FeeDetails {
@@ -150,6 +147,6 @@ where
 	}
 }
 
-fn runtime_api_error_into_rpc_error<E: Display>(e: E, msg: &str) -> CallError {
-	CallError::Custom(ErrorObject::owned(Error::RuntimeError.into(), msg, Some(e.to_string())))
+fn runtime_api_error_into_rpc_error<E: Display>(e: E, msg: &str) -> ErrorObjectOwned {
+	ErrorObject::owned(Error::RuntimeError.into(), msg, Some(e.to_string()))
 }
diff --git a/balances/Cargo.toml b/balances/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-balances"
-version = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 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 = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 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 = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 edition = "2021"
 description = "Bazaar rpc for the Encointer blockchain runtime"

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 = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 edition = "2021"
 description = "Bazaar rpc runtime API for the Encointer blockchain runtime"

diff --git a/ceremonies/Cargo.toml b/ceremonies/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-ceremonies"
-version = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 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 = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 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 = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 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 = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 edition = "2021"
 description = "Ceremonies rpc for the Encointer blockchain runtime"

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 = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 edition = "2021"
 description = "Ceremonies rpc runtime API for the Encointer blockchain runtime"

diff --git a/communities/Cargo.toml b/communities/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-communities"
-version = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 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 = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 edition = "2021"
 description = "Communities rpc for the Encointer blockchain runtime"

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 = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 edition = "2021"
 description = "Communities rpc runtime api for the Encointer blockchain runtime"

diff --git a/democracy/Cargo.toml b/democracy/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-democracy"
-version = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 edition = "2021"
 description = "Democracy pallet for the Encointer blockchain runtime"

diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-faucet"
-version = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 edition = "2021"
 description = "Faucet pallet for the Encointer blockchain runtime"

diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "encointer-primitives"
-version = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 edition = "2021"
 description = "Primitives for the Encointer blockchain runtime"

diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ep-core"
-version = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 edition = "2021"
 description = "Core primitives for the Encointer blockchain runtime"

diff --git a/reputation-commitments/Cargo.toml b/reputation-commitments/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-reputation-commitments"
-version = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 edition = "2021"
 description = "Reputation commitments pallet for the Encointer blockchain runtime"

diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "encointer-rpc"
-version = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 edition = "2021"
 description = "RPC for the Encointer blockchain runtime"

diff --git a/rpc/src/error.rs b/rpc/src/error.rs
@@ -1,5 +1,5 @@
-use jsonrpsee_core::error::Error as JsonRpseeError;
-use jsonrpsee_types::error::{CallError, ErrorObject};
+use jsonrpsee_types::error::ErrorObject;
+use jsonrpsee_types::ErrorObjectOwned;
 
 mod error_codes {
 	pub const RUNTIME_ERROR: i32 = 1; // Arbitrary number, but substrate uses the same
@@ -36,8 +36,8 @@ impl Error {
 	}
 }
 
-impl From<Error> for JsonRpseeError {
+impl From<Error> for ErrorObjectOwned {
 	fn from(err: Error) -> Self {
-		CallError::Custom(ErrorObject::owned(err.code(), err.to_string(), None::<()>)).into()
+		ErrorObject::owned(err.code(), err.to_string(), None::<()>)
 	}
 }
diff --git a/scheduler/Cargo.toml b/scheduler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-scheduler"
-version = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 edition = "2021"
 description = "Scheduler pallet for the Encointer blockchain runtime"

diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "test-utils"
-version = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 edition = "2021"
 description = "Test utils for the Encointer blockchain runtime"

diff --git a/test-utils/src/lib.rs b/test-utils/src/lib.rs
@@ -150,7 +150,6 @@ macro_rules! impl_balances {
 			type RuntimeHoldReason = ();
 			type RuntimeFreezeReason = RuntimeFreezeReason;
 			type FreezeIdentifier = ();
-			type MaxHolds = frame_support::traits::ConstU32<0>;
 			type MaxFreezes = frame_support::traits::ConstU32<0>;
 		}
 	};

diff --git a/vouches/Cargo.toml b/vouches/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-vouches"
-version = "5.0.0"
+version = "6.0.0"
 authors = ["Encointer Association <info@encointer.org>"]
 edition = "2021"
 description = "Vouches pallet for the Encointer blockchain runtime"