Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hack 500ms deadline as an experiment #726

Closed
wants to merge 3 commits into from
Closed

Hack 500ms deadline as an experiment #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82bc23c
wire it in
JoshOrndorff Aug 21, 2021
b1441e0
hack deadline from 500ms to 1s
JoshOrndorff Aug 23, 2021
8c1964d
oops, change the branch name.
JoshOrndorff Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
241 changes: 174 additions & 67 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions node/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polk
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8", optional = true }

cumulus-client-cli = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098" }
cumulus-client-service = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098" }
nimbus-primitives = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098" }
cumulus-client-cli = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit" }
cumulus-client-service = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit" }
nimbus-primitives = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit" }

polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.8" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.8" }
Expand Down
22 changes: 11 additions & 11 deletions node/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,20 +94,20 @@ fc-db = { git = "https://github.com/purestake/frontier", branch = "moonriver-pha
fc-mapping-sync = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }

# Cumulus dependencies
cumulus-client-cli = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098" }
cumulus-client-collator = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098" }
cumulus-client-network = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098" }
cumulus-client-service = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098" }
cumulus-client-consensus-relay-chain = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098" }
cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098" }
cumulus-client-cli = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit" }
cumulus-client-collator = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit" }
cumulus-client-network = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit" }
cumulus-client-service = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit" }
cumulus-client-consensus-relay-chain = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit" }
cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit" }

# Nimbus dependencies
nimbus-consensus = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098" }
pallet-author-inherent = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098" }
nimbus-consensus = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit" }
pallet-author-inherent = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit" }
# TODO we should be able to depend only on the primitives crate once we move the inherent data provider there.
nimbus-primitives = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098" }
nimbus-primitives = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit" }

# Polkadot dependencies
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.8" }
Expand Down
3 changes: 3 additions & 0 deletions node/service/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,8 @@ where
})
};

let skip_prediction = parachain_config.force_authoring;

sc_service::spawn_tasks(sc_service::SpawnTasksParams {
on_demand: None,
remote_blockchain: None,
Expand Down Expand Up @@ -546,6 +548,7 @@ where
relay_chain_backend: relay_chain_full_node.backend.clone(),
parachain_client: client.clone(),
keystore: params.keystore_container.sync_keystore(),
skip_prediction,
create_inherent_data_providers: move |_, (relay_parent, validation_data, author_id)| {
let parachain_inherent =
cumulus_primitives_parachain_inherent::ParachainInherentData::
Expand Down
2 changes: 1 addition & 1 deletion pallets/author-mapping/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description = "Maps AuthorIds to AccountIds Useful for associating consensus aut

[dependencies]
log = { version="0.4", default-features=false }
nimbus-primitives = { git="https://github.com/purestake/cumulus", branch="joshy-np098", default-features=false }
nimbus-primitives = { git="https://github.com/purestake/cumulus", branch="joshy-hack-500ms-limit", default-features=false }
frame-support = { git="https://github.com/paritytech/substrate", branch="polkadot-v0.9.8", default-features=false }
frame-system = { git="https://github.com/paritytech/substrate", branch="polkadot-v0.9.8", default-features=false }
parity-scale-codec = { version="2.0.0", default-features=false, features=["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion pallets/parachain-staking/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch =
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8", default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8", default-features = false }
log = "0.4"
nimbus-primitives = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098", default-features = false }
nimbus-primitives = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit", default-features = false }
parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.101", optional = true }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8", default-features = false }
Expand Down
8 changes: 4 additions & 4 deletions precompiles/crowdloan-rewards/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ pallet-scheduler = { git="https://github.com/paritytech/substrate", branch="polk
max-encoded-len = { git="https://github.com/paritytech/substrate", branch="polkadot-v0.9.8", features=["derive"] }
serde = "1.0.100"
derive_more = "0.99"
cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }
cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }
cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }

[features]
default = ["std"]
Expand Down
18 changes: 9 additions & 9 deletions runtime/moonbase/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ log = "0.4"

runtime-common = { path = "../common", default-features = false }

pallet-author-inherent = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098", default-features = false }
pallet-author-inherent = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit", default-features = false }
account = { path = "../../primitives/account/", default-features = false }
moonbeam-core-primitives = { path = "../../core-primitives", default-features = false }
pallet-ethereum-chain-id = { path = "../../pallets/ethereum-chain-id", default-features = false }
parachain-staking = { path = "../../pallets/parachain-staking", default-features = false }
parachain-staking-precompiles = { path = "../../precompiles/parachain-staking", default-features = false }
pallet-maintenance-mode = { path = "../../pallets/maintenance-mode", default-features = false }
pallet-author-slot-filter = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098", default-features = false }
nimbus-primitives = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098", default-features = false }
pallet-author-slot-filter = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit", default-features = false }
nimbus-primitives = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit", default-features = false }
pallet-author-mapping = { path = "../../pallets/author-mapping", default-features = false }
evm = { version = "0.27.0", default-features = false, features = ["with-codec"] }
precompile-utils = { path = "../../precompiles/utils", default-features = false }
Expand Down Expand Up @@ -80,10 +80,10 @@ moonbeam-rpc-primitives-debug = { path = "../../primitives/rpc/debug", default-f
moonbeam-rpc-primitives-txpool = { path = "../../primitives/rpc/txpool", default-features = false }

# Cumulus dependencies
cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
parachain-info = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-primitives-timestamp = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }
parachain-info = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }
cumulus-primitives-timestamp = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }

