mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-11 01:27:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5816 from chimp1984/fix-btc-address-for-regtest

Browse source 
Fix missing handling for non-mainnet use case
This commit is contained in:
Christoph Atteneder 2021-11-10 09:22:39 +01:00 • committed by GitHub
commit 245b76be74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/main/java/bisq/core/util/FeeReceiverSelector.java
View file

@ -19,6 +19,8 @@ package bisq.core.util;
import bisq.core.filter.FilterManager;
import bisq.common.config.Config;
import org.bitcoinj.core.Coin;
import com.google.common.annotations.VisibleForTesting;
@ -35,7 +37,9 @@ public class FeeReceiverSelector {
public static final String BTC_FEE_RECEIVER_ADDRESS = "38bZBj5peYS3Husdz7AH3gEUiUbYRD951t";
public static String getMostRecentAddress() {
return BTC_FEE_RECEIVER_ADDRESS;
return Config.baseCurrencyNetwork().isMainnet() ? BTC_FEE_RECEIVER_ADDRESS :
Config.baseCurrencyNetwork().isTestnet() ? "2N4mVTpUZAnhm9phnxB7VrHB4aBhnWrcUrV" :
"2MzBNTJDjjXgViKBGnatDU3yWkJ8pJkEg9w";
}
public static String getAddress(FilterManager filterManager) {