Swapd: Complete swap key manager refactor

<p dir="auto">This is the last big swap &lt;-&gt; wallet refactor - mostly because the wallet does not exist anymore after this.</p>
<p dir="auto">Here is a very basic overview of changes:</p>
<ul dir="auto">
<li>Move any mutating state from the wallet (so fields that we Optional before) into the swap state machine</li>
<li>Pass in Event and Runtime into the wallet functions</li>
<li>Use the farcaster core types instead of the wrapped p2p types for increased type safety</li>
<li>Move functions that functionally belong into the wallet from the swapd Runtime into the wallet</li>
<li>Thanks to these changes remove much of the complicated Error handling and checking from the wallet</li>
<li>The remote proof is now just verified, but not persisted anymore. It's therefore no longer part of the checkpoint!</li>
<li>Rename the <code class="notranslate">swapd/wallet.rs</code> to <code class="notranslate">swapd/swap_key_manager.rs</code></li>
</ul>

Author: Lederstrumpf

src/swapd/mod.rs

@@ -8,10 +8,10 @@
 mod opts;
 mod runtime;
 mod state_report;
+mod swap_key_manager;
 mod swap_state;
 mod syncer_client;
 mod temporal_safety;
-mod wallet;
 
 #[cfg(feature = "shell")]
 pub use opts::Opts;

src/swapd/runtime.rs

@@ -14,9 +14,9 @@ use crate::swapd::Opts;
 use crate::syncerd::bitcoin_syncer::p2wpkh_signed_tx_fee;
 use crate::syncerd::types::{Event, TransactionConfirmations};
 use crate::{
-    bus::ctl::{BitcoinFundingInfo, Checkpoint, CtlMsg, FundingInfo, Params},
+    bus::ctl::{BitcoinFundingInfo, Checkpoint, CtlMsg, FundingInfo},
     bus::info::{InfoMsg, SwapInfo},
-    bus::p2p::{Commit, PeerMsg, Reveal},
+    bus::p2p::PeerMsg,
     bus::sync::SyncMsg,
     bus::{BusMsg, Outcome, ServiceBus},
     syncerd::{HeightChanged, Task, TransactionRetrieved, XmrAddressAddendum},
@@ -34,7 +34,7 @@ use bitcoin::Txid;
 use colored::ColoredString;
 use farcaster_core::{
     blockchain::Blockchain,
-    crypto::{CommitmentEngine, SharedKeyId},
+    crypto::SharedKeyId,
     monero::SHARED_VIEW_KEY_ID,
     role::{SwapRole, TradeRole},
     swap::btcxmr::{Deal, DealParameters, Parameters},
@@ -786,70 +786,6 @@ impl Runtime {
         Ok(amount)
     }
 
-    pub fn taker_commit(
-        &mut self,
-        endpoints: &mut Endpoints,
-        params: Params,
-    ) -> Result<Commit, Error> {
-        self.log_info(format!(
-            "{} to Maker remote peer",
-            "Proposing to take swap".bright_white_bold(),
-        ));
-
-        let msg = format!(
-            "Proposing to take swap {} to Maker remote peer",
-            self.swap_id()
-        );
-        // Ignoring possible reporting errors here and after: do not want to
-        // halt the swap just because the client disconnected
-        let _ = self.report_progress_message(endpoints, msg);
-
-        let engine = CommitmentEngine;
-        let commitment = match params {
-            Params::Bob(params) => {
-                Commit::BobParameters(params.commit_bob(self.swap_id(), &engine))
-            }
-            Params::Alice(params) => {
-                Commit::AliceParameters(params.commit_alice(self.swap_id(), &engine))
-            }
-        };
-
-        Ok(commitment)
-    }
-
-    pub fn maker_commit(
-        &mut self,
-        endpoints: &mut Endpoints,
-        swap_id: SwapId,
-        params: Params,
-    ) -> Result<Commit, Error> {
-        self.log_info(format!(
-            "{} as Maker from Taker through peerd {}",
-            "Accepting swap".bright_white_bold(),
-            self.peer_service.bright_blue_italic()
-        ));
-
-        let msg = format!(
-            "Accepting swap {} as Maker from Taker through peerd {}",
-            swap_id, self.peer_service
-        );
-        // Ignoring possible reporting errors here and after: do not want to
-        // halt the swap just because the enquirer (farcasterd) disconnected
-        let _ = self.report_progress_message(endpoints, msg);
-
-        let engine = CommitmentEngine;
-        let commitment = match params {
-            Params::Bob(params) => {
-                Commit::BobParameters(params.commit_bob(self.swap_id(), &engine))
-            }
-            Params::Alice(params) => {
-                Commit::AliceParameters(params.commit_alice(self.swap_id(), &engine))
-            }
-        };
-
-        Ok(commitment)
-    }
-
     pub fn abort_swap(&mut self, endpoints: &mut Endpoints) -> Result<(), Error> {
         let swap_success_req = BusMsg::Ctl(CtlMsg::SwapOutcome(Outcome::FailureAbort));
         self.send_ctl(endpoints, ServiceId::Farcasterd, swap_success_req)?;
@@ -992,39 +928,3 @@ pub fn aggregate_xmr_spend_view(
         .elem();
     (alice_params.spend + bob_params.spend, alice_view + bob_view)
 }
-
-/// Parameter processing irrespective of maker & taker role. Return [`Params`] if the commit/reveal
-/// matches.
-pub fn validate_reveal(reveal: &Reveal, remote_commit: Commit) -> Result<Params, Error> {
-    let core_wallet = CommitmentEngine;
-    match reveal {
-        Reveal::Alice { parameters, .. } => match &remote_commit {
-            Commit::AliceParameters(commit) => {
-                commit.verify_with_reveal(&core_wallet, parameters.clone())?;
-                Ok(Params::Alice(parameters.clone().into_parameters()))
-            }
-            _ => {
-                let err_msg = format!(
-                    "expected Some(Commit::Alice(commit)), found {}",
-                    remote_commit
-                );
-                error!("{}", err_msg);
-                Err(Error::Farcaster(err_msg))
-            }
-        },
-        Reveal::Bob { parameters, .. } => match &remote_commit {
-            Commit::BobParameters(commit) => {
-                commit.verify_with_reveal(&core_wallet, parameters.clone())?;
-                Ok(Params::Bob(parameters.clone().into_parameters()))
-            }
-            _ => {
-                let err_msg = format!(
-                    "expected Some(Commit::Bob(commit)), found {}",
-                    remote_commit
-                );
-                error!("{}", err_msg);
-                Err(Error::Farcaster(err_msg))
-            }
-        },
-    }
-}