add tests for /decodergbinvoice + /rgbinvoice asset ID

src/routes.rs

@@ -94,7 +94,7 @@ pub(crate) struct AssetBalanceResponse {
     pub(crate) offchain_inbound: u64,
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize)]
 pub(crate) enum AssetIface {
     RGB20,
     RGB25,
@@ -106,7 +106,7 @@ pub(crate) struct BackupRequest {
     pub(crate) password: String,
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize)]
 pub(crate) enum BitcoinNetwork {
     Mainnet,
     Testnet,

src/test/close_coop_nobtc_acceptor.rs

@@ -35,16 +35,16 @@ async fn close_coop_nobtc_acceptor() {
     wait_for_balance(node1_addr, &asset_id, 900).await;
     wait_for_balance(node2_addr, &asset_id, 100).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node1_addr, &asset_id, 700, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node1_addr, &asset_id, 700, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;
     refresh_transfers(node1_addr).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
     fund_and_create_utxos(node2_addr).await;
-    send_asset(node2_addr, &asset_id, 50, blinded_utxo).await;
+    send_asset(node2_addr, &asset_id, 50, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;

src/test/close_coop_other_side.rs

@@ -38,15 +38,15 @@ async fn close_coop_other_side() {
     wait_for_balance(node1_addr, &asset_id, 900).await;
     wait_for_balance(node2_addr, &asset_id, 100).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node1_addr, &asset_id, 700, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node1_addr, &asset_id, 700, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;
     refresh_transfers(node1_addr).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node2_addr, &asset_id, 50, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node2_addr, &asset_id, 50, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;

src/test/close_coop_standard.rs

@@ -56,8 +56,8 @@ async fn close_coop_standard() {
     keysend(node1_addr, &node2_pubkey, &asset_id, 150).await;
     keysend(node2_addr, &node1_pubkey, &asset_id, 50).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node1_addr, &asset_id, 10, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node1_addr, &asset_id, 10, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;
@@ -75,15 +75,15 @@ async fn close_coop_standard() {
     let peers = list_peers(node1_addr).await;
     assert!(!peers.iter().any(|p| p.pubkey == node2_pubkey));
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node1_addr, &asset_id, 690, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node1_addr, &asset_id, 690, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;
     refresh_transfers(node1_addr).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node2_addr, &asset_id, 50, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node2_addr, &asset_id, 50, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;

src/test/close_coop_zero_balance.rs

@@ -30,8 +30,8 @@ async fn close_coop_zero_balance() {
     wait_for_balance(node1_addr, &asset_id, 1000).await;
     assert_eq!(asset_balance(node2_addr, &asset_id).await, 0);
 
-    let blinded_utxo = rgb_invoice(node2_addr).await;
-    send_asset(node1_addr, &asset_id, 700, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node2_addr, None).await.recipient_id;
+    send_asset(node1_addr, &asset_id, 700, recipient_id).await;
     mine(false);
     refresh_transfers(node2_addr).await;
     refresh_transfers(node2_addr).await;

src/test/close_force_nobtc_acceptor.rs

@@ -35,16 +35,16 @@ async fn close_force_nobtc_acceptor() {
     wait_for_balance(node1_addr, &asset_id, 900).await;
     wait_for_balance(node2_addr, &asset_id, 100).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node1_addr, &asset_id, 700, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node1_addr, &asset_id, 700, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;
     refresh_transfers(node1_addr).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
     fund_and_create_utxos(node2_addr).await;
-    send_asset(node2_addr, &asset_id, 50, blinded_utxo).await;
+    send_asset(node2_addr, &asset_id, 50, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;

src/test/close_force_other_side.rs

@@ -38,15 +38,15 @@ async fn close_force_other_side() {
     wait_for_balance(node1_addr, &asset_id, 900).await;
     wait_for_balance(node2_addr, &asset_id, 100).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node1_addr, &asset_id, 700, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node1_addr, &asset_id, 700, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;
     refresh_transfers(node1_addr).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node2_addr, &asset_id, 50, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node2_addr, &asset_id, 50, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;

src/test/close_force_standard.rs

@@ -39,15 +39,15 @@ async fn close_force_standard() {
     wait_for_balance(node1_addr, &asset_id, 900).await;
     wait_for_balance(node2_addr, &asset_id, 100).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node1_addr, &asset_id, 700, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node1_addr, &asset_id, 700, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;
     refresh_transfers(node1_addr).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node2_addr, &asset_id, 50, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node2_addr, &asset_id, 50, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;

src/test/mod.rs

@@ -13,13 +13,14 @@ use tracing_test::traced_test;
 use crate::routes::{
     AddressResponse, Asset, AssetBalanceRequest, AssetBalanceResponse, BackupRequest, Channel,
     CloseChannelRequest, ConnectPeerRequest, CreateUtxosRequest, DecodeLNInvoiceRequest,
-    DecodeLNInvoiceResponse, DisconnectPeerRequest, EmptyResponse, HTLCStatus, InitRequest,
-    InitResponse, InvoiceStatus, InvoiceStatusRequest, InvoiceStatusResponse, IssueAssetRequest,
-    IssueAssetResponse, KeysendRequest, KeysendResponse, LNInvoiceRequest, LNInvoiceResponse,
-    ListAssetsResponse, ListChannelsResponse, ListPaymentsResponse, ListPeersResponse,
-    ListUnspentsResponse, NodeInfoResponse, OpenChannelRequest, OpenChannelResponse, Payment, Peer,
-    RestoreRequest, RgbInvoiceRequest, RgbInvoiceResponse, SendAssetRequest, SendAssetResponse,
-    SendPaymentRequest, SendPaymentResponse, UnlockRequest, Unspent,
+    DecodeLNInvoiceResponse, DecodeRGBInvoiceRequest, DecodeRGBInvoiceResponse,
+    DisconnectPeerRequest, EmptyResponse, HTLCStatus, InitRequest, InitResponse, InvoiceStatus,
+    InvoiceStatusRequest, InvoiceStatusResponse, IssueAssetRequest, IssueAssetResponse,
+    KeysendRequest, KeysendResponse, LNInvoiceRequest, LNInvoiceResponse, ListAssetsResponse,
+    ListChannelsResponse, ListPaymentsResponse, ListPeersResponse, ListUnspentsResponse,
+    NodeInfoResponse, OpenChannelRequest, OpenChannelResponse, Payment, Peer, RestoreRequest,
+    RgbInvoiceRequest, RgbInvoiceResponse, SendAssetRequest, SendAssetResponse, SendPaymentRequest,
+    SendPaymentResponse, UnlockRequest, Unspent,
 };
 use crate::utils::PROXY_ENDPOINT_REGTEST;
 
@@ -281,6 +282,23 @@ async fn decode_ln_invoice(node_address: SocketAddr, invoice: &str) -> DecodeLNI
         .unwrap()
 }
 
+async fn decode_rgb_invoice(node_address: SocketAddr, invoice: &str) -> DecodeRGBInvoiceResponse {
+    let payload = DecodeRGBInvoiceRequest {
+        invoice: invoice.to_string(),
+    };
+    let res = reqwest::Client::new()
+        .post(format!("http://{}/decodergbinvoice", node_address))
+        .json(&payload)
+        .send()
+        .await
+        .unwrap();
+    _check_response_is_ok(res)
+        .await
+        .json::<DecodeRGBInvoiceResponse>()
+        .await
+        .unwrap()
+}
+
 async fn disconnect_peer(node_address: SocketAddr, peer_pubkey: &str) {
     let payload = DisconnectPeerRequest {
         peer_pubkey: peer_pubkey.to_string(),
@@ -604,10 +622,10 @@ async fn lock(node_address: SocketAddr) {
         .unwrap();
 }
 
-async fn rgb_invoice(node_address: SocketAddr) -> String {
+async fn rgb_invoice(node_address: SocketAddr, asset_id: Option<String>) -> RgbInvoiceResponse {
     let payload = RgbInvoiceRequest {
         min_confirmations: 1,
-        asset_id: None,
+        asset_id,
     };
     let res = reqwest::Client::new()
         .post(format!("http://{}/rgbinvoice", node_address))
@@ -620,7 +638,6 @@ async fn rgb_invoice(node_address: SocketAddr) -> String {
         .json::<RgbInvoiceResponse>()
         .await
         .unwrap()
-        .recipient_id
 }
 
 async fn refresh_transfers(node_address: SocketAddr) {

src/test/multi_hop.rs

@@ -31,8 +31,8 @@ async fn multi_hop() {
     let node3_info = node_info(node3_addr).await;
     let node3_pubkey = node3_info.pubkey;
 
-    let blinded_utxo = rgb_invoice(node2_addr).await;
-    send_asset(node1_addr, &asset_id, 400, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node2_addr, None).await.recipient_id;
+    send_asset(node1_addr, &asset_id, 400, recipient_id).await;
     mine(false);
     refresh_transfers(node2_addr).await;
     refresh_transfers(node2_addr).await;
@@ -57,22 +57,22 @@ async fn multi_hop() {
     wait_for_balance(node2_addr, &asset_id, 400).await;
     wait_for_balance(node3_addr, &asset_id, 50).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node1_addr, &asset_id, 200, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node1_addr, &asset_id, 200, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;
     refresh_transfers(node1_addr).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node2_addr, &asset_id, 150, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node2_addr, &asset_id, 150, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;
     refresh_transfers(node2_addr).await;
 
-    let blinded_utxo = rgb_invoice(node2_addr).await;
-    send_asset(node3_addr, &asset_id, 375, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node2_addr, None).await.recipient_id;
+    send_asset(node3_addr, &asset_id, 375, recipient_id).await;
     mine(false);
     refresh_transfers(node2_addr).await;
     refresh_transfers(node2_addr).await;

src/test/multi_open_close.rs

@@ -46,15 +46,15 @@ async fn multi_open_close() {
     wait_for_balance(node1_addr, &asset_id, 800).await;
     wait_for_balance(node2_addr, &asset_id, 200).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node1_addr, &asset_id, 700, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node1_addr, &asset_id, 700, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;
     refresh_transfers(node1_addr).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node2_addr, &asset_id, 150, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node2_addr, &asset_id, 150, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;

src/test/open_after_double_send.rs

@@ -29,16 +29,16 @@ async fn open_after_double_send() {
     let node2_info = node_info(node2_addr).await;
     let node2_pubkey = node2_info.pubkey;
 
-    let blinded_utxo = rgb_invoice(node2_addr).await;
-    send_asset(node1_addr, &asset_id, 100, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node2_addr, None).await.recipient_id;
+    send_asset(node1_addr, &asset_id, 100, recipient_id).await;
     mine(false);
     refresh_transfers(node2_addr).await;
     refresh_transfers(node2_addr).await;
     refresh_transfers(node1_addr).await;
     assert_eq!(asset_balance(node1_addr, &asset_id).await, 900);
 
-    let blinded_utxo = rgb_invoice(node2_addr).await;
-    send_asset(node1_addr, &asset_id, 200, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node2_addr, None).await.recipient_id;
+    send_asset(node1_addr, &asset_id, 200, recipient_id).await;
     mine(false);
     refresh_transfers(node2_addr).await;
     refresh_transfers(node2_addr).await;
@@ -56,15 +56,15 @@ async fn open_after_double_send() {
     wait_for_balance(node1_addr, &asset_id, 750).await;
     wait_for_balance(node2_addr, &asset_id, 250).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node1_addr, &asset_id, 725, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node1_addr, &asset_id, 725, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;
     refresh_transfers(node1_addr).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node2_addr, &asset_id, 225, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node2_addr, &asset_id, 225, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;

src/test/payment.rs

@@ -57,15 +57,15 @@ async fn payment() {
     wait_for_balance(node1_addr, &asset_id, 950).await;
     wait_for_balance(node2_addr, &asset_id, 50).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node1_addr, &asset_id, 925, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node1_addr, &asset_id, 925, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;
     refresh_transfers(node1_addr).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node2_addr, &asset_id, 25, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node2_addr, &asset_id, 25, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;

src/test/restart.rs

@@ -152,15 +152,15 @@ async fn restart() {
     assert_eq!(asset_balance(node1_addr, &asset_id).await, 900);
     assert_eq!(asset_balance(node2_addr, &asset_id).await, 100);
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node1_addr, &asset_id, 700, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node1_addr, &asset_id, 700, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;
     refresh_transfers(node1_addr).await;
 
-    let blinded_utxo = rgb_invoice(node3_addr).await;
-    send_asset(node2_addr, &asset_id, 50, blinded_utxo).await;
+    let recipient_id = rgb_invoice(node3_addr, None).await.recipient_id;
+    send_asset(node2_addr, &asset_id, 50, recipient_id).await;
     mine(false);
     refresh_transfers(node3_addr).await;
     refresh_transfers(node3_addr).await;