gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove feature switch for secp256k1 program (#18467)

Browse Source 
* Remove feature switch for secp256k1 program

* fix tests
This commit is contained in:
Justin Starry
2021-07-09 10:08:03 -05:00
committed by GitHub
parent 4e1333fbe6
commit fd574dcb3b
10 changed files with 41 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ledger/src/blockstore_processor.rs
View File

@ -791,11 +791,8 @@ pub fn confirm_slot(
};
let check_start = Instant::now();
let check_result = entries.verify_and_hash_transactions(
skip_verification,
bank.secp256k1_program_enabled(),
bank.verify_tx_signatures_len_enabled(),
);
let check_result = entries
.verify_and_hash_transactions(skip_verification, bank.verify_tx_signatures_len_enabled());
if check_result.is_none() {
warn!("Ledger proof of history failed at slot: {}", slot);
return Err(BlockError::InvalidEntryHash.into());

21
ledger/src/entry.rs
View File

@ -359,7 +359,6 @@ pub trait EntrySlice {
fn verify_and_hash_transactions(
&self,
skip_verification: bool,
secp256k1_program_enabled: bool,
verify_tx_signatures_len: bool,
) -> Option<Vec<EntryType<'_>>>;
}
@ -515,7 +514,6 @@ impl EntrySlice for [Entry] {
fn verify_and_hash_transactions<'a>(
&'a self,
skip_verification: bool,
secp256k1_program_enabled: bool,
verify_tx_signatures_len: bool,
) -> Option<Vec<EntryType<'a>>> {
let verify_and_hash = |tx: &'a Transaction| -> Option<HashedTransaction<'a>> {
@ -524,10 +522,7 @@ impl EntrySlice for [Entry] {
if size > PACKET_DATA_SIZE as u64 {
return None;
}
if secp256k1_program_enabled {
// Verify tx precompiles if secp256k1 program is enabled.
tx.verify_precompiles().ok()?;
}
tx.verify_precompiles().ok()?;
if verify_tx_signatures_len && !tx.verify_signatures_len() {
return None;
}
@ -927,10 +922,10 @@ mod tests {
let tx = make_transaction(TestCase::RemoveSignature);
let entries = vec![next_entry(&recent_blockhash, 1, vec![tx])];
assert!(entries[..]
.verify_and_hash_transactions(false, false, false)
.verify_and_hash_transactions(false, false)
.is_some());
assert!(entries[..]
.verify_and_hash_transactions(false, false, true)
.verify_and_hash_transactions(false, true)
.is_none());
}
// Too many signatures.
@ -938,10 +933,10 @@ mod tests {
let tx = make_transaction(TestCase::AddSignature);
let entries = vec![next_entry(&recent_blockhash, 1, vec![tx])];
assert!(entries[..]
.verify_and_hash_transactions(false, false, false)
.verify_and_hash_transactions(false, false)
.is_some());
assert!(entries[..]
.verify_and_hash_transactions(false, false, true)
.verify_and_hash_transactions(false, true)
.is_none());
}
}
@ -967,7 +962,7 @@ mod tests {
let entries = vec![next_entry(&recent_blockhash, 1, vec![tx.clone()])];
assert!(bincode::serialized_size(&tx).unwrap() <= PACKET_DATA_SIZE as u64);
assert!(entries[..]
.verify_and_hash_transactions(false, false, false)
.verify_and_hash_transactions(false, false)
.is_some());
}
// Big transaction.
@ -976,7 +971,7 @@ mod tests {
let entries = vec![next_entry(&recent_blockhash, 1, vec![tx.clone()])];
assert!(bincode::serialized_size(&tx).unwrap() > PACKET_DATA_SIZE as u64);
assert!(entries[..]
.verify_and_hash_transactions(false, false, false)
.verify_and_hash_transactions(false, false)
.is_none());
}
// Assert that verify fails as soon as serialized
@ -987,7 +982,7 @@ mod tests {
assert_eq!(
bincode::serialized_size(&tx).unwrap() <= PACKET_DATA_SIZE as u64,
entries[..]
.verify_and_hash_transactions(false, false, false)
.verify_and_hash_transactions(false, false)
.is_some(),
);
}