# Benchmarking dependencies
frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8", optional = true }
Expand All @@ -92,8 +92,8 @@ frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", d
frame-try-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8", optional = true }

[dev-dependencies]
cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }
evm = { version = "0.27.0", default-features = false, features = ["with-codec"] }
rlp = "0.5"
hex = "0.4"
Expand Down
18 changes: 9 additions & 9 deletions runtime/moonbeam/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ log = "0.4"

runtime-common = { path = "../common", default-features = false }

pallet-author-inherent = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098", default-features = false }
pallet-author-inherent = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit", default-features = false }
account = { path = "../../primitives/account/", default-features = false }
moonbeam-core-primitives = { path = "../../core-primitives", default-features = false }
pallet-ethereum-chain-id = { path = "../../pallets/ethereum-chain-id", default-features = false }
parachain-staking = { path = "../../pallets/parachain-staking", default-features = false }
parachain-staking-precompiles = { path = "../../precompiles/parachain-staking", default-features = false }
pallet-author-slot-filter = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098", default-features = false }
nimbus-primitives = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098", default-features = false }
pallet-author-slot-filter = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit", default-features = false }
nimbus-primitives = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit", default-features = false }
pallet-author-mapping = { path = "../../pallets/author-mapping", default-features = false }
pallet-maintenance-mode = { path = "../../pallets/maintenance-mode", default-features = false }
evm = { version="0.27.0", default-features=false, features=["with-codec"] }
Expand Down Expand Up @@ -79,18 +79,18 @@ moonbeam-rpc-primitives-debug = { path = "../../primitives/rpc/debug", default-f
moonbeam-rpc-primitives-txpool = { path = "../../primitives/rpc/txpool", default-features = false }

# Cumulus dependencies
cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
parachain-info = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-primitives-timestamp = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }
parachain-info = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }
cumulus-primitives-timestamp = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }

# Benchmarking dependencies
frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8", optional = true, version = '3.0.0' }
frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8", optional = true }

[dev-dependencies]
cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }
evm = { version = "0.27.0", default-features = false, features = ["with-codec"] }
rlp = "0.5"
hex = "0.4"
Expand Down
18 changes: 9 additions & 9 deletions runtime/moonriver/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ log = "0.4"

runtime-common = { path = "../common", default-features = false }

pallet-author-inherent = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098", default-features = false }
pallet-author-inherent = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit", default-features = false }
account = { path = "../../primitives/account/", default-features = false }
moonbeam-core-primitives = { path = "../../core-primitives", default-features = false }
pallet-ethereum-chain-id = { path = "../../pallets/ethereum-chain-id", default-features = false }
parachain-staking = { path = "../../pallets/parachain-staking", default-features = false }
parachain-staking-precompiles = { path = "../../precompiles/parachain-staking", default-features = false }
pallet-author-slot-filter = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098", default-features = false }
nimbus-primitives = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098", default-features = false }
pallet-author-slot-filter = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit", default-features = false }
nimbus-primitives = { git = "https://github.com/purestake/cumulus", branch = "joshy-hack-500ms-limit", default-features = false }
pallet-author-mapping = { path = "../../pallets/author-mapping", default-features = false }
pallet-maintenance-mode = { path = "../../pallets/maintenance-mode", default-features = false }
evm = { version="0.27.0", default-features=false, features=["with-codec"] }
Expand Down Expand Up @@ -78,18 +78,18 @@ moonbeam-rpc-primitives-debug = { path = "../../primitives/rpc/debug", default-f
moonbeam-rpc-primitives-txpool = { path = "../../primitives/rpc/txpool", default-features = false }

# Cumulus dependencies
cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
parachain-info = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-primitives-timestamp = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }
parachain-info = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }
cumulus-primitives-timestamp = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }

# Benchmarking dependencies
frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8", optional = true }
frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8", optional = true }

[dev-dependencies]
cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-hack-500ms-limit" }
evm = { version = "0.27.0", default-features = false, features = ["with-codec"] }
rlp = "0.5"
hex = "0.4"
Expand Down