feat: Update substrate to gear-polkadot-stable2409

common/src/pallet_tests.rs

@@ -42,7 +42,6 @@ macro_rules! impl_pallet_balances_inner {
  ($runtime:ty) => {
  impl pallet_balances::Config for $runtime {
  type MaxLocks = ();
- type MaxHolds = ConstU32<1>;
  type MaxFreezes = ConstU32<1>;
  type MaxReserves = ();
  type RuntimeFreezeReason = RuntimeFreezeReason;
@@ -112,6 +111,7 @@ macro_rules! impl_pallet_system_inner {
  type Block = Block;
  type RuntimeEvent = RuntimeEvent;
  type BlockHashCount = BlockHashCount;
+ type RuntimeTask = ();
  type Version = ();
  type PalletInfo = PalletInfo;
  type AccountData = pallet_balances::AccountData<Balance>;
@@ -121,6 +121,11 @@ macro_rules! impl_pallet_system_inner {
  type SS58Prefix = $crate::pallet_tests::SS58Prefix;
  type OnSetCode = ();
  type MaxConsumers = frame_support::traits::ConstU32<16>;
+ type MultiBlockMigrator = ();
+ type SingleBlockMigrations = ();
+ type PreInherents = ();
+ type PostInherents = ();
+ type PostTransactions = ();
  }
  };
 
@@ -255,6 +260,7 @@ macro_rules! impl_pallet_staking_inner {
  pub const OffendingValidatorsThreshold: Perbill = Perbill::from_percent(17);
  pub const HistoryDepth: u32 = 84;
  pub const MaxNominations: u32 = 16;
+ pub const MaxControllersInDeprecationBatch: u32 = 5900;
  }
 
  impl pallet_staking::Config for Test {
@@ -276,7 +282,6 @@ macro_rules! impl_pallet_staking_inner {
  type EraPayout = StakingConfigEraPayout;
  type NextNewSession = StakingConfigNextNewSession;
  type MaxExposurePageSize = MaxExposurePageSize;
- type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
  type VoterList = pallet_staking::UseNominatorsAndValidatorsMap<Self>;
  type TargetList = pallet_staking::UseValidatorsMap<Self>;
  type NominationsQuota = pallet_staking::FixedNominationsQuota<16>;
@@ -285,6 +290,8 @@ macro_rules! impl_pallet_staking_inner {
  type EventListeners = ();
  type WeightInfo = ();
  type BenchmarkingConfig = pallet_staking::TestBenchmarkingConfig;
+ type MaxControllersInDeprecationBatch = MaxControllersInDeprecationBatch;
+ type DisablingStrategy = pallet_staking::UpToLimitDisablingStrategy;
  }
  };
 

gsdk/Cargo.toml

@@ -30,7 +30,7 @@ serde_json.workspace = true
 subxt.workspace = true
 thiserror.workspace = true
 sp-runtime = { workspace = true, features = [ "std" ] }
-sp-core.workspace = true
+sp-core = { workspace = true, features = [ "std" , "full_crypto"] }
 gsdk-codegen.workspace = true
 parking_lot.workspace = true
 

gsdk/src/client.rs

@@ -26,7 +26,6 @@ use jsonrpsee::{
  core::{
  client::{ClientT, Subscription, SubscriptionClientT, SubscriptionKind},
  traits::ToRpcParams,
- Error as JsonRpseeError,
  },
  http_client::{HttpClient, HttpClientBuilder},
  types::SubscriptionId,
@@ -50,7 +49,7 @@ const ONE_HUNDRED_MEGA_BYTES: u32 = 100 * 1024 * 1024;
 struct Params(Option<Box<RawValue>>);
 
 impl ToRpcParams for Params {
- fn to_rpc_params(self) -> StdResult<Option<Box<RawValue>>, JsonRpseeError> {
+ fn to_rpc_params(self) -> StdResult<Option<Box<RawValue>>, serde_json::Error> {
  Ok(self.0)
  }
 }
@@ -69,11 +68,7 @@ impl RpcClient {
  if uri.starts_with("ws") {
  Ok(Self::Ws(
  WsClientBuilder::default()
- // Actually that stand for the response too.
- // *WARNING*:
- // After updating jsonrpsee to 0.20.0 and higher
- // use another method created only for that.
- .max_request_body_size(ONE_HUNDRED_MEGA_BYTES)
+ .max_request_size(ONE_HUNDRED_MEGA_BYTES)
  .connection_timeout(Duration::from_millis(timeout))
  .request_timeout(Duration::from_millis(timeout))
  .build(uri)

gsdk/src/result.rs

@@ -91,7 +91,7 @@ pub enum Error {
  #[error(transparent)]
  Tx(#[from] TxError),
  #[error(transparent)]
- SubxtRpc(#[from] jsonrpsee::core::Error),
+ SubxtRpc(#[from] jsonrpsee::core::ClientError),
  #[error("Page {0} of Program {1} was not found in the storage.")]
  PageNotFound(u32, String),
  #[error("Program has been terminated.")]

gsdk/tests/rpc.rs

@@ -24,7 +24,7 @@ use gear_core::{
 };
 use gear_core_errors::{ReplyCode, SuccessReplyReason};
 use gsdk::{Api, Error, Result};
-use jsonrpsee::types::error::{CallError, ErrorObject};
+use jsonrpsee::types::error::ErrorObject;
 use parity_scale_codec::Encode;
 use std::{borrow::Cow, process::Command, str::FromStr, time::Instant};
 use subxt::{error::RpcError, utils::H256, Error as SubxtError};
@@ -50,11 +50,11 @@ async fn pallet_errors_formatting() -> Result<()> {
  .expect_err("Must return error");
 
  let expected_err = Error::Subxt(SubxtError::Rpc(RpcError::ClientError(Box::new(
- CallError::Custom(ErrorObject::owned(
+ ErrorObject::owned(
  8000,
  "Runtime error",
  Some("Extrinsic `gear.upload_program` failed: 'ProgramConstructionFailed'"),
- )),
+ ),
  ))));
 
  assert_eq!(format!("{err}"), format!("{expected_err}"));
@@ -285,11 +285,11 @@ async fn test_runtime_wasm_blob_version_history() -> Result<()> {
  .runtime_wasm_blob_version(Some(no_method_block_hash))
  .await;
 
- let err = CallError::Custom(ErrorObject::owned(
+ let err = ErrorObject::owned(
  9000,
  "Unable to find WASM blob version in WASM blob",
  None::<String>,
- ));
+ );
  assert!(
  matches!(
  &wasm_blob_version_result,

node/authorship/Cargo.toml

@@ -33,6 +33,7 @@ sc-service.workspace = true
 sp-core = { workspace = true, features = ["std"] }
 sp-api = { workspace = true, features = ["std"] }
 sp-consensus.workspace = true
+sp-io = { workspace = true, features = ["std"] }
 sp-runtime = { workspace = true, features = ["std"] }
 sp-blockchain.workspace = true
 sp-inherents = { workspace = true, features = ["std"] }

node/authorship/src/tests.rs

@@ -29,7 +29,6 @@ use crate::{
  block_builder::{BlockBuilder, BlockBuilderBuilder},
  ProposerFactory,
 };
-
 use codec::{Decode, Encode};
 use core::convert::TryFrom;
 use demo_constructor::{Calls, Scheme, WASM_BINARY};
@@ -41,7 +40,7 @@ use pallet_gear_rpc_runtime_api::GearApi;
 use parking_lot::{Mutex, RwLock};
 use runtime_primitives::{Block as TestBlock, BlockNumber};
 use sc_client_api::Backend as _;
-use sc_executor::{NativeElseWasmExecutor, WasmExecutor};
+use sc_executor::WasmExecutor;
 use sc_service::client::Client;
 use sc_transaction_pool::{BasicPool, FullPool};
 use sc_transaction_pool_api::{
@@ -69,7 +68,7 @@ use std::{
 };
 use testing::{
  client::{
- Backend as TestBackend, Client as TestClient, ClientBlockImportExt, ExecutorDispatch,
+ Backend as TestBackend, Client as TestClient, ClientBlockImportExt, ExtendHostFunctions,
  TestClientBuilder, TestClientBuilderExt,
  },
  keyring::{alice, bob, sign, signed_extra, CheckedExtrinsic},
@@ -78,15 +77,18 @@ use vara_runtime::{
  AccountId, Runtime, RuntimeApi as RA, RuntimeCall, UncheckedExtrinsic, SLOT_DURATION, VERSION,
 };
 
+type RuntimeExecutor = sc_executor::WasmExecutor<
+ sc_executor::sp_wasm_interface::ExtendedHostFunctions<
+ sp_io::SubstrateHostFunctions,
+ ExtendHostFunctions,
+ >,
+>;
+
 type TestProposal = sp_consensus::Proposal<TestBlock, ()>;
 
-fn get_executor() -> &'static RwLock<ExecutorDispatch> {
- static EXECUTOR: OnceLock<RwLock<ExecutorDispatch>> = OnceLock::new();
- EXECUTOR.get_or_init(|| {
- RwLock::new(NativeElseWasmExecutor::new_with_wasm_executor(
- WasmExecutor::builder().build(),
- ))
- })
+fn get_executor() -> &'static RwLock<RuntimeExecutor> {
+ static EXECUTOR: OnceLock<RwLock<RuntimeExecutor>> = OnceLock::new();
+ EXECUTOR.get_or_init(|| RwLock::new(WasmExecutor::builder().build()))
 }
 
 const SOURCE: TransactionSource = TransactionSource::External;
@@ -268,7 +270,7 @@ pub fn init() -> (
 }
 
 pub fn create_proposal<A>(
- mut client: Arc<TestClient>,
+ client: Arc<TestClient>,
  _backend: Arc<TestBackend>,
  txpool: Arc<A>,
  spawner: sp_core::testing::TaskExecutor,

node/cli/Cargo.toml

@@ -50,6 +50,7 @@ sp-timestamp = { workspace = true, features = ["std"] }
 
 # Substrate other (benchmarking etc)
 frame-system = { workspace = true, features = ["std"] }
+frame-metadata-hash-extension = { workspace = true, features = ["std"] }
 frame-benchmarking = { workspace = true, optional = true, features = ["std"] }
 frame-benchmarking-cli = { workspace = true, optional = true }
 

node/cli/src/benchmarking.rs

@@ -84,6 +84,7 @@ macro_rules! with_signed_payload {
  runtime::CustomCheckNonce::<runtime::Runtime>::from($nonce),
  frame_system::CheckWeight::<runtime::Runtime>::new(),
  pallet_gear_payment::CustomChargeTransactionPayment::<runtime::Runtime>::from($tip),
+ frame_metadata_hash_extension::CheckMetadataHash::<runtime::Runtime>::new(false),
  );
 
  let $raw_payload = runtime::SignedPayload::from_raw(
@@ -99,6 +100,7 @@ macro_rules! with_signed_payload {
  (),
  (),
  (),
+ None,
  ),
  );
 

node/cli/src/command.rs

@@ -20,7 +20,7 @@ use crate::cli::{Cli, Subcommand};
 use runtime_primitives::Block;
 use sc_cli::{ChainSpec, SubstrateCli};
 use sc_service::config::BasePath;
-use service::{chain_spec, IdentifyVariant};
+use service::{chain_spec, ExtendHostFunctions, IdentifyVariant};
 
 impl SubstrateCli for Cli {
  fn impl_name() -> String {
@@ -211,7 +211,7 @@ pub fn run() -> sc_cli::Result<()> {
  use frame_benchmarking_cli::{
  BenchmarkCmd, ExtrinsicFactory, SUBSTRATE_REFERENCE_HARDWARE,
  };
- use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
+ use sc_executor::sp_wasm_interface::ExtendedHostFunctions;
  use sp_keyring::Sr25519Keyring;
 
  let runner = cli.create_runner(cmd)?;
@@ -231,12 +231,10 @@ pub fn run() -> sc_cli::Result<()> {
  match &config.chain_spec {
  #[cfg(feature = "vara-native")]
  spec if spec.is_vara() => cmd
- .run::<service::vara_runtime::Block, ExtendedHostFunctions<
- sp_io::SubstrateHostFunctions,
- <service::VaraExecutorDispatch as NativeExecutionDispatch>::ExtendHostFunctions,
- >>(
- config,
- ),
+ .run_with_spec::<sp_runtime::traits::HashingFor<service::vara_runtime::Block>, ExtendedHostFunctions<
+ sp_io::SubstrateHostFunctions,
+ ExtendHostFunctions,
+ >>(Some(config.chain_spec)),
  _ => Err("invalid chain spec".into()),
  }
  }

node/service/Cargo.toml

@@ -39,6 +39,7 @@ gear-runtime-common = { workspace = true, features = ["std"] }
 vara-runtime = { workspace = true, optional = true, features = ["std", "dev"] }
 
 # Substrate Client
+sc-authority-discovery.workspace = true
 sc-chain-spec.workspace = true
 sc-executor.workspace = true
 sc-executor-common.workspace = true
@@ -47,7 +48,6 @@ sc-telemetry.workspace = true
 sc-network.workspace = true
 sc-network-common.workspace = true
 sc-network-sync.workspace = true
-sc-network-statement.workspace = true
 sc-consensus-slots.workspace = true
 sc-transaction-pool.workspace = true
 sc-transaction-pool-api.workspace = true
@@ -72,6 +72,7 @@ sp-api = { workspace = true, features = ["std"] }
 sp-authority-discovery = { workspace = true, optional = true, features = ["std"] }
 sp-consensus.workspace = true
 sp-consensus-babe = { workspace = true, features = ["std"] }
+sp-io = { workspace = true, features = ["std"] }
 sp-transaction-pool = { workspace = true, features = ["std"] }
 sp-transaction-storage-proof = { workspace = true, features = ["std"] }
 sp-consensus-grandpa = { workspace = true, features = ["std"] }
@@ -82,6 +83,7 @@ sp-block-builder = { workspace = true, features = ["std"] }
 sp-keystore = { workspace = true, features = ["std"] }
 sp-trie = { workspace = true, features = ["std"] }
 sp-storage = { workspace = true, features = ["std"] }
+sp-state-machine = { workspace = true, features = ["std"] }
 sp-offchain = { workspace = true, features = ["std"] }
 sp-session = { workspace = true, features = ["std"] }
 
@@ -96,7 +98,6 @@ frame-benchmarking = { workspace = true, features = ["std"] }
 frame-benchmarking-cli.workspace = true
 substrate-frame-rpc-system.workspace = true
 substrate-state-trie-migration-rpc.workspace = true
-try-runtime-cli = { workspace = true, optional = true }
 
 [build-dependencies]
 substrate-build-script-utils.workspace = true
@@ -118,5 +119,4 @@ runtime-benchmarks-checkers = [
 ]
 try-runtime = [
  "vara-runtime?/try-runtime",
- "try-runtime-cli",
 ]

node/service/src/chain_spec/mod.rs

@@ -44,7 +44,7 @@ pub struct Extensions {
 }
 
 /// General `ChainSpec` used as a basis for a specialized config.
-pub type RawChainSpec = sc_service::GenericChainSpec<(), Extensions>;
+pub type RawChainSpec = sc_service::GenericChainSpec<Extensions>;
 
 /// Generate a crypto pair from seed.
 pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {

node/service/src/chain_spec/vara.rs

@@ -34,7 +34,7 @@ use vara_runtime::{
 };
 
 /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.
-pub type ChainSpec = sc_service::GenericChainSpec<(), Extensions>;
+pub type ChainSpec = sc_service::GenericChainSpec<Extensions>;
 
 /// Returns the [`Properties`] for the Vara network.
 pub fn vara_properties() -> Properties {