Skip to content
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

Jump to bottom

Merge the valid_bundles, invalid_bundles, and block_extrinsics_roots fields of the ER into one bundles field and add more precise fraud detection #1995

Merged
merged 6 commits into from
Oct 6, 2023
Merged

Merge the valid_bundles, invalid_bundles, and block_extrinsics_roots fields of the ER into one bundles field and add more precise fraud detection #1995

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2cddcd2
Rename InboxedBundle storage item to InboxedBundleAuthor and remove B…
NingLin-P Sep 22, 2023
6a758b8
Merge the valid_bundles, invalid_bundle, and block_extrinsics_roots f…
NingLin-P Sep 22, 2023
3836bd6
Support finding the first mismatch of the ER::bundles to detect fraud
NingLin-P Sep 22, 2023
838ac71
Fix test test_invalid_domain_extrinsic_root_proof
NingLin-P Oct 3, 2023
2da9280
Apply review suggestions
NingLin-P Oct 5, 2023
d957fc4
Merge branch 'main' of github.com:subspace/subspace into ER-refactoring
NingLin-P Oct 5, 2023
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
19 changes: 12 additions & 7 deletions domains/client/domain-operator/src/aux_schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use sc_client_api::backend::AuxStore;
use sc_client_api::HeaderBackend;
use sp_blockchain::{Error as ClientError, Result as ClientResult};
use sp_core::H256;
use sp_domains::InvalidBundleType;
use sp_runtime::traits::{Block as BlockT, NumberFor, One, SaturatedConversion};
use subspace_core_primitives::BlockNumber;

Expand Down Expand Up @@ -230,11 +231,15 @@ pub(super) fn target_receipt_is_pruned(
head_receipt_number.saturating_sub(target_block) >= PRUNING_DEPTH
}

// TODO: Naming could use some work
#[derive(Encode, Decode, Debug, PartialEq)]
pub(super) enum InvalidBundlesMismatchType {
ValidAsInvalid,
InvalidAsValid,
pub(super) enum BundleMismatchType {
// The invalid bundle is mismatch
// For `TrueInvalid`, the fraud proof need to prove the bundle is indees invalid due to `InvalidBundleType`
// For `TrueInvalid`, the fraud proof need to prove the bundle is not invalid due to `InvalidBundleType`
NingLin-P marked this conversation as resolved.
Show resolved Hide resolved
TrueInvalid(InvalidBundleType),
FalseInvalid(InvalidBundleType),
// The valid bundle is mismatch
Valid,
}

#[derive(Encode, Decode, Debug, PartialEq)]
Expand All @@ -249,8 +254,8 @@ pub(super) enum ReceiptMismatchInfo<CHash> {
DomainExtrinsicsRoot {
consensus_block_hash: CHash,
},
InvalidBundles {
mismatch_type: InvalidBundlesMismatchType,
Bundles {
mismatch_type: BundleMismatchType,
bundle_index: u32,
consensus_block_hash: CHash,
},
Expand All @@ -275,7 +280,7 @@ impl<CHash: Clone> ReceiptMismatchInfo<CHash> {
consensus_block_hash,
..
} => consensus_block_hash.clone(),
ReceiptMismatchInfo::InvalidBundles {
ReceiptMismatchInfo::Bundles {
consensus_block_hash,
..
} => consensus_block_hash.clone(),
Expand Down
Loading
Loading