Skip to content

TransferInfo: track output_map instead of rgb_amount #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zoedberg merged 1 commit into from
Jul 22, 2026
Merged

TransferInfo: track output_map instead of rgb_amount #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions lightning/src/rgb_utils/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ pub struct TransferInfo {
/// Transfer contract ID
#[serde(with = "contract_id_serde")]
pub contract_id: ContractId,
/// Transfer RGB amount
pub rgb_amount: u64,
/// RGB amount assigned to each output of the transaction, by vout
pub output_map: HashMap<u32, u64>,
}

mod contract_id_serde {
Expand Down Expand Up @@ -333,8 +333,10 @@ where
output_map.insert(vout_p2wsh as u32, vout_p2wsh_amt);
}

let asset_coloring_info =
AssetColoringInfo { output_map, static_blinding: Some(STATIC_BLINDING) };
let asset_coloring_info = AssetColoringInfo {
output_map: output_map.clone(),
static_blinding: Some(STATIC_BLINDING),
};
let coloring_info = ColoringInfo {
asset_info_map: HashMap::from_iter([(contract_id, asset_coloring_info)]),
static_blinding: Some(STATIC_BLINDING),
Expand All @@ -359,12 +361,7 @@ where
wallet.consume_fascia(fascia.clone(), Some(WitnessOrd::Ignored)).unwrap();

// save RGB transfer data to disk
let rgb_amount = if counterparty {
vout_p2wpkh_amt + rgb_offered_htlc
} else {
vout_p2wsh_amt + rgb_received_htlc
};
let transfer_info = TransferInfo { contract_id, rgb_amount };
let transfer_info = TransferInfo { contract_id, output_map };
let transfer_info_path = ldk_data_dir.join(format!("{txid}_transfer_info"));
write_rgb_transfer_info(&transfer_info_path, &transfer_info);

Expand All @@ -387,8 +384,9 @@ pub(crate) fn color_htlc(
let transfer_info = read_rgb_transfer_info(&transfer_info_path);
let contract_id = transfer_info.contract_id;

let output_map = HashMap::from([(0, htlc_amount_rgb)]);
let asset_coloring_info = AssetColoringInfo {
output_map: HashMap::from([(0, htlc_amount_rgb)]),
output_map: output_map.clone(),
static_blinding: Some(STATIC_BLINDING),
};
let coloring_info = ColoringInfo {
Expand All @@ -413,7 +411,7 @@ pub(crate) fn color_htlc(
wallet.consume_fascia(fascia.clone(), Some(WitnessOrd::Ignored)).unwrap();

// save RGB transfer data to disk
let transfer_info = TransferInfo { contract_id, rgb_amount: htlc_amount_rgb };
let transfer_info = TransferInfo { contract_id, output_map };
let transfer_info_path = ldk_data_dir.join(format!("{txid}_transfer_info"));
write_rgb_transfer_info(&transfer_info_path, &transfer_info);

Expand Down Expand Up @@ -452,8 +450,10 @@ pub(crate) fn color_closing(
output_map.insert(counterparty_vout as u32, counterparty_vout_amount);
}

let asset_coloring_info =
AssetColoringInfo { output_map, static_blinding: Some(STATIC_BLINDING) };
let asset_coloring_info = AssetColoringInfo {
output_map: output_map.clone(),
static_blinding: Some(STATIC_BLINDING),
};
let coloring_info = ColoringInfo {
asset_info_map: HashMap::from_iter([(contract_id, asset_coloring_info)]),
static_blinding: Some(STATIC_BLINDING),
Expand All @@ -478,7 +478,7 @@ pub(crate) fn color_closing(
wallet.consume_fascia(fascia.clone(), Some(WitnessOrd::Ignored)).unwrap();

// save RGB transfer data to disk
let transfer_info = TransferInfo { contract_id, rgb_amount: holder_vout_amount };
let transfer_info = TransferInfo { contract_id, output_map };
let transfer_info_path = ldk_data_dir.join(format!("{txid}_transfer_info"));
write_rgb_transfer_info(&transfer_info_path, &transfer_info);

Expand Down
Loading