From 6cb2ffaef27b6b15dc102d5f0b356c4ea6c179ff Mon Sep 17 00:00:00 2001 From: Maros Silady Date: Tue, 28 Nov 2023 16:37:04 +0100 Subject: [PATCH 1/3] BATM-5013 - LND sendpayment should contain remote transaction id - Fix --- .../extra/lightningbitcoin/wallets/lnd/dto/Payment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/dto/Payment.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/dto/Payment.java index f14ef05fe..d8f788596 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/dto/Payment.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/dto/Payment.java @@ -64,8 +64,8 @@ public String toString() { @Override public String toString() { String rid = ""; - if (dest_custom_records != null && !dest_custom_records.containsKey(1L)) { - rid = new String(dest_custom_records.get(1L), StandardCharsets.UTF_8); + if (dest_custom_records != null && !dest_custom_records.containsKey(70000L)) { + rid = new String(dest_custom_records.get(70000L), StandardCharsets.UTF_8); } return "Payment{" + amt + " sat, fee limit: " + fee_limit + " to " + payment_request + ", rid: " + rid + '}'; } From 93bd0c9eef811efd2c951b96124e28537c0528b3 Mon Sep 17 00:00:00 2001 From: Maros Silady Date: Tue, 28 Nov 2023 22:44:34 +0100 Subject: [PATCH 2/3] BATM-5013 - LND sendpayment should contain remote transaction id - Fix getCustomRecords --- .../extra/lightningbitcoin/wallets/lnd/LndWallet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWallet.java index 0471730ec..e99966b48 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/lightningbitcoin/wallets/lnd/LndWallet.java @@ -116,7 +116,7 @@ private Payment.FeeLimit getFeeLimit(String fee) { private static Map getCustomRecords(String description) { Map customRecords = new HashMap<>(); if (description != null && !description.trim().isEmpty()) { - customRecords.put(1L, description.getBytes()); + customRecords.put(70000L, description.getBytes()); } return customRecords; } From d952ba6ea16375f70ea1af27b2f5172f82711c1d Mon Sep 17 00:00:00 2001 From: Maros Silady Date: Wed, 29 Nov 2023 13:21:23 +0100 Subject: [PATCH 3/3] BATM-5013 - BATM-5013 - LND sendpayment should contain remote transaction id --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b8e4eb429..b9cd86a25 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # buildscript - project id projectGroup=com.generalbytes.batm.public -projectVersion=1.2.3 +projectVersion=1.2.4 # buildscript - common dependency versions bitrafaelVersion=1.0.44