Minor release and local relay running fixes (#2359)

# Goal
The goal of this PR is to fix the issues with running Paseo-Local, and
confirm that there are no issues with fatxpool

Part of #2333

# Discussion

- Updated the fee test to be a bit looser with the new benchmark runners
- Adding missing `with_id` to the `frequnecy-paseo-local` spec generator
- Bumped the Paseo-Local spec to the new v1.4.2
- Removed/Fixed the old generate_spec.sh script
- Added notes about `setSchedulingLookahead` for the Paseo Local chain
- Added a third tech council member for local to break ties

# Checklist
- [x] Updated Readme?
- [x] Spec version incremented?

Author: wilwade

Makefile

@@ -90,6 +90,10 @@ register:
 onboard:
 	./scripts/init.sh onboard-frequency-paseo-local
 
+.PHONY: onboard-res-local
+onboard-debug:
+	./scripts/init.sh onboard-res-local
+
 .PHONY: onboard-docker
 onboard-docker:
 	env DOCKER_ONBOARD=true PARA_DOCKER_IMAGE=frequencychain/collator-node-local:latest ./scripts/init.sh onboard-frequency-paseo-local
@@ -98,12 +102,13 @@ onboard-docker:
 offboard:
 	./scripts/init.sh offboard-frequency-paseo-local
 
-.PHONY: specs-testnet-2000 specs-paseo-local
-specs-testnet-2000:
-	./scripts/generate_specs.sh 2000 paseo-2000 release
+.PHONY: specs-frequency-paseo-local-debug specs-frequency-paseo-local-release
+
+specs-frequency-paseo-local-debug:
+	./scripts/generate_specs.sh 2000 frequency-paseo-local debug
 
-specs-paseo-local:
-	./scripts/generate_relay_specs.sh
+specs-frequency-paseo-local-release:
+	./scripts/generate_specs.sh 2000 frequency-paseo-local release
 
 .PHONY: format
 format:

README.md

@@ -224,6 +224,8 @@ This option runs two collator nodes as local host processes and two relay chain
    make start-paseo-relay
    ```
 
+   ALERT: You likely need to manually set the scheduling lookahead. `sudo(configuration.setSchedulingLookahead(3))` and wait for it to apply.
+
 1. Register a new parachain slot (parachain id) for Frequency. _Note, if parachain was
    previously registered on a running relay chain and no new registration is required,
    then you can skip the above step._

node/service/src/chain_spec/frequency_paseo_local.rs

@@ -12,8 +12,6 @@ pub type ChainSpec = sc_service::GenericChainSpec<Extensions>;
 // Generic chain spec, in case when we don't have the native runtime.
 pub type RelayChainSpec = sc_service::GenericChainSpec<RelayChainExtensions>;
 
-// TODO: Remove once on a Polkadot-SDK with Paseo-Local
-#[allow(clippy::unwrap_used)]
 /// Generates the Paseo-Local Relay chain spec from the json
 pub fn load_paseo_local_spec() -> RelayChainSpec {
 	RelayChainSpec::from_json_bytes(&include_bytes!("../../../../resources/paseo-local.json")[..])
@@ -34,6 +32,7 @@ pub fn local_paseo_testnet_config() -> ChainSpec {
 		},
 	)
 	.with_name("Frequency Local Testnet")
+	.with_id("frequency-local")
 	.with_protocol_id("frequency-paseo-local")
 	.with_properties(properties)
 	.with_chain_type(ChainType::Local)

resources/paseo-local.json

@@ -77,8 +77,8 @@ mod test {
 
 		assert_eq!(p, 100_000);
 
-		assert!(q >= 50_000_000);
-		assert!(q <= 110_000_000);
+		assert!(q >= 75_000_000);
+		assert!(q <= 130_000_000);
 
 		assert_eq!(p / q, Balance::from(0u128));
 	}

runtime/common/src/fee.rs

@@ -156,5 +156,6 @@ pub fn default_technical_committee_members() -> Vec<AccountId> {
 	vec![
 		get_account_id_from_seed::<sr25519::Public>("Bob"),
 		get_account_id_from_seed::<sr25519::Public>("Dave"),
+		get_account_id_from_seed::<sr25519::Public>("Eve"),
 	]
 }

runtime/frequency/src/genesis/helpers.rs

@@ -435,7 +435,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: Cow::Borrowed("frequency"),
 	impl_name: Cow::Borrowed("frequency"),
 	authoring_version: 1,
-	spec_version: 152,
+	spec_version: 153,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -449,7 +449,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: Cow::Borrowed("frequency-testnet"),
 	impl_name: Cow::Borrowed("frequency"),
 	authoring_version: 1,
-	spec_version: 152,
+	spec_version: 153,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,

runtime/frequency/src/lib.rs

@@ -3,7 +3,7 @@
 set -e
 
 parachain_id=$1
-build_step=$2
+chain=$2
 profile=$3
 if [[ $parachain_id == "" ]]; then
   echo "Chain Name or Parachain ID argument not provided"
@@ -15,23 +15,32 @@ if [ ! -x "$BUILT_TARGET" ]; then
     echo "FATAL: $BUILT_TARGET does not exist, or not executable, rebuild binary to continue"
     exit 1
 fi
-case $build_step in
-  paseo-2000)
-    mkdir -p ./res/genesis/local
-    echo "Building Spec for frequency testnet paseo localnet paraid=2000"
-    $PWD/target/$profile/frequency build-spec --disable-default-bootnode --chain=frequency-paseo-local > ./res/genesis/local/frequency-spec-paseo.json
-    sed -i.bu "s/\"parachainId\": 2000/\"parachainId\": $parachain_id/g" ./res/genesis/local/frequency-spec-paseo.json
-    sed -i.bu "s/\"para_id\": 2000/\"para_id\": $parachain_id/g" ./res/genesis/local/frequency-spec-paseo.json
-    $PWD/target/$profile/frequency build-spec --raw --disable-default-bootnode --chain ./res/genesis/local/frequency-spec-paseo.json > ./res/genesis/local/paseo-local-frequency-2000-raw.json
-    rm ./res/genesis/local/frequency-spec-paseo.json.bu
-
-    echo "Exporting state and wasm for frequency testnet paseo localnet paraid=2000"
-    $PWD/target/$profile/frequency export-genesis-state --chain ./res/genesis/local/paseo-local-frequency-2000-raw.json > ./res/genesis/local/frequency-paseo-genesis-state
-    $PWD/target/$profile/frequency export-genesis-wasm --chain ./res/genesis/local/paseo-local-frequency-2000-raw.json > ./res/genesis/local/frequency-paseo-genesis-wasm
-    ;;
-  *)
-    echo "Unknown build step: $build_step"
-    exit 1
-    ;;
 
-esac
+spec_file="./res/genesis/local/${chain}-${parachain_id}.json"
+uncompressed_wasm="./res/genesis/local/${chain}-${parachain_id}.wasm"
+compressed_wasm="./res/genesis/local/${chain}-${parachain_id}.compressed.wasm"
+genesis_state="./res/genesis/local/${chain}-${parachain_id}-genesis-state"
+hex_wasm_file="./res/genesis/local/${chain}-${parachain_id}-wasm-hex"
+
+mkdir -p ./res/genesis/local
+echo "Building Spec for ${chain} paraid=${parachain_id}"
+./target/$profile/frequency build-spec --disable-default-bootnode --chain="${chain}" > "${spec_file}"
+
+cp ./target/$profile/wbuild/frequency-runtime/frequency_runtime.wasm "${uncompressed_wasm}"
+
+subwasm compress "${uncompressed_wasm}" "${compressed_wasm}"
+
+# Update the spec with the compressed WASM
+hex_compressed_wasm=`xxd -ps -c 0 "${compressed_wasm}"`
+echo -n "0x${hex_compressed_wasm}" > "${hex_wasm_file}"
+
+jq --rawfile code "${hex_wasm_file}" '.genesis.runtimeGenesis.code = $code' "${spec_file}" > "${spec_file}.tmp" && mv "${spec_file}.tmp" "${spec_file}"
+
+echo "Exporting state and wasm for ${chain} paraid=${parachain_id}"
+./target/$profile/frequency export-genesis-state --chain="${spec_file}" > "${genesis_state}"
+
+echo "Spec File: ${spec_file}"
+echo "Uncompressed wasm: ${uncompressed_wasm}"
+echo "Compressed wasm: ${compressed_wasm}"
+echo "Genesis State: ${genesis_state}"
+echo "Compressed wasm Hex: ${hex_wasm_file}"

scripts/generate_relay_specs.sh

@@ -30,6 +30,7 @@ start-paseo-relay-chain)
   echo "Starting local relay chain with Alice and Bob..."
   cd docker
   docker compose up -d relay_paseo_alice relay_paseo_bob
+  echo "ALERT: You likely need to manually set the scheduling lookahead. sudo(configuration.setSchedulingLookahead(3)) and wait for it to apply."
   ;;
 
 stop-paseo-relay-chain)
@@ -64,15 +65,18 @@ start-paseo-collator-alice)
 
   "${Frequency_BINARY_PATH:-./target/release/frequency}" key generate-node-key --base-path=$parachain_dir_alice/data
 
-  ./scripts/run_collator.sh \
+  NODE_PARACHAIN_RPC_PORT=9943 ./scripts/run_collator.sh \
     --chain="frequency-paseo-local" --alice \
     --base-path=$parachain_dir_alice/data \
     --force-authoring \
+    --discover-local \
     --port $((30333)) \
     --rpc-port $((9944)) \
     --rpc-external \
     --rpc-cors all \
     --rpc-methods=Unsafe \
+    --no-prometheus \
+    --no-hardware-benchmarks \
     $offchain_params \
   ;;
 
@@ -90,15 +94,18 @@ start-paseo-collator-bob)
 
   "${Frequency_BINARY_PATH:-./target/release/frequency}" key generate-node-key --base-path=$parachain_dir_bob/data
 
-  ./scripts/run_collator.sh \
+  NODE_PARACHAIN_RPC_PORT=9944 ./scripts/run_collator.sh \
     --chain="frequency-paseo-local" --bob \
     --base-path=$parachain_dir_bob/data \
+    --discover-local \
     --force-authoring \
     --port $((30332)) \
     --rpc-port $((9943)) \
     --rpc-external \
     --rpc-cors all \
     --rpc-methods=Unsafe \
+    --no-prometheus \
+    --no-hardware-benchmarks \
     $offchain_params \
   ;;
 
@@ -212,6 +219,7 @@ start-frequency-container)
 
   ./scripts/run_collator.sh \
     --chain="frequency-paseo-local" \
+    --state-pruning archive \
     --alice \
     --unsafe-force-node-key-generation \
     --base-path=$parachain_dir/data \
@@ -234,22 +242,40 @@ register-frequency-paseo-local)
 onboard-frequency-paseo-local)
   echo "Onboarding parachain with runtime '$parachain' and id '$para_id'..."
 
-   onboard_dir="$base_dir/onboard"
-   mkdir -p $onboard_dir
-   wasm_location="$onboard_dir/${parachain}-${para_id}.wasm"
+  onboard_dir="$base_dir/onboard"
+  mkdir -p $onboard_dir
+  wasm_location="$onboard_dir/${parachain}-${para_id}.wasm"
+
+  # THE `-r` is important for it to be binary instead of hex
+  # Make sure the docker does NOT use -t as it breaks the binary output
+  if [ "$docker_onboard" == "true" ]; then
+    genesis=$(docker run --rm -e RUST_LOG=off -i ${frequency_docker_image} /frequency/target/release/frequency export-genesis-state --chain="frequency-paseo-local")
+    docker run --rm -e RUST_LOG=off -i ${frequency_docker_image} /frequency/target/release/frequency export-genesis-wasm --raw --chain="frequency-paseo-local" > $wasm_location
+  else
+    genesis=$(RUST_LOG=off ./target/release/frequency export-genesis-state --chain=frequency-paseo-local)
+        RUST_LOG=off ./target/release/frequency export-genesis-wasm --raw --chain=frequency-paseo-local > $wasm_location
+  fi
+
+  cd scripts/js/onboard
+  echo "WASM File md5: $(md5 "${wasm_location}")"
+  wasm_hex=$(echo -n "0x"`xxd -ps -c 0 "${wasm_location}"`)
+  echo "WASM Hex md5: $(echo -n "${wasm_hex}" | md5)"
+  npm i && echo -n "${wasm_hex}" | npm run onboard "ws://0.0.0.0:9946" "//Alice" ${para_id} "${genesis}"
+  ;;
+
+# Useful in combination with make specs-frequency-paseo-local-*
+onboard-res-local)
+  echo "Onboarding parachain with runtime '$parachain' and id '$para_id'..."
+  echo "Assuming that the files in res/genesis/local are correct..."
 
-   # THE `-r` is important for it to be binary instead of hex
-   # Make sure the docker does NOT use -t as it breaks the binary output
-    if [ "$docker_onboard" == "true" ]; then
-      genesis=$(docker run --rm -e RUST_LOG=off -i ${frequency_docker_image} /frequency/target/release/frequency export-genesis-state --chain="frequency-paseo-local")
-      docker run --rm -e RUST_LOG=off -i ${frequency_docker_image} /frequency/target/release/frequency export-genesis-wasm --chain="frequency-paseo-local" -r > $wasm_location
-    else
-      genesis=$(RUST_LOG=off ./target/release/frequency export-genesis-state --chain="frequency-paseo-local")
-      RUST_LOG=off ./target/release/frequency export-genesis-wasm --chain="frequency-paseo-local" -r > $wasm_location
-    fi
+  wasm_location="../../../res/genesis/local/frequency-paseo-local-2000.compressed.wasm"
+  genesis=$(cat res/genesis/local/frequency-paseo-local-2000-genesis-state)
 
   cd scripts/js/onboard
-  npm i && npm run onboard "ws://0.0.0.0:9946" "//Alice" ${para_id} "${genesis}" "${wasm_location}"
+  echo "WASM File md5: $(md5 "${wasm_location}")"
+  wasm_hex=$(echo -n "0x"`xxd -ps -c 0 "${wasm_location}"`)
+  echo "WASM Hex md5: $(echo -n "${wasm_hex}" | md5)"
+  npm i && echo -n "${wasm_hex}" | npm run onboard "ws://0.0.0.0:9946" "//Alice" ${para_id} "${genesis}"
   ;;
 
 offboard-frequency-paseo-local)

scripts/generate_specs.sh

@@ -1,5 +1,5 @@
 import { ApiPromise, WsProvider, Keyring } from "@polkadot/api";
-import { readFileSync } from "fs";
+import fs from 'node:fs';
 
 const run = async () => {
   try {
@@ -9,7 +9,10 @@ const run = async () => {
     const seed = process.argv[3];
     const id = process.argv[4];
     const header = process.argv[5];
-    const wasmFile = process.argv[6];
+
+    // Read wasmHex from stdin synchronously
+    // 0 is the file descriptor for stdin
+    const wasmHex = fs.readFileSync(0, 'utf-8').trim();
 
     const wsProvider = new WsProvider(endpoint);
 
@@ -20,17 +23,9 @@ const run = async () => {
     const keyring = new Keyring({ type: "sr25519" });
     const alice = keyring.addFromUri(seed);
 
-    let wasm;
-    try {
-      wasm = readFileSync(wasmFile).toString("hex");
-    } catch (err) {
-      console.error(err);
-      throw err;
-    }
-
     let paraGenesisArgs = {
       genesis_head: header,
-      validation_code: "0x" + wasm,
+      validation_code: wasmHex,
       parachain: true,
     };
 

scripts/init.sh

@@ -21,6 +21,9 @@ alice_rpc_port="${ALICE_RPC_PORT:-9946}"
 bob_rpc_port="${BOB_RPC_PORT:-9947}"
 chain="${RELAY_CHAIN_SPEC:-./resources/paseo-local.json}"
 
+node_parachain="${NODE_PARACHAIN:-127.0.0.1}"
+node_parachain_rpc_port="${NODE_PARACHAIN_RPC_PORT:-9944}"
+
 get_bootnode () {
     node="$1"
     port="$2"
@@ -34,6 +37,18 @@ get_bootnode () {
 
 }
 
+bootnode_para () {
+    node="$1"
+    rpc_port="$2"
+    bootnode=$(get_bootnode "$node" "$rpc_port")
+    >&2 echo "Parachain Bootnode: $bootnode"
+    if [ ! -z "$bootnode" ]; then
+        echo "$bootnode"
+    else
+        echo >&2 "failed to get id for $node"
+    fi
+}
+
 bootnode () {
     node="$1"
     rpc_port="$2"
@@ -50,6 +65,14 @@ bootnode () {
     echo "$bootnode"
 }
 
+# Only add it if it's not empty
+parachain_bootnode="$(bootnode_para "$node_parachain" "$node_parachain_rpc_port")"
+if [ ! -z "$parachain_bootnode" ]; then
+    args+=( "--bootnodes=$parachain_bootnode" )
+else
+    echo "No parachain bootnode found. May not be needed..."
+fi
+
 args+=( "--" "--chain=${chain}" "--bootnodes=$(bootnode "$alice" "$alice_rpc_port")" "--bootnodes=$(bootnode "$bob" "$bob_rpc_port")" )
 
 set -x