[bisq-network/bisq] Fix bug with wrong deposit tx to master (#4881)

[chimp1984]

Alternative to #4880 based on master...

Fixes #4879

Beside what is mentioned in #4879 I found another (minor) issue. We use an immutable list for address entries but the coinLockedInMultiSig value was set in the object via a setter. This change would be lost when accessed like visible when one open the wallet tool with cmd+j (after take offe the value was 0 there instead of the locked up funds). As the field is only used for lookup for locked funds from failed trades the bug was not very visible.
coinLockedInMultiSig is now a final field set by the constructor.
You can view, comment on, or merge this pull request online at:

  https://github.com/bisq-network/bisq/pull/4881

-- Commit Summary --

  * Prevent that a wrong tx is set as deposit tx
  * Apply project format rules (no code change)
  * Add check to swapTradeEntryToAvailableEntry to not swap MULTI_SIG entries.
  * 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.
  * Add setCoinLockedInMultiSigAddressEntrymethods
  * Apply API changes:
  * Merge branch 'fix-bug-with-wrong-deposit-tx' into fix-bug-with-wrong-deposit-tx-to-master

-- File Changes --

    M core/src/main/java/bisq/core/app/BisqSetup.java (2)
    M core/src/main/java/bisq/core/btc/Balances.java (2)
    M core/src/main/java/bisq/core/btc/model/AddressEntry.java (48)
    M core/src/main/java/bisq/core/btc/model/AddressEntryList.java (27)
    M core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java (58)
    M core/src/main/java/bisq/core/trade/protocol/tasks/SetupPayoutTxListener.java (8)
    M core/src/main/java/bisq/core/trade/protocol/tasks/arbitration/PublishedDelayedPayoutTx.java (3)
    M core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerProcessPayoutTxPublishedMessage.java (3)
    M core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerSetupDepositTxListener.java (67)
    M core/src/main/java/bisq/core/trade/protocol/tasks/buyer_as_maker/BuyerAsMakerCreatesAndSignsDepositTx.java (3)
    M core/src/main/java/bisq/core/trade/protocol/tasks/buyer_as_taker/BuyerAsTakerSignsDepositTx.java (3)
    M core/src/main/java/bisq/core/trade/protocol/tasks/mediation/FinalizeMediatedPayoutTx.java (2)
    M core/src/main/java/bisq/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutTxPublishedMessage.java (3)
    M core/src/main/java/bisq/core/trade/protocol/tasks/seller/SellerSignAndFinalizePayoutTx.java (2)
    M core/src/main/java/bisq/core/trade/protocol/tasks/seller_as_maker/SellerAsMakerCreatesUnsignedDepositTx.java (3)
    M core/src/main/java/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignsDepositTx.java (3)
    M desktop/src/main/java/bisq/desktop/main/funds/locked/LockedListItem.java (2)

-- Patch Links --

https://github.com/bisq-network/bisq/pull/4881.patch
https://github.com/bisq-network/bisq/pull/4881.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/bisq-network/bisq/pull/4881
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20201202/5b3e852f/attachment-0001.htm>