-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4157 from sqrrm/unfail-with-reattach
Unfail with reattach
- Loading branch information
Showing
16 changed files
with
320 additions
and
31 deletions.
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * This file is part of Bisq. | ||
| * | ||
| * Bisq is free software: you can redistribute it and/or modify it | ||
| * under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or (at | ||
| * your option) any later version. | ||
| * | ||
| * Bisq is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public | ||
| * License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with Bisq. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package bisq.core.trade; | ||
|
|
||
| import bisq.core.btc.wallet.BtcWalletService; | ||
|
|
||
| import bisq.common.crypto.KeyRing; | ||
| import bisq.common.util.Tuple2; | ||
| import bisq.common.util.Utilities; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| public class TradeUtils { | ||
|
|
||
| // Returns <MULTI_SIG, TRADE_PAYOUT> if both are AVAILABLE, otherwise null | ||
| static Tuple2<String, String> getAvailableAddresses(Trade trade, BtcWalletService btcWalletService, | ||
| KeyRing keyRing) { | ||
| var addresses = getTradeAddresses(trade, btcWalletService, keyRing); | ||
| if (addresses == null) | ||
| return null; | ||
|
|
||
| if (btcWalletService.getAvailableAddressEntries().stream() | ||
| .noneMatch(e -> Objects.equals(e.getAddressString(), addresses.first))) | ||
| return null; | ||
| if (btcWalletService.getAvailableAddressEntries().stream() | ||
| .noneMatch(e -> Objects.equals(e.getAddressString(), addresses.second))) | ||
| return null; | ||
|
|
||
| return new Tuple2<>(addresses.first, addresses.second); | ||
| } | ||
|
|
||
| // Returns <MULTI_SIG, TRADE_PAYOUT> addresses as strings if they're known by the wallet | ||
| public static Tuple2<String, String> getTradeAddresses(Trade trade, BtcWalletService btcWalletService, | ||
| KeyRing keyRing) { | ||
| var contract = trade.getContract(); | ||
| if (contract == null) | ||
| return null; | ||
|
|
||
| // Get multisig address | ||
| var isMyRoleBuyer = contract.isMyRoleBuyer(keyRing.getPubKeyRing()); | ||
| var multiSigPubKey = isMyRoleBuyer ? contract.getBuyerMultiSigPubKey() : contract.getSellerMultiSigPubKey(); | ||
| if (multiSigPubKey == null) | ||
| return null; | ||
| var multiSigPubKeyString = Utilities.bytesAsHexString(multiSigPubKey); | ||
| var multiSigAddress = btcWalletService.getAddressEntryListAsImmutableList().stream() | ||
| .filter(e -> e.getKeyPair().getPublicKeyAsHex().equals(multiSigPubKeyString)) | ||
| .findAny() | ||
| .orElse(null); | ||
| if (multiSigAddress == null) | ||
| return null; | ||
|
|
||
| // Get payout address | ||
| var payoutAddress = isMyRoleBuyer ? | ||
| contract.getBuyerPayoutAddressString() : contract.getSellerPayoutAddressString(); | ||
| var payoutAddressEntry = btcWalletService.getAddressEntryListAsImmutableList().stream() | ||
| .filter(e -> Objects.equals(e.getAddressString(), payoutAddress)) | ||
| .findAny() | ||
| .orElse(null); | ||
| if (payoutAddressEntry == null) | ||
| return null; | ||
|
|
||
| return new Tuple2<>(multiSigAddress.getAddressString(), payoutAddress); | ||
| } | ||
| } |
Oops, something went wrong.