Sulkta-Coop/pallas
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

chore[applying]: Fix cargo fmt from previous commits

Browse source
This commit is contained in:
Andrew Westberg 2024-09-25 20:12:04 +00:00
parent 73a3a73d0e
commit 615e2d4c29
4 changed files with 72 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/validate.yml vendored
View file

@ -25,7 +25,7 @@ jobs:
with: with:
toolchain: ${{ matrix.rust }} toolchain: ${{ matrix.rust }}
- name: Run cargo check Windows - name: Run cargo check
run: cargo check run: cargo check
test: test:
@ -48,7 +48,7 @@ jobs:
toolchain: stable toolchain: stable
- name: Run cargo test - name: Run cargo test
run: cargo test run: cargo test --release
lints: lints:
name: Lints name: Lints

10
pallas-applying/src/lib.rs
View file

@ -31,13 +31,7 @@ pub fn validate_txs(
) -> ValidationResult { ) -> ValidationResult {
let mut delta_state: CertState = cert_state.clone(); let mut delta_state: CertState = cert_state.clone();
for (txix, metx) in metxs.iter().enumerate() { for (txix, metx) in metxs.iter().enumerate() {
validate_tx( validate_tx(metx, txix.try_into().unwrap(), env, utxos, &mut delta_state)?;
&metx,
txix.try_into().unwrap(),
env,
utxos,
&mut delta_state,
)?;
} }
*cert_state = delta_state; *cert_state = delta_state;
Ok(()) Ok(())
@ -67,7 +61,7 @@ pub fn validate_tx(
utxos, utxos,
cert_state, cert_state,
spp, spp,
&acnt, acnt,
env.block_slot(), env.block_slot(),
env.network_id(), env.network_id(),
&metx.era(), &metx.era(),

36
pallas-applying/src/shelley_ma.rs
View file

@ -29,8 +29,10 @@ use pallas_traverse::{
time::Slot, wellknown::GenesisValues, ComputeHash, Era, MultiEraInput, MultiEraOutput, time::Slot, wellknown::GenesisValues, ComputeHash, Era, MultiEraInput, MultiEraOutput,
}; };
use std::{cmp::max, collections::HashMap, ops::Deref}; // TODO: remove when fixed missing args use std::{cmp::max, collections::HashMap, ops::Deref};
// TODO: remove when fixed missing args
#[allow(clippy::too_many_arguments)]
pub fn validate_shelley_ma_tx( pub fn validate_shelley_ma_tx(
mtx: &MintedTx, mtx: &MintedTx,
txix: TransactionIndex, txix: TransactionIndex,
@ -63,7 +65,7 @@ pub fn validate_shelley_ma_tx(
stk_dep_count, stk_dep_count,
stk_refund_count, stk_refund_count,
pool_count, pool_count,
&acnt, acnt,
block_slot, block_slot,
&stab_win, &stab_win,
prot_pps, prot_pps,
@ -229,8 +231,8 @@ fn get_produced(
// Adding fees // Adding fees
res = add_values(&res, &Value::Coin(tx_body.fee), &neg_val_err)?; res = add_values(&res, &Value::Coin(tx_body.fee), &neg_val_err)?;
// Pool reg deposits and staking key registrations // Pool reg deposits and staking key registrations
let total_deposits = prot_pps.pool_deposit * *pool_count + let total_deposits =
prot_pps.key_deposit * *stk_dep_count; prot_pps.pool_deposit * *pool_count + prot_pps.key_deposit * *stk_dep_count;
res = add_values(&res, &Value::Coin(total_deposits), &neg_val_err)?; res = add_values(&res, &Value::Coin(total_deposits), &neg_val_err)?;
Ok(res) Ok(res)
} }
@ -407,6 +409,7 @@ fn compute_script_hash(script: &NativeScript) -> PolicyId {
} }
// Checks all certificates in order, and counts the relevant ones for computing deposits. // Checks all certificates in order, and counts the relevant ones for computing deposits.
#[allow(clippy::too_many_arguments)]
fn check_certificates( fn check_certificates(
cert_opt: &Option<Vec<Certificate>>, cert_opt: &Option<Vec<Certificate>>,
tx_ix: TransactionIndex, tx_ix: TransactionIndex,
@ -452,7 +455,7 @@ fn check_certificates(
relays, relays,
pool_metadata, pool_metadata,
} => { } => {
if !cert_state.pstate.pool_params.contains_key(&operator) { if !cert_state.pstate.pool_params.contains_key(operator) {
*pool_count += 1; *pool_count += 1;
} }
let pool_param = PoolParam { let pool_param = PoolParam {
@ -551,7 +554,7 @@ where
V: Clone, V: Clone,
{ {
if map.contains_key(key) { if map.contains_key(key) {
return Err(error); Err(error)
} else { } else {
map.insert(key.clone(), value.clone()); map.insert(key.clone(), value.clone());
Ok(()) Ok(())
@ -568,14 +571,12 @@ fn check_pool_reg_or_update(
Err(ShelleyMA(PoolCostBelowMin)) Err(ShelleyMA(PoolCostBelowMin))
} else if ps.pool_params.contains_key(pool_hash) { } else if ps.pool_params.contains_key(pool_hash) {
// Updating // Updating
ps.fut_pool_params ps.fut_pool_params.insert(*pool_hash, (*pool_param).clone());
.insert(pool_hash.clone(), (*pool_param).clone()); ps.retiring.remove(pool_hash);
ps.retiring.remove(&pool_hash);
Ok(()) Ok(())
} else { } else {
// Registering // Registering
ps.pool_params ps.pool_params.insert(*pool_hash, (*pool_param).clone());
.insert(pool_hash.clone(), (*pool_param).clone());
Ok(()) Ok(())
} }
} }
@ -587,11 +588,11 @@ fn check_pool_retirement(
emax: &u32, emax: &u32,
ps: &mut PState, ps: &mut PState,
) -> ValidationResult { ) -> ValidationResult {
if !ps.pool_params.contains_key(&pool_hash) { if !ps.pool_params.contains_key(pool_hash) {
return Err(ShelleyMA(PoolNotRegistered)); return Err(ShelleyMA(PoolNotRegistered));
} }
if (*cepoch < *repoch) & (*repoch <= *cepoch + *emax as u64) { if (*cepoch < *repoch) & (*repoch <= *cepoch + *emax as u64) {
ps.retiring.insert(pool_hash.clone(), *repoch); ps.retiring.insert(*pool_hash, *repoch);
Ok(()) Ok(())
} else { } else {
Err(ShelleyMA(PoolNotRegistered)) Err(ShelleyMA(PoolNotRegistered))
@ -633,7 +634,7 @@ fn check_genesis_key_delegation(
} else { } else {
let gen_slot: Slot = *slot + *stab_win; let gen_slot: Slot = *slot + *stab_win;
ds.fut_gen_delegs ds.fut_gen_delegs
.insert((gen_slot, gkh.clone()), (dkh.clone(), vrf.clone())); .insert((gen_slot, gkh.clone()), (dkh.clone(), *vrf));
Ok(()) Ok(())
} }
} }
@ -646,7 +647,7 @@ fn check_mir(
acnt: &AccountState, acnt: &AccountState,
) -> ValidationResult { ) -> ValidationResult {
let genesis = &GenesisValues::mainnet(); let genesis = &GenesisValues::mainnet();
if !(*slot < first_slot(genesis, &(to_epoch(genesis, slot) + 1)) - *stab_win) { if *slot >= first_slot(genesis, &(to_epoch(genesis, slot) + 1)) - *stab_win {
Err(ShelleyMA(MIRCertificateTooLateinEpoch)) Err(ShelleyMA(MIRCertificateTooLateinEpoch))
} else { } else {
let (ir_reserves, ir_treasury) = ds.inst_rewards.clone(); let (ir_reserves, ir_treasury) = ds.inst_rewards.clone();
@ -655,8 +656,7 @@ fn check_mir(
Treasury => (acnt.treasury, ir_treasury.clone()), Treasury => (acnt.treasury, ir_treasury.clone()),
}; };
let mut combined: HashMap<StakeCredential, Coin> = HashMap::new(); let mut combined: HashMap<StakeCredential, Coin> = HashMap::new();
match &mir.target { if let StakeCredentials(kvp) = &mir.target {
StakeCredentials(kvp) => {
let mut kvv: Vec<(StakeCredential, u64)> = // TODO: Err if the value is negative let mut kvv: Vec<(StakeCredential, u64)> = // TODO: Err if the value is negative
kvp.iter().map(|kv| (kv.clone().0, kv.clone().1 as u64)).collect(); kvp.iter().map(|kv| (kv.clone().0, kv.clone().1 as u64)).collect();
kvv.extend(ir_pot); kvv.extend(ir_pot);
@ -664,8 +664,6 @@ fn check_mir(
combined.insert(key, value); combined.insert(key, value);
} }
} }
_ => (),
}
if combined.iter().map(|kv| kv.1).sum::<u64>() > pot { if combined.iter().map(|kv| kv.1).sum::<u64>() > pot {
return Err(ShelleyMA(InsufficientForInstantaneousRewards)); return Err(ShelleyMA(InsufficientForInstantaneousRewards));
} else { } else {

74
pallas-applying/tests/shelley_ma.rs
View file

@ -2,6 +2,7 @@ pub mod common;
use common::*; use common::*;
use pallas_addresses::{Address, Network, ShelleyAddress}; use pallas_addresses::{Address, Network, ShelleyAddress};
use pallas_applying::utils::PoolParam;
use pallas_applying::{ use pallas_applying::{
utils::{ utils::{
AccountState, Environment, MultiEraProtocolParameters, ShelleyMAError, ShelleyProtParams, AccountState, Environment, MultiEraProtocolParameters, ShelleyMAError, ShelleyProtParams,
@ -18,13 +19,11 @@ use pallas_codec::{
}; };
use pallas_crypto::hash::Hash; use pallas_crypto::hash::Hash;
use pallas_primitives::alonzo::{ use pallas_primitives::alonzo::{
MintedTx, MintedWitnessSet, Nonce, NonceVariant, RationalNumber, StakeCredential, Certificate, MintedTx, MintedWitnessSet, Nonce, NonceVariant, PoolKeyhash, PoolMetadata,
TransactionBody, TransactionOutput, VKeyWitness, Value, PoolMetadata, Relay, RationalNumber, Relay, StakeCredential, TransactionBody, TransactionOutput, VKeyWitness, Value,
PoolKeyhash, Certificate,
}; };
use pallas_traverse::{Era, MultiEraTx}; use pallas_traverse::{Era, MultiEraTx};
use std::str::FromStr; use std::str::FromStr;
use pallas_applying::utils::PoolParam;
#[cfg(test)] #[cfg(test)]
mod shelley_ma_tests { mod shelley_ma_tests {
@ -468,7 +467,11 @@ mod shelley_ma_tests {
Err(err) => panic!("Unexpected error ({:?})", err), Err(err) => panic!("Unexpected error ({:?})", err),
}; };
if !cert_state.pstate.pool_params.contains_key(&mary2_pool_operator()) { if !cert_state
.pstate
.pool_params
.contains_key(&mary2_pool_operator())
{
panic!("Pool not registered or keyhash mismatch"); panic!("Pool not registered or keyhash mismatch");
} }
} }
@ -484,15 +487,13 @@ mod shelley_ma_tests {
let metx: MultiEraTx = MultiEraTx::from_alonzo_compatible(&mtx, Era::Mary); let metx: MultiEraTx = MultiEraTx::from_alonzo_compatible(&mtx, Era::Mary);
let utxos: UTxOs = mk_utxo_for_alonzo_compatible_tx( let utxos: UTxOs = mk_utxo_for_alonzo_compatible_tx(
&mtx.transaction_body, &mtx.transaction_body,
&[( &[(String::from(MARY3_UTXO), Value::Coin(627_760_000), None)],
String::from(MARY3_UTXO),
Value::Coin(627_760_000),
None,
)],
); );
let mut cert_state: CertState = CertState::default(); let mut cert_state: CertState = CertState::default();
cert_state.pstate.pool_params cert_state
.pstate
.pool_params
.insert(mary2_pool_operator(), mary2_pool_param()); .insert(mary2_pool_operator(), mary2_pool_param());
match validate_txs(&[metx], &mary3_env(), &utxos, &mut cert_state) { match validate_txs(&[metx], &mary3_env(), &utxos, &mut cert_state) {
Ok(()) => (), Ok(()) => (),
@ -507,20 +508,37 @@ mod shelley_ma_tests {
// Params for the pool registered in `successful_mainnet_mary_tx_with_pool_reg` // Params for the pool registered in `successful_mainnet_mary_tx_with_pool_reg`
fn mary2_pool_param() -> PoolParam { fn mary2_pool_param() -> PoolParam {
PoolParam { PoolParam {
vrf_keyhash: Hash::from_str("1EFB798F239B9B02DEB4636A3AB1962AF43512595FCB82276E11971E684E49B7").unwrap(), vrf_keyhash: Hash::from_str(
"1EFB798F239B9B02DEB4636A3AB1962AF43512595FCB82276E11971E684E49B7",
)
.unwrap(),
pledge: 1000000000, pledge: 1000000000,
cost: 340000000, cost: 340000000,
margin: RationalNumber { numerator: 3, denominator: 100 }, margin: RationalNumber {
reward_account: hex::decode("E1FB2B631DB76384F64DD94B47F97FC8C2A206764C17A1DE7DA2F70E83").unwrap().into(), numerator: 3,
pool_owners: Vec::from([Hash::from_str("FB2B631DB76384F64DD94B47F97FC8C2A206764C17A1DE7DA2F70E83").unwrap()]), denominator: 100,
relays: [ },
Relay::SingleHostAddr(Nullable::Some(3001), reward_account: hex::decode(
"E1FB2B631DB76384F64DD94B47F97FC8C2A206764C17A1DE7DA2F70E83",
)
.unwrap()
.into(),
pool_owners: Vec::from([Hash::from_str(
"FB2B631DB76384F64DD94B47F97FC8C2A206764C17A1DE7DA2F70E83",
)
.unwrap()]),
relays: [Relay::SingleHostAddr(
Nullable::Some(3001),
Nullable::Some(hex::decode("C22614BB").unwrap().into()), Nullable::Some(hex::decode("C22614BB").unwrap().into()),
Nullable::Null,) Nullable::Null,
].to_vec(), )]
.to_vec(),
pool_metadata: Nullable::Some(PoolMetadata { pool_metadata: Nullable::Some(PoolMetadata {
url: "https://cardapool.com/a.json".to_string(), url: "https://cardapool.com/a.json".to_string(),
hash: Hash::from_str("01F708549816C9A075FF96E9682C11A5F5C7F4E147862A663BDEECE0716AB76E").unwrap(), hash: Hash::from_str(
"01F708549816C9A075FF96E9682C11A5F5C7F4E147862A663BDEECE0716AB76E",
)
.unwrap(),
}), }),
} }
} }
@ -1785,11 +1803,7 @@ mod shelley_ma_tests {
let metx: MultiEraTx = MultiEraTx::from_alonzo_compatible(&mtx, Era::Mary); let metx: MultiEraTx = MultiEraTx::from_alonzo_compatible(&mtx, Era::Mary);
let utxos: UTxOs = mk_utxo_for_alonzo_compatible_tx( let utxos: UTxOs = mk_utxo_for_alonzo_compatible_tx(
&mtx.transaction_body, &mtx.transaction_body,
&[( &[(String::from(MARY3_UTXO), Value::Coin(627_760_000), None)],
String::from(MARY3_UTXO),
Value::Coin(627_760_000),
None,
)],
); );
let mut cert_state: CertState = CertState::default(); let mut cert_state: CertState = CertState::default();
@ -1827,15 +1841,13 @@ mod shelley_ma_tests {
let utxos: UTxOs = mk_utxo_for_alonzo_compatible_tx( let utxos: UTxOs = mk_utxo_for_alonzo_compatible_tx(
&mtx.transaction_body, &mtx.transaction_body,
&[( &[(String::from(MARY3_UTXO), Value::Coin(627_760_000), None)],
String::from(MARY3_UTXO),
Value::Coin(627_760_000),
None,
)],
); );
let mut cert_state: CertState = CertState::default(); let mut cert_state: CertState = CertState::default();
cert_state.pstate.pool_params cert_state
.pstate
.pool_params
.insert(mary2_pool_operator(), mary2_pool_param()); .insert(mary2_pool_operator(), mary2_pool_param());
match validate_txs(&[metx], &mary3_env(), &utxos, &mut cert_state) { match validate_txs(&[metx], &mary3_env(), &utxos, &mut cert_state) {
Ok(()) => panic!("Staking key is not registered"), Ok(()) => panic!("Staking key is not registered"),