Merge 1.5.1 to master #4915
Closed
Merge 1.5.1 to master #4915
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We check if the txIds of the inputs matches our maker fee tx and taker fee tx and if the depositTxAddress we use for the confidence lookup is use as an output address. This prevents that past txs which have the our depositTxAddress as input or output (deposit or payout txs) could be interpreted as our deposit tx. This happened because if a bug which caused re-use of the Multisig address entries and if both traders use the same key for multiple trades the depositTxAddress would be the same. We fix that bug as well but we also need to avoid that past already used addresses might be taken again (the Multisig flag got reverted to available in the address entry). - Add check to swapTradeEntryToAvailableEntry to not swap MULTI_SIG entries. - Remove swap for MULTI_SIG entries at resetAddressEntriesForPendingTrade - Add check to swapToAvailable to not swap MULTI_SIG entries. - Remove swaps for MULTI_SIG entries - Add setCoinLockedInMultiSigAddressEntry method - Make coinLockedInMultiSig final and remove setter but use it in constructor. - Rename getCoinLockedInMultiSig to getCoinLockedInMultiSigAsCoin We use an immutable list when operating on AddressEntry so changes on the object would not be reflected in the list. The only mutable field (beside non critical cache fields) is the keyPair. Might be good to refactor that as well at some point. - Add setCoinLockedInMultiSigAddressEntrymethods - Apply API changes: -- resetCoinLockedInMultiSigAddressEntry -- setCoinLockedInMultiSigAddressEntry -- renamed methods
When seller if offline we resend the CounterCurrencyTransferStartedMessage at startup. That caused the trade state set to BUYER_SENT_FIAT_PAYMENT_INITIATED_MSG and then after the msg was stored in mailbox to BUYER_STORED_IN_MAILBOX_FIAT_PAYMENT_INITIATED_MSG. Those 2 msg trigger diff. UI states which led to the UI glitch that the UI moved to step 2 and then to step 3 which was correct but confusing to the user. Now we only apply BUYER_SENT_FIAT_PAYMENT_INITIATED_MSG is trade state ordinal is smaller avoiding that UI glitch.
…ong-tx-is-set-as-deposit-tx Prevent that a wrong tx is set as deposit tx
add logging of Tx hex
fails early that we get another trade with same id at maker in case another use takes the offer afterwards.
fail in case of multiple trades with the same offer id. Use uid instead of the weaker offerId as key for the tradeProtocolByTradeId map
Requested here: bisq-network#4856
Increase max number of log files to 20.
…ti-trades-with-same-offer-id Avoid case of multi trades with same offer
…-offer-task Remove checkNotNull for takerFeeTxId
…plying-past-trade-state Avoid that buyer switches back to trade step 2 at startup after payment confirmed
Remove dev log, fix typo in log
Rename Contract as json button to detail data
…-as-hex-to-trade-details Add "Raw deposit transaction as hex" to details window
Upate bitcoinj to commit dcf8af0 - Bloom filter fix
…ith-address-is-null-at-startup Avoid logging warning at startup
# Conflicts: # build.gradle # core/src/main/java/bisq/core/btc/setup/WalletConfig.java # desktop/package/linux/Dockerfile # desktop/package/linux/package.sh # desktop/package/linux/release.sh # desktop/package/macosx/create_app.sh # desktop/package/macosx/finalize.sh # desktop/package/windows/package.bat # desktop/package/windows/release.bat # relay/src/main/resources/version.txt # seednode/src/main/java/bisq/seednode/SeedNodeMain.java
|
Superseded by #4918. |
Atm it is not so critical as I'm the only one creating the binaries anyways. As soon as we have the new build process in place we could start building nightly builds with Travis which would result with clearly named files that it is not a release, but rather a snapshot. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@ripcurlx This merges 1.5.1. to master but not updating the SNAPSHOT postfix of the version. I leave that for you as I am not sure where it needs to be updated.
Is that really required anyway?