evert changes to changelog and impl FinalizeContext

Author: 0xZaddyy

flake.nix

@@ -69,12 +69,12 @@
             doCheck = false; # skip testing, since that's done in flake check
           };
 
-        fileSetForCrate = mailbox:
+        fileSetForCrate = subdir:
           pkgs.lib.fileset.toSource {
             root = ./.;
             fileset = pkgs.lib.fileset.unions [
               ./Cargo.toml
-              (craneLib.fileset.commonCargoSources mailbox)
+              (craneLib.fileset.commonCargoSources subdir)
             ];
           };
 

payjoin-cli/src/app/v1.rs

@@ -69,7 +69,7 @@ impl AppTrait for App {
         let (req, ctx) = SenderBuilder::new(psbt, uri.clone())
             .build_recommended(fee_rate)
             .with_context(|| "Failed to build payjoin request")?
-            .extract_v1();
+            .create_v1_post_request();
         let http = http_agent()?;
         let body = String::from_utf8(req.body.clone()).unwrap();
         println!("Sending fallback request to {}", &req.url);

payjoin-cli/src/app/v2/mod.rs

@@ -208,8 +208,9 @@ impl App {
         sender: Sender<WithReplyKey>,
         persister: &SenderPersister,
     ) -> Result<()> {
-        let (req, ctx) = sender
-            .create_v2_post_request(self.unwrap_relay_or_else_fetch(Some(sender.endpoint().clone())).await?)?;
+        let (req, ctx) = sender.create_v2_post_request(
+            self.unwrap_relay_or_else_fetch(Some(sender.endpoint().clone())).await?,
+        )?;
         let response = post_request(req).await?;
         println!("Posted original proposal...");
         let sender = sender.process_response(&response.bytes().await?, ctx).save(persister)?;
@@ -514,4 +515,4 @@ fn map_reqwest_err(e: reqwest::Error) -> anyhow::Error {
         Some(status_code) => anyhow!("HTTP request failed: {} {}", status_code, e),
         None => anyhow!("No HTTP response: {}", e),
     }
-}
+}

payjoin-directory/src/db.rs

@@ -71,24 +71,15 @@ impl DbPool {
         self.peek_with_timeout(mailbox_id, PJ_V1_COLUMN).await
     }
 
