Get payjoin send-receive communicating

dev/payjoin-cli/config.toml

@@ -2,4 +2,4 @@ bitcoind_rpcuser = "rpcuser"
 bitcoind_rpcpass = "rpcpassword"
 bitcoind_rpchost = "http://bitcoind:18443" # use default wallet
 pj_endpoint = "https://payjo.in"
-ohttp_relay = "https://ohttp.payjoin.org"
+ohttp_relay = "https://pj.bobspacebkk.com"

docker-compose.yml

@@ -91,6 +91,10 @@ services:
     volumes:
       - ${HOST_PROJECT_PATH:-.}/dev/payjoin-cli/config.toml:/config.toml
     depends_on: [ bitcoind ]
+    entrypoint: [ "/bin/sh", "-c" ]
+    command:
+      - |
+        tail -f /dev/null
   lnd:
     image: lightninglabs/lnd:v0.15.4-beta
     volumes:

src/address/repo.rs

@@ -149,6 +149,7 @@ impl Addresses {
         account_id: AccountId,
         address: String,
     ) -> Result<WalletAddress, AddressError> {
+        println!("find address: {:?}", address);
         let rows = sqlx::query!(
             r#"
               SELECT b.id, e.sequence, e.event
@@ -161,7 +162,7 @@ impl Addresses {
         )
         .fetch_all(&self.pool)
         .await?;
-
+        println!("found smth?");
         if rows.is_empty() {
             return Err(AddressError::AddressNotFound(address));
         }
@@ -170,6 +171,7 @@ impl Addresses {
         for row in rows {
             events.load_event(row.sequence as usize, row.event)?;
         }
+        println!("event loaded");
         Ok(WalletAddress::try_from(events)?)
     }
 

src/api/server/mod.rs

@@ -374,6 +374,7 @@ impl BriaService for Bria {
     ) -> Result<Response<NewUriResponse>, Status> {
         crate::tracing::record_error(|| async move {
             extract_tracing(&request);
+            println!("REQ");
 
             let key = extract_api_token(&request)?;
             let profile = self.app.authenticate(key).await?;

src/app/mod.rs

@@ -1,7 +1,7 @@
 mod config;
 pub mod error;
 
-use bdk::bitcoin::address::NetworkChecked;
+use bdk::bitcoin::{address::NetworkChecked, Amount};
 use payjoin::receive::v2::Enrolled;
 use sqlxmq::JobRunnerHandle;
 use tracing::instrument;
@@ -13,24 +13,7 @@ pub use config::*;
 use error::*;
 
 use crate::{
-    account::balance::AccountBalanceSummary,
-    address::*,
-    batch::*,
-    batch_inclusion::*,
-    descriptor::*,
-    fees::{self, *},
-    job,
-    ledger::*,
-    outbox::*,
-    payjoin::*,
-    payout::*,
-    payout_queue::*,
-    primitives::*,
-    profile::*,
-    signing_session::*,
-    utxo::*,
-    wallet::{balance::*, *},
-    xpub::*,
+    account::balance::AccountBalanceSummary, address::*, api::proto::payout, batch::*, batch_inclusion::*, descriptor::*, fees::{self, *}, job, ledger::*, outbox::*, payjoin::{config::PayjoinConfig, *}, payout::*, payout_queue::*, primitives::*, profile::*, signing_session::*, utxo::*, wallet::{balance::*, *}, xpub::*
 };
 
 #[allow(dead_code)]
@@ -53,6 +36,7 @@ pub struct App {
     batch_inclusion: BatchInclusion,
     pool: sqlx::PgPool,
     config: AppConfig,
+    pj: crate::payjoin::PayjoinReceiver,
 }
 
 impl App {
@@ -102,14 +86,15 @@ impl App {
             config.jobs.respawn_all_outbox_handlers_delay,
         )
         .await?;
-        // let pj = PayjoinReceiver::new(
-        //     PayjoinConfig { listen_port: 8088 },
-        //     addresses.clone(),
-        //     utxos.clone(),
-        //     wallets.clone(),
-        //     config.blockchain.network,
-        // );
-        //Self::spawn_payjoin_receiver(pj).await?;
+        let pj = PayjoinReceiver::new(
+            pool.clone(),
+            payout_queues.clone(),
+            PayjoinConfig { listen_port: 8088 },
+            addresses.clone(),
+            utxos.clone(),
+            wallets.clone(),
+            config.blockchain.network,
+        );
         let app = Self {
             outbox,
             profiles: Profiles::new(&pool),
@@ -127,6 +112,7 @@ impl App {
             fees_client,
             batch_inclusion,
             config,
+            pj,
             _runner: runner,
         };
         crate::profile::migration::profile_event_migration(&app.pool).await?;
@@ -543,7 +529,8 @@ impl App {
             .await?;
         let keychain_wallet = wallet.current_keychain_wallet(&self.pool);
         let addr = keychain_wallet.new_external_address().await?;
-        let address = Address::from(addr.address);
+        let address = Address::from(addr.address.clone());
+        println!("got address: {:?}", addr.address);
         let mut builder = NewAddress::builder();
         builder
             .address(address.clone())
@@ -559,47 +546,17 @@ impl App {
         }
         let new_address = builder.build().expect("Couldn't build NewUri");
         self.addresses.persist_new_address(new_address).await?;
-
-        let (enrolled, ohttp_keys) = Self::start_payjoin_session().await?;
+        println!("init payjoin");
+        let (enrolled, ohttp_keys) = crate::payjoin::init_payjoin_session(self.pj.clone(), profile.account_id).await?;
+        println!("init'd payjoin");
         // TODO save session to DB
-        let uri = enrolled.fallback_target();
-
+        let pj_dir = enrolled.fallback_target();
+        let uri = payjoin::PjUriBuilder::new(addr.address, url::Url::parse(&pj_dir).map_err(|e| anyhow::anyhow!(e.to_string()))?, Some(ohttp_keys))
+            .amount(Amount::from_sat(600_000))
+            .build().to_string();
         Ok((wallet.id, uri))
     }
 
-    async fn start_payjoin_session() -> Result<(Enrolled, payjoin::OhttpKeys), anyhow::Error> {
-        let payjoin_dir =  Url::parse("https://payjo.in").expect("Invalid URL");
-        let ohttp_relays: [Url; 2] = [
-            Url::parse("https://pj.bobspacebkk.com").expect("Invalid URL"),
-            Url::parse("https://ohttp-relay.obscuravpn.io").expect("Invalid URL"),
-        ];
-        let ohttp_keys = payjoin_defaults::fetch_ohttp_keys(ohttp_relays[0].clone(), payjoin_dir.clone())?;
-        let http_client = reqwest::Client::builder().build()?;
-
-        fn random_ohttp_relay(ohttp_relays: [Url; 2]) -> Url {
-            use rand::seq::SliceRandom;
-            use rand::thread_rng;
-            ohttp_relays.choose(&mut thread_rng()).unwrap().clone()
-        }
-        let mut enroller = payjoin::receive::v2::Enroller::from_directory_config(
-            payjoin_dir.to_owned(),
-            ohttp_keys.clone(),
-            random_ohttp_relay(ohttp_relays).to_owned(),
-        );
-        let (req, context) = enroller.extract_req().map_err(|e| anyhow::anyhow!(e.to_string()))?;
-        let ohttp_response = http_client
-            .post(req.url)
-            .header("Content-Type", "message/ohttp-req")
-            .body(req.body)
-            .send()
-            .await?;
-        let ohttp_response = ohttp_response.bytes().await?;
-        Ok((
-            enroller.process_res(ohttp_response.as_ref(), context).map_err(|e| anyhow::anyhow!(e.to_string()))?,
-            ohttp_keys,
-        ))
-    }
-
     #[instrument(name = "app.update_address", skip(self), err)]
     pub async fn update_address(
         &self,
@@ -1182,11 +1139,4 @@ impl App {
         });
         Ok(())
     }
-
-    async fn spawn_payjoin_receiver(pj: PayjoinReceiver) -> Result<(), ApplicationError> {
-        tokio::spawn(async move {
-            crate::payjoin::start(pj).await;
-        });
-        Ok(())
-    }
 }

src/cli/api_client.rs

@@ -267,6 +267,25 @@ impl ApiClient {
         output_json(response)
     }
 
+    pub async fn new_uri(
+        &self,
+        wallet: String,
+        external_id: Option<String>,
+        metadata: Option<serde_json::Value>,
+    ) -> anyhow::Result<()> {
+        let request = tonic::Request::new(proto::NewAddressRequest {
+            wallet_name: wallet,
+            external_id,
+            metadata: metadata.map(serde_json::from_value).transpose()?,
+        });
+        let response = self
+            .connect()
+            .await?
+            .new_uri(self.inject_auth_token(request)?)
+            .await?;
+        output_json(response)
+    }
+
     pub async fn update_address(
         &self,
         address: String,

src/cli/mod.rs

@@ -276,6 +276,25 @@ enum Command {
         #[clap(short, long, value_parser = parse_json)]
         metadata: Option<serde_json::Value>,
     },
+    // Get a new BIP21 URI for a wallet
+    NewUri {
+        #[clap(
+            short,
+            long,
+            value_parser,
+            default_value = "http://localhost:2742",
+            env = "BRIA_API_URL"
+        )]
+        url: Option<Url>,
+        #[clap(env = "BRIA_API_KEY", default_value = "")]
+        api_key: String,
+        #[clap(short, long)]
+        wallet: String,
+        #[clap(short, long)]
+        external_id: Option<String>,
+        #[clap(short, long, value_parser = parse_json)]
+        metadata: Option<serde_json::Value>,
+    },
     /// Update address information
     UpdateAddress {
         #[clap(
@@ -851,6 +870,16 @@ pub async fn run() -> anyhow::Result<()> {
             let client = api_client(cli.bria_home, url, api_key);
             client.new_address(wallet, external_id, metadata).await?;
         }
+        Command::NewUri{
+            url,
+            api_key,
+            wallet,
+            external_id,
+            metadata,
+        } => {
+            let client = api_client(cli.bria_home, url, api_key);
+            client.new_uri(wallet, external_id, metadata).await?;
+        }
         Command::UpdateAddress {
             url,
             api_key,

src/job/process_payout_queue.rs

@@ -388,6 +388,20 @@ pub async fn construct_psbt(
     .await?)
 }
 
+// pub async fn sign_payjoin_psbt(
+//     psbt: bdk::bitcoin::psbt::Psbt,
+//     pool: &sqlx::Pool<sqlx::Postgres>,
+//     tx: &mut sqlx::Transaction<'_, sqlx::Postgres>,
+//     unbatched_payouts: &UnbatchedPayouts,
+//     utxos: &Utxos,
+//     wallets: &Wallets,
+//     payout_queue: PayoutQueue,
+//     fee_rate: bitcoin::FeeRate,
+//     for_estimation: bool,
+// ) -> Result<FinishedPsbtBuild, JobError> {
+
+// }
+
 // #[allow(clippy::too_many_arguments)]
 // pub async fn construct_payjoin_psbt(
 //     pool: &sqlx::Pool<sqlx::Postgres>,

src/lib.rs

@@ -17,7 +17,7 @@ pub mod fees;
 mod job;
 pub mod ledger;
 mod outbox;
-mod payjoin;
+pub mod payjoin;
 pub mod payout;
 pub mod payout_queue;
 pub mod primitives;