Commit Graph

1935 Commits

Author SHA1 Message Date
Oscar Guindzberg
8a3d403bfc
Rename WalletService.emptyWallet() to emtyBtcWallet() 2020-09-21 12:40:52 -03:00
chimp1984
48a3f7443e
Merge branch 'master_upstream' into fix-trade-protocol-issues
# Conflicts:
#	core/src/main/java/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java
2020-09-19 10:23:40 -05:00
Oscar Guindzberg
fc70c11573
ok codacy, you win 2020-09-18 18:29:40 -03:00
Oscar Guindzberg
f1738f0b19
Code polishing to make Codacy happier 2020-09-18 18:29:38 -03:00
Oscar Guindzberg
f342c89c8e
Code polishing to make Codacy happy 2020-09-18 18:29:37 -03:00
Oscar Guindzberg
08cc836bab
bitcoinj 0.15: Fix TransactionAwareTradeTest 2020-09-18 18:29:34 -03:00
Oscar Guindzberg
9a9b067d70
bitcoinj 0.15: Replace deprecated Transaction.getHashAsString with Transaction.getTxId().toString(). 2020-09-18 18:29:33 -03:00
Oscar Guindzberg
87481cdbf5
bitcoinj 0.15: Replace usage of bitcoinj's removed methods with new ones. 2020-09-18 18:29:30 -03:00
Oscar Guindzberg
7356b64f59
bitcoinj 0.15: Use LegacyAddress.fromBase58() instead of Address.fromBase58(). 2020-09-18 18:29:30 -03:00
Oscar Guindzberg
46f2ba6ee0
bitcoinj 0.15: WalletEventListener was replaced by more granular listeners. 2020-09-18 18:29:29 -03:00
Oscar Guindzberg
d4ac45da21
bitcoinj 0.15: bitcoinj moved from spongycastle to bouncycastle. 2020-09-18 18:29:28 -03:00
Oscar Guindzberg
423ffa84e1
bitcoinj 0.15: Futures.addCallback() in guava 28 requires an executor. 2020-09-18 18:29:27 -03:00
chimp1984
48a14ee8a7
Merge branch 'master_upstream' into fix-trade-protocol-issues 2020-09-16 20:45:17 -05:00
Christoph Atteneder
81df879881
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.9
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
2020-09-16 16:52:54 +02:00
Christoph Atteneder
95dd561d91
Revert to SNAPSHOT version 2020-09-16 16:49:48 +02:00
Christoph Atteneder
06ac7a7605
Bump version number for v1.3.9 2020-09-16 15:58:58 +02:00
chimp1984
601de7890d
Add try/catch at setSuggestedSecurityDeposit code 2020-09-16 15:56:13 +02:00
Christoph Atteneder
8cb4b5016c
Merge pull request #4529 from chimp1984/make-moving-average-code-more-safe
Make moving average code more safe
2020-09-16 15:51:14 +02:00
Christoph Atteneder
98b03937d8
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.8
# Conflicts:
#	core/src/main/java/bisq/core/support/dispute/agent/MultipleHolderNameDetection.java
#	core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java
2020-09-15 13:24:06 +02:00
Christoph Atteneder
5f957f0a64
Revert to SNAPSHOT version 2020-09-15 09:26:08 +02:00
chimp1984
71d57298b0
Add try/catch at setSuggestedSecurityDeposit code 2020-09-14 16:05:47 -05:00
chimp1984
352e661bac
update devmode price 2020-09-13 15:35:39 -05:00
chimp1984
6821c582e9
Add check for open offers and remove them if present at restore from seed 2020-09-09 14:12:03 -05:00
wiz
8cde8ce16a
Fix codacy complaining about missing space character 2020-09-09 15:16:38 +02:00
wiz
cc7e6559ff
Use lots of regex to add http or https for XMR explorer API endpoint
* If Tor *.onion hostname, use HTTP with Tor proxy
* If 127.0.0.1 or localhost, use HTTP without Tor proxy
* If LAN address or *.local FQDN, use HTTP without Tor proxy
* If any other FQDN hostname, use HTTPS with Tor proxy
2020-09-09 15:12:09 +02:00
chimp1984
54fdb5267f
Instead of renaming the AddressEntryList to a backup file we keep it
at restore from seed and create a backup copy.
I don't know what was the motivation of removing the original file
(probably the use case that the seeds are different and thus there
is no match of existing entries with the new addresses) as
that breaks the internal association of addresses with trades/offers and
the reserved balances display.

This should be tested well though with the related use cases
(diff. offer and trade states, wallet restore with same seed of with
foreign seed -> in that case we need to recreated the AddressEntryList
but that should be handled in the related domain)

