Skip to content

Invalidate stale drand transactions #1665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sam0x17 merged 4 commits into from
May 21, 2025
+15 −11
Merged

Invalidate stale drand transactions #1665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb3a7ad
ignore stale drand
liamaharon May 21, 2025
5d185cf
spec version bump
liamaharon May 21, 2025
dd3dcb6
tests
liamaharon May 21, 2025
397e997
bump for safety
liamaharon May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pallets/drand/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,10 @@ pub mod pallet {
pulses_payload: payload,
signature,
} => {
// Blacklist stale pulses in the txpool that can stall finalization.
if payload.block_number < BlockNumberFor::<T>::from(5612500u32) {
return InvalidTransaction::Stale.into();
}
let signature = signature.as_ref().ok_or(InvalidTransaction::BadSigner)?;
Self::validate_signature_and_parameters(
payload,
Expand Down
20 changes: 10 additions & 10 deletions pallets/drand/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ fn it_can_submit_valid_pulse_when_beacon_config_exists() {
let p: Pulse = u_p.try_into_pulse().unwrap();

let alice = sp_keyring::Sr25519Keyring::Alice;
let block_number = 1;
let block_number = 100_000_000;
System::set_block_number(block_number);

// Set the beacon config
Expand Down Expand Up @@ -91,7 +91,7 @@ fn it_can_submit_valid_pulse_when_beacon_config_exists() {
fn it_rejects_invalid_pulse_due_to_bad_signature() {
new_test_ext().execute_with(|| {
let alice = sp_keyring::Sr25519Keyring::Alice;
let block_number = 1;
let block_number = 100_000_000;
System::set_block_number(block_number);

// Set the beacon config using Root origin
Expand Down Expand Up @@ -139,7 +139,7 @@ fn it_rejects_invalid_pulse_due_to_bad_signature() {
#[test]
fn it_rejects_pulses_with_non_incremental_round_numbers() {
new_test_ext().execute_with(|| {
let block_number = 1;
let block_number = 100_000_000;
let alice = sp_keyring::Sr25519Keyring::Alice;
System::set_block_number(block_number);

Expand Down Expand Up @@ -189,7 +189,7 @@ fn it_rejects_pulses_with_non_incremental_round_numbers() {
#[test]
fn it_blocks_non_root_from_submit_beacon_info() {
new_test_ext().execute_with(|| {
let block_number = 1;
let block_number = 100_000_000;
let alice = sp_keyring::Sr25519Keyring::Alice;
System::set_block_number(block_number);

Expand Down Expand Up @@ -239,7 +239,7 @@ fn it_blocks_non_root_from_submit_beacon_info() {
#[test]
fn signed_cannot_submit_beacon_info() {
new_test_ext().execute_with(|| {
let block_number = 1;
let block_number = 100_000_000;
let alice = sp_keyring::Sr25519Keyring::Alice;
System::set_block_number(block_number);

Expand Down Expand Up @@ -268,7 +268,7 @@ fn signed_cannot_submit_beacon_info() {
#[test]
fn test_validate_unsigned_write_pulse() {
new_test_ext().execute_with(|| {
let block_number = 1;
let block_number = 100_000_000;
let alice = sp_keyring::Sr25519Keyring::Alice;
System::set_block_number(block_number);
let pulses_payload = PulsesPayload {
Expand All @@ -293,7 +293,7 @@ fn test_validate_unsigned_write_pulse() {
#[test]
fn test_not_validate_unsigned_write_pulse_with_bad_proof() {
new_test_ext().execute_with(|| {
let block_number = 1;
let block_number = 100_000_000;
let alice = sp_keyring::Sr25519Keyring::Alice;
System::set_block_number(block_number);
let pulses_payload = PulsesPayload {
Expand All @@ -319,7 +319,7 @@ fn test_not_validate_unsigned_write_pulse_with_bad_proof() {
#[test]
fn test_not_validate_unsigned_write_pulse_with_no_payload_signature() {
new_test_ext().execute_with(|| {
let block_number = 1;
let block_number = 100_000_000;
let alice = sp_keyring::Sr25519Keyring::Alice;
System::set_block_number(block_number);
let pulses_payload = PulsesPayload {
Expand Down Expand Up @@ -388,8 +388,8 @@ fn can_execute_and_handle_valid_http_responses() {
#[test]
fn validate_unsigned_rejects_future_block_number() {
new_test_ext().execute_with(|| {
let block_number = 1;
let future_block_number = 100;
let block_number = 100_000_000;
let future_block_number = 100_000_100;
let alice = sp_keyring::Sr25519Keyring::Alice;
System::set_block_number(block_number);
let pulses_payload = PulsesPayload {
Expand Down
2 changes: 1 addition & 1 deletion runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
// `spec_version`, and `authoring_version` are the same between Wasm and native.
// This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
// the compatible custom types.
spec_version: 263,
spec_version: 264,
impl_version: 1,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
Expand Down
Loading