From 5e4267fdde83a2382a52c2d409bbec91986d0351 Mon Sep 17 00:00:00 2001 From: Uncle Stinky Date: Thu, 19 Nov 2026 17:31:59 +0300 Subject: [PATCH] extend event during bridging with exodus_session for UI only Signed-off-by: Uncle Stinky --- Cargo.lock | 6 +++--- pallets/exodus/Cargo.toml | 2 +- pallets/exodus/src/lib.rs | 23 +++++++++++++++-------- pallets/exodus/src/tests.rs | 1 + pallets/traits/Cargo.toml | 2 +- pallets/traits/src/exodus.rs | 2 +- runtime/casper/Cargo.toml | 2 +- runtime/casper/src/lib.rs | 2 +- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3d87006..3a7f57a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1195,7 +1195,7 @@ dependencies = [ [[package]] name = "casper-runtime" -version = "4.0.21" +version = "4.0.25" dependencies = [ "casper-runtime-constants", "frame-benchmarking", @@ -3685,7 +3685,7 @@ dependencies = [ [[package]] name = "ghost-exodus" -version = "0.1.7" +version = "0.1.11" dependencies = [ "chacha20poly1305", "frame-benchmarking", @@ -4090,7 +4090,7 @@ dependencies = [ [[package]] name = "ghost-traits" -version = "0.4.10" +version = "0.4.11" dependencies = [ "frame-support", "frost-core", diff --git a/pallets/exodus/Cargo.toml b/pallets/exodus/Cargo.toml index 67e63d4..33a470d 100644 --- a/pallets/exodus/Cargo.toml +++ b/pallets/exodus/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ghost-exodus" -version = "0.1.10" +version = "0.1.11" description = "Threshold signature generation with DKG included" license.workspace = true authors.workspace = true diff --git a/pallets/exodus/src/lib.rs b/pallets/exodus/src/lib.rs index 0e21cc8..0a68bda 100644 --- a/pallets/exodus/src/lib.rs +++ b/pallets/exodus/src/lib.rs @@ -455,6 +455,7 @@ pub mod pallet { amount: BalanceOf, bounty: Perbill, receiver: EvmAddress, + exodus_session: ExodusSession, } } @@ -1798,7 +1799,7 @@ pub mod pallet { Fortitude::Polite, )?; - Self::do_register_evm_bridge_out_exodus( + let exodus_session = Self::do_register_evm_bridge_out_exodus( network_id, actual_amount, bounty, @@ -1811,6 +1812,7 @@ pub mod pallet { amount: actual_amount, bounty, receiver, + exodus_session, }); Ok(()) @@ -2084,7 +2086,7 @@ impl Pallet { fn do_register_evm_exodus( network_id: NetworkIdOf, exodus_request: ExodusRequest, - ) -> DispatchResult { + ) -> Result { let network = T::NetworkDataHandler::get(&network_id) .ok_or(Error::::NetworkDoesNotExist)?; @@ -2100,7 +2102,7 @@ impl Pallet { ExodusRequests::::insert((&network.curve, &exodus_context), exodus_request); - Ok(()) + Ok(exodus_session) } fn do_register_evm_bridge_out_exodus( @@ -2108,7 +2110,7 @@ impl Pallet { amount: BalanceOf, bounty: Perbill, receiver: EvmAddress, - ) -> DispatchResult { + ) -> Result { let out_amount = T::NetworkDataHandler::register_outgoing(&network_id, amount) .map_err(|_| Error::::BridgeOverflow)?; @@ -2122,7 +2124,7 @@ impl Pallet { network_id: NetworkIdOf, target_address: EvmAddress, governance_action: GovernanceAction, - ) -> DispatchResult { + ) -> Result { let evm_governance_request = ExodusRequest::evm_governance(target_address, governance_action); @@ -5399,12 +5401,17 @@ impl EvmGovernanceRegistrar, EvmAddress, GovernanceAct network_id: NetworkIdOf, target_address: EvmAddress, governance_action: GovernanceAction, - ) -> DispatchResult { - Self::do_register_evm_governance( + ) -> Result { + let exodus_session = Self::do_register_evm_governance( network_id, target_address, governance_action, - ) + )?; + + let exodus_session_u128: u128 = exodus_session + .unique_saturated_into(); + + Ok(exodus_session_u128) } } diff --git a/pallets/exodus/src/tests.rs b/pallets/exodus/src/tests.rs index e487289..3159621 100644 --- a/pallets/exodus/src/tests.rs +++ b/pallets/exodus/src/tests.rs @@ -1433,6 +1433,7 @@ fn register_evm_bridge_out_dynamic_threshold_works() { amount: amount_1, bounty, receiver, + exodus_session: 0, } )); diff --git a/pallets/traits/Cargo.toml b/pallets/traits/Cargo.toml index b61a175..392746e 100644 --- a/pallets/traits/Cargo.toml +++ b/pallets/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ghost-traits" -version = "0.4.10" +version = "0.4.11" description = "Shared traits including `GhostHasher`, `NetworkDataBasicHandler`, `BoundedBTreeMap`, `MerkleTree` and more." license.workspace = true authors.workspace = true diff --git a/pallets/traits/src/exodus.rs b/pallets/traits/src/exodus.rs index 5aa6f73..866c76a 100644 --- a/pallets/traits/src/exodus.rs +++ b/pallets/traits/src/exodus.rs @@ -128,5 +128,5 @@ pub trait EvmGovernanceRegistrar { network_id: NetworkId, target_address: EvmAddress, governance_action: GovernanceAction - ) -> frame_support::dispatch::DispatchResult; + ) -> Result; } diff --git a/runtime/casper/Cargo.toml b/runtime/casper/Cargo.toml index fe9ba08..7977eb2 100644 --- a/runtime/casper/Cargo.toml +++ b/runtime/casper/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "casper-runtime" -version = "4.0.24" +version = "4.0.25" build = "build.rs" description = "Runtime of the Casper Network" edition.workspace = true diff --git a/runtime/casper/src/lib.rs b/runtime/casper/src/lib.rs index 5229b07..9a4b78c 100644 --- a/runtime/casper/src/lib.rs +++ b/runtime/casper/src/lib.rs @@ -124,7 +124,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("casper"), impl_name: create_runtime_str!("casper-svengali"), authoring_version: 0, - spec_version: 18, + spec_version: 19, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1,