Merge pull request fedimint#5851 from joschisan/lnv2_extensible_outcome

Lnv2 extensible outcome
Kodylow · Aug 15, 2024 · d4a043e · d4a043e
2 parents 1d84569 + de5530c
commit d4a043e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 17 deletions.
diff --git a/gateway/ln-gateway/src/gateway_module_v2/receive_sm.rs b/gateway/ln-gateway/src/gateway_module_v2/receive_sm.rs
@@ -18,7 +18,9 @@ use fedimint_core::task::sleep;
 use fedimint_core::{NumPeersExt, OutPoint, PeerId, TransactionId};
 use fedimint_lnv2_client::LightningClientStateMachines;
 use fedimint_lnv2_common::contracts::IncomingContract;
-use fedimint_lnv2_common::{LightningInput, LightningInputV0, LightningOutputOutcome};
+use fedimint_lnv2_common::{
+    LightningInput, LightningInputV0, LightningOutputOutcome, LightningOutputOutcomeV0,
+};
 use tpe::{aggregate_decryption_shares, AggregatePublicKey, DecryptionKeyShare, PublicKeyShare};
 use tracing::{error, trace};
 
@@ -157,18 +159,18 @@ impl ReceiveStateMachine {
         let verify_decryption_share = move |peer, outcome: SerdeOutputOutcome| {
             let outcome = deserialize_outcome::<LightningOutputOutcome>(&outcome, &module_decoder)?;
 
-            match outcome {
-                LightningOutputOutcome::Incoming(share) => {
+            match outcome.ensure_v0_ref()? {
+                LightningOutputOutcomeV0::Incoming(share) => {
                     if !decryption_contract.verify_decryption_share(
                         tpe_pks.get(&peer).ok_or(anyhow!("Unknown peer pk"))?,
-                        &share,
+                        share,
                     ) {
                         bail!("Invalid decryption share");
                     }
 
-                    Ok(share)
+                    Ok(*share)
                 }
-                LightningOutputOutcome::Outgoing => {
+                LightningOutputOutcomeV0::Outgoing => {
                     bail!("Unexpected outcome variant");
                 }
             }

diff --git a/modules/fedimint-lnv2-common/src/lib.rs b/modules/fedimint-lnv2-common/src/lib.rs
@@ -77,15 +77,21 @@ impl std::fmt::Display for LightningOutputV0 {
     }
 }
 
+extensible_associated_module_type!(
+    LightningOutputOutcome,
+    LightningOutputOutcomeV0,
+    UnknownLightningOutputOutcomeVariantError
+);
+
 #[derive(Debug, Clone, Eq, PartialEq, Hash, Deserialize, Serialize, Encodable, Decodable)]
-pub enum LightningOutputOutcome {
+pub enum LightningOutputOutcomeV0 {
     Outgoing,
     Incoming(DecryptionKeyShare),
 }
 
-impl std::fmt::Display for LightningOutputOutcome {
+impl std::fmt::Display for LightningOutputOutcomeV0 {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "LightningOutputOutcome")
+        write!(f, "LightningOutputOutcomeV0")
     }
 }
 

diff --git a/modules/fedimint-lnv2-server/src/db.rs b/modules/fedimint-lnv2-server/src/db.rs
@@ -1,12 +1,10 @@
 use fedimint_core::encoding::{Decodable, Encodable};
 use fedimint_core::{impl_db_lookup, impl_db_record, OutPoint, PeerId};
 use fedimint_lnv2_common::contracts::{IncomingContract, OutgoingContract};
-use fedimint_lnv2_common::{ContractId, GatewayEndpoint};
+use fedimint_lnv2_common::{ContractId, GatewayEndpoint, LightningOutputOutcome};
 use serde::{Deserialize, Serialize};
 use strum_macros::EnumIter;
 
-use crate::LightningOutputOutcome;
-
 #[repr(u8)]
 #[derive(Clone, EnumIter, Debug)]
 pub enum DbKeyPrefix {

diff --git a/modules/fedimint-lnv2-server/src/lib.rs b/modules/fedimint-lnv2-server/src/lib.rs
@@ -43,8 +43,8 @@ use fedimint_lnv2_common::endpoint_constants::{
 use fedimint_lnv2_common::{
     ContractId, GatewayEndpoint, LightningCommonInit, LightningConsensusItem, LightningInput,
     LightningInputError, LightningInputV0, LightningModuleTypes, LightningOutput,
-    LightningOutputError, LightningOutputOutcome, LightningOutputV0, OutgoingWitness,
-    MODULE_CONSENSUS_VERSION,
+    LightningOutputError, LightningOutputOutcome, LightningOutputOutcomeV0, LightningOutputV0,
+    OutgoingWitness, MODULE_CONSENSUS_VERSION,
 };
 use fedimint_server::config::distributedgen::{evaluate_polynomial_g1, PeerHandleOps};
 use fedimint_server::net::api::check_auth;
@@ -465,7 +465,7 @@ impl ServerModule for Lightning {
                     return Err(LightningOutputError::ContractAlreadyExists);
                 }
 
-                LightningOutputOutcome::Outgoing
+                LightningOutputOutcomeV0::Outgoing
             }
             LightningOutputV0::Incoming(contract) => {
                 if !contract.verify() {
@@ -486,12 +486,15 @@ impl ServerModule for Lightning {
 
                 let dk_share = contract.create_decryption_key_share(&self.cfg.private.sk);
 
-                LightningOutputOutcome::Incoming(dk_share)
+                LightningOutputOutcomeV0::Incoming(dk_share)
             }
         };
 
         if dbtx
-            .insert_entry(&OutputOutcomeKey(out_point), &outcome)
+            .insert_entry(
+                &OutputOutcomeKey(out_point),
+                &LightningOutputOutcome::V0(outcome),
+            )
             .await
             .is_some()
         {