-    async fn push(
-        &self,
-        mailbox_id: &ShortId,
-        channel_type: &str,
-        data: Vec<u8>,
-    ) -> Result<()> {
+    async fn push(&self, mailbox_id: &ShortId, channel_type: &str, data: Vec<u8>) -> Result<()> {
         let mut conn = self.client.get_async_connection().await?;
         let key = channel_name(mailbox_id, channel_type);
         () = conn.set(&key, data.clone()).await?;
         () = conn.publish(&key, "updated").await?;
         Ok(())
     }
 
-    async fn peek_with_timeout(
-        &self,
-        mailbox_id: &ShortId,
-        channel_type: &str,
-    ) -> Result<Vec<u8>> {
+    async fn peek_with_timeout(&self, mailbox_id: &ShortId, channel_type: &str) -> Result<Vec<u8>> {
         match tokio::time::timeout(self.timeout, self.peek(mailbox_id, channel_type)).await {
             Ok(redis_result) => match redis_result {
                 Ok(result) => Ok(result),

payjoin-ffi/python/test/test_payjoin_integration_test.py

@@ -159,10 +159,7 @@ async def test_integration_v2_to_v2(self):
             # Create a funded PSBT (not broadcasted) to address with amount given in the pj_uri
             pj_uri = session.pj_uri()
             psbt = build_sweep_psbt(self.sender, pj_uri)
-            new_sender = SenderBuilder(psbt, pj_uri).build_recommended(1000)
-            persister = InMemorySenderPersister()
-            token = new_sender.persist(persister)
-            req_ctx: WithReplyKey = WithReplyKey.load(token, persister)
+            req_ctx: WithReplyKey = SenderBuilder(psbt, pj_uri).build_recommended(1000).save(sender_persister)
             request: RequestV2PostContext = req_ctx.create_v2_post_request(ohttp_relay.as_string())
             response = await agent.post(
                 url=request.request.url.as_string(),

payjoin-ffi/src/receive/mod.rs

@@ -87,7 +87,7 @@ impl InitInputsTransition {
     }
 }
 
-pub struct x(
+pub struct UninitializedReceiver(
     payjoin::receive::v2::Receiver<payjoin::receive::v2::UninitializedReceiver>,
 );
 
@@ -208,7 +208,7 @@ impl
     }
 }
 
-impl WithContext {
+impl Initialized {
     pub fn create_poll_request(&self, ohttp_relay: String) -> Result<(Request, ClientResponse), Error> {
         self.0
             .clone()
@@ -218,8 +218,8 @@ impl WithContext {
     }
 
     ///The response can either be an UncheckedProposal or an ACCEPTED message indicating no UncheckedProposal is available yet.
-    pub fn process_response(&self, body: &[u8], ctx: &ClientResponse) -> WithContextTransition {
-        WithContextTransition(Arc::new(RwLock::new(Some(
+    pub fn process_response(&self, body: &[u8], ctx: &ClientResponse) -> InitializedTransition {
+        InitializedTransition(Arc::new(RwLock::new(Some(
             self.0.clone().process_response(body, ctx.into()),
         ))))
     }

payjoin-ffi/src/receive/uni.rs

@@ -271,7 +271,7 @@ impl InitializedTransitionOutcome {
 
 #[uniffi::export]
 impl Initialized {
-    /// The contents of the `&pj=` query parameter including the base64url-encoded public key receiver subdirectory.
+    /// The contents of the `&pj=` query parameter including the base64url-encoded public key receiver mailbox.
     /// This identifies a session at the payjoin directory server.
     pub fn pj_uri(&self) -> crate::PjUri { self.0.pj_uri() }
 
@@ -282,8 +282,8 @@ impl Initialized {
     }
 
     ///The response can either be an UncheckedProposal or an ACCEPTED message indicating no UncheckedProposal is available yet.
-    pub fn process_res(&self, body: &[u8], context: Arc<ClientResponse>) -> InitializedTransition {
-        InitializedTransition(self.0.process_res(body, &context))
+    pub fn process_response(&self, body: &[u8], context: Arc<ClientResponse>) -> InitializedTransition {
+        InitializedTransition(self.0.process_response(body, &context))
     }
 
     pub fn to_json(&self) -> Result<String, SerdeJsonError> { self.0.to_json() }
@@ -730,7 +730,7 @@ impl PayjoinProposal {
     ///
     /// After this function is called, the receiver can either wait for the Payjoin transaction to be broadcast or choose to broadcast the original PSBT.
     pub fn process_res(&self, body: &[u8], ctx: Arc<ClientResponse>) -> PayjoinProposalTransition {
-        PayjoinProposalTransition(self.0.process_res(body, ctx.as_ref()))
+        PayjoinProposalTransition(self.0.process_response(body, ctx.as_ref()))
     }
 }
 

payjoin-ffi/src/send/mod.rs

@@ -208,9 +208,6 @@ impl WithReplyKeyTransition {
 }
 
 impl WithReplyKey {
-    pub fn extract_v1(&self) -> (Request, V1Context) {
-        let (req, ctx) = self.0.clone().extract_v1();
-    }
     pub fn create_v1_post_request(&self) -> (Request, V1Context) {
         let (req, ctx) = self.0.clone().create_v1_post_request();
         (req.into(), ctx.into())

payjoin-ffi/src/send/uni.rs

@@ -222,20 +222,6 @@ impl WithReplyKeyTransition {
 
 #[uniffi::export]
 impl WithReplyKey {
-    pub fn extract_v1(&self) -> RequestV1Context {
-        let (req, ctx) = self.0.extract_v1();
-    }
-    #[uniffi::constructor]
-    pub fn load(
-        token: Arc<SenderToken>,
-        persister: Arc<dyn SenderPersister>,
-    ) -> Result<Self, ImplementationError> {
-        Ok(super::WithReplyKey::from(
-            (*persister.load(token).map_err(|e| ImplementationError::from(e.to_string()))?).clone(),
-        )
-        .into())
-    }
-
     pub fn create_v1_post_request(&self) -> RequestV1Context {
         let (req, ctx) = self.0.create_v1_post_request();
         RequestV1Context { request: req, context: Arc::new(ctx.into()) }

payjoin-ffi/tests/bdk_integration_test.rs

@@ -316,7 +316,7 @@ mod v2 {
                 .send()
                 .await?;
             let proposal = session
-                .process_res(&response.bytes().await?, &client_response)
+                .process_response(&response.bytes().await?, &client_response)
                 .save(&recv_session_persister)?
                 .success()
                 .expect("proposal should exist");
@@ -330,7 +330,7 @@ mod v2 {
                 .send()
                 .await?;
             payjoin_proposal
-                .process_res(&response.bytes().await?, &client_response)
+                .process_response(&response.bytes().await?, &client_response)
                 .save(&recv_session_persister)?;
 
             // **********************