Skip to content

Commit

Permalink
Update Substrate to latest master (rc3) (paritytech#129)
Browse files Browse the repository at this point in the history 
* Substrate 606c56d

* update jsonrpsee
  • Loading branch information
@svyatonik @serban300
svyatonik authored and serban300 committed Apr 8, 2024
1 parent 6f56cb8 commit e9a3eb7
Show file tree
Hide file tree
Showing 14 changed files with 189 additions and 187 deletions.
80 changes: 40 additions & 40 deletions bridges/bin/node/node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,107 +19,107 @@ bridge-node-runtime = { version = "0.1.0", path = "../runtime" }
sp-bridge-eth-poa = { version = "0.1.0", path = "../../../primitives/ethereum-poa" }

[dependencies.sc-cli]
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[dependencies.sc-rpc]
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[dependencies.sp-core]
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[dependencies.sc-executor]
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[dependencies.sc-service]
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[dependencies.sp-inherents]
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[dependencies.sc-transaction-pool]
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[dependencies.sp-transaction-pool]
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[dependencies.sc-network]
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[dependencies.sc-consensus-aura]
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[dependencies.sp-consensus-aura]
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[dependencies.sp-consensus]
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[dependencies.grandpa]
package = "sc-finality-grandpa"
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[dependencies.grandpa-primitives]
package = "sp-finality-grandpa"
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[dependencies.sc-consensus]
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[dependencies.sc-client-api]
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[dependencies.sp-runtime]
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[dependencies.sc-basic-authorship]
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[dependencies.substrate-frame-rpc-system]
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"

[build-dependencies]
vergen = "3.1.0"

[build-dependencies.build-script-utils]
package = "substrate-build-script-utils"
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
22 changes: 12 additions & 10 deletions bridges/bin/node/node/src/service.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ macro_rules! new_full_start {
crate::service::Executor,
>($config)?
.with_select_chain(|_config, backend| Ok(sc_consensus::LongestChain::new(backend.clone())))?
.with_transaction_pool(|config, client, _fetcher, prometheus_registry| {
let pool_api = sc_transaction_pool::FullChainApi::new(client.clone());
.with_transaction_pool(|builder| {
let pool_api = sc_transaction_pool::FullChainApi::new(builder.client().clone());
Ok(sc_transaction_pool::BasicPool::new(
config,
builder.config().transaction_pool.clone(),
std::sync::Arc::new(pool_api),
prometheus_registry,
builder.prometheus_registry(),
))
})?
.with_import_queue(
Expand Down Expand Up @@ -158,7 +158,7 @@ pub fn new_full(config: Configuration) -> Result<impl AbstractService, ServiceEr
// if the node isn't actively participating in consensus then it doesn't
// need a keystore, regardless of which protocol we use below.
let keystore = if role.is_authority() {
Some(service.keystore())
Some(service.keystore() as sp_core::traits::BareCryptoStorePtr)
} else {
None
};
Expand Down Expand Up @@ -208,14 +208,16 @@ pub fn new_light(config: Configuration) -> Result<impl AbstractService, ServiceE

ServiceBuilder::new_light::<Block, RuntimeApi, Executor>(config)?
.with_select_chain(|_config, backend| Ok(LongestChain::new(backend.clone())))?
.with_transaction_pool(|config, client, fetcher, prometheus_registry| {
let fetcher = fetcher.ok_or_else(|| "Trying to start light transaction pool without active fetcher")?;
.with_transaction_pool(|builder| {
let fetcher = builder
.fetcher()
.ok_or_else(|| "Trying to start light transaction pool without active fetcher")?;

let pool_api = sc_transaction_pool::LightChainApi::new(client.clone(), fetcher.clone());
let pool_api = sc_transaction_pool::LightChainApi::new(builder.client().clone(), fetcher.clone());
let pool = sc_transaction_pool::BasicPool::with_revalidation_type(
config,
builder.config().transaction_pool.clone(),
Arc::new(pool_api),
prometheus_registry,
builder.prometheus_registry(),
sc_transaction_pool::RevalidationType::Light,
);
Ok(pool)
Expand Down
Loading

0 comments on commit e9a3eb7

Please sign in to comment.