diff --git a/Cargo.lock b/Cargo.lock index d6155bb536..95e39bad8f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2905,7 +2905,7 @@ dependencies = [ [[package]] name = "kusama-runtime" version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "bitvec", "frame-executive", @@ -5017,7 +5017,7 @@ checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e" [[package]] name = "polkadot-availability-bitfield-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "futures 0.3.7", "log 0.4.11", @@ -5031,7 +5031,7 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "futures 0.3.7", "log 0.4.11", @@ -5049,7 +5049,7 @@ dependencies = [ [[package]] name = "polkadot-cli" version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "frame-benchmarking-cli", "log 0.4.11", @@ -5068,7 +5068,7 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "futures 0.3.7", "log 0.4.11", @@ -5082,7 +5082,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.7.30" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "parity-scale-codec", "sp-core", @@ -5093,7 +5093,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -5106,7 +5106,7 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "async-trait", "futures 0.3.7", @@ -5123,7 +5123,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "futures 0.3.7", "log 0.4.11", @@ -5139,7 +5139,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "futures 0.3.7", "futures-timer 3.0.2", @@ -5159,7 +5159,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "bitvec", "futures 0.3.7", @@ -5177,7 +5177,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "derive_more 0.99.11", "futures 0.3.7", @@ -5193,7 +5193,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-selection" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "futures 0.3.7", "log 0.4.11", @@ -5206,7 +5206,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "futures 0.3.7", "log 0.4.11", @@ -5222,7 +5222,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "futures 0.3.7", "polkadot-node-subsystem", @@ -5234,7 +5234,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-proposer" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "futures 0.3.7", "futures-timer 3.0.2", @@ -5258,7 +5258,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "bitvec", "futures 0.3.7", @@ -5272,7 +5272,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "futures 0.3.7", "polkadot-node-subsystem", @@ -5284,7 +5284,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -5295,7 +5295,7 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "futures 0.3.7", "parity-scale-codec", @@ -5308,7 +5308,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "async-trait", "derive_more 0.99.11", @@ -5331,7 +5331,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-test-helpers" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "async-trait", "futures 0.3.7", @@ -5353,7 +5353,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "async-trait", "futures 0.3.7", @@ -5376,7 +5376,7 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "async-trait", "futures 0.3.7", @@ -5393,7 +5393,7 @@ dependencies = [ [[package]] name = "polkadot-parachain" version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "derive_more 0.99.11", "futures 0.3.7", @@ -5416,7 +5416,7 @@ dependencies = [ [[package]] name = "polkadot-pov-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "futures 0.3.7", "log 0.4.11", @@ -5429,7 +5429,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "bitvec", "frame-system", @@ -5454,7 +5454,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "jsonrpc-core", "pallet-transaction-payment-rpc", @@ -5484,7 +5484,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "bitvec", "frame-executive", @@ -5547,7 +5547,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "bitvec", "frame-support", @@ -5582,7 +5582,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" version = "0.8.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "bitvec", "frame-support", @@ -5611,12 +5611,13 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "xcm", ] [[package]] name = "polkadot-service" version = "0.8.3" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "frame-benchmarking", "frame-system-rpc-runtime-api", @@ -5695,7 +5696,7 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "arrayvec 0.5.2", "futures 0.3.7", @@ -5712,7 +5713,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -5722,7 +5723,7 @@ dependencies = [ [[package]] name = "polkadot-test-client" version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "parity-scale-codec", "polkadot-node-subsystem", @@ -5746,7 +5747,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "bitvec", "frame-executive", @@ -5800,7 +5801,7 @@ dependencies = [ [[package]] name = "polkadot-test-service" version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "frame-benchmarking", "frame-system", @@ -5851,7 +5852,7 @@ dependencies = [ [[package]] name = "polkadot-validation" version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "futures 0.3.7", "log 0.4.11", @@ -6594,7 +6595,7 @@ dependencies = [ [[package]] name = "rococo-runtime" version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "frame-executive", "frame-support", @@ -8227,7 +8228,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2e7292cd84121db8bcd2317c1ad70e348ee52f7a" +source = "git+https://github.com/paritytech/substrate?branch=master#9ec43d880823e9ad082de7e3038ac9777613fa15" dependencies = [ "parity-scale-codec", "sp-api", @@ -8622,7 +8623,7 @@ dependencies = [ [[package]] name = "sp-test-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2e7292cd84121db8bcd2317c1ad70e348ee52f7a" +source = "git+https://github.com/paritytech/substrate?branch=master#9ec43d880823e9ad082de7e3038ac9777613fa15" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -8920,7 +8921,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2e7292cd84121db8bcd2317c1ad70e348ee52f7a" +source = "git+https://github.com/paritytech/substrate?branch=master#9ec43d880823e9ad082de7e3038ac9777613fa15" dependencies = [ "cfg-if 0.1.10", "frame-executive", @@ -8962,7 +8963,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2e7292cd84121db8bcd2317c1ad70e348ee52f7a" +source = "git+https://github.com/paritytech/substrate?branch=master#9ec43d880823e9ad082de7e3038ac9777613fa15" dependencies = [ "futures 0.3.7", "parity-scale-codec", @@ -8983,7 +8984,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2e7292cd84121db8bcd2317c1ad70e348ee52f7a" +source = "git+https://github.com/paritytech/substrate?branch=master#9ec43d880823e9ad082de7e3038ac9777613fa15" dependencies = [ "futures 0.3.7", "substrate-test-utils-derive", @@ -8993,7 +8994,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2e7292cd84121db8bcd2317c1ad70e348ee52f7a" +source = "git+https://github.com/paritytech/substrate?branch=master#9ec43d880823e9ad082de7e3038ac9777613fa15" dependencies = [ "proc-macro-crate", "quote 1.0.7", @@ -9009,7 +9010,7 @@ checksum = "54cab12167e32b38a62c5ea5825aa0874cde315f907a46aad2b05aa8ef3d862f" [[package]] name = "substrate-wasm-builder-runner" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2e7292cd84121db8bcd2317c1ad70e348ee52f7a" +source = "git+https://github.com/paritytech/substrate?branch=master#9ec43d880823e9ad082de7e3038ac9777613fa15" [[package]] name = "subtle" @@ -10189,7 +10190,7 @@ dependencies = [ [[package]] name = "westend-runtime" version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-adder-collator-integration-test#11347d4d050f9c405dea096d8de1ed388399bc1f" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" dependencies = [ "bitvec", "frame-executive", @@ -10326,6 +10327,14 @@ dependencies = [ "zeroize", ] +[[package]] +name = "xcm" +version = "0.8.22" +source = "git+https://github.com/paritytech/polkadot?branch=master#cfde07678a4086b724c6333f8607df92c7fbf92b" +dependencies = [ + "parity-scale-codec", +] + [[package]] name = "yamux" version = "0.8.0" diff --git a/collator/Cargo.toml b/collator/Cargo.toml index 958b60d9f0..927f7107c6 100644 --- a/collator/Cargo.toml +++ b/collator/Cargo.toml @@ -19,13 +19,13 @@ sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot dependencies -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test", features = [ "real-overseer" ] } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-validation = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", features = [ "real-overseer" ] , branch = "master" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-validation = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Cumulus dependencies cumulus-consensus = { path = "../consensus" } @@ -51,7 +51,7 @@ sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = " substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot dependencies -polkadot-node-subsystem-test-helpers = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } +polkadot-node-subsystem-test-helpers = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Other dependencies env_logger = "0.7.1" diff --git a/collator/src/lib.rs b/collator/src/lib.rs index b55f2ad434..764af36980 100644 --- a/collator/src/lib.rs +++ b/collator/src/lib.rs @@ -42,7 +42,7 @@ use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProt use polkadot_overseer::OverseerHandler; use polkadot_primitives::v1::{ Block as PBlock, BlockData, CollatorPair, Hash as PHash, HeadData, Id as ParaId, PoV, - UpwardMessage, + UpwardMessage, BlockNumber as PBlockNumber, }; use polkadot_service::RuntimeApiCollection; @@ -215,6 +215,7 @@ where &mut self, block: ParachainBlockData, block_hash: Block::Hash, + relay_block_number: PBlockNumber, ) -> Option { let block_data = BlockData(block.encode()); let header = block.into_header(); @@ -248,6 +249,9 @@ where proof_of_validity: PoV { block_data }, // TODO! processed_downward_messages: 0, + // TODO! + horizontal_messages: Vec::new(), + hrmp_watermark: relay_block_number, }) }) } @@ -360,7 +364,7 @@ where return None; } - let collation = self.build_collation(b, block_hash)?; + let collation = self.build_collation(b, block_hash, validation_data.persisted.block_number)?; let pov_hash = collation.proof_of_validity.hash(); self.wait_to_announce diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml index 32c7013213..1a45ac4c34 100644 --- a/consensus/Cargo.toml +++ b/consensus/Cargo.toml @@ -18,8 +18,8 @@ sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" } # polkadot deps -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "master" } # other deps futures = { version = "0.3.1", features = ["compat"] } diff --git a/network/Cargo.toml b/network/Cargo.toml index b6e2a25df5..0e70841f6f 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -15,13 +15,13 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } # polkadot deps -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-statement-table = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-validation = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-statement-table = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-validation = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } # cumulus deps cumulus-primitives = { path = "../primitives" } diff --git a/network/src/tests.rs b/network/src/tests.rs index 7e31894a42..e41c051161 100644 --- a/network/src/tests.rs +++ b/network/src/tests.rs @@ -21,9 +21,9 @@ use polkadot_node_primitives::{SignedFullStatement, Statement}; use polkadot_primitives::v1::{ AuthorityDiscoveryId, Block as PBlock, BlockNumber, CandidateCommitments, CandidateDescriptor, CandidateEvent, CommittedCandidateReceipt, CoreState, GroupRotationInfo, Hash as PHash, - HeadData, Header as PHeader, Id as ParaId, OccupiedCoreAssumption, ParachainHost, - PersistedValidationData, SessionIndex, SigningContext, ValidationCode, ValidationData, - ValidationOutputs, ValidatorId, ValidatorIndex, InboundDownwardMessage, + HeadData, Header as PHeader, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage, + OccupiedCoreAssumption, ParachainHost, PersistedValidationData, SessionIndex, SigningContext, + ValidationCode, ValidationData, ValidationOutputs, ValidatorId, ValidatorIndex, }; use sp_api::{ApiRef, ProvideRuntimeApi}; use sp_blockchain::{Error as ClientError, HeaderBackend}; @@ -35,6 +35,7 @@ use sp_runtime::{ traits::{NumberFor, Zero}, RuntimeAppPublic, }; +use std::collections::BTreeMap; #[derive(Clone)] struct DummyCollatorNetwork; @@ -407,6 +408,12 @@ sp_api::mock_impl_runtime_apis! { fn historical_validation_code(_: ParaId, _: BlockNumber) -> Option { None } + + fn inbound_hrmp_channels_contents( + _: ParaId, + ) -> BTreeMap>> { + BTreeMap::new() + } } } diff --git a/parachain-upgrade/Cargo.toml b/parachain-upgrade/Cargo.toml index 7f3e6bf4aa..dd0b34fce4 100644 --- a/parachain-upgrade/Cargo.toml +++ b/parachain-upgrade/Cargo.toml @@ -11,7 +11,7 @@ cumulus-primitives = { path = "../primitives", default-features = false } cumulus-runtime = { path = "../runtime", default-features = false } # Polkadot dependencies -parachain = { package = "polkadot-parachain", git = "https://github.com/paritytech/polkadot", default-features = false , branch = "bkchr-adder-collator-integration-test" } +parachain = { package = "polkadot-parachain", git = "https://github.com/paritytech/polkadot", default-features = false , branch = "master" } # Substrate dependencies frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" } diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 968ad79d8f..b0f46efc3e 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -12,15 +12,15 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", default-features sc-chain-spec = { git = "https://github.com/paritytech/substrate", optional = true, branch = "master" } # Polkadot dependencies -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "bkchr-adder-collator-integration-test" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "bkchr-adder-collator-integration-test" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Other dependencies codec = { package = "parity-scale-codec", version = "1.0.5", default-features = false, features = [ "derive" ] } impl-trait-for-tuples = "0.1.3" # Polkadot dependencies -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "bkchr-adder-collator-integration-test" } +polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "master" } [features] default = [ "std" ] diff --git a/rococo-parachains/Cargo.toml b/rococo-parachains/Cargo.toml index b5f51c2cde..17e26c3d9d 100644 --- a/rococo-parachains/Cargo.toml +++ b/rococo-parachains/Cargo.toml @@ -62,11 +62,11 @@ cumulus-primitives = { path = "../primitives" } cumulus-service = { path = "../service" } # Polkadot dependencies -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" } [build-dependencies] substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } @@ -78,10 +78,10 @@ rand = "0.7.3" tokio = { version = "0.2.13", features = ["macros"] } # Polkadot dependencies -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Substrate dependencies pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/rococo-parachains/runtime/Cargo.toml b/rococo-parachains/runtime/Cargo.toml index 0bb2928082..da797ecae0 100644 --- a/rococo-parachains/runtime/Cargo.toml +++ b/rococo-parachains/runtime/Cargo.toml @@ -39,7 +39,7 @@ cumulus-parachain-upgrade = { path = "../../parachain-upgrade", default-features cumulus-primitives = { path = "../../primitives", default-features = false } # Polkadot dependencies -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "bkchr-adder-collator-integration-test" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "master" } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "2.0.0" } diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 2cfdb18e9e..19a4dace6c 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -23,7 +23,7 @@ frame-executive = { git = "https://github.com/paritytech/substrate", default-fea sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot dependencies -parachain = { package = "polkadot-parachain", git = "https://github.com/paritytech/polkadot", default-features = false, features = [ "wasm-api" ] , branch = "bkchr-adder-collator-integration-test" } +parachain = { package = "polkadot-parachain", git = "https://github.com/paritytech/polkadot", default-features = false, features = [ "wasm-api" ] , branch = "master" } [dev-dependencies] sc-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } diff --git a/runtime/src/validate_block/implementation.rs b/runtime/src/validate_block/implementation.rs index 68d9da13e1..abcbea5ffd 100644 --- a/runtime/src/validate_block/implementation.rs +++ b/runtime/src/validate_block/implementation.rs @@ -161,11 +161,20 @@ pub fn validate_block>(params: ValidationParams) - .and_then(|v| Decode::decode(&mut &v[..]).ok()) .unwrap_or_default(); + let validation_data: ValidationData = + with_storage(|storage| storage.modified(VALIDATION_DATA)) + .and_then(|v| Decode::decode(&mut &v[..]).ok()) + .expect("`ValidationData` is required to be placed into the storage!"); + ValidationResult { head_data, new_validation_code, upward_messages, processed_downward_messages, + //TODO! + horizontal_messages: Vec::new(), + //TODO! + hrmp_watermark: validation_data.persisted.block_number, } } diff --git a/service/Cargo.toml b/service/Cargo.toml index c3fb3e816a..174be9ad4c 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -21,9 +21,9 @@ sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "mast sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot dependencies -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Other deps futures = "0.3.6" diff --git a/test/client/Cargo.toml b/test/client/Cargo.toml index 78ade9f1b0..a89cec1078 100644 --- a/test/client/Cargo.toml +++ b/test/client/Cargo.toml @@ -27,7 +27,7 @@ cumulus-test-service = { path = "../service" } cumulus-primitives = { path = "../../primitives" } # Polkadot deps -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Other deps codec = { package = "parity-scale-codec", version = "1.0.5", default-features = false, features = [ "derive" ] } diff --git a/test/runtime/Cargo.toml b/test/runtime/Cargo.toml index 4ec03e2266..5ad0329baa 100644 --- a/test/runtime/Cargo.toml +++ b/test/runtime/Cargo.toml @@ -35,7 +35,7 @@ cumulus-primitives = { path = "../../primitives", default-features = false } cumulus-runtime = { path = "../../runtime", default-features = false } # Polkadot dependencies -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "bkchr-adder-collator-integration-test" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "master" } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "2.0.0" } diff --git a/test/service/Cargo.toml b/test/service/Cargo.toml index 704c1dd880..3a29d7a244 100644 --- a/test/service/Cargo.toml +++ b/test/service/Cargo.toml @@ -36,10 +36,10 @@ sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Cumulus cumulus-consensus = { path = "../../consensus" } @@ -56,8 +56,8 @@ futures = { version = "0.3.5" } tokio = { version = "0.2.21", features = ["macros"] } # Polkadot dependencies -polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } -polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" } +polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Substrate dependencies pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master" }