From 2a6e31db577fd5369e3f37747de3cfc3b0dab3a2 Mon Sep 17 00:00:00 2001 From: Uncle Stinky Date: Tue, 10 Nov 2026 14:05:28 +0300 Subject: [PATCH] align with updated probability signature and skip logic Signed-off-by: Uncle Stinky --- pallets/weaver/Cargo.toml | 2 +- pallets/weaver/src/errors.rs | 6 +++--- pallets/weaver/src/lib.rs | 13 +++++++++---- pallets/weaver/src/types.rs | 8 +++++--- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/pallets/weaver/Cargo.toml b/pallets/weaver/Cargo.toml index bafc1d3..a9b7678 100644 --- a/pallets/weaver/Cargo.toml +++ b/pallets/weaver/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ghost-weaver" -version = "0.0.27" +version = "0.0.28" description = "Weaving a secure cryptographic tapestry across different external chains." license.workspace = true authors.workspace = true diff --git a/pallets/weaver/src/errors.rs b/pallets/weaver/src/errors.rs index fb1b9df..a0fcf5c 100644 --- a/pallets/weaver/src/errors.rs +++ b/pallets/weaver/src/errors.rs @@ -7,7 +7,7 @@ pub enum WeavingError { UnknownWeavingPhase(NetworkId), OffchainLockPeriod(NetworkId), NoEndpointsAvailable(NetworkId), - ContradictoryHashes(NetworkId), + ContradictoryHashes(NetworkId, u32), ContradictoryBlocks(u32, ExternalBlockNumber, NetworkId), } @@ -34,9 +34,9 @@ impl core::fmt::Debug for WeavingError { "No RPC URLs configured for network #{:?}.", network_id ), - Self::ContradictoryHashes(network_id) => write!( + Self::ContradictoryHashes(network_id, len) => write!( fmt, - "Divergence among reported hashes for network #{:?}.", + "Divergence among {len} reported hashes for network #{:?}.", network_id ), Self::ContradictoryBlocks(len, deviation, network_id) => { diff --git a/pallets/weaver/src/lib.rs b/pallets/weaver/src/lib.rs index f21f615..023306b 100644 --- a/pallets/weaver/src/lib.rs +++ b/pallets/weaver/src/lib.rs @@ -830,12 +830,13 @@ impl Pallet { return Err(WeavingError::NoEndpointsAvailable(network_id)); } - let check_probability = |values_count: usize, blocks_left: BlockNumberFor| -> bool { + let check_probability = |values_count: usize, block_until: BlockNumberFor| -> bool { let total_authorities = Authorities::::decode_len().unwrap_or(1); let submission_probability = get_submission_probability( total_authorities, values_count, - blocks_left, + block_until, + current_block, ); let seed = sp_io::offchain::random_seed(); @@ -843,7 +844,7 @@ impl Pallet { .expect("input is padded with zeroes; qed"); let random_roll = Perbill::from_parts(randomness % Perbill::ACCURACY); - random_roll > submission_probability + random_roll >= submission_probability }; match TapestryDrafts::::get(&network_id) { @@ -915,9 +916,13 @@ impl Pallet { .then(|| (*first_hash, *first_next_session)) }) .ok_or(WeavingError::>::ContradictoryHashes( - network_id, + network_id, hashes_and_next_sessions.len() as u32 ))?; + if LoomStates::::get(&network_id, &weaving_session).root_hash == first_hash { + return Ok(WeavingOk::HashUnchanged(network_id)); + } + let next_session_bytes = first_next_session.to_be_bytes(); let weaving_session_bytes = weaving_session.to_be_bytes(); diff --git a/pallets/weaver/src/types.rs b/pallets/weaver/src/types.rs index ed560b8..3aeee07 100644 --- a/pallets/weaver/src/types.rs +++ b/pallets/weaver/src/types.rs @@ -37,6 +37,7 @@ const PROTOCOL_PREFIX: [u8; 7] = [0x47, 0x48, 0x53, 0x54, 0x74, 0x6F, 0x3A]; pub enum WeavingOk { Skipped(NetworkId), + HashUnchanged(NetworkId), Block(ExternalBlockNumber, u32, NetworkId), Hash(ExternalBlockNumber, H256, WeavingSession, NetworkId), } @@ -47,9 +48,10 @@ where { fn fmt(&self, fmt: &mut core::fmt::Formatter) -> core::fmt::Result { match self { - Self::Skipped(network_id) => write!(fmt, "Submission step skipped for network: {:?} based on probability distribution.", network_id), - Self::Block(block, count, network_id) => write!(fmt, "Verified block height #{:?} for network: {:?} based on {} parsed requests.", block, network_id, count), - Self::Hash(block, hash, next_session, network_id) => write!(fmt, "Extracted Merkle Root {:?} (next session is {:?}) from block #{:?} for network: {:?}.", hash, next_session, block, network_id), + Self::Skipped(network_id) => write!(fmt, "Submission step skipped for network: #{:?} based on probability distribution.", network_id), + Self::HashUnchanged(network_id) => write!(fmt, "Merkle Root unchanged for network: #{:?}, skipping submission.", network_id), + Self::Block(block, count, network_id) => write!(fmt, "Verified block height #{:?} for network: #{:?} based on {} parsed requests.", block, network_id, count), + Self::Hash(block, hash, next_session, network_id) => write!(fmt, "Extracted Merkle Root {:?} (next session is {:?}) from block #{:?} for network: #{:?}.", hash, next_session, block, network_id), } } }