AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Correct wrong source for lockTimeA when Bob waiting for P2SH-B. Spotted by tcallahan14. In lieu of PR #23

Browse Source
This commit is contained in:
catbref 2020-08-31 09:14:15 +01:00
parent 1ca5b864a9
commit 99315c7378
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/qortal/controller/TradeBot.java
View File

@ -785,7 +785,7 @@ public class TradeBot {
byte[] redeemScriptBytes = BTCP2SH.buildScript(crossChainTradeData.partnerBitcoinPKH, crossChainTradeData.lockTimeB, crossChainTradeData.creatorBitcoinPKH, crossChainTradeData.hashOfSecretB); byte[] redeemScriptBytes = BTCP2SH.buildScript(crossChainTradeData.partnerBitcoinPKH, crossChainTradeData.lockTimeB, crossChainTradeData.creatorBitcoinPKH, crossChainTradeData.hashOfSecretB);
String p2shAddress = BTC.getInstance().deriveP2shAddress(redeemScriptBytes); String p2shAddress = BTC.getInstance().deriveP2shAddress(redeemScriptBytes);
int lockTimeA = tradeBotData.getLockTimeA(); int lockTimeA = crossChainTradeData.lockTimeA;
Long estimatedFee = BTC.getInstance().estimateFee(lockTimeA * 1000L); Long estimatedFee = BTC.getInstance().estimateFee(lockTimeA * 1000L);
if (estimatedFee == null) { if (estimatedFee == null) {
LOGGER.debug(() -> String.format("Couldn't estimate Bitcoin fees?")); LOGGER.debug(() -> String.format("Couldn't estimate Bitcoin fees?"));