crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Added defensiveness in convertToSimpleTransaction()

Browse Source
This commit is contained in:
CalDescent 2022-02-08 18:24:42 +00:00
parent 9630625449
commit d1f24d45da
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/org/qortal/crosschain/Bitcoiny.java
View File

@ -447,13 +447,15 @@ public abstract class Bitcoiny implements ForeignBlockchain {
List<String> senders = t2.outputs.get(input.outputVout).addresses; List<String> senders = t2.outputs.get(input.outputVout).addresses;
long inputAmount = t2.outputs.get(input.outputVout).value; long inputAmount = t2.outputs.get(input.outputVout).value;
totalInputAmount += inputAmount; totalInputAmount += inputAmount;
for (String sender : senders) { if (senders != null) {
boolean addressInWallet = false; for (String sender : senders) {
if (keySet.contains(sender)) { boolean addressInWallet = false;
total += inputAmount; if (keySet.contains(sender)) {
addressInWallet = true; total += inputAmount;
addressInWallet = true;
}
inputs.add(new SimpleTransaction.Input(sender, inputAmount, addressInWallet));
} }
inputs.add(new SimpleTransaction.Input(sender, inputAmount, addressInWallet));
} }
} catch (ForeignBlockchainException e) { } catch (ForeignBlockchainException e) {
LOGGER.trace("Failed to retrieve transaction information {}", input.outputTxHash); LOGGER.trace("Failed to retrieve transaction information {}", input.outputTxHash);
@ -461,17 +463,19 @@ public abstract class Bitcoiny implements ForeignBlockchain {
} }
if (t.outputs != null && !t.outputs.isEmpty()) { if (t.outputs != null && !t.outputs.isEmpty()) {
for (BitcoinyTransaction.Output output : t.outputs) { for (BitcoinyTransaction.Output output : t.outputs) {
for (String address : output.addresses) { if (output.addresses != null) {
boolean addressInWallet = false; for (String address : output.addresses) {
if (keySet.contains(address)) { boolean addressInWallet = false;
if (total > 0L) { if (keySet.contains(address)) {
amount -= (total - output.value); if (total > 0L) {
} else { amount -= (total - output.value);
amount += output.value; } else {
amount += output.value;
}
addressInWallet = true;
} }
addressInWallet = true; outputs.add(new SimpleTransaction.Output(address, output.value, addressInWallet));
} }
outputs.add(new SimpleTransaction.Output(address, output.value, addressInWallet));
} }
totalOutputAmount += output.value; totalOutputAmount += output.value;
} }