From 99315c7378e5ef0f85223d5a002f4cd7e0308eb0 Mon Sep 17 00:00:00 2001 From: catbref Date: Mon, 31 Aug 2020 09:14:15 +0100 Subject: [PATCH] Correct wrong source for lockTimeA when Bob waiting for P2SH-B. Spotted by tcallahan14. In lieu of PR #23 --- src/main/java/org/qortal/controller/TradeBot.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/qortal/controller/TradeBot.java b/src/main/java/org/qortal/controller/TradeBot.java index 550df4db..4c6e6517 100644 --- a/src/main/java/org/qortal/controller/TradeBot.java +++ b/src/main/java/org/qortal/controller/TradeBot.java @@ -785,7 +785,7 @@ public class TradeBot { byte[] redeemScriptBytes = BTCP2SH.buildScript(crossChainTradeData.partnerBitcoinPKH, crossChainTradeData.lockTimeB, crossChainTradeData.creatorBitcoinPKH, crossChainTradeData.hashOfSecretB); String p2shAddress = BTC.getInstance().deriveP2shAddress(redeemScriptBytes); - int lockTimeA = tradeBotData.getLockTimeA(); + int lockTimeA = crossChainTradeData.lockTimeA; Long estimatedFee = BTC.getInstance().estimateFee(lockTimeA * 1000L); if (estimatedFee == null) { LOGGER.debug(() -> String.format("Couldn't estimate Bitcoin fees?"));