Skip to content
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

Revert "Bugfix and typofix" #4238

Merged
merged 1 commit into from
May 6, 2020
Merged

Revert "Bugfix and typofix" #4238

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion core/src/main/java/bisq/core/dao/governance/proposal/param/ChangeParamValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ private void validateBsqValue(Coin currentParamValueAsCoin, Coin inputValueAsCoi
case REIMBURSEMENT_MIN_AMOUNT:
checkArgument(inputValueAsCoin.value >= Restrictions.getMinNonDustOutput().value,
Res.get("validation.amountBelowDust", Restrictions.getMinNonDustOutput().value));
break;
case COMPENSATION_REQUEST_MAX_AMOUNT:
case REIMBURSEMENT_MAX_AMOUNT:
checkArgument(inputValueAsCoin.value >= Restrictions.getMinNonDustOutput().value,
Expand Down
7 changes: 3 additions & 4 deletions core/src/main/java/bisq/core/dao/node/parser/TxOutputParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,12 @@ private boolean isBtcOutputOfBurnFeeTx(TempTxOutput tempTxOutput) {

// If it is the vote stake output we return false.
if (index == 0) {
break;
return false;
}

// There must be a vote fee left
if (availableInputValue <= 0) {
break;
return false;
}

// Burned BSQ output is last output before opReturn.
Expand All @@ -285,15 +285,14 @@ private boolean isBtcOutputOfBurnFeeTx(TempTxOutput tempTxOutput) {
// We always have the BSQ change before the burned BSQ output if both are present.
checkArgument(optionalOpReturnIndex.isPresent());
if (index != optionalOpReturnIndex.get() - 1) {
break;
return false;
}

// Without checking the fee we would not be able to distinguish between 2 structurally same transactions, one
// where the output is burned BSQ and one where it is a BSQ change output.
long blindVoteFee = daoStateService.getParamValueAsCoin(Param.BLIND_VOTE_FEE, tempTxOutput.getBlockHeight()).value;
return availableInputValue == blindVoteFee;
}
break;
case VOTE_REVEAL:
break;
case LOCKUP:
Expand Down
2 changes: 1 addition & 1 deletion p2p/src/main/java/bisq/network/p2p/network/Connection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ public void sendMessage(NetworkEnvelope networkEnvelope) {
protobuf.NetworkEnvelope proto = networkEnvelope.toProtoNetworkEnvelope();
log.trace("Sending message: {}", Utilities.toTruncatedString(proto.toString(), 10000));

if (networkEnvelope instanceof Ping || networkEnvelope instanceof RefreshOfferMessage) {
if (networkEnvelope instanceof Ping | networkEnvelope instanceof RefreshOfferMessage) {
// pings and offer refresh msg we don't want to log in production
log.trace("\n\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" +
"Sending direct message to peer" +
Expand Down