From beabc8de5c225ad32a82e9527ab9cac64722b9c5 Mon Sep 17 00:00:00 2001
From: Bryan Chen <xlchen1291@gmail.com>
Date: Thu, 11 Jun 2026 09:59:23 +1200
Subject: [PATCH 1/5] bump polkadot sdk

---
 Cargo.lock                 | 16 ++++++++--------
 Cargo.toml                 | 26 +++++++++++++-------------
 runtime/acala/src/lib.rs   |  2 +-
 runtime/karura/src/lib.rs  |  2 +-
 runtime/mandala/src/lib.rs |  2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6a8c2a260..6e1ef11bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1735,9 +1735,9 @@ dependencies = [
 
 [[package]]
 name = "cumulus-pallet-xcmp-queue"
-version = "0.21.1"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44173ef89d1a8e955ab77a2ebf155ba2ffc5a7bef45019c2edd5cec63b605c5b"
+checksum = "1842e93d9a5eb3b6bf182a0396af8a7f53c2b55d1d88511eedf3e0fa67a69d95"
 dependencies = [
  "approx",
  "bounded-collections",
@@ -2866,9 +2866,9 @@ dependencies = [
 
 [[package]]
 name = "frame-support"
-version = "41.0.1"
+version = "41.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9162e30a146eabaa72feaf67a79b32d4adbebfc0566b5544937e44786734ac7b"
+checksum = "64952f32334370e6f866288c3374591d224abe9389628dca3ff0fd3ebc5037f2"
 dependencies = [
  "aquamarine",
  "array-bytes 6.2.3",
@@ -9535,9 +9535,9 @@ dependencies = [
 
 [[package]]
 name = "sp-trie"
-version = "40.0.0"
+version = "40.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b2e157c9cf44a1a9d20f3c69322e302db70399bf3f218211387fe009dd4041c"
+checksum = "71487fba795cb599bf6d1905b55a2a548524439264e2a7405684a5d30e26a370"
 dependencies = [
  "ahash",
  "foldhash 0.1.5",
@@ -9671,9 +9671,9 @@ dependencies = [
 
 [[package]]
 name = "staging-xcm"
-version = "17.0.0"
+version = "17.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234f7bf2ef7809870c28b5744f898f882047ff5cd88d9c838e122c861c139594"
+checksum = "14d2c487abc2b7977da6dae9e44ef219418e6964a8b5b67767bc32942284be28"
 dependencies = [
  "array-bytes 6.2.3",
  "bounded-collections",
diff --git a/Cargo.toml b/Cargo.toml
index 347f3b815..d7a7c7d99 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -215,19 +215,19 @@ orml-build-script-utils = { path = "orml/build-script-utils" }
 
 # polkadot-sdk (wasm)
 cumulus-pallet-aura-ext = { version = "0.21.0", default-features = false }
-cumulus-pallet-parachain-system = { version = "0.21.0", default-features = false }
+cumulus-pallet-parachain-system = { version = "0.21.2", default-features = false }
 cumulus-pallet-xcm = { version = "0.20.0", default-features = false }
-cumulus-pallet-xcmp-queue = { version = "0.21.0", default-features = false }
+cumulus-pallet-xcmp-queue = { version = "0.21.2", default-features = false }
 cumulus-primitives-core = { version = "0.19.0", default-features = false }
 cumulus-primitives-parachain-inherent = { version = "0.19.0", default-features = false }
 cumulus-primitives-timestamp = { version = "0.20.0", default-features = false }
 cumulus-primitives-utility = { version = "0.21.0", default-features = false }
 cumulus-test-relay-sproof-builder = { version = "0.20.0", default-features = false }
-frame-benchmarking = { version = "41.0.0", default-features = false }
-frame-executive = { version = "41.0.0", default-features = false }
+frame-benchmarking = { version = "41.0.1", default-features = false }
+frame-executive = { version = "41.0.2", default-features = false }
 frame-metadata-hash-extension = { version = "0.9.0", default-features = false }
-frame-support = { version = "41.0.0", default-features = false }
-frame-system = { version = "41.0.0", default-features = false }
+frame-support = { version = "41.0.2", default-features = false }
+frame-system = { version = "41.0.2", default-features = false }
 frame-system-rpc-runtime-api = { version = "37.0.0", default-features = false }
 frame-try-runtime = { version = "0.47.0", default-features = false }
 pallet-aura = { version = "40.0.0", default-features = false }
@@ -256,7 +256,7 @@ pallet-transaction-payment = { version = "41.0.0", default-features = false }
 pallet-transaction-payment-rpc-runtime-api = { version = "41.0.0", default-features = false }
 pallet-treasury = { version = "40.0.0", default-features = false }
 pallet-utility = { version = "41.0.0", default-features = false }
-pallet-xcm = { version = "20.1.0", default-features = false }
+pallet-xcm = { version = "20.1.3", default-features = false }
 pallet-xcm-benchmarks = { version = "21.0.0", default-features = false }
 parachain-info = { version = "0.21.0", package = "staging-parachain-info", default-features = false }
 parachains-common = { version = "22.0.0", default-features = false }
@@ -264,7 +264,7 @@ polkadot-core-primitives = { version = "18.0.0", default-features = false }
 polkadot-parachain-primitives = { version = "17.0.0", default-features = false }
 polkadot-primitives = { version = "19.0.0", default-features = false }
 polkadot-runtime-common = { version = "20.0.0", default-features = false }
-polkadot-runtime-parachains = { version = "20.0.1", default-features = false }
+polkadot-runtime-parachains = { version = "20.0.3", default-features = false }
 sp-api = { version = "37.0.0", default-features = false }
 sp-application-crypto = { version = "41.0.0", default-features = false }
 sp-arithmetic = { version = "27.0.0", default-features = false }
@@ -292,15 +292,15 @@ sp-storage = { version = "22.0.0", default-features = false }
 sp-timestamp = { version = "37.0.0", default-features = false }
 sp-tracing = { version = "17.1.0", default-features = false }
 sp-transaction-pool = { version = "37.0.0", default-features = false }
-sp-trie = { version = "40.0.0", default-features = false }
+sp-trie = { version = "40.0.1", default-features = false }
 sp-version = { version = "40.0.0", default-features = false }
 sp-wasm-interface = { version = "22.0.0", default-features = false }
 sp-weights = { version = "32.0.0", default-features = false }
-xcm = { version = "17.0.0", package = "staging-xcm", default-features = false }
-xcm-builder = { version = "21.0.0", package = "staging-xcm-builder", default-features = false }
-xcm-executor = { version = "20.0.0", package = "staging-xcm-executor", default-features = false }
+xcm = { version = "17.0.1", package = "staging-xcm", default-features = false }
+xcm-builder = { version = "21.1.0", package = "staging-xcm-builder", default-features = false }
+xcm-executor = { version = "20.0.2", package = "staging-xcm-executor", default-features = false }
 xcm-runtime-apis = { version = "0.8.0", default-features = false }
 
 # polkadot-sdk (client)
-substrate-wasm-builder = { version = "27.0.0", features = ["metadata-hash"] }
+substrate-wasm-builder = { version = "27.0.1", features = ["metadata-hash"] }
 xcm-simulator = { version = "21.0.0" }
diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs
index c078434a5..635c584cf 100644
--- a/runtime/acala/src/lib.rs
+++ b/runtime/acala/src/lib.rs
@@ -2036,7 +2036,7 @@ pub type Executive = frame_executive::Executive<
 >;
 
 #[allow(unused_parens)]
-type Migrations = ();
+type Migrations = (cumulus_pallet_xcmp_queue::migration::v7::MigrateV6ToV7<Runtime>,);
 
 #[cfg(feature = "runtime-benchmarks")]
 mod benches {
diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs
index df4f20c9e..81cc5c366 100644
--- a/runtime/karura/src/lib.rs
+++ b/runtime/karura/src/lib.rs
@@ -2043,7 +2043,7 @@ pub type Executive = frame_executive::Executive<
 >;
 
 #[allow(unused_parens)]
-type Migrations = ();
+type Migrations = (cumulus_pallet_xcmp_queue::migration::v7::MigrateV6ToV7<Runtime>,);
 
 #[cfg(feature = "runtime-benchmarks")]
 mod benches {
diff --git a/runtime/mandala/src/lib.rs b/runtime/mandala/src/lib.rs
index 713fea860..1c8dcd18e 100644
--- a/runtime/mandala/src/lib.rs
+++ b/runtime/mandala/src/lib.rs
@@ -2098,7 +2098,7 @@ pub type Executive = frame_executive::Executive<
 >;
 
 #[allow(unused_parens)]
-type Migrations = ();
+type Migrations = (cumulus_pallet_xcmp_queue::migration::v7::MigrateV6ToV7<Runtime>,);
 
 construct_runtime!(
 	pub enum Runtime {

From fd6e34e11ed8505158f86bf00d4c7ac876048b21 Mon Sep 17 00:00:00 2001
From: Bryan Chen <xlchen1291@gmail.com>
Date: Thu, 11 Jun 2026 10:13:26 +1200
Subject: [PATCH 2/5] bump 2360

---
 Cargo.toml                 | 2 +-
 runtime/acala/src/lib.rs   | 2 +-
 runtime/karura/src/lib.rs  | 2 +-
 runtime/mandala/src/lib.rs | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d7a7c7d99..e35183941 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,7 +40,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "2.35.0"
+version = "2.36.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs
index 635c584cf..62019ccd5 100644
--- a/runtime/acala/src/lib.rs
+++ b/runtime/acala/src/lib.rs
@@ -141,7 +141,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: Cow::Borrowed("acala"),
 	impl_name: Cow::Borrowed("acala"),
 	authoring_version: 1,
-	spec_version: 2350,
+	spec_version: 2360,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 3,
diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs
index 81cc5c366..ab991190f 100644
--- a/runtime/karura/src/lib.rs
+++ b/runtime/karura/src/lib.rs
@@ -145,7 +145,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: Cow::Borrowed("karura"),
 	impl_name: Cow::Borrowed("karura"),
 	authoring_version: 1,
-	spec_version: 2350,
+	spec_version: 2360,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
diff --git a/runtime/mandala/src/lib.rs b/runtime/mandala/src/lib.rs
index 1c8dcd18e..ee11cda57 100644
--- a/runtime/mandala/src/lib.rs
+++ b/runtime/mandala/src/lib.rs
@@ -144,7 +144,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: Cow::Borrowed("mandala"),
 	impl_name: Cow::Borrowed("mandala"),
 	authoring_version: 1,
-	spec_version: 2350,
+	spec_version: 2360,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 3,

From c98b55c07f14f5e4ad1e782d4746429dab5b6fee Mon Sep 17 00:00:00 2001
From: Bryan Chen <xlchen1291@gmail.com>
Date: Thu, 11 Jun 2026 10:44:46 +1200
Subject: [PATCH 3/5] feat(deps): Update core dependencies to v2.36.0

Bumped versions of `acala-primitives`, `acala-runtime`, `karura-runtime`, `mandala-runtime`, and various `module-*` packages from `2.35.0` to `2.36.0` in `Cargo.lock`.

Ensured build consistency by adding the `--locked` flag to `cargo install staging-chain-spec-builder` commands in both the CI workflow (`.github/workflows/test.yml`) and `Makefile`. This prevents unexpected dependency resolution during tool installation.
---
 .github/workflows/test.yml |  2 +-
 Cargo.lock                 | 84 +++++++++++++++++++-------------------
 Makefile                   |  2 +-
 3 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9748bfc1c..c12afcb65 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -134,7 +134,7 @@ jobs:
         with:
           node-version: 18.x
       - name: Install deps
-        run: cargo install staging-chain-spec-builder --force
+        run: cargo install staging-chain-spec-builder --locked --force
       - name: Run ts tests
         run: |
           npm install -g yarn
diff --git a/Cargo.lock b/Cargo.lock
index 6e1ef11bf..cedd1bbd8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,7 +14,7 @@ dependencies = [
 
 [[package]]
 name = "acala-primitives"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "bstringify",
  "enumflags2",
@@ -40,7 +40,7 @@ dependencies = [
 
 [[package]]
 name = "acala-runtime"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "cumulus-pallet-aura-ext",
@@ -3823,7 +3823,7 @@ dependencies = [
 
 [[package]]
 name = "karura-runtime"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "cumulus-pallet-aura-ext",
@@ -4284,7 +4284,7 @@ dependencies = [
 
 [[package]]
 name = "mandala-runtime"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "cumulus-pallet-aura-ext",
@@ -4538,7 +4538,7 @@ dependencies = [
 
 [[package]]
 name = "module-aggregated-dex"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -4560,7 +4560,7 @@ dependencies = [
 
 [[package]]
 name = "module-asset-registry"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -4585,7 +4585,7 @@ dependencies = [
 
 [[package]]
 name = "module-assethub"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "cumulus-primitives-core",
@@ -4602,7 +4602,7 @@ dependencies = [
 
 [[package]]
 name = "module-auction-manager"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -4627,7 +4627,7 @@ dependencies = [
 
 [[package]]
 name = "module-cdp-engine"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -4660,7 +4660,7 @@ dependencies = [
 
 [[package]]
 name = "module-cdp-treasury"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -4685,7 +4685,7 @@ dependencies = [
 
 [[package]]
 name = "module-collator-selection"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -4710,7 +4710,7 @@ dependencies = [
 
 [[package]]
 name = "module-currencies"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -4736,7 +4736,7 @@ dependencies = [
 
 [[package]]
 name = "module-currencies-runtime-api"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -4746,7 +4746,7 @@ dependencies = [
 
 [[package]]
 name = "module-dex"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -4767,7 +4767,7 @@ dependencies = [
 
 [[package]]
 name = "module-dex-oracle"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -4786,7 +4786,7 @@ dependencies = [
 
 [[package]]
 name = "module-earning"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -4805,7 +4805,7 @@ dependencies = [
 
 [[package]]
 name = "module-emergency-shutdown"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -4828,7 +4828,7 @@ dependencies = [
 
 [[package]]
 name = "module-evm"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "env_logger",
@@ -4872,7 +4872,7 @@ dependencies = [
 
 [[package]]
 name = "module-evm-accounts"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -4895,7 +4895,7 @@ dependencies = [
 
 [[package]]
 name = "module-evm-bridge"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "ethereum-types",
@@ -4921,7 +4921,7 @@ dependencies = [
 
 [[package]]
 name = "module-evm-rpc-runtime-api"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "sp-api",
@@ -4932,7 +4932,7 @@ dependencies = [
 
 [[package]]
 name = "module-evm-utility"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "ethereum",
  "evm",
@@ -4944,7 +4944,7 @@ dependencies = [
 
 [[package]]
 name = "module-evm-utility-macro"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "module-evm-utility",
  "proc-macro2",
@@ -4954,7 +4954,7 @@ dependencies = [
 
 [[package]]
 name = "module-homa"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -4978,7 +4978,7 @@ dependencies = [
 
 [[package]]
 name = "module-homa-validator-list"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -5000,7 +5000,7 @@ dependencies = [
 
 [[package]]
 name = "module-honzon"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -5028,7 +5028,7 @@ dependencies = [
 
 [[package]]
 name = "module-honzon-bridge"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -5055,7 +5055,7 @@ dependencies = [
 
 [[package]]
 name = "module-idle-scheduler"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -5073,7 +5073,7 @@ dependencies = [
 
 [[package]]
 name = "module-incentives"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -5095,7 +5095,7 @@ dependencies = [
 
 [[package]]
 name = "module-liquid-crowdloan"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -5116,7 +5116,7 @@ dependencies = [
 
 [[package]]
 name = "module-loans"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-support",
@@ -5138,7 +5138,7 @@ dependencies = [
 
 [[package]]
 name = "module-nft"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -5163,7 +5163,7 @@ dependencies = [
 
 [[package]]
 name = "module-nominees-election"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -5185,7 +5185,7 @@ dependencies = [
 
 [[package]]
 name = "module-prices"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -5204,7 +5204,7 @@ dependencies = [
 
 [[package]]
 name = "module-session-manager"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5221,7 +5221,7 @@ dependencies = [
 
 [[package]]
 name = "module-support"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-support",
@@ -5242,7 +5242,7 @@ dependencies = [
 
 [[package]]
 name = "module-transaction-pause"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -5265,7 +5265,7 @@ dependencies = [
 
 [[package]]
 name = "module-transaction-payment"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "frame-benchmarking",
@@ -5293,7 +5293,7 @@ dependencies = [
 
 [[package]]
 name = "module-xcm-interface"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "cumulus-primitives-core",
@@ -5320,7 +5320,7 @@ dependencies = [
 
 [[package]]
 name = "module-xnft"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "cumulus-primitives-core",
@@ -7920,7 +7920,7 @@ checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18"
 
 [[package]]
 name = "runtime-common"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "cumulus-pallet-aura-ext",
@@ -7991,7 +7991,7 @@ dependencies = [
 
 [[package]]
 name = "runtime-integration-tests"
-version = "2.35.0"
+version = "2.36.0"
 dependencies = [
  "acala-primitives",
  "acala-runtime",
diff --git a/Makefile b/Makefile
index 5548b33dc..357580e57 100644
--- a/Makefile
+++ b/Makefile
@@ -258,6 +258,6 @@ bench-evm:
 
 .PHONY: tools
 tools:
-	cargo install staging-chain-spec-builder
+	cargo install staging-chain-spec-builder --locked
 	cargo install frame-omni-bencher
 	cargo install --git https://github.com/paritytech/try-runtime-cli --tag v0.7.0

From 007c2e0ff6c5f1635007ddc7463de2760ed032d9 Mon Sep 17 00:00:00 2001
From: Bryan Chen <xlchen1291@gmail.com>
Date: Thu, 11 Jun 2026 11:56:57 +1200
Subject: [PATCH 4/5] build(deps): add solc dependency and configure Waffle

Adds `solc@0.8.24` as a dev dependency and updates `waffle.json` to use the locally installed `solc` compiler. This ensures consistent Solidity compilation within the project.
---
 ts-tests/package.json |  1 +
 ts-tests/waffle.json  |  2 +-
 ts-tests/yarn.lock    | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/ts-tests/package.json b/ts-tests/package.json
index 25d459bf0..0c0ba7ec4 100644
--- a/ts-tests/package.json
+++ b/ts-tests/package.json
@@ -15,6 +15,7 @@
 		"@polkadot/api": "16.4.8",
 		"ethereum-waffle": "4.0.10",
 		"ethers": "5.7.2",
+		"solc": "0.8.24",
 		"vitest": "^3.2.4"
 	},
 	"packageManager": "yarn@4.4.0"
diff --git a/ts-tests/waffle.json b/ts-tests/waffle.json
index a73455c7b..02bdac49c 100644
--- a/ts-tests/waffle.json
+++ b/ts-tests/waffle.json
@@ -1,6 +1,6 @@
 {
   "compilerType": "solcjs",
-  "compilerVersion": "0.8.24",
+  "compilerVersion": "./node_modules/solc",
   "sourceDirectory": "./contracts",
   "outputDirectory": "./build"
 }
diff --git a/ts-tests/yarn.lock b/ts-tests/yarn.lock
index 5d14c7702..15ee1b8a4 100644
--- a/ts-tests/yarn.lock
+++ b/ts-tests/yarn.lock
@@ -6525,6 +6525,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"solc@npm:0.8.24":
+  version: 0.8.24
+  resolution: "solc@npm:0.8.24"
+  dependencies:
+    command-exists: "npm:^1.2.8"
+    commander: "npm:^8.1.0"
+    follow-redirects: "npm:^1.12.1"
+    js-sha3: "npm:0.8.0"
+    memorystream: "npm:^0.3.1"
+    semver: "npm:^5.5.0"
+    tmp: "npm:0.0.33"
+  bin:
+    solcjs: solc.js
+  checksum: 10c0/31f748be9998d9dee6a4c59aa6800a87802827766ccab2429cce2783898561658c98bad89c081a7b69510e3741668245375ab3dd73b840f15213352d5caf0a91
+  languageName: node
+  linkType: hard
+
 "sonic-boom@npm:^4.0.1":
   version: 4.0.1
   resolution: "sonic-boom@npm:4.0.1"
@@ -6947,6 +6964,7 @@ __metadata:
     "@polkadot/api": "npm:16.4.8"
     ethereum-waffle: "npm:4.0.10"
     ethers: "npm:5.7.2"
+    solc: "npm:0.8.24"
     vitest: "npm:^3.2.4"
   languageName: unknown
   linkType: soft

From 17be4ce9918e01745bb0de340412924011869cab Mon Sep 17 00:00:00 2001
From: Bryan Chen <xlchen1291@gmail.com>
Date: Thu, 11 Jun 2026 13:54:27 +1200
Subject: [PATCH 5/5] fix: Increase EVM fill block test timeouts

Increase the timeout for `test-evm-call-fill-block.ts` and `test-evm-create-fill-block.ts` to prevent premature test failures due to long execution times.
---
 ts-tests/tests/test-evm-call-fill-block.ts   | 4 +++-
 ts-tests/tests/test-evm-create-fill-block.ts | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ts-tests/tests/test-evm-call-fill-block.ts b/ts-tests/tests/test-evm-call-fill-block.ts
index 4057a6949..3b992eaa5 100644
--- a/ts-tests/tests/test-evm-call-fill-block.ts
+++ b/ts-tests/tests/test-evm-call-fill-block.ts
@@ -2,6 +2,8 @@ import { expect, beforeAll, it } from "vitest";
 import { describeWithAcala, nextBlock } from "./util";
 import { BodhiSigner } from "@acala-network/bodhi";
 
+const FILL_BLOCK_TEST_TIMEOUT = 360_000;
+
 describeWithAcala("Acala RPC (EVM call fill block)", (context) => {
     let alice: BodhiSigner;
 
@@ -38,5 +40,5 @@ describeWithAcala("Acala RPC (EVM call fill block)", (context) => {
         const evmCreateEvents = events.events.filter((item) => context.provider.api.events.evm.Executed.is(item.event));
 
         expect(evmCreateEvents.length).to.closeTo(240, 10);
-    });
+    }, FILL_BLOCK_TEST_TIMEOUT);
 });
diff --git a/ts-tests/tests/test-evm-create-fill-block.ts b/ts-tests/tests/test-evm-create-fill-block.ts
index 117ff95b8..77d575459 100644
--- a/ts-tests/tests/test-evm-create-fill-block.ts
+++ b/ts-tests/tests/test-evm-create-fill-block.ts
@@ -3,6 +3,8 @@ import { describeWithAcala, nextBlock } from "./util";
 import { BodhiSigner } from "@acala-network/bodhi";
 import EmptyContract from "../build/EmptyContract.json"
 
+const FILL_BLOCK_TEST_TIMEOUT = 360_000;
+
 describeWithAcala("Acala RPC (EVM create fill block)", (context) => {
     let alice: BodhiSigner;
 
@@ -36,5 +38,5 @@ describeWithAcala("Acala RPC (EVM create fill block)", (context) => {
         const evmCreateEvents = events.events.filter((item) => context.provider.api.events.evm.Created.is(item.event));
 
         expect(evmCreateEvents.length).to.equal(206);
-    });
+    }, FILL_BLOCK_TEST_TIMEOUT);
 });