Merge branch 'develop' into next

This commit is contained in:
Luke Parker
2025-09-01 21:22:28 -04:00
6 changed files with 8 additions and 16 deletions

View File

@@ -1 +1 @@
nightly-2025-08-01
nightly-2025-09-01

6
Cargo.lock generated
View File

@@ -11490,7 +11490,7 @@ dependencies = [
[[package]]
name = "sp-maybe-compressed-blob"
version = "11.0.0"
source = "git+https://github.com/serai-dex/polkadot-sdk?branch=serai-next#ebfc5f338a9752403fa07e88dd072b1d6de7acfc"
source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=19c487d6aa9893b6b09a21ce0ab8aefb1c299186#19c487d6aa9893b6b09a21ce0ab8aefb1c299186"
dependencies = [
"thiserror 2.0.16",
"zstd 0.13.3",
@@ -12015,8 +12015,8 @@ dependencies = [
[[package]]
name = "substrate-wasm-builder"
version = "25.0.0"
source = "git+https://github.com/serai-dex/polkadot-sdk?branch=serai-next#ebfc5f338a9752403fa07e88dd072b1d6de7acfc"
version = "26.0.1"
source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=19c487d6aa9893b6b09a21ce0ab8aefb1c299186#19c487d6aa9893b6b09a21ce0ab8aefb1c299186"
dependencies = [
"build-helper",
"cargo_metadata",

View File

@@ -150,7 +150,7 @@ pub fn musig<C: Ciphersuite>(
}
let group_key = multiexp::multiexp(&multiexp);
debug_assert_eq!(our_pub_key, verification_shares[&params.i()]);
debug_assert_eq!(musig_key_vartime::<C>(context, keys).unwrap(), group_key);
debug_assert_eq!(musig_key_vartime::<C>(context, keys), Ok(group_key));
ThresholdKeys::new(
params,

View File

@@ -137,5 +137,5 @@ allow-git = [
"https://github.com/monero-oxide/monero-oxide",
"https://github.com/serai-dex/substrate-bip39",
"https://github.com/serai-dex/substrate",
"https://github.com/serai-dex/polkadot-sdk",
"https://github.com/serai-dex/patch-polkadot-sdk",
]

View File

@@ -32,7 +32,7 @@ rustup toolchain install nightly
rustup target add wasm32v1-none --toolchain nightly
```
### Install Solidity
### Install Solidity with `svm`
```
cargo install svm-rs
@@ -40,14 +40,6 @@ svm install 0.8.26
svm use 0.8.26
```
### Install Solidity Compiler Version Manager
```
cargo install svm-rs
svm install 0.8.25
svm use 0.8.25
```
### Install foundry (for tests)
```

View File

@@ -75,7 +75,7 @@ frame-system-rpc-runtime-api = { git = "https://github.com/serai-dex/substrate",
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/serai-dex/substrate", default-features = false }
[build-dependencies]
substrate-wasm-builder = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "serai-next" }
substrate-wasm-builder = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "19c487d6aa9893b6b09a21ce0ab8aefb1c299186" }
[features]
std = [