From c4a0306845d076371a3a1db12a078a605472140c Mon Sep 17 00:00:00 2001 From: Arsh Date: Fri, 24 Oct 2025 20:39:31 +0200 Subject: [PATCH 1/3] test: modify send_receive to generate witness rgb invoice --- src/test/send_receive.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/send_receive.rs b/src/test/send_receive.rs index b153942..475460b 100644 --- a/src/test/send_receive.rs +++ b/src/test/send_receive.rs @@ -43,7 +43,7 @@ async fn send_receive() { recipient_id, invoice, .. - } = rgb_invoice(node1_addr, Some(asset_id.clone()), false).await; + } = rgb_invoice(node1_addr, Some(asset_id.clone()), true).await; send_asset( node2_addr, &asset_id, From b8bb15419dbe547cad3acfbf65cf106075a69340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoe=20Faltib=C3=A0?= Date: Fri, 10 Oct 2025 18:28:28 +0200 Subject: [PATCH 2/3] handle the InvalidRecipientData rgb-lib error --- src/error.rs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/error.rs b/src/error.rs index 46f268c..1860a66 100644 --- a/src/error.rs +++ b/src/error.rs @@ -180,6 +180,9 @@ pub enum APIError { #[error("Invalid pubkey")] InvalidPubkey, + #[error("The provided recipient data is invalid: {0}")] + InvalidRecipientData(String), + #[error("The provided recipient ID is neither a blinded UTXO or a script")] InvalidRecipientID, @@ -348,6 +351,9 @@ impl From for APIError { RgbLibError::InvalidProxyProtocol { version } => { APIError::InvalidProxyProtocol(version) } + RgbLibError::InvalidRecipientData { details } => { + APIError::InvalidRecipientData(details) + } RgbLibError::InvalidRecipientID => APIError::InvalidRecipientID, RgbLibError::InvalidRecipientNetwork => APIError::InvalidRecipientNetwork, RgbLibError::InvalidTicker { details } => APIError::InvalidTicker(details), @@ -429,6 +435,7 @@ impl IntoResponse for APIError { | APIError::InvalidPeerInfo(_) | APIError::InvalidPrecision(_) | APIError::InvalidPubkey + | APIError::InvalidRecipientData(_) | APIError::InvalidRecipientID | APIError::InvalidRecipientNetwork | APIError::InvalidSwap(_) From bc0824827f6893fa14750ce131a1d1a253d5bd49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoe=20Faltib=C3=A0?= Date: Sat, 25 Oct 2025 11:32:19 +0200 Subject: [PATCH 3/3] support send to witness recipient --- openapi.yaml | 18 ++++++++ src/routes.rs | 41 +++++++++++++++++-- src/test/close_coop_nobtc_acceptor.rs | 2 + src/test/close_coop_other_side.rs | 2 + src/test/close_coop_standard.rs | 3 ++ src/test/close_coop_zero_balance.rs | 9 +++- src/test/close_force_nobtc_acceptor.rs | 2 + src/test/close_force_other_side.rs | 2 + src/test/close_force_standard.rs | 2 + src/test/mod.rs | 4 +- src/test/multi_hop.rs | 4 ++ src/test/multi_open_close.rs | 2 + src/test/open_after_double_send.rs | 4 ++ src/test/payment.rs | 2 + src/test/refuse_high_fees.rs | 1 + src/test/restart.rs | 2 + src/test/send_receive.rs | 7 ++++ src/test/swap_assets_liquidity_both_ways.rs | 3 ++ src/test/swap_roundtrip_assets.rs | 4 ++ src/test/swap_roundtrip_buy.rs | 10 ++++- src/test/swap_roundtrip_buy_same_channel.rs | 10 ++++- .../swap_roundtrip_multihop_asset_asset.rs | 8 ++++ src/test/swap_roundtrip_multihop_buy.rs | 12 +++++- src/test/swap_roundtrip_multihop_sell.rs | 12 +++++- src/test/swap_roundtrip_sell.rs | 10 ++++- src/test/vanilla_payment_on_rgb_channel.rs | 1 + 26 files changed, 167 insertions(+), 10 deletions(-) diff --git a/openapi.yaml b/openapi.yaml index eaa60c4..182abc0 100644 --- a/openapi.yaml +++ b/openapi.yaml @@ -1412,6 +1412,8 @@ components: recipient_id: type: string example: bcrt:utxob:cbgHUJ4e-7QyKY4U-Jsj5AZw-oI0gxZh-7fxQY2_-tFFUAZN-4CgpX + recipient_type: + $ref: '#/components/schemas/RecipientType' asset_schema: $ref: '#/components/schemas/AssetSchema' asset_id: @@ -1997,6 +1999,11 @@ components: items: type: integer example: [6, 36, 87, 13, 5, 17] + RecipientType: + type: string + enum: + - Blind + - Witness RefreshRequest: type: object properties: @@ -2070,6 +2077,8 @@ components: recipient_id: type: string example: bcrt:utxob:2FZsSuk-iyVQLVuU4-Gc6J4qkE8-mLS17N4jd-MEx6cWz9F-MFkyE1n + witness_data: + $ref: '#/components/schemas/WitnessData' donation: type: boolean example: false @@ -2411,6 +2420,15 @@ components: colorable: type: boolean example: true + WitnessData: + type: object + properties: + amount_sat: + type: number + example: 1000 + blinding: + type: number + example: 439017309 securitySchemes: bearerAuth: type: http diff --git a/src/routes.rs b/src/routes.rs index f56a60e..21c1271 100644 --- a/src/routes.rs +++ b/src/routes.rs @@ -56,7 +56,8 @@ use rgb_lib::{ AssetCFA as RgbLibAssetCFA, AssetNIA as RgbLibAssetNIA, AssetUDA as RgbLibAssetUDA, Balance as RgbLibBalance, EmbeddedMedia as RgbLibEmbeddedMedia, Invoice as RgbLibInvoice, Media as RgbLibMedia, ProofOfReserves as RgbLibProofOfReserves, Recipient, RecipientInfo, - Token as RgbLibToken, TokenLight as RgbLibTokenLight, WitnessData, + RecipientType as RgbLibRecipientType, Token as RgbLibToken, TokenLight as RgbLibTokenLight, + WitnessData as RgbLibWitnessData, }, AssetSchema as RgbLibAssetSchema, Assignment as RgbLibAssignment, BitcoinNetwork as RgbLibNetwork, ContractId, RgbTransport, @@ -472,6 +473,7 @@ pub(crate) struct DecodeRGBInvoiceRequest { #[derive(Deserialize, Serialize)] pub(crate) struct DecodeRGBInvoiceResponse { pub(crate) recipient_id: String, + pub(crate) recipient_type: RecipientType, pub(crate) asset_schema: Option, pub(crate) asset_id: Option, pub(crate) assignment: Assignment, @@ -885,6 +887,21 @@ impl From for ProofOfReserves { } } +#[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize, Serialize)] +pub(crate) enum RecipientType { + Blind, + Witness, +} + +impl From for RecipientType { + fn from(value: RgbLibRecipientType) -> Self { + match value { + RgbLibRecipientType::Blind => Self::Blind, + RgbLibRecipientType::Witness => Self::Witness, + } + } +} + #[derive(Deserialize, Serialize)] pub(crate) struct RefreshRequest { pub(crate) skip_sync: bool, @@ -929,6 +946,7 @@ pub(crate) struct SendAssetRequest { pub(crate) asset_id: String, pub(crate) assignment: Assignment, pub(crate) recipient_id: String, + pub(crate) witness_data: Option, pub(crate) donation: bool, pub(crate) fee_rate: u64, pub(crate) min_confirmations: u8, @@ -1172,6 +1190,21 @@ pub(crate) struct Utxo { pub(crate) colorable: bool, } +#[derive(Deserialize, Serialize)] +pub(crate) struct WitnessData { + pub(crate) amount_sat: u64, + pub(crate) blinding: Option, +} + +impl From for RgbLibWitnessData { + fn from(value: WitnessData) -> Self { + Self { + amount_sat: value.amount_sat, + blinding: value.blinding, + } + } +} + impl AppState { fn check_changing_state(&self) -> Result<(), APIError> { if *self.get_changing_state() { @@ -1513,9 +1546,11 @@ pub(crate) async fn decode_rgb_invoice( let _guard = state.get_unlocked_app_state(); let invoice_data = RgbLibInvoice::new(payload.invoice)?.invoice_data(); + let recipient_info = RecipientInfo::new(invoice_data.recipient_id.clone())?; Ok(Json(DecodeRGBInvoiceResponse { recipient_id: invoice_data.recipient_id, + recipient_type: recipient_info.recipient_type.into(), asset_schema: invoice_data.asset_schema.map(|s| s.into()), asset_id: invoice_data.asset_id, assignment: invoice_data.assignment.into(), @@ -3046,7 +3081,7 @@ pub(crate) async fn open_channel( let recipient_map = map! { asset_id => vec![Recipient { recipient_id, - witness_data: Some(WitnessData { + witness_data: Some(RgbLibWitnessData { amount_sat: payload.capacity_sat, blinding: Some(STATIC_BLINDING + 1), }), @@ -3301,7 +3336,7 @@ pub(crate) async fn send_asset( let recipient_map = map! { payload.asset_id => vec![Recipient { recipient_id: payload.recipient_id, - witness_data: None, + witness_data: payload.witness_data.map(|w| w.into()), assignment: payload.assignment.into(), transport_endpoints: payload.transport_endpoints, }] diff --git a/src/test/close_coop_nobtc_acceptor.rs b/src/test/close_coop_nobtc_acceptor.rs index 70dca8f..69baf60 100644 --- a/src/test/close_coop_nobtc_acceptor.rs +++ b/src/test/close_coop_nobtc_acceptor.rs @@ -46,6 +46,7 @@ async fn close_coop_nobtc_acceptor() { &asset_id, Assignment::Fungible(700), recipient_id, + None, ) .await; mine(false); @@ -60,6 +61,7 @@ async fn close_coop_nobtc_acceptor() { &asset_id, Assignment::Fungible(50), recipient_id, + None, ) .await; mine(false); diff --git a/src/test/close_coop_other_side.rs b/src/test/close_coop_other_side.rs index 9a23cae..80c71c4 100644 --- a/src/test/close_coop_other_side.rs +++ b/src/test/close_coop_other_side.rs @@ -49,6 +49,7 @@ async fn close_coop_other_side() { &asset_id, Assignment::Fungible(700), recipient_id, + None, ) .await; mine(false); @@ -62,6 +63,7 @@ async fn close_coop_other_side() { &asset_id, Assignment::Fungible(50), recipient_id, + None, ) .await; mine(false); diff --git a/src/test/close_coop_standard.rs b/src/test/close_coop_standard.rs index 5d3e486..54ddd02 100644 --- a/src/test/close_coop_standard.rs +++ b/src/test/close_coop_standard.rs @@ -90,6 +90,7 @@ async fn close_coop_standard() { &asset_id, Assignment::Fungible(10), recipient_id, + None, ) .await; mine(false); @@ -115,6 +116,7 @@ async fn close_coop_standard() { &asset_id, Assignment::Fungible(690), recipient_id, + None, ) .await; mine(false); @@ -128,6 +130,7 @@ async fn close_coop_standard() { &asset_id, Assignment::Fungible(50), recipient_id, + None, ) .await; mine(false); diff --git a/src/test/close_coop_zero_balance.rs b/src/test/close_coop_zero_balance.rs index 7b88640..3d3fcf8 100644 --- a/src/test/close_coop_zero_balance.rs +++ b/src/test/close_coop_zero_balance.rs @@ -38,7 +38,14 @@ async fn close_coop_zero_balance() { assert_eq!(asset_balance_spendable(node2_addr, &asset_id).await, 0); let recipient_id = rgb_invoice(node2_addr, None, false).await.recipient_id; - send_asset(node1_addr, &asset_id, Assignment::NonFungible, recipient_id).await; + send_asset( + node1_addr, + &asset_id, + Assignment::NonFungible, + recipient_id, + None, + ) + .await; mine(false); refresh_transfers(node2_addr).await; refresh_transfers(node2_addr).await; diff --git a/src/test/close_force_nobtc_acceptor.rs b/src/test/close_force_nobtc_acceptor.rs index cfb9389..4f5038a 100644 --- a/src/test/close_force_nobtc_acceptor.rs +++ b/src/test/close_force_nobtc_acceptor.rs @@ -46,6 +46,7 @@ async fn close_force_nobtc_acceptor() { &asset_id, Assignment::Fungible(700), recipient_id, + None, ) .await; mine(false); @@ -60,6 +61,7 @@ async fn close_force_nobtc_acceptor() { &asset_id, Assignment::Fungible(50), recipient_id, + None, ) .await; mine(false); diff --git a/src/test/close_force_other_side.rs b/src/test/close_force_other_side.rs index 67cb75b..d0845c4 100644 --- a/src/test/close_force_other_side.rs +++ b/src/test/close_force_other_side.rs @@ -48,6 +48,7 @@ async fn close_force_other_side() { &asset_id, Assignment::Fungible(700), recipient_id, + None, ) .await; mine(false); @@ -61,6 +62,7 @@ async fn close_force_other_side() { &asset_id, Assignment::Fungible(50), recipient_id, + None, ) .await; mine(false); diff --git a/src/test/close_force_standard.rs b/src/test/close_force_standard.rs index edf5b5a..8535c37 100644 --- a/src/test/close_force_standard.rs +++ b/src/test/close_force_standard.rs @@ -53,6 +53,7 @@ async fn close_force_standard() { &asset_id, Assignment::Fungible(700), recipient_id, + None, ) .await; mine(false); @@ -66,6 +67,7 @@ async fn close_force_standard() { &asset_id, Assignment::Fungible(50), recipient_id, + None, ) .await; mine(false); diff --git a/src/test/mod.rs b/src/test/mod.rs index 7bb1d75..ea4721f 100644 --- a/src/test/mod.rs +++ b/src/test/mod.rs @@ -38,7 +38,7 @@ use crate::routes::{ PostAssetMediaResponse, RefreshRequest, RestoreRequest, RevokeTokenRequest, RgbInvoiceRequest, RgbInvoiceResponse, SendAssetRequest, SendAssetResponse, SendBtcRequest, SendBtcResponse, SendPaymentRequest, SendPaymentResponse, Swap, SwapStatus, TakerRequest, Transaction, Transfer, - UnlockRequest, Unspent, + UnlockRequest, Unspent, WitnessData, }; use crate::utils::{hex_str_to_vec, ELECTRUM_URL_REGTEST, PROXY_ENDPOINT_LOCAL}; @@ -1332,6 +1332,7 @@ async fn send_asset( asset_id: &str, assignment: Assignment, recipient_id: String, + witness_data: Option, ) { println!( "sending on-chain {assignment:?} of asset {asset_id} from node {node_address} to {recipient_id}" @@ -1340,6 +1341,7 @@ async fn send_asset( asset_id: asset_id.to_string(), assignment, recipient_id, + witness_data, donation: true, fee_rate: FEE_RATE, min_confirmations: 1, diff --git a/src/test/multi_hop.rs b/src/test/multi_hop.rs index 9f1957e..99299db 100644 --- a/src/test/multi_hop.rs +++ b/src/test/multi_hop.rs @@ -50,6 +50,7 @@ async fn multi_hop() { &asset_id, Assignment::Fungible(400), recipient_id, + None, ) .await; mine(false); @@ -279,6 +280,7 @@ async fn multi_hop() { &asset_id, Assignment::Fungible(200), recipient_id, + None, ) .await; mine(false); @@ -292,6 +294,7 @@ async fn multi_hop() { &asset_id, Assignment::Fungible(150), recipient_id, + None, ) .await; mine(false); @@ -305,6 +308,7 @@ async fn multi_hop() { &asset_id, Assignment::Fungible(375), recipient_id, + None, ) .await; mine(false); diff --git a/src/test/multi_open_close.rs b/src/test/multi_open_close.rs index baf6d31..d65f4ad 100644 --- a/src/test/multi_open_close.rs +++ b/src/test/multi_open_close.rs @@ -66,6 +66,7 @@ async fn multi_open_close() { &asset_id, Assignment::Fungible(700), recipient_id, + None, ) .await; mine(false); @@ -79,6 +80,7 @@ async fn multi_open_close() { &asset_id, Assignment::Fungible(150), recipient_id, + None, ) .await; mine(false); diff --git a/src/test/open_after_double_send.rs b/src/test/open_after_double_send.rs index f1175f7..46e7b3c 100644 --- a/src/test/open_after_double_send.rs +++ b/src/test/open_after_double_send.rs @@ -30,6 +30,7 @@ async fn open_after_double_send() { &asset_id, Assignment::Fungible(100), recipient_id, + None, ) .await; mine(false); @@ -44,6 +45,7 @@ async fn open_after_double_send() { &asset_id, Assignment::Fungible(200), recipient_id, + None, ) .await; mine(false); @@ -79,6 +81,7 @@ async fn open_after_double_send() { &asset_id, Assignment::Fungible(725), recipient_id, + None, ) .await; mine(false); @@ -92,6 +95,7 @@ async fn open_after_double_send() { &asset_id, Assignment::Fungible(225), recipient_id, + None, ) .await; mine(false); diff --git a/src/test/payment.rs b/src/test/payment.rs index 2a3adfc..b3ae30a 100644 --- a/src/test/payment.rs +++ b/src/test/payment.rs @@ -137,6 +137,7 @@ async fn success() { &asset_id, Assignment::Fungible(925), recipient_id, + None, ) .await; mine(false); @@ -150,6 +151,7 @@ async fn success() { &asset_id, Assignment::Fungible(25), recipient_id, + None, ) .await; mine(false); diff --git a/src/test/refuse_high_fees.rs b/src/test/refuse_high_fees.rs index 88d10c0..8d84614 100644 --- a/src/test/refuse_high_fees.rs +++ b/src/test/refuse_high_fees.rs @@ -37,6 +37,7 @@ async fn refuse_high_fees() { &asset_id, Assignment::Fungible(400), recipient_id, + None, ) .await; mine(false); diff --git a/src/test/restart.rs b/src/test/restart.rs index 4ec0349..0094743 100644 --- a/src/test/restart.rs +++ b/src/test/restart.rs @@ -159,6 +159,7 @@ async fn restart() { &asset_id, Assignment::Fungible(700), recipient_id, + None, ) .await; mine(false); @@ -172,6 +173,7 @@ async fn restart() { &asset_id, Assignment::Fungible(50), recipient_id, + None, ) .await; mine(false); diff --git a/src/test/send_receive.rs b/src/test/send_receive.rs index 475460b..e3584a7 100644 --- a/src/test/send_receive.rs +++ b/src/test/send_receive.rs @@ -30,6 +30,7 @@ async fn send_receive() { &asset_id, Assignment::Fungible(400), recipient_id, + None, ) .await; mine(false); @@ -44,11 +45,16 @@ async fn send_receive() { invoice, .. } = rgb_invoice(node1_addr, Some(asset_id.clone()), true).await; + let witness_data = WitnessData { + amount_sat: 1200, + blinding: None, + }; send_asset( node2_addr, &asset_id, Assignment::Fungible(300), recipient_id.clone(), + Some(witness_data), ) .await; mine(false); @@ -74,6 +80,7 @@ async fn send_receive() { &asset_id, Assignment::Fungible(200), recipient_id, + None, ) .await; mine(false); diff --git a/src/test/swap_assets_liquidity_both_ways.rs b/src/test/swap_assets_liquidity_both_ways.rs index 42f333e..e22674a 100644 --- a/src/test/swap_assets_liquidity_both_ways.rs +++ b/src/test/swap_assets_liquidity_both_ways.rs @@ -291,6 +291,7 @@ async fn swap_assets_liquidity_both_ways() { &asset_id_1, Assignment::Fungible(300), recipient_id, + None, ) .await; mine(false); @@ -304,6 +305,7 @@ async fn swap_assets_liquidity_both_ways() { &asset_id_2, Assignment::Fungible(900), recipient_id, + None, ) .await; mine(false); @@ -317,6 +319,7 @@ async fn swap_assets_liquidity_both_ways() { &asset_id_1, Assignment::Fungible(500), recipient_id, + None, ) .await; mine(false); diff --git a/src/test/swap_roundtrip_assets.rs b/src/test/swap_roundtrip_assets.rs index da620ec..e7d7c75 100644 --- a/src/test/swap_roundtrip_assets.rs +++ b/src/test/swap_roundtrip_assets.rs @@ -220,6 +220,7 @@ async fn swap_roundtrip_assets() { &asset_id_1, Assignment::Fungible(200), recipient_id, + None, ) .await; mine(false); @@ -233,6 +234,7 @@ async fn swap_roundtrip_assets() { &asset_id_2, Assignment::Fungible(20), recipient_id, + None, ) .await; mine(false); @@ -246,6 +248,7 @@ async fn swap_roundtrip_assets() { &asset_id_1, Assignment::Fungible(5), recipient_id, + None, ) .await; mine(false); @@ -259,6 +262,7 @@ async fn swap_roundtrip_assets() { &asset_id_2, Assignment::Fungible(200), recipient_id, + None, ) .await; mine(false); diff --git a/src/test/swap_roundtrip_buy.rs b/src/test/swap_roundtrip_buy.rs index 4c608c3..f397043 100644 --- a/src/test/swap_roundtrip_buy.rs +++ b/src/test/swap_roundtrip_buy.rs @@ -201,6 +201,7 @@ async fn swap_roundtrip_buy() { &asset_id, Assignment::Fungible(200), recipient_id, + None, ) .await; mine(false); @@ -209,7 +210,14 @@ async fn swap_roundtrip_buy() { refresh_transfers(node1_addr).await; let recipient_id = rgb_invoice(node3_addr, None, false).await.recipient_id; - send_asset(node2_addr, &asset_id, Assignment::Fungible(5), recipient_id).await; + send_asset( + node2_addr, + &asset_id, + Assignment::Fungible(5), + recipient_id, + None, + ) + .await; mine(false); refresh_transfers(node3_addr).await; refresh_transfers(node3_addr).await; diff --git a/src/test/swap_roundtrip_buy_same_channel.rs b/src/test/swap_roundtrip_buy_same_channel.rs index 50d43f7..77d83e5 100644 --- a/src/test/swap_roundtrip_buy_same_channel.rs +++ b/src/test/swap_roundtrip_buy_same_channel.rs @@ -160,6 +160,7 @@ async fn swap_roundtrip_buy_same_channel() { &asset_id, Assignment::Fungible(200), recipient_id, + None, ) .await; mine(false); @@ -168,7 +169,14 @@ async fn swap_roundtrip_buy_same_channel() { refresh_transfers(node1_addr).await; let recipient_id = rgb_invoice(node3_addr, None, false).await.recipient_id; - send_asset(node2_addr, &asset_id, Assignment::Fungible(5), recipient_id).await; + send_asset( + node2_addr, + &asset_id, + Assignment::Fungible(5), + recipient_id, + None, + ) + .await; mine(false); refresh_transfers(node3_addr).await; refresh_transfers(node3_addr).await; diff --git a/src/test/swap_roundtrip_multihop_asset_asset.rs b/src/test/swap_roundtrip_multihop_asset_asset.rs index c10816f..dcac6f0 100644 --- a/src/test/swap_roundtrip_multihop_asset_asset.rs +++ b/src/test/swap_roundtrip_multihop_asset_asset.rs @@ -33,6 +33,7 @@ async fn swap_roundtrip_multihop_asset_asset() { &asset_id_1, Assignment::Fungible(400), recipient_id, + None, ) .await; mine(false); @@ -47,6 +48,7 @@ async fn swap_roundtrip_multihop_asset_asset() { &asset_id_2, Assignment::Fungible(400), recipient_id, + None, ) .await; mine(false); @@ -339,6 +341,7 @@ async fn swap_roundtrip_multihop_asset_asset() { &asset_id_1, Assignment::Fungible(200), recipient_id, + None, ) .await; mine(false); @@ -352,6 +355,7 @@ async fn swap_roundtrip_multihop_asset_asset() { &asset_id_2, Assignment::Fungible(10), recipient_id, + None, ) .await; mine(false); @@ -365,6 +369,7 @@ async fn swap_roundtrip_multihop_asset_asset() { &asset_id_1, Assignment::Fungible(100), recipient_id, + None, ) .await; mine(false); @@ -378,6 +383,7 @@ async fn swap_roundtrip_multihop_asset_asset() { &asset_id_2, Assignment::Fungible(100), recipient_id, + None, ) .await; mine(false); @@ -391,6 +397,7 @@ async fn swap_roundtrip_multihop_asset_asset() { &asset_id_1, Assignment::Fungible(5), recipient_id, + None, ) .await; mine(false); @@ -404,6 +411,7 @@ async fn swap_roundtrip_multihop_asset_asset() { &asset_id_2, Assignment::Fungible(80), recipient_id, + None, ) .await; mine(false); diff --git a/src/test/swap_roundtrip_multihop_buy.rs b/src/test/swap_roundtrip_multihop_buy.rs index 9efaf91..0765c48 100644 --- a/src/test/swap_roundtrip_multihop_buy.rs +++ b/src/test/swap_roundtrip_multihop_buy.rs @@ -32,6 +32,7 @@ async fn swap_roundtrip_multihop_buy() { &asset_id, Assignment::Fungible(400), recipient_id, + None, ) .await; mine(false); @@ -297,6 +298,7 @@ async fn swap_roundtrip_multihop_buy() { &asset_id, Assignment::Fungible(200), recipient_id, + None, ) .await; mine(false); @@ -310,6 +312,7 @@ async fn swap_roundtrip_multihop_buy() { &asset_id, Assignment::Fungible(100), recipient_id, + None, ) .await; mine(false); @@ -318,7 +321,14 @@ async fn swap_roundtrip_multihop_buy() { refresh_transfers(node2_addr).await; let recipient_id = rgb_invoice(node4_addr, None, false).await.recipient_id; - send_asset(node3_addr, &asset_id, Assignment::Fungible(5), recipient_id).await; + send_asset( + node3_addr, + &asset_id, + Assignment::Fungible(5), + recipient_id, + None, + ) + .await; mine(false); refresh_transfers(node4_addr).await; refresh_transfers(node4_addr).await; diff --git a/src/test/swap_roundtrip_multihop_sell.rs b/src/test/swap_roundtrip_multihop_sell.rs index 2df10ad..e076d8e 100644 --- a/src/test/swap_roundtrip_multihop_sell.rs +++ b/src/test/swap_roundtrip_multihop_sell.rs @@ -32,6 +32,7 @@ async fn swap_roundtrip_multihop_sell() { &asset_id, Assignment::Fungible(400), recipient_id, + None, ) .await; mine(false); @@ -301,6 +302,7 @@ async fn swap_roundtrip_multihop_sell() { &asset_id, Assignment::Fungible(200), recipient_id, + None, ) .await; mine(false); @@ -314,6 +316,7 @@ async fn swap_roundtrip_multihop_sell() { &asset_id, Assignment::Fungible(100), recipient_id, + None, ) .await; mine(false); @@ -322,7 +325,14 @@ async fn swap_roundtrip_multihop_sell() { refresh_transfers(node2_addr).await; let recipient_id = rgb_invoice(node4_addr, None, false).await.recipient_id; - send_asset(node3_addr, &asset_id, Assignment::Fungible(5), recipient_id).await; + send_asset( + node3_addr, + &asset_id, + Assignment::Fungible(5), + recipient_id, + None, + ) + .await; mine(false); refresh_transfers(node4_addr).await; refresh_transfers(node4_addr).await; diff --git a/src/test/swap_roundtrip_sell.rs b/src/test/swap_roundtrip_sell.rs index 8bace82..ebf6c71 100644 --- a/src/test/swap_roundtrip_sell.rs +++ b/src/test/swap_roundtrip_sell.rs @@ -195,7 +195,14 @@ async fn swap_roundtrip_sell() { println!("\nspend assets"); let recipient_id = rgb_invoice(node3_addr, None, false).await.recipient_id; - send_asset(node1_addr, &asset_id, Assignment::Fungible(5), recipient_id).await; + send_asset( + node1_addr, + &asset_id, + Assignment::Fungible(5), + recipient_id, + None, + ) + .await; mine(false); refresh_transfers(node3_addr).await; refresh_transfers(node3_addr).await; @@ -207,6 +214,7 @@ async fn swap_roundtrip_sell() { &asset_id, Assignment::Fungible(700), recipient_id, + None, ) .await; mine(false); diff --git a/src/test/vanilla_payment_on_rgb_channel.rs b/src/test/vanilla_payment_on_rgb_channel.rs index d6af230..e6fa3e5 100644 --- a/src/test/vanilla_payment_on_rgb_channel.rs +++ b/src/test/vanilla_payment_on_rgb_channel.rs @@ -86,6 +86,7 @@ async fn vanilla_payment_on_rgb_channel() { &asset_id, Assignment::Fungible(900), recipient_id, + None, ) .await; mine(false);