bump substrate+polkadot refs and fix builds (#1989)

* bump refs and fix build

* more fixes

* Fix rialto-parachain node

* Update dependencies for tools/runtime-codegen

* Regenerate rialto-parachain indirect runtime

* Fix register_parachain

* Fix clippy

* Undo clippy allow

---------

Co-authored-by: Serban Iorga <serban@parity.io>
This commit is contained in:
Adrian Catangiu
2023-03-24 15:11:34 +02:00
committed by Bastian Köcher
parent 830afff353
commit e55d4dd6e0
21 changed files with 997 additions and 574 deletions
@@ -103,8 +103,8 @@ impl RegisterParachain {
let para_id: ParaId = relay_client
.storage_value(StorageKey(para_id_key.to_vec()), None)
.await?
.unwrap_or(polkadot_primitives::v2::LOWEST_PUBLIC_ID)
.max(polkadot_primitives::v2::LOWEST_PUBLIC_ID);
.unwrap_or(polkadot_primitives::v4::LOWEST_PUBLIC_ID)
.max(polkadot_primitives::v4::LOWEST_PUBLIC_ID);
log::info!(target: "bridge", "Going to reserve parachain id: {:?}", para_id);
// step 1: reserve a parachain id
@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
[dependencies]
codec = { package = "parity-scale-codec", version = "3.1.5" }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
subxt = { git = "https://github.com/paritytech/subxt", branch = "master", default-features = false, features = [] }
subxt = { version = "0.27.1", default-features = false, features = [] }
# Bridge dependencies
File diff suppressed because it is too large Load Diff
@@ -739,12 +739,12 @@ impl<C: Chain> Client<C> {
async fn jsonrpsee_execute<MF, F, T>(&self, make_jsonrpsee_future: MF) -> Result<T>
where
MF: FnOnce(Arc<RpcClient>) -> F + Send + 'static,
F: Future<Output = Result<T>> + Send,
F: Future<Output = Result<T>> + Send + 'static,
T: Send + 'static,
{
let data = self.data.read().await;
let client = data.client.clone();
data.tokio.spawn(async move { make_jsonrpsee_future(client).await }).await?
data.tokio.spawn(make_jsonrpsee_future(client)).await?
}
/// Returns `true` if version guard can be started.