Skip to content
This repository has been archived by the owner on Jan 10, 2021. It is now read-only.

Merge bisq/master #20

Open
wants to merge 69 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
2450d9b
List Krypton (ZOD)
gregmeszaros Sep 3, 2019
10bed7a
Remove redundant/invalid null handling from PaymentMethod.compareTo
stejbac Sep 12, 2019
a392081
Fix invalid neutral element handling in View comparators
stejbac Sep 12, 2019
b2befde
Check for dust after subtracting fee, not before.
christophsturm Sep 25, 2019
f71cf15
List Animecoin (ANI)
Sep 28, 2019
f5d2493
Fix proposal table hide when switching to another screen and back
stejbac Oct 3, 2019
d20afd6
Remove not used private methods from BisqEnvironment
lusarz Oct 3, 2019
a9c2448
Refactor BisqApp - update scene size calculation
lusarz Oct 9, 2019
584e552
Refactor BisqApp - update error popup message build
lusarz Oct 9, 2019
23877d4
Refactor BisqApp - move icon load into ImageUtil
lusarz Oct 9, 2019
db17fd5
Remove unused Utilities
lusarz Oct 9, 2019
679985d
Increase minimum TX fee to 2 sats/vByte to fix #3106 (#3387)
wiz Oct 10, 2019
ccfbf6f
Fix mistakes in English source (#3386)
ripcurlx Oct 10, 2019
a5aea5a
Merge pull request #3383 from lusarz/remove-unused-utilities
ripcurlx Oct 14, 2019
94b12a7
Merge pull request #3382 from lusarz/refactor-bisq-app-image-util
ripcurlx Oct 14, 2019
4277ec8
Merge pull request #3381 from lusarz/refactor-bisq-app-throwable
ripcurlx Oct 14, 2019
d8dd014
Refactor BisqEnvironment
lusarz Oct 3, 2019
aaddda9
Merge pull request #3380 from lusarz/refactor-bisq-app-scene-size-cal…
ripcurlx Oct 14, 2019
57fc862
Merge pull request #3363 from lusarz/refactor-bisq-environment-2
ripcurlx Oct 14, 2019
1e40bb0
List Ndau (XND)
coriolinus Aug 19, 2019
2178dbd
Merge pull request #3362 from lusarz/refactor-bisq-environment
ripcurlx Oct 15, 2019
75f28eb
Merge pull request #3190 from kryptonchain/list-krypton-zod
ripcurlx Oct 17, 2019
c8cb7ff
Show connected Bitcoin network peer info
devinbileck Jun 3, 2019
1557a7b
Merge pull request #3423 from devinbileck/show-connected-peer-info
ripcurlx Oct 18, 2019
c91c40c
Merge pull request #3110 from oneiro-ndev/list-ndau
ripcurlx Oct 18, 2019
7e4b8b7
Merge pull request #3396 from caraphinneth/list-ani-asset
ripcurlx Oct 18, 2019
4eb3b59
Not show payment account details for blocked offers (#3425)
ripcurlx Oct 18, 2019
ab887db
List LBRY Credits (LBC)
BrannonKing Oct 14, 2019
d0357af
Refactor BisqEnvironment - create getListProperty
lusarz Oct 3, 2019
4f4b394
Refactor BisqEnvironment - use @Getter annotation for appDataDir
lusarz Oct 19, 2019
2967702
Add GitHub issue template for user reported bugs (#3454)
wiz Oct 24, 2019
2d4c091
Remove donation link
devinbileck Oct 29, 2019
92e4622
Launch in Limbo with BisqException when last navigation no longer exists
niyid Oct 29, 2019
2e78e33
Launch in Limbo with BisqException when last navigation no longer exists
niyid Oct 29, 2019
e64a2d0
Update tor, netlayer, jtorctl
freimair Oct 30, 2019
b976570
Release/v1.2.0 (#3532)
ripcurlx Oct 31, 2019
e4c2900
Remove duplicate word in user agreement
yahiheb Oct 31, 2019
2e9636c
Tweak issue template to send users to keybase for support requests (#…
wiz Oct 31, 2019
89edd67
Fix BTC valuation popups
devinbileck Nov 1, 2019
0c85c8c
Bump version number
ripcurlx Nov 1, 2019
04777c4
Update translations
ripcurlx Nov 1, 2019
581436e
Revert to SNAPSHOT version
ripcurlx Nov 1, 2019
8ee2d53
Merge pull request #3251 from stejbac/fix-invalid-comparators
freimair Nov 1, 2019
d174535
Merge pull request #3327 from christophsturm/fix-dust-check
freimair Nov 1, 2019
1999cfb
Merge pull request #3356 from stejbac/fix-proposal-table-hide
freimair Nov 1, 2019
9d66307
Merge pull request #3433 from lusarz/refactor-bisq-environment-4
freimair Nov 1, 2019
c1e7a0b
Merge pull request #3432 from lusarz/refactor-bisq-environment-3
freimair Nov 1, 2019
df45102
Merge pull request #3511 from devinbileck/remove-donate-link
freimair Nov 1, 2019
901cde0
Merge pull request #3539 from devinbileck/fix-btc-valuation-popups
freimair Nov 1, 2019
15fce7c
Merge pull request #3534 from yahiheb/user-agreement-fix
freimair Nov 1, 2019
8a44358
Merge pull request #3513 from bisq-3510/master
freimair Nov 1, 2019
fe32649
Refactor BisqEnvironment - change type of ignoreLocalBtcNode to boolean
lusarz Oct 19, 2019
9a8615a
Merge pull request #3550 from bisq-network/release/v1.2.2
ripcurlx Nov 4, 2019
fe4059a
Update seednode config to increase resource limits for v1.2 (#3545)
wiz Nov 4, 2019
6d6a4d0
Add missing network capability for trade statistics hash update
ripcurlx Nov 4, 2019
415aa10
Merge pull request #3434 from lusarz/refactor-bisq-environment-5
freimair Nov 4, 2019
33c9dd1
Merge pull request #3551 from ripcurlx/add-missing-capability
ripcurlx Nov 4, 2019
ad93606
Merge pull request #3526 from freimair/tor_0.4.1.6
ripcurlx Nov 4, 2019
00183db
Merge pull request #3407 from lbryio/list-lbry-asset
ripcurlx Nov 5, 2019
5a97683
Default view should be OfferBookChartView when an old view has been r…
ripcurlx Nov 5, 2019
b976bec
Limit max. nr. of PersistableNetworkPayload and ProtectedStorageEntri…
chimp1984 Nov 5, 2019
70abd27
Only show approval icon for accounts that are able to sign (#3552)
ripcurlx Nov 6, 2019
fee7850
Improve handling of failed trades and offers (#3566)
chimp1984 Nov 6, 2019
61e51a0
Fix trade view peer info (#3549)
sqrrm Nov 6, 2019
2fc260b
Update translations (#3569)
ripcurlx Nov 7, 2019
585ccd3
Update data stores and bitcoinj checkpoints (#3570)
ripcurlx Nov 7, 2019
68b3a8c
Revert "Update tor, netlayer, jtorctl" (#3567)
ripcurlx Nov 7, 2019
2b2e2c2
Release/v1.2.3 (#3577)
ripcurlx Nov 7, 2019
eaa93fe
Merge remote-tracking branch 'upstream/master' into upstream-master
Nov 9, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refactor BisqEnvironment - change type of ignoreLocalBtcNode to boolean
lusarz committed Nov 3, 2019
commit fe32649956e67d92a43d896afc3eb6bfbef6865e
13 changes: 6 additions & 7 deletions core/src/main/java/bisq/core/app/BisqEnvironment.java
Original file line number Diff line number Diff line change
@@ -195,7 +195,10 @@ public static boolean isDaoActivated(Environment environment) {
banList, dumpStatistics, maxMemory, socks5ProxyBtcAddress,
torRcFile, torRcOptions, externalTorControlPort, externalTorPassword, externalTorCookieFile,
socks5ProxyHttpAddress, useAllProvidedNodes, numConnectionForBtc, genesisTxId, genesisBlockHeight, genesisTotalSupply,
referralId, daoActivated, msgThrottlePerSec, msgThrottlePer10Sec, sendMsgThrottleTrigger, sendMsgThrottleSleep, ignoreLocalBtcNode;
referralId, daoActivated, msgThrottlePerSec, msgThrottlePer10Sec, sendMsgThrottleTrigger, sendMsgThrottleSleep;

@Getter
protected boolean ignoreLocalBtcNode;

protected final boolean externalTorUseSafeCookieAuthentication, torStreamIsolation;

@@ -264,7 +267,7 @@ public BisqEnvironment(PropertySource commandLineProperties) {
userAgent = getProperty(commandLineProperties, BtcOptionKeys.USER_AGENT, "Bisq");
useAllProvidedNodes = getProperty(commandLineProperties, BtcOptionKeys.USE_ALL_PROVIDED_NODES, "false");
numConnectionForBtc = getProperty(commandLineProperties, BtcOptionKeys.NUM_CONNECTIONS_FOR_BTC, "9");
ignoreLocalBtcNode = getProperty(commandLineProperties, BtcOptionKeys.IGNORE_LOCAL_BTC_NODE, "false");
ignoreLocalBtcNode = getProperty(commandLineProperties, BtcOptionKeys.IGNORE_LOCAL_BTC_NODE, "false").equalsIgnoreCase("true");


MutablePropertySources propertySources = getPropertySources();
@@ -344,10 +347,6 @@ protected void setProperty(String key, String value) {
}
}

public boolean getIgnoreLocalBtcNode() {
return ignoreLocalBtcNode.equalsIgnoreCase("true");
}

private Resource getAppDirPropertiesResource() {
String location = String.format("file:%s/bisq.properties", appDataDir);
return resourceLoader.getResource(location);
@@ -429,7 +428,7 @@ private PropertySource<?> defaultProperties() {
setProperty(BtcOptionKeys.USER_AGENT, userAgent);
setProperty(BtcOptionKeys.USE_ALL_PROVIDED_NODES, useAllProvidedNodes);
setProperty(BtcOptionKeys.NUM_CONNECTIONS_FOR_BTC, numConnectionForBtc);
setProperty(BtcOptionKeys.IGNORE_LOCAL_BTC_NODE, ignoreLocalBtcNode);
setProperty(BtcOptionKeys.IGNORE_LOCAL_BTC_NODE, String.valueOf(ignoreLocalBtcNode));

setProperty(UserAgent.NAME_KEY, appName);
setProperty(UserAgent.VERSION_KEY, Version.VERSION);
2 changes: 1 addition & 1 deletion core/src/main/java/bisq/core/app/BisqSetup.java
Original file line number Diff line number Diff line change
@@ -466,7 +466,7 @@ private void checkIfLocalHostNodeIsRunning() {
// For DAO testnet we ignore local btc node
if (BisqEnvironment.getBaseCurrencyNetwork().isDaoRegTest() ||
BisqEnvironment.getBaseCurrencyNetwork().isDaoTestNet() ||
bisqEnvironment.getIgnoreLocalBtcNode()) {
bisqEnvironment.isIgnoreLocalBtcNode()) {
step3();
} else {
new Thread(() -> {