Ecosystem/serai
Ecosystem/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2024-11-17 09:27:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Replace mutate with get + set

Browse source 
I'm legitimately unsure why mutate doesn't work. Reading the impls, it should...
This commit is contained in:
Luke Parker 2023-10-11 02:10:35 -04:00
parent ed90d1752a
commit 2401266374
No known key found for this signature in database
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
substrate/in-instructions/pallet/src/lib.rs
View file

@ -80,7 +80,9 @@ pub mod pallet {
} }
} }
fn key_for_network<T: Config>(network: NetworkId) -> Result<(Session, Option<Public>, Option<Public>), InvalidTransaction> { fn keys_for_network<T: Config>(
network: NetworkId,
) -> Result<(Session, Option<Public>, Option<Public>), InvalidTransaction> {
let session = ValidatorSets::<T>::session(network); let session = ValidatorSets::<T>::session(network);
let mut set = ValidatorSet { session, network }; let mut set = ValidatorSet { session, network };
let latest = ValidatorSets::<T>::keys(set).map(|keys| keys.0); let latest = ValidatorSets::<T>::keys(set).map(|keys| keys.0);
@ -146,9 +148,6 @@ pub mod pallet {
Call::__Ignore(_, _) => unreachable!(), Call::__Ignore(_, _) => unreachable!(),
}; };
let network = batch.batch.network;
let (current_session, prior, current) = key_for_network::<T>(network)?;
// verify the batch size // verify the batch size
// TODO: Merge this encode with the one done by batch_message // TODO: Merge this encode with the one done by batch_message
if batch.batch.encode().len() > MAX_BATCH_SIZE { if batch.batch.encode().len() > MAX_BATCH_SIZE {
@ -156,15 +155,19 @@ pub mod pallet {
} }
// verify the signature // verify the signature
let network = batch.batch.network;
let (current_session, prior, current) = keys_for_network::<T>(network)?;
let batch_message = batch_message(&batch.batch); let batch_message = batch_message(&batch.batch);
// Check the prior key first since only a single `Batch` (the last one) will be when prior is // Check the prior key first since only a single `Batch` (the last one) will be when prior is
// Some yet prior wasn't the signing key // Some yet prior wasn't the signing key
let valid_by_prior = if let Some(key) = prior { let valid_by_prior =
if let Some(key) = prior { key.verify(&batch_message, &batch.signature) } else { false };
let valid = valid_by_prior ||
(if let Some(key) = current {
key.verify(&batch_message, &batch.signature) key.verify(&batch_message, &batch.signature)
} else { false }; } else {
let valid = valid_by_prior || (if let Some(key) = current { false
key.verify(&batch_message, &batch.signature) });
} else { false });
if !valid { if !valid {
Err(InvalidTransaction::BadProof)?; Err(InvalidTransaction::BadProof)?;
} }

9
substrate/validator-sets/pallet/src/lib.rs
View file

@ -169,10 +169,11 @@ pub mod pallet {
fn new_set(network: NetworkId) { fn new_set(network: NetworkId) {
// Update CurrentSession // Update CurrentSession
let session = if network != NetworkId::Serai { let session = if network != NetworkId::Serai {
CurrentSession::<T>::mutate(network, |session| { let new_session = CurrentSession::<T>::get(network)
Some(session.map(|session| Session(session.0 + 1)).unwrap_or(Session(0))) .map(|session| Session(session.0 + 1))
}) .unwrap_or(Session(0));
.unwrap() CurrentSession::<T>::set(network, Some(new_session));
new_session
} else { } else {
Self::session(network) Self::session(network)
}; };