mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4681 from oscarguindzberg/removeAddressClassFromBsqClasses

Browse source 
Use LegacyAddress instead of Address for BSQ
This commit is contained in:
sqrrm 2020-10-27 23:59:44 +01:00 • committed by GitHub
commit 9a871373c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java
View file

@ -774,12 +774,12 @@ public class BsqWalletService extends WalletService implements DaoStateListener
// Addresses
///////////////////////////////////////////////////////////////////////////////////////////
private Address getChangeAddress() {
private LegacyAddress getChangeAddress() {
return getUnusedAddress();
}
public Address getUnusedAddress() {
return wallet.getIssuedReceiveAddresses().stream()
public LegacyAddress getUnusedAddress() {
return (LegacyAddress) wallet.getIssuedReceiveAddresses().stream()
.filter(this::isAddressUnused)
.findAny()
.orElse(wallet.freshReceiveAddress());

1
core/src/main/java/bisq/core/dao/state/model/governance/CompensationProposal.java
View file

@ -27,7 +27,6 @@ import bisq.common.app.Version;
import bisq.common.config.Config;
import bisq.common.util.CollectionUtils;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.AddressFormatException;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.LegacyAddress;

1
core/src/main/java/bisq/core/dao/state/model/governance/ReimbursementProposal.java
View file

@ -27,7 +27,6 @@ import bisq.common.app.Version;
import bisq.common.config.Config;
import bisq.common.util.CollectionUtils;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.AddressFormatException;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.LegacyAddress;

3
core/src/main/java/bisq/core/util/coin/BsqFormatter.java
View file

@ -31,7 +31,6 @@ import bisq.common.app.DevEnv;
import bisq.common.config.Config;
import bisq.common.util.MathUtils;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.AddressFormatException;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.LegacyAddress;
@ -97,7 +96,7 @@ public class BsqFormatter implements CoinFormatter {
* Returns the base-58 encoded String representation of this
* object, including version and checksum bytes.
*/
public String getBsqAddressStringFromAddress(Address address) {
public String getBsqAddressStringFromAddress(LegacyAddress address) {
final String addressString = address.toString();
if (useBsqAddressFormat)
return prefix + addressString;

5
desktop/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxListItem.java
View file

@ -28,6 +28,7 @@ import bisq.core.locale.Res;
import bisq.core.util.coin.BsqFormatter;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.LegacyAddress;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.TransactionOutput;
@ -102,7 +103,7 @@ class BsqTxListItem extends TxConfidenceListItem {
WalletService.isOutputScriptConvertibleToAddress(output)) {
// We don't support send txs with multiple outputs to multiple receivers, so we can
// assume that only one output is not from our own wallets.
sendToAddress = bsqFormatter.getBsqAddressStringFromAddress(WalletService.getAddressFromOutput(output));
sendToAddress = bsqFormatter.getBsqAddressStringFromAddress((LegacyAddress) WalletService.getAddressFromOutput(output));
break;
}
}
@ -113,7 +114,7 @@ class BsqTxListItem extends TxConfidenceListItem {
if (sendToAddress != null) {
for (TransactionOutput output : transaction.getOutputs()) {
if (WalletService.isOutputScriptConvertibleToAddress(output)) {
receivedWithAddress = bsqFormatter.getBsqAddressStringFromAddress(WalletService.getAddressFromOutput(output));
receivedWithAddress = bsqFormatter.getBsqAddressStringFromAddress((LegacyAddress) WalletService.getAddressFromOutput(output));
break;
}
}