Wasm upgrade (#1345)

* targeted codesubstitute for fees

* update blob with current release chain spec

* latest spec

* 473

* update wasm

* release 4.7.4

* add logging for test

* add codesub

* update chain spec

* get clippy green

* update

Author: takemiyamakoto

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "framenode"
-version = "4.7.1"
+version = "4.7.5"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 edition = "2021"
@@ -111,6 +111,11 @@ tokio = "=1.40.0"
 finality-grandpa = "=0.16.2"
 pest = "=2.7.14"
 
+[target.'cfg(target_os = "linux")'.dependencies]
+# Netlink-based watchers rely on Linux-specific libc types; keep them off macOS builds.
+if-watch = "=3.2.0"
+netlink-proto = "=0.10.0"
+
 [build-dependencies]
 substrate-build-script-utils = "3"
 

node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "framenode-chain-spec"
-version = "4.7.0"
+version = "4.7.5"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 
@@ -33,6 +33,8 @@ xor-fee = { path = "../../pallets/xor-fee" }
 
 [dev-dependencies]
 common = { path = "../../common", features = ["test"] }
+hex = "0.4"
+serde_json = "1"
 
 [features]
 include-real-files = []

node/chain_spec/Cargo.toml

@@ -2890,6 +2890,10 @@ mod tests {
 
     use common::eth::EthAddress;
     use common::{balance, Balance};
+    #[cfg(not(feature = "private-net"))]
+    use serde_json::Value;
+    #[cfg(not(feature = "private-net"))]
+    use sp_core::blake2_256;
 
     #[test]
     fn calculate_reserves() {
@@ -2912,4 +2916,46 @@ mod tests {
             balance!(123.45678)
         );
     }
+
+    #[cfg(not(feature = "private-net"))]
+    #[test]
+    fn mainnet_code_substitute_matches_expected_wasm() {
+        // The live chain is upgraded via codeSubstitutes, so we verify the embedded JSON still
+        // carries the correct Wasm blob for the emergency fork height.
+        let raw_spec = include_str!("./bytes/chain_spec_main.json");
+        let json: Value = serde_json::from_str(raw_spec).expect("parse mainnet spec json");
+        let code_substitutes = json
+            .get("codeSubstitutes")
+            .and_then(Value::as_object)
+            .expect("codeSubstitutes object missing");
+        let wasm_hex = code_substitutes
+            .get("23234813")
+            .and_then(Value::as_str)
+            .expect("missing codeSubstitute for block 23234813");
+        let wasm_bytes = hex::decode(wasm_hex.trim_start_matches("0x"))
+            .expect("codeSubstitutes entry must be valid hex");
+        assert_eq!(
+            blake2_256(&wasm_bytes),
+            hex!("311d77b61faf6950680f520333e2c8af5ad3155f0d3e60ec9439fcf2bbceef3e"),
+            "unexpected Wasm hash for 23234813 code substitute"
+        );
+    }
+
+    #[cfg(not(feature = "private-net"))]
+    #[test]
+    fn mainnet_code_substitute_has_expected_wasm_size() {
+        let raw_spec = include_str!("./bytes/chain_spec_main.json");
+        let json: Value = serde_json::from_str(raw_spec).expect("parse mainnet spec json");
+        let code_substitutes = json
+            .get("codeSubstitutes")
+            .and_then(Value::as_object)
+            .expect("codeSubstitutes object missing");
+        let wasm_hex = code_substitutes
+            .get("23234813")
+            .and_then(Value::as_str)
+            .expect("missing codeSubstitute for block 23234813");
+        let wasm_bytes = hex::decode(wasm_hex.trim_start_matches("0x"))
+            .expect("codeSubstitutes entry must be valid hex");
+        assert_eq!(wasm_bytes.len(), 2_815_465);
+    }
 }

node/chain_spec/src/bytes/chain_spec_bridge_staging.json

@@ -41,7 +41,7 @@ use framenode_runtime::opaque::Block;
 use framenode_runtime::{self, Runtime, RuntimeApi};
 use log::debug;
 use prometheus_endpoint::Registry;
-use sc_client_api::{Backend, BlockBackend};
+use sc_client_api::{execution_extensions::ExecutionStrategy, Backend, BlockBackend};
 use sc_consensus_aura::SlotDuration;
 pub use sc_executor::NativeElseWasmExecutor;
 use sc_service::config::PrometheusConfig;
@@ -125,6 +125,26 @@ pub fn new_partial(
         )));
     }
     set_prometheus_registry(config)?;