- Add copyFile method
2020-09-08 19:14:38 -05:00
chimp1984
fa0224550c
Refactoring
- Add SharedPresentation class for methods in GUIUtil which are no
utility methods.
- Move restoreSeedWords to SharedPresentation
2020-09-08 19:00:16 -05:00
wiz
245027bff4
Fix codacy complaining about missing space character 2020-09-08 20:20:30 +09:00
wiz
a2c6f279a6
Merge remote-tracking branch 'bisq/master' into use-https-for-xmr-explorer-api 2020-09-08 20:19:20 +09:00
chimp1984
062c52dd55
Resolve merge conflict in Merge conflict in desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java 2020-09-08 11:57:51 +02:00
chimp1984
35cd7ac56b
Add check if trade have been dispute to protocol classes 2020-09-08 11:53:29 +02:00
chimp1984
cdf2698e29
Add comment to empty method 2020-09-08 11:53:20 +02:00
chimp1984
5ecbbf601f
Resolve merge conflict in Merge conflict in desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java 2020-09-08 11:53:04 +02:00
chimp1984
a7b5cdbd03
Resolve merge conflict in Merge conflict in desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java 2020-09-08 11:49:33 +02:00
m52go
67fc398f9b
Add note to SetXmrTxKeyWindow
To convey what it's about, and that it's optional.
2020-09-08 11:36:39 +02:00
m52go
2265d8f9e1
Add note to SetXmrTxKeyWindow
To convey what it's about, and that it's optional.
2020-09-07 11:36:32 -04:00
wiz
0869f9a016
Use lots of regex to add http or https for XMR explorer API endpoint
* If Tor *.onion hostname, use HTTP with Tor proxy
* If 127.0.0.1 or localhost, use HTTP without Tor proxy
* If LAN address or *.local FQDN, use HTTP without Tor proxy
* If any other FQDN hostname, use HTTPS with Tor proxy
2020-09-08 00:26:56 +09:00
Christoph Atteneder
b81e804bb1
Merge pull request #4491 from chimp1984/bugfix-xmr-tool
Bug fixes
2020-09-07 09:56:44 +02:00
chimp1984
e704d02801
Bug fixes
- useXmrTxProof was set at active but used in addContent which was
called before activate.
- Fix bug with using currencyName instead of currencyCode
- Refactor: Use methods in base class instead of repeated code
2020-09-07 09:56:13 +02:00
jmacxx
05cc29d854
Minor bug fixes for XMR tx proof feature
Fix missing CSS color code xmr-orange, was missing from dark mode.

Fix log message spelling/typo errors.

Removed 2 fixes from SellerStep3View so that chimp1984 can make
changes.

Remove address validator from XMR service address settings because
it does not support https prefix.
2020-09-07 09:55:05 +02:00
Christoph Atteneder
38cff29d97
Merge pull request #4490 from jmacxx/origin/add-xmr-tx-key-service-fix
Minor bug fixes for XMR tx proof feature
2020-09-07 09:54:38 +02:00
chimp1984
b1b3136969
Improve handling of nullable assetTxProof fields 2020-09-07 09:39:11 +02:00
chimp1984
9eb7900d51
Fix handling of username/accountId
We apply userName to accountId if it is not set (e.g. new account
created with new version). We do not use that for display or for
account signing in case both fields are the same but we need to use
accountId in case the user trades with a not updated user who expects
accountId as only field.
I improved a bit the display of account data in the trade screens.
In case accountId was set with the phone number (updated account with
phone nr used for account signing) we show both userName and phone nr.

- Show phone number if accountId was set by old account. Otherwise
show only userName
- For old users they will see the user name as phone number displayed
if they trade with new users if the new user has created a new account.
If he has updated an existing account the accountId (phone number) is
used, so it displays the phone number.
- At step 2 changed display of own account data to show account name
- Add 'Recipients' prefix to account data of peer at step 2

Step 3: Buyers account data can be
- Phone number if peer is using old version
- User name if peer is updated user with new account (we apply userName
to accountId)
- Phone number if user is on old version and peer is updated user with
updated account (we keep accountId as phone number)
- User name/Phone number if peer is updated user with updated account
2020-09-07 09:39:02 +02:00
chimp1984
a4f6d2af2e
Add check if xmrTxProof is used to avoid null pointer exception 2020-09-07 09:38:44 +02:00
chimp1984
e080b06736
Remove unused method 2020-09-07 09:34:57 +02:00
chimp1984
9cc614a790
Add alert icon to list entries
Support agent can mark a suspicious dispute as resolved so it does not
show the alert icon anymore. In the full report a [ACK] got added to
that dispute.
2020-09-07 09:34:47 +02:00
chimp1984
cc2d258915
Scan disputes for accounts where same user used diff. real names.
Might be fraudulent traders.
2020-09-07 09:34:31 +02:00
chimp1984
38d33ceab3
Remove offer from takers offerbook after take offer is completed.
We do not wait until the offer got removed by a network remove message but remove it
directly from the offer book. The broadcast gets now bundled and has 2 sec. delay so the
removal from the network is a bit slower as it has been before. To avoid that the taker gets
confused to see the same offer still in the offerbook we remove it manually. This removal has
only local effect. Other trader might see the offer for a few seconds
still (but cannot take it).
2020-09-07 09:30:44 +02:00
jmacxx
f49aa0f674
Minor bug fixes for XMR tx proof feature
Fix missing CSS color code xmr-orange, was missing from dark mode.

Fix log message spelling/typo errors.

Removed 2 fixes from SellerStep3View so that chimp1984 can make
changes.

Remove address validator from XMR service address settings because
it does not support https prefix.
2020-09-07 00:06:50 -05:00
chimp1984
c40bcfedfc
Fix merge mistake 2020-09-06 23:51:24 -05:00