Skip to content

Commit

Permalink
Merge pull request #58 from centrifuge/polkadot-v0.9.38
Browse files Browse the repository at this point in the history 
Polkadot v0.9.38
  • Loading branch information
@cdamian
cdamian authored Apr 12, 2023
2 parents 56d5ca3 + 6cc5d29 commit 70ca818
Show file tree
Hide file tree
Showing 13 changed files with 1,216 additions and 977 deletions.
1,952 changes: 1,103 additions & 849 deletions Cargo.lock
View file

Large diffs are not rendered by default.

100 changes: 49 additions & 51 deletions core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,69 +21,67 @@ metered = { package = "prioritized-metered-channel", version = "0.2.0" }
fudge-companion = { path = "./src/builder/companion"}

# Substrate primitives dependencies
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-database = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sp-database = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }

# Substarte client dependencies
sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "polkadot-v0.9.37" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-consensus-uncles = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "polkadot-v0.9.38" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }

# Substrate frame dependencies
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.37" }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.38" }

# Polkadot dependencies
polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" }
polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" }
polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38" }
polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38" }
## Currently only needed to make cumulus-relay-chain-inprocess-interface compile, not sure why cumulus works though
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" }
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38" }

# Cumulus dependencies
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" }
cumulus-relay-chain-inprocess-interface= { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38" }
cumulus-relay-chain-inprocess-interface= { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38" }

[dev-dependencies]
polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38" }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
tracing-subscriber = "0.2"
pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
fudge-test-runtime = {path = "./src/tests/test-parachain", default-features = true}

[features]
Expand Down
2 changes: 1 addition & 1 deletion core/src/builder/companion/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ proc-macro = true
syn = { version = "1.0.83", features = ["full", "extra-traits"] }
quote = "1.0.14"
proc-macro2 = "1.0.36"
proc-macro-crate = "1.2.1"
proc-macro-crate = "1.3.1"
1 change: 1 addition & 0 deletions core/src/provider/initiator.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ where
genesis_block_builder,
backend.clone(),
call_executor,
Box::new(task_manager.spawn_handle()),
)
.unwrap();

Expand Down
5 changes: 4 additions & 1 deletion core/src/provider/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use sc_service::{
use sc_transaction_pool_api::{MaintainedTransactionPool, TransactionPool};
use sp_api::{ApiExt, CallApiAt, ConstructRuntimeApi, ProvideRuntimeApi};
use sp_block_builder::BlockBuilder;
use sp_core::traits::CodeExecutor;
use sp_core::traits::{CodeExecutor, SpawnNamed};
use sp_runtime::traits::{Block as BlockT, BlockIdTo};
use sp_transaction_pool::runtime_api::TaggedTransactionQueue;

Expand Down Expand Up @@ -110,6 +110,7 @@ pub trait ClientProvider<Block: BlockT> {
genesis_block_builder: GenesisBlockBuilder<Block, Self::Backend, Self::Exec>,
backend: Arc<Self::Backend>,
exec: LocalCallExecutor<Block, Self::Backend, Self::Exec>,
spawn_handle: Box<dyn SpawnNamed>,
) -> Result<Arc<Self::Client>, ()>;
}

Expand Down Expand Up @@ -155,10 +156,12 @@ where
genesis_block_builder: GenesisBlockBuilder<Block, Self::Backend, Self::Exec>,
backend: Arc<Self::Backend>,
exec: LocalCallExecutor<Block, Self::Backend, Self::Exec>,
spawn_handle: Box<dyn SpawnNamed>,
) -> Result<Arc<Self::Client>, ()> {
TFullClient::new(
backend.clone(),
exec,
spawn_handle,
genesis_block_builder,
None,
None,
Expand Down
5 changes: 1 addition & 4 deletions core/src/tests/parachain.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,6 @@ fn cidp_and_dp_relay(
let parent_header = client.header(parent).unwrap().unwrap();

async move {
let uncles =
sc_consensus_uncles::create_uncles_inherent_data_provider(&*client, parent)?;

let timestamp = FudgeInherentTimestamp::get_instance(instance_id)
.expect("Instance is initialized. qed");

Expand All @@ -137,7 +134,7 @@ fn cidp_and_dp_relay(
);

let relay_para_inherent = FudgeDummyInherentRelayParachain::new(parent_header);
Ok((timestamp, uncles, slot, relay_para_inherent))
Ok((timestamp, slot, relay_para_inherent))
}
}
};
Expand Down
5 changes: 1 addition & 4 deletions core/src/tests/relay_chain.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ fn cidp_and_dp(
let parent_header = client.header(parent).unwrap().unwrap();

async move {
let uncles =
sc_consensus_uncles::create_uncles_inherent_data_provider(&*client, parent)?;

let timestamp = FudgeInherentTimestamp::get_instance(instance_id)
.expect("Instance is initialized. qed");

Expand All @@ -61,7 +58,7 @@ fn cidp_and_dp(
);

let relay_para_inherent = FudgeDummyInherentRelayParachain::new(parent_header);
Ok((timestamp, uncles, slot, relay_para_inherent))
Ok((timestamp, slot, relay_para_inherent))
}
}
};
Expand Down
5 changes: 1 addition & 4 deletions core/src/tests/stand_alone.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ fn cidp_and_dp(
let parent_header = client.header(parent).unwrap().unwrap();

async move {
let uncles =
sc_consensus_uncles::create_uncles_inherent_data_provider(&*client, parent)?;

let timestamp = FudgeInherentTimestamp::get_instance(instance_id)
.expect("Instance is initialized. qed");

Expand All @@ -59,7 +56,7 @@ fn cidp_and_dp(
);

let relay_para_inherent = FudgeDummyInherentRelayParachain::new(parent_header);
Ok((timestamp, uncles, slot, relay_para_inherent))
Ok((timestamp, slot, relay_para_inherent))
}
}
};
Expand Down
Loading

0 comments on commit 70ca818

Please sign in to comment.