+    // Force wasm execution paths when users rely on code substitutes while keeping the on-chain
+    // spec version unchanged. Native execution would otherwise run the embedded runtime (with the
+    // post-fix logic) against historical blocks that expect the old code, causing storage root
+    // mismatches. Honour any explicit `--execution` flags by only overriding non-wasm defaults.
+    let strategies = &mut config.execution_strategies;
+    if !matches!(strategies.syncing, ExecutionStrategy::AlwaysWasm) {
+        strategies.syncing = ExecutionStrategy::AlwaysWasm;
+    }
+    if !matches!(strategies.importing, ExecutionStrategy::AlwaysWasm) {
+        strategies.importing = ExecutionStrategy::AlwaysWasm;
+    }
+    if !matches!(strategies.block_construction, ExecutionStrategy::AlwaysWasm) {
+        strategies.block_construction = ExecutionStrategy::AlwaysWasm;
+    }
+    if !matches!(strategies.offchain_worker, ExecutionStrategy::AlwaysWasm) {
+        strategies.offchain_worker = ExecutionStrategy::AlwaysWasm;
+    }
+    if !matches!(strategies.other, ExecutionStrategy::AlwaysWasm) {
+        strategies.other = ExecutionStrategy::AlwaysWasm;
+    }
 
     let telemetry = config
         .telemetry_endpoints

node/chain_spec/src/bytes/chain_spec_main.json

@@ -47,8 +47,6 @@ use common::{
     LiquidityProxyTrait, LiquiditySourceFilter, LiquiditySourceType, OnValBurned,
     ReferrerAccountProvider, KUSD, PSWAP, TBCD, VAL, XOR,
 };
-use sp_arithmetic::FixedU128;
-
 use currencies::BasicCurrencyAdapter;
 use frame_support::dispatch::{DispatchInfo, Pays, PostDispatchInfo};
 use frame_support::pallet_prelude::{Hooks, ValueQuery};
@@ -60,6 +58,7 @@ use frame_support::{construct_runtime, parameter_types, storage_alias};
 use frame_system::pallet_prelude::BlockNumberFor;
 use frame_system::EnsureRoot;
 use permissions::{Scope, BURN, MINT};
+use sp_arithmetic::FixedU128;
 use sp_core::H256;
 use sp_runtime::{AccountId32, DispatchError, Percent};
 use traits::MultiCurrency;

node/chain_spec/src/bytes/chain_spec_test.json

@@ -139,6 +139,55 @@ fn non_root_update_fails() {
     });
 }
 
+#[test]
+fn fees_remain_stable_on_codesub_block_without_forced_override() {
+    // This block matches mainnet codeSubstitute activation height.
+    const CODESUB_BLOCK: u64 = 23_234_813;
+
+    ExtBuilder::build().execute_with(|| {
+        set_weight_to_fee_multiplier(2);
+        System::set_block_number(CODESUB_BLOCK - 1);
+
+        let tracked_call = RuntimeCall::Assets(assets::Call::transfer {
+            to: alice(),
+            asset_id: common::VAL,
+            amount: 10,
+        });
+        let tracked_info = info_from_weight(100.into());
+        let tracked_len = 100;
+
+        let (fee_before, _) = XorFee::compute_fee(tracked_len, &tracked_call, &tracked_info, 0);
+        assert_eq!(fee_before, balance!(0.0014));
+
+        let multiplier_events_before = System::events()
+            .iter()
+            .filter(|record| {
+                matches!(
+                    &record.event,
+                    RuntimeEvent::XorFee(crate::Event::WeightToFeeMultiplierUpdated(_))
+                )
+            })
+            .count();
+
+        run_to_block(CODESUB_BLOCK);
+
+        assert_eq!(XorFee::multiplier(), FixedU128::saturating_from_integer(2));
+        let (fee_after, _) = XorFee::compute_fee(tracked_len, &tracked_call, &tracked_info, 0);
+        assert_eq!(fee_after, fee_before);
+
+        let multiplier_events_after = System::events()
+            .iter()
+            .filter(|record| {
+                matches!(
+                    &record.event,
+                    RuntimeEvent::XorFee(crate::Event::WeightToFeeMultiplierUpdated(_))
+                )
+            })
+            .count();
+        assert_eq!(multiplier_events_before, multiplier_events_after);
+    });
+}
+
 #[test]
 fn it_works_postpone() {
     ExtBuilder::build().execute_with(|| {