Bump tx version; Cleanup comments; Move shared dependency

gluwa · Mar 13, 2023 · b8193cb · b8193cb
1 parent 5acd626
commit b8193cb
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 26 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,6 +33,7 @@ assert_matches = { version = "1.5.0" }
 hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
 hex-literal = { version = "0.3.4" }
 jsonrpc-core = { version = "18.0.0" }
+jsonrpsee = { version = "0.16.2" }
 log = { version = "0.4.17" }
 parity-scale-codec = { version = "3.2.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0.152", default-features = false, features = ["derive"] }

diff --git a/creditcoin-js/src/interfaces/registry.ts b/creditcoin-js/src/interfaces/registry.ts
@@ -94,7 +94,7 @@ import type {
     PalletTransactionPaymentChargeTransactionPayment,
     PalletTransactionPaymentEvent,
     PalletTransactionPaymentReleases,
-    SpArithmeticArithmeticError,
+    SpRuntimeArithmeticError,
     SpCoreEcdsaPublic,
     SpCoreEcdsaSignature,
     SpCoreEd25519Public,
@@ -205,7 +205,7 @@ declare module '@polkadot/types/types/registry' {
         PalletTransactionPaymentChargeTransactionPayment: PalletTransactionPaymentChargeTransactionPayment;
         PalletTransactionPaymentEvent: PalletTransactionPaymentEvent;
         PalletTransactionPaymentReleases: PalletTransactionPaymentReleases;
-        SpArithmeticArithmeticError: SpArithmeticArithmeticError;
+        SpRuntimeArithmeticError: SpRuntimeArithmeticError;
         SpCoreEcdsaPublic: SpCoreEcdsaPublic;
         SpCoreEcdsaSignature: SpCoreEcdsaSignature;
         SpCoreEd25519Public: SpCoreEd25519Public;

diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -60,7 +60,7 @@ substrate-prometheus-endpoint = { workspace = true }
 task-scheduler-runtime-api = { workspace = true }
 thiserror = "1.0.38"
 try-runtime-cli = { workspace = true, optional = true }
-jsonrpsee = { version = "0.16.2", features = ["server"] }
+jsonrpsee = { workspace = true, features = ["server"] }
 serde_json = "1.0.93"
 frame-system = { workspace = true }
 pallet-transaction-payment = { workspace = true }

diff --git a/node/rpc/Cargo.toml b/node/rpc/Cargo.toml
@@ -11,7 +11,7 @@ repository.workspace = true
 [dependencies]
 creditcoin-node-runtime = { workspace = true }
 frame-system = { features = ["std"], workspace = true }
-jsonrpsee = { version = "0.16.2", features = ["server", "macros"] }
+jsonrpsee = { workspace = true, features = ["server", "macros"] }
 primitives = { workspace = true, features = ["prometheus"] }
 sc-rpc = { workspace = true }
 serde = { workspace = true }

diff --git a/pallets/staking/src/lib.rs b/pallets/staking/src/lib.rs
@@ -261,27 +261,6 @@ where
 		false
 	}
 
-	/** Based on substrate example
-	 ```ignore
-		macro_rules! bounded_vec {
-			($ ($values:expr),* $(,)?) => {
-				{
-					sp_std::vec![$($values),*].try_into().unwrap()
-				}
-			};
-			( $value:expr ; $repetition:expr ) => {
-				{
-					sp_std::vec![$value ; $repetition].try_into().unwrap()
-				}
-			}
-		}
-		DataProvider::electable_targets(None)
-			.defensive_proof("Trivial 0 AccountId") // Wrap in defensive
-			.map_err(|_| "failed to elect")
-			.map(|t| bounded_vec![(t[0].clone(), Default::default())])
-	 ```
-	*/
-	/// Based on previous implementation
 	fn elect() -> Result<BoundedSupportsOf<Self>, Self::Error> {
 		// Get electable targets
 		DataProvider::electable_targets(None)

diff --git a/runtime/src/version.rs b/runtime/src/version.rs
@@ -17,6 +17,6 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_version: 214,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 10,
+	transaction_version: 11,
 	state_version: 1,
 };