Skip to content

Commit

Permalink
change
Browse files Browse the repository at this point in the history
  • Loading branch information
@enddynayn
enddynayn committed Aug 28, 2024
1 parent 01c233c commit 9cfffa4
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 77 deletions.
37 changes: 0 additions & 37 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,42 +119,6 @@ tokio = { version = "1.25.0", default-features = false }
unicode-normalization = { version = "0.1.22", default-features = false }
clap = { version = "4.2.5", features = ["derive"] }

# <<<<<<< HEAD
# frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-client-db = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-consensus-manual-seal = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
# sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-network-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
# sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
# sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
# sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
# sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
# sp-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
# sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
# sp-wasm-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# substrate-test-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
# =======
sp-externalities = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.13.0", default-features = false}
sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.13.0", default-features = false}
frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.13.0" }
Expand Down Expand Up @@ -191,7 +155,6 @@ sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", bran
sp-wasm-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.13.0" }
substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.13.0" }
substrate-test-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.13.0" }
# >>>>>>> 570713f1 (cargo)

substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.13.0" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.13.0" }
Expand Down
7 changes: 5 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ make start-interval

### Mixed Terminal/Docker

This option runs one collator node as local host process and two relay chain validator nodes in each own docker container.
This option runs two collator node as local host process and two relay chain validator nodes in each own docker container.

1. Start relay chain validator nodes.

Expand All @@ -235,7 +235,10 @@ This option runs one collator node as local host process and two relay chain val
1. Start Frequency as parachain with a single collator.

```sh
make start-frequency
make start-paseo-collator-alice
```
```sh
make start-paseo-collator-bob
```

1. Generate genesis/wasm and onboard Frequency to the relay chain.
Expand Down
4 changes: 2 additions & 2 deletions node/cli/src/benchmarking.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,10 @@ pub fn inherent_benchmark_data() -> Result<InherentData> {
let mock_para_inherent_provider =
cumulus_client_parachain_inherent::MockValidationDataInherentDataProvider {
para_id: 1000.into(),
current_para_block_head: Default::default(),
current_para_block_head: Some(cumulus_primitives_core::relay_chain::HeadData::default()),
current_para_block: 0,
relay_offset: 1,
relay_blocks_per_para_block: 2,
relay_blocks_per_para_block: 1,
xcm_config: Default::default(),
raw_downward_messages: Default::default(),
raw_horizontal_messages: Default::default(),
Expand Down
2 changes: 1 addition & 1 deletion node/service/src/service.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ fn start_consensus(
relay_chain_slot_duration,
proposer,
collator_service,
#[cfg(any(feature = "frequency-testnet", feature = "frequency-local"))]
#[cfg(any(feature = "frequency-testnet", feature = "frequency-local", feature = "frequency-lint-check"))]
// Very limited proposal time.
authoring_duration: Duration::from_millis(2000),
#[cfg(not(any(feature = "frequency-testnet", feature = "frequency-local")))]
Expand Down
3 changes: 1 addition & 2 deletions runtime/common/src/constants.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ pub type MaxSchemaGrants = ConstU32<30>;
/// up by `pallet_aura` to implement `fn slot_duration()`.
///
/// Change this to adjust the block time.
#[cfg(not(any(feature = "frequency-testnet", feature = "frequency-local")))]
pub const MILLISECS_PER_BLOCK: u64 = 12000;
pub const MILLISECS_PER_BLOCK: u64 = 12_000;

#[cfg(any(feature = "frequency-testnet", feature = "frequency-local"))]
pub const MILLISECS_PER_BLOCK: u64 = 6000;
Expand Down
2 changes: 1 addition & 1 deletion runtime/frequency/src/apis.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ impl_runtime_apis! {
}
}

#[cfg(any(feature = "frequency-testnet", feature = "frequency-local"))]
#[cfg(any(not(feature = "frequency-no-relay"), feature = "frequency-lint-check"))]
impl cumulus_primitives_aura::AuraUnincludedSegmentApi<Block> for Runtime {
fn can_build_upon(
included_hash: <Block as BlockT>::Hash,
Expand Down
6 changes: 2 additions & 4 deletions runtime/frequency/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("frequency"),
impl_name: create_runtime_str!("frequency"),
authoring_version: 1,
spec_version: 108,
spec_version: 109,
impl_version: 0,
apis: apis::RUNTIME_API_VERSIONS,
transaction_version: 1,
Expand All @@ -375,7 +375,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("frequency-testnet"),
impl_name: create_runtime_str!("frequency"),
authoring_version: 1,
spec_version: 108,
spec_version: 109,
impl_version: 0,
apis: apis::RUNTIME_API_VERSIONS,
transaction_version: 1,
Expand Down Expand Up @@ -951,7 +951,6 @@ impl pallet_passkey::Config for Runtime {
feature = "frequency",
feature = "runtime-benchmarks",
feature = "frequency-lint-check",
feature = "frequency-no-relay"
))]
/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
/// into the relay chain.
Expand Down Expand Up @@ -982,7 +981,6 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
type ReservedXcmpWeight = ();
type CheckAssociatedRelayNumber = RelayNumberMonotonicallyIncreases;
type WeightInfo = ();
// TODO: Remove this when Async Backing is activated and the feature is set for cumulus-pallet-parachain-system
type ConsensusHook = ConsensusHook;
}

Expand Down
28 changes: 0 additions & 28 deletions scripts/init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,34 +104,6 @@ start-paseo-collator-bob)
$offchain_params \
;;

start-frequency)
printf "\nBuilding frequency with runtime '$parachain' and id '$para_id'...\n"
cargo build --release --features frequency-local

parachain_dir=$base_dir/parachain/${para_id}
mkdir -p $parachain_dir;

if [ "$2" == "purge" ]; then
echo "purging parachain..."
rm -rf $parachain_dir
fi

"${Frequency_BINARY_PATH:-./target/release/frequency}" key generate-node-key --base-path=$parachain_dir/data

./scripts/run_collator.sh \
--chain="frequency-paseo-local" --alice \
--base-path=$parachain_dir/data \
--wasm-execution=compiled \
--force-authoring \
--port $((30333)) \
--rpc-port $((9944)) \
--rpc-external \
--rpc-cors all \
--rpc-methods=Unsafe \
--trie-cache-size 0 \
$offchain_params \
;;

start-frequency-instant)
printf "\nBuilding Frequency without relay. Running with instant sealing ...\n"
cargo build --features frequency-no-relay
Expand Down

0 comments on commit 9cfffa4

Please sign in to comment.