Manfred Karrer
2c84623154
Add filter for arbitrators
2017-10-25 17:24:54 -05:00
Manfred Karrer
d6e1f954b7
Merge remote-tracking branch 'origin/Development' into Development
2017-10-25 16:04:19 -05:00
Manfred Karrer
f24cbd9592
Merge Terracoin
2017-10-25 16:04:01 -05:00
Manfred Karrer
e8290e3b8a
Fix missing verifications, handle altcoins, cleanup
2017-10-25 14:18:26 -05:00
Manfred Karrer
75e95aef92
Use peers witness not the one from the offer for verification call
2017-10-22 22:06:04 -05:00
Manfred Karrer
fe4514b460
Remove PublishAccountAgeWitness task
2017-10-22 19:48:34 -05:00
Manfred Karrer
611428f5f0
Use peers currnet date for witness age calculation
2017-10-22 19:22:46 -05:00
Manfred Karrer
7c78db5101
Apply account age limit in take offer screen
2017-10-21 20:51:41 -05:00
Manfred Karrer
801a9174ad
Dont publish altcoin account witness
2017-10-21 20:32:05 -05:00
Manfred Karrer
df8ed79e0c
Set extraMap to null with altcoins
2017-10-21 20:30:44 -05:00
Manfred Karrer
e56fc44956
Only use accumulated hash in Witness object
2017-10-21 14:07:48 -05:00
Manfred Karrer
a33923cc1e
Add missing linebreak
2017-10-21 09:11:18 -05:00
Manfred Karrer
085f6b354b
Merge branch 'Development' into PaymentAccountAgeVerification
2017-10-20 18:54:23 -05:00
Manfred Karrer
1206878579
Add peers account age witness verifications in trade process
2017-10-17 20:41:33 -05:00
Manfred Karrer
5f9d59143e
Add salt field to payment method forms
2017-10-16 18:44:42 -05:00
Manfred Karrer
b60579fc37
Add account age to payment method forms
2017-10-16 18:16:24 -05:00
Manfred Karrer
f6c0d02bc3
Refactor: Rename addAllowedPeriod to addLimitations
2017-10-16 17:01:00 -05:00
Manfred Karrer
654270ec94
Add maxTradeLimit to BtcValidator
2017-10-16 17:00:16 -05:00
Manfred Karrer
851792d1f1
Add new P2P network data structure for AccountAgeWitness without pubKey
2017-10-16 15:52:54 -05:00
diego-ab
7b19f2642c
Add Terracoin
2017-10-16 21:47:03 +01:00
Manfred Karrer
0f322ad37f
Add PB support for excludeFromJsonDataMap to all PaymentPayload classes
2017-10-15 13:36:12 -05:00
vroehrig
801ffaefce
Update AltCoinAddressValidator.java
2017-10-15 08:22:12 +13:00
Manfred Karrer
a3ab418079
Filter offer by account age withness age (WIP)
2017-10-14 12:54:03 -05:00
Manfred Karrer
cb50faca95
Apply age based trade limit to offer
2017-10-13 21:36:15 -05:00
Manfred Karrer
b1a45f5365
Show account age and categroy in PeerIcon
2017-10-13 20:32:23 -05:00
vroehrig
1e6c12cec7
Update AltCoinAddressValidator.java
2017-10-14 13:16:07 +13:00
vroehrig
5dbb545bdd
Create XCNAddressValidator.java
2017-10-14 13:14:35 +13:00
vroehrig
aed946370b
Update AltCoinAddressValidatorTest.java
2017-10-14 13:13:58 +13:00
Manfred Karrer
7c122369be
Show account age in peer info icon
2017-10-13 11:41:26 -05:00
Manfred Karrer
5adda7b64f
Merge branch 'Development' into PaymentAccountAgeVerification
2017-10-13 10:30:53 -05:00
Manfred Karrer
46b2a14954
Fix wrong getMakerFee method, cleanup
2017-10-13 10:12:32 -05:00
Manfred Karrer
ca171bcb43
Merge branch 'api-pr1' of https://github.com/mrosseel/bisq-exchange into mrosseel-api-pr1
2017-10-13 09:16:53 -05:00
Mike Rosseel
0d411707e5
Documentation and cleanup of Offer related classes
...
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-10-13 14:40:18 +02:00
Manfred Karrer
5e8c8310ba
Merge branch 'Development' into PaymentAccountAgeVerification
2017-10-12 19:44:30 -05:00
Manfred Karrer
b0f451a2df
Merge remote-tracking branch 'upstream/Development' into Development
2017-10-12 19:11:26 -05:00
Manfred Karrer
9543b01d81
Merge branch 'master' into Development
2017-10-12 14:11:10 -05:00
Mike Rosseel
68048bc2d3
Removing all changes to make GUI work with the API
...
The other changes in GUI, namely small refactoring to have the GUI
and the API use the same methods to calculate things have been
left in place.
2017-10-12 17:32:59 +02:00
Mike Rosseel
c79d9e992c
Reverting non-relevant changes
2017-10-12 16:12:21 +02:00
Manfred Karrer
5d0c2d65c3
Change restrictiron for pw lenght from 50 to 500 chars
2017-10-11 15:17:01 -05:00
Mike Rosseel
0755cac9d1
Merge remote-tracking branch 'origin/Development' into api-pr1
...
Conflicts:
common/src/main/java/io/bisq/common/locale/LocaleUtil.java
2017-10-11 14:38:34 +02:00
Manfred Karrer
01cf823d7a
Prepare merge Dev
2017-10-11 07:21:50 -05:00
Manfred Karrer
e179475bb9
Merge branch 'Development' of https://github.com/ManfredKarrer/exchange
2017-10-11 07:14:01 -05:00
Manfred Karrer
27ecbf7260
Publish accountAgeWitness data to P2P network (WIP)
2017-10-09 21:14:40 -05:00
Manfred Karrer
130c9bd5bc
Merge branch 'Development' into PaymentAccountAgeVerification
2017-10-09 09:39:52 -05:00
Mike Rosseel
fbfb9ccc50
Merge branch 'Development' into issue544-api
2017-10-09 16:11:37 +02:00
Manfred Karrer
a8c81871c9
Merge branch 'Development' of https://github.com/ellaismer/exchange into ellaismer-Development
2017-10-08 21:12:02 -05:00
Manfred Karrer
a76b4d17f5
Show better text in PeerInfo if 0 trades
2017-10-08 21:03:08 -05:00
Manfred Karrer
361a520048
Remove sum column in market offerbook tables
2017-10-08 20:48:11 -05:00
Manfred Karrer
4522f50149
Fix wrong fee group at Create offer screen. Improve wording
2017-10-08 20:39:09 -05:00
Manfred Karrer
cb24b973ba
Don't show fee and security deposit fields if BSQ is not enabled
2017-10-08 19:53:52 -05:00
Manfred Karrer
ce25beff5e
Merge master to Development
2017-10-06 21:04:04 -05:00
Manfred Karrer
e5738507c3
Merge branch 'master' into Development
2017-10-06 20:57:32 -05:00
Pepper Lebeck-Jobe
a85611ca4d
Add a paddedId and use it for String concatenation
...
See #957 for why this is needed.
Fixes #957
2017-10-06 16:21:58 +02:00
Manfred Karrer
e6498e2659
Remove pre-filled entries in ManualPayoutTxWindow
2017-09-26 09:06:12 -05:00
Manfred Karrer
da2b12f71a
Rename SpendFromDepositTxWindow to ManualPayoutTxWindow
2017-09-26 08:47:55 -05:00
Manfred Karrer
efcc7ff05c
Remove accountSalt from trade messages and TradePeer
2017-09-25 12:47:09 -05:00
Manfred Karrer
b667e1b18a
Rename PaymentAccountAgeWitnessService to AccountAgeWitnessService
2017-09-25 09:16:01 -05:00
Manfred Karrer
8c7e1fd04a
Add verification methods, add hash to offer, add salt to trde process (WIP)
2017-09-25 09:13:23 -05:00
Mike Rosseel
bc4460bc9e
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-09-22 13:09:06 +02:00
Manfred Karrer
af27682f2f
Merge Development
2017-09-21 09:56:01 -05:00
Manfred Karrer
86c20682e9
Cleanup startup process
2017-09-21 09:03:50 -05:00
Ellaismer
a61f37b6e1
Add Ellaism coin
2017-09-21 04:38:36 +08:00
Manfred Karrer
80111caf3b
Rename bisq.io to bisq.network.
2017-09-20 15:21:13 -05:00
Manfred Karrer
ac0bf80606
Support different keys for code signing in download-tool
2017-09-20 15:05:25 -05:00
Manfred Karrer
981e6814cc
Add Chris Beams' gpg key 5BC5ED73 to resources
2017-09-20 13:07:50 -05:00
Manfred Karrer
016626c745
Activate DAO for BTC testnet and regtest
2017-09-19 20:53:51 -05:00
Manfred Karrer
2f459cd05e
Decrease font size and width of Tac window for small screens
2017-09-19 19:18:45 -05:00
Manfred Karrer
0bc339f916
Remove DOGE from base currency selection
2017-09-18 12:53:23 -05:00
Manfred Karrer
322ffab270
Cleanup
2017-09-18 12:21:48 -05:00
Manfred Karrer
76e031bbb2
Merge Development
2017-09-18 11:48:25 -05:00
Roznovjak
8e7e720bb7
Update AltCoinAddressValidatorTest.java
...
DCT integration
2017-09-18 15:03:03 +02:00
Roznovjak
668e9758af
Update AltCoinAddressValidator.java
...
DCT integration
2017-09-18 14:58:35 +02:00
Mike Rosseel
a72986ff5b
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-09-18 09:45:22 +02:00
Manfred Karrer
b72d716910
Merge Development
2017-09-17 11:28:34 -05:00
Manfred Karrer
1aa3038a07
Merge WACoin
2017-09-17 10:16:00 -05:00
Manfred Karrer
50106990ba
Merge branch 'master' into Development
...
Merge master to Development
2017-09-16 12:28:49 -05:00
Manfred Karrer
7daee4f212
Remove comment
2017-09-16 12:22:20 -05:00
Manfred Karrer
262c947d85
Merge PR 919 (ZenCash)
2017-09-16 12:16:54 -05:00
Mike Rosseel
7e980c1ad2
Fix an offer_make issue, add wallet tx support, remove offer_take param
...
This fixes an offer_make issue, but there is still one left.
General cleanup of model files/parameters no longer needed.
Remove offer_take savings_wallet param because it's always implied,
external wallets are not yet supported.
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-09-14 12:09:41 +02:00
Казьмина Татьяна
daaeddb968
Add new altcoin with code "PNC": additional code in AltCoinAddressValidator and AltCoinAddressValidatorTest and 2 specific classes: PNCAddressValidator and PNCParams.
2017-09-09 15:23:00 +03:00
smrtz
728e178828
Adds ZenCash Support
2017-09-05 18:38:59 -04:00
Chris Beams
0f2145d19c
Rename bisq-network/{bisq-exchange => exchange}
...
This is a follow on to 6ffa52a00
2017-09-05 14:55:42 +02:00
Mike Rosseel
68a7e7c9c5
check that the corrent paymentaccount is used for this offer
2017-09-04 19:59:40 +02:00
Mike Rosseel
9101aa367b
fix startup issues in some cases, where the p2pservice calls an onmessage before the storagefile is initialised.
...
Aligning Api module with other modules by using the AppSetupWithP2P class.
2017-09-04 13:26:56 +02:00
Mike Rosseel
46641200bc
adding more checks to offer_make, provide a cleaner/easier feedback mechanism between proxy/api.
...
Use threading to wait for offer creation results, add callback for errors.
Most exceptions coming from the bisq code are now propagated to the api result.
Added market check to forbid offers on non-existing markets.
TODO: further testing of rest api, adding checks
2017-09-02 11:39:27 +02:00
Mike Rosseel
9456b00127
Merge branch 'Development' into issue544-api
2017-08-28 09:31:45 +02:00
Chris Beams
6ffa52a006
Rename bitsquare/bitsquare => bisq-network/bisq-exchange
2017-08-23 15:36:17 +02:00
WACoinsTeam
41450d7543
Add WACoins coin
2017-08-20 21:51:54 +02:00
Manfred Karrer
a7c0f1d16f
Merge branch 'Development' into DAO_phase1
2017-08-09 12:48:56 +02:00
Manfred Karrer
e8c46c9709
Merge branch 'master' into Development
...
# Conflicts:
# doc/build.md
2017-08-09 12:48:07 +02:00
Chris Beams
3b73516ad6
Pin maven-enforcer-plugin version to 1.4.1 ( #897 )
...
A new version (v3.0.0-M1) of the enforcer plugin was released on July
27th. If for whatever reason that new version ends up in the local ~/.m2
cache, it results in broken builds because the new version's checksum
gets validated instead of the older v1.4.1 checksum being validated.
This is because the version provided to check was set simply to
'RELEASE', i.e. an alias indicating "whatever the latest release happens
to be". This commit fixes #897 and avoids these potential build failures
by pinning the version explicitly to v1.4.1. This forces the correct
checksum to get validated, in turn causing the build to pass as
expected.
2017-08-09 10:15:14 +02:00
Manfred Karrer
2dee533d37
Set onAction in activate method
2017-07-29 03:16:57 +02:00
Manfred Karrer
94203b9101
Add BSQ dashboard/statistics
2017-07-29 03:09:39 +02:00
Manfred Karrer
2a67d39d53
Cleanup
2017-07-29 00:04:31 +02:00
Manfred Karrer
594fe882d9
update dev input field data
2017-07-28 20:04:57 +02:00
Mike Rosseel
c6f11429f1
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-07-27 18:44:28 +02:00
Manfred Karrer
2f322f7a33
Merge branch 'Development' into DAO_phase1
2017-07-27 17:12:24 +02:00
Manfred Karrer
2d6fa2be6f
Move removeCryptographyRestrictions method to Utilities and add static initializer to SeedNodeMain, ProviderMain and StatisticsMain
2017-07-27 17:12:14 +02:00
Manfred Karrer
5af504095e
Fix bug with sorting offers
...
https://github.com/bitsquare/bitsquare/issues/869#issuecomment-318004502
2017-07-27 01:10:07 +02:00
Manfred Karrer
1857cc0b30
Show latest trade price as market price for currencies which have no external price feed provided but have been traded in Bisq
2017-07-26 11:44:28 +02:00
Manfred Karrer
03c33964a7
Add more selectors to filter.
2017-07-26 00:07:44 +02:00
Manfred Karrer
493b3a4f11
Add BSQ address validation
2017-07-25 22:14:48 +02:00
Mike Rosseel
6d782cdd73
adding command-line switch to GUI, ENABLE_API
2017-07-25 18:31:11 +02:00
Mike Rosseel
0c1cf298f6
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-07-25 13:35:13 +02:00
Manfred Karrer
614344218f
Use url instead of file name for log at daownloader
2017-07-23 01:58:26 +02:00
Mike Rosseel
412e19923c
utility scripts
2017-07-20 16:38:49 +02:00
Mike Rosseel
47a5e85e5f
api headless startup - wip
2017-07-20 14:38:03 +02:00
Mike Rosseel
537a99eb0f
adding healthchecks, adapting offer_make to new ctor (wip), adding banner, start of swagger integration
2017-07-18 17:32:44 +02:00
Mike Rosseel
337610ef7c
Merge branch 'Development' into issue544-api
2017-07-17 13:19:24 +02:00
Manfred Karrer
a7f3d68cb1
Version 0.5.3 with hotfix for fixing wrong app data name (bisq was renamed to Bisq -> we rename the app data dir).
2017-07-17 10:05:08 +02:00
Mike Rosseel
cda82172e3
Merge branch 'Development' into issue544-api
...
Conflicts:
.idea/codeStyleSettings.xml
2017-07-17 09:03:15 +02:00
Manfred Karrer
6c1e803220
Improve check for showing popup
2017-07-16 23:11:05 +02:00
Manfred Karrer
2fe77aadd4
Optimize startup performance
2017-07-16 22:39:15 +02:00
Manfred Karrer
b7d8a0acb6
set version 0.5.2
2017-07-16 16:29:10 +02:00
Manfred Karrer
a2563fd0d4
Cleanup, improve comments, small refactorings
2017-07-16 16:06:05 +02:00
Manfred Karrer
fde3d7d542
Add try/catch
2017-07-16 16:05:42 +02:00
Manfred Karrer
71115d46df
Update key
2017-07-16 15:32:31 +02:00
Manfred Karrer
68042b3c1e
Ignore test
2017-07-16 03:30:18 +02:00
Manfred Karrer
0b6c3c04da
Fix tests
2017-07-16 03:29:52 +02:00
Manfred Karrer
782a5b87ce
Backup file if there is an existing file. Filter duplicate sig.
2017-07-16 03:11:45 +02:00
Manfred Karrer
25f9368990
Add info for wallet restore
2017-07-16 02:35:03 +02:00
Manfred Karrer
46dc82c02d
Fix wrong sub view selection in DAO view. Only allow DAO view if BTC is basecurrency
2017-07-16 01:17:19 +02:00
Manfred Karrer
9cb0134369
Add reminder for seed word and backup before setting the wallet pw
2017-07-16 00:53:11 +02:00
Manfred Karrer
51e8aae991
Add email again but set to empty string as otherwise it would break backward compatibility (hash of contract)
2017-07-16 00:34:46 +02:00
Manfred Karrer
04fa5f079f
Remove email from bank accounts and fasterpayment
2017-07-15 23:09:13 +02:00
Manfred Karrer
f8ed97cb2e
Merge branch 'Development' into 0.5.2
...
# Conflicts:
# core/src/main/java/io/bisq/core/payment/payload/PaymentMethod.java
2017-07-15 14:57:42 +02:00
Manfred Karrer
ca9e53a2ab
Remove email from sepa account
2017-07-15 13:12:09 +02:00
Mike Rosseel
b2f6d7435c
added dash as base currency
2017-07-14 20:20:19 +02:00
Manfred Karrer
1d5965e296
Merge remote-tracking branch 'origin/0.5.2' into 0.5.2
2017-07-14 11:43:23 +02:00
Manfred Karrer
2a55758d3b
Merge branch 'Development' into 0.5.2
2017-07-14 11:42:16 +02:00
Manfred Karrer
4b5b305389
Merge branch 'master' into Development
2017-07-14 11:41:39 +02:00
Manfred Karrer
6bbac2903b
Change version nr back to 0.5.1 (0.5.2 is not ready yet)
2017-07-14 11:41:20 +02:00
Mike Rosseel
e9cbd07674
clear downloaded/verified list in case download fails and button is pushed again.
2017-07-12 16:57:56 +02:00
Mike Rosseel
c1e0e76127
move unit tests, add unit test for sigs, add documentation
2017-07-12 16:32:33 +02:00
Manfred Karrer
afe2a17f71
Merge branch 'downloadUpdates' into 0.5.2
2017-07-12 03:28:56 +02:00
Manfred Karrer
7067acc824
Improve UI for in-app-download window.
2017-07-12 03:28:00 +02:00
Manfred Karrer
dfc67b3df0
Merge branch 'Development' into downloadUpdates
2017-07-11 23:32:36 +02:00
Manfred Karrer
c7ccb56ca5
Add NewBestBlockListener to update BSQ tx UI if best chain has changed
2017-07-11 23:01:40 +02:00
Manfred Karrer
8abaf2dffb
Only request restart if base currency has changed
2017-07-11 22:44:48 +02:00
Manfred Karrer
45720486b2
Use Bisq instead of bisq
2017-07-11 22:37:44 +02:00
Manfred Karrer
6b2f3aeb10
Move seting of default locale to static initializer
2017-07-10 17:22:01 +02:00
Manfred Karrer
2844cdece3
Merge pull request #860 from cedricwalter/fix-maven-transitive-dependency
...
Fix maven transitive dependency
2017-07-08 22:12:35 +02:00
cedric.walter
ec6dc25195
fixed maven transitive dependencies, do not use ${project.parent.version} but ${project.version} with this change you can now run test without installing first all artifacts to local repository! test now run before install as expected and with current code version of ide/reactor
2017-07-08 21:40:16 +02:00
cedric.walter
d6a0bdd4dd
corrected a typo but did not change hash, (previous version was org.bouncycastle:bcprov-jdk15on:1.52 🫙 null:compile), now org.bouncycastle:bcprov-jdk15on:1.56 🫙 null:compile with a different hash
2017-07-08 21:27:33 +02:00
cedric.walter
76a8e53fe0
removed need to set unlimited cipher strength, use reflection to set java policy in code, hopefully something we can removed soon when using jdk 9 (-dcrypto.policy=unlimited will be enough).
2017-07-08 21:06:36 +02:00
cedric.walter
692bc1a837
added dependency management for all bouncycastle dependencies, these jar are signed and can not be placed in shaded jar, copy them in a lib directory that will be use by shaded.jar classloader
2017-07-08 21:03:13 +02:00
Mike Rosseel
55be62bc25
rebase problem
2017-07-07 17:44:36 +02:00
Mike Rosseel
95fb2dcebf
download update is code complete
2017-07-07 17:37:47 +02:00
Mike Rosseel
1b01ea7cfd
rebase of downloadUpdates branch by Simon Tuberlin on the Development HEAD
...
- rebase conflicts due to package renames
- some bouncy castle pgp stuff changed with new releases
2017-07-07 17:35:33 +02:00
SimonTuberlin
85cbd39a33
Sig verification for multiple keys
...
but download somehow does not work anymore :s
TODO: Open download folder, give qualified report about signatures
2017-07-07 17:35:33 +02:00
SimonTuberlin
5ac1ba2e88
Download to tmpdir works, can be cancelled by closing update alert, and shows directory upon completion (only tested on Linux)
2017-07-07 17:35:33 +02:00
SimonTuberlin
fb5869602e
Ready for first message/download test
2017-07-07 17:35:33 +02:00
SimonTuberlin
fac57c74f7
Prepared DownloadUtil task and updateAlert window
2017-07-07 17:35:33 +02:00
Mike Rosseel
2f4ef841bf
rebase of downloadUpdates branch by Simon Tuberlin on the Development HEAD
...
- rebase conflicts due to package renames
- some bouncy castle pgp stuff changed with new releases
2017-07-07 17:35:17 +02:00
SimonTuberlin
3e895f45e4
Sig verification for multiple keys
...
but download somehow does not work anymore :s
TODO: Open download folder, give qualified report about signatures
2017-07-07 17:35:17 +02:00
SimonTuberlin
5a8235008a
Download to tmpdir works, can be cancelled by closing update alert, and shows directory upon completion (only tested on Linux)
2017-07-07 17:35:17 +02:00
SimonTuberlin
204e4c4409
Ready for first message/download test
2017-07-07 17:35:17 +02:00
SimonTuberlin
fc01f797f0
Prepared DownloadUtil task and updateAlert window
2017-07-07 17:35:16 +02:00
Manfred Karrer
e68f4219c6
v0.5.2
2017-07-03 12:18:14 +02:00
Manfred Karrer
f5479eca2c
Merge branch 'master' into Development
2017-07-03 02:37:24 +02:00
Manfred Karrer
3deb80d23c
Add check for areWalletsAvailable
2017-07-03 02:30:45 +02:00
Manfred Karrer
aa4b15c007
Fix Locale issue with non-english default locales
2017-07-03 02:24:27 +02:00
Manfred Karrer
570549bfd1
v0.5.1
2017-07-01 00:32:06 +02:00
Manfred Karrer
73f2139923
Fixed missing price update in offerbook table.
...
Rename currenciesUpdateFlagProperty to updateCounterProperty.
Remove dev logs
2017-07-01 00:11:20 +02:00
Manfred Karrer
875db1f32e
Move base currency/network selection from network settings to preferences
2017-06-30 22:01:35 +02:00
Manfred Karrer
926f317a37
Add support for different REFERENCE_DEFAULT_MIN_TX_FEE by base currency
2017-06-30 21:29:32 +02:00
Manfred Karrer
5be0a3750e
Add btc address validator to last trade step for withdrawal.
...
Remove dontshow again option for tx summary popup.
2017-06-30 21:03:36 +02:00
Mike Rosseel
ad742403c9
fix merge errors - deleted files
2017-06-30 16:53:18 +02:00
Manfred Karrer
35635c7b9d
Turn off logs for BlockingClient
2017-06-30 13:10:53 +02:00
Mike Rosseel
cdc9649dd2
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-06-30 11:21:02 +02:00
Manfred Karrer
ad99e66ebe
Fix missing handling of diff. PersistedEntryMaps (trade statistics) from resource file
2017-06-29 20:23:22 +02:00
Manfred Karrer
31ace1c5d3
Fix missing handling of diff. PersistedEntryMaps (trade statistics) from resource file
2017-06-29 20:22:08 +02:00
Mike Rosseel
0ffac07fd6
Merge branch 'Development' into issue544-api
...
Conflicts:
api/src/main/java/io/bisq/api/app/Api.java
api/src/main/java/io/bisq/api/app/ApiModule.java
common/src/main/java/io/bisq/common/app/Version.java
common/src/main/java/io/bisq/common/crypto/PGP.java
common/src/main/java/io/bisq/common/locale/BankUtil.java
common/src/main/java/io/bisq/common/locale/CurrencyUtil.java
common/src/main/java/io/bisq/common/locale/LanguageUtil.java
common/src/main/java/io/bisq/common/locale/Res.java
common/src/main/java/io/bisq/common/proto/ProtoUtil.java
common/src/main/java/io/bisq/common/storage/FileManager.java
common/src/main/java/io/bisq/common/storage/Storage.java
common/src/main/proto/pb.proto
common/src/main/resources/i18n/displayStrings.properties
common/src/main/resources/i18n/displayStrings_de.properties
common/src/main/resources/i18n/displayStrings_es.properties
common/src/main/resources/i18n/displayStrings_sr.properties
common/src/main/resources/i18n/in_dev/displayStrings_es.properties
core/src/main/java/io/bisq/core/alert/Alert.java
core/src/main/java/io/bisq/core/app/BisqEnvironment.java
core/src/main/java/io/bisq/core/app/BisqExecutable.java
core/src/main/java/io/bisq/core/arbitration/messages/DisputeCommunicationMessage.java
core/src/main/java/io/bisq/core/btc/wallet/BisqDefaultCoinSelector.java
core/src/main/java/io/bisq/core/btc/wallet/BisqDeterministicKeyChain.java
core/src/main/java/io/bisq/core/btc/wallet/BsqWalletService.java
core/src/main/java/io/bisq/core/btc/wallet/BtcDeterministicKeyChain.java
core/src/main/java/io/bisq/core/btc/wallet/TradeWalletService.java
core/src/main/java/io/bisq/core/btc/wallet/WalletConfig.java
core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
core/src/main/java/io/bisq/core/dao/DaoPeriodService.java
core/src/main/java/io/bisq/core/dao/blockchain/BsqFullNode.java
core/src/main/java/io/bisq/core/dao/blockchain/BsqLiteNode.java
core/src/main/java/io/bisq/core/dao/blockchain/BsqNode.java
core/src/main/java/io/bisq/core/dao/blockchain/btcd/PubKeyScript.java
core/src/main/java/io/bisq/core/dao/blockchain/btcd/ScriptTypes.java
core/src/main/java/io/bisq/core/dao/blockchain/json/JsonSpentInfo.java
core/src/main/java/io/bisq/core/dao/blockchain/parse/BsqChainState.java
core/src/main/java/io/bisq/core/dao/blockchain/parse/BsqFullNodeExecutor.java
core/src/main/java/io/bisq/core/dao/blockchain/parse/BsqParser.java
core/src/main/java/io/bisq/core/dao/blockchain/parse/IssuanceVerification.java
core/src/main/java/io/bisq/core/dao/blockchain/parse/OpReturnVerification.java
core/src/main/java/io/bisq/core/dao/blockchain/parse/RpcService.java
core/src/main/java/io/bisq/core/dao/blockchain/vo/TxOutputType.java
core/src/main/java/io/bisq/core/dao/vote/VotingDefaultValues.java
core/src/main/java/io/bisq/core/filter/Filter.java
core/src/main/java/io/bisq/core/offer/OfferPayload.java
core/src/main/java/io/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java
core/src/main/java/io/bisq/core/payment/FasterPaymentsAccount.java
core/src/main/java/io/bisq/core/payment/NationalBankAccount.java
core/src/main/java/io/bisq/core/payment/PaymentAccountList.java
core/src/main/java/io/bisq/core/payment/SameBankAccount.java
core/src/main/java/io/bisq/core/payment/SepaAccount.java
core/src/main/java/io/bisq/core/payment/SpecificBanksAccount.java
core/src/main/java/io/bisq/core/payment/payload/BankAccountPayload.java
core/src/main/java/io/bisq/core/payment/payload/CashDepositAccountPayload.java
core/src/main/java/io/bisq/core/payment/payload/FasterPaymentsAccountPayload.java
core/src/main/java/io/bisq/core/payment/payload/NationalBankAccountPayload.java
core/src/main/java/io/bisq/core/payment/payload/PaymentMethod.java
core/src/main/java/io/bisq/core/payment/payload/SameBankAccountPayload.java
core/src/main/java/io/bisq/core/payment/payload/SepaAccountPayload.java
core/src/main/java/io/bisq/core/payment/payload/SpecificBanksAccountPayload.java
core/src/main/java/io/bisq/core/trade/Trade.java
core/src/main/java/io/bisq/core/trade/protocol/SellerAsMakerProtocol.java
core/src/main/java/io/bisq/core/trade/protocol/tasks/CheckIfPeerIsBanned.java
core/src/main/java/io/bisq/core/trade/protocol/tasks/buyer/BuyerProcessPayoutTxPublishedMessage.java
core/src/main/java/io/bisq/core/trade/protocol/tasks/buyer_as_taker/BuyerAsTakerSignAndPublishDepositTx.java
core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerProcessDepositTxPublishedMessage.java
core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerProcessPayDepositRequest.java
core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerVerifyArbitratorSelection.java
core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerVerifyMediatorSelection.java
core/src/main/java/io/bisq/core/trade/protocol/tasks/seller/SellerProcessCounterCurrencyTransferStartedMessage.java
core/src/main/java/io/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignAndPublishDepositTx.java
core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/CreateTakerFeeTx.java
core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerProcessPublishDepositTxRequest.java
core/src/main/java/io/bisq/core/user/PreferencesPayload.java
core/src/main/resources/bisq.policy
core/src/test/java/io/bisq/core/arbitration/ArbitratorTest.java
core/src/test/java/io/bisq/core/dao/vote/VoteManagerTest.java
core/src/test/java/io/bisq/core/dao/vote/VotingDefaultValuesTest.java
core/src/test/java/io/bisq/core/payment/OKPayAccountPayloadTest.java
core/src/test/java/io/bisq/core/trade/TradableListTest.java
core/src/test/java/io/bisq/core/util/ProtoUtilTest.java
doc/CONTRIBUTING.md
doc/bisq-sn.cron.sh
doc/bisq-sn.init.sh
doc/build.md
doc/install_on_unix.sh
doc/monitor-bisq-sn.cron.sh
doc/protobuffer.md
doc/seed-node-daemon.md
gui/src/main/java/io/bisq/gui/app/BisqApp.java
gui/src/main/java/io/bisq/gui/components/paymentmethods/BankForm.java
gui/src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java
gui/src/main/java/io/bisq/gui/components/paymentmethods/FasterPaymentsForm.java
gui/src/main/java/io/bisq/gui/components/paymentmethods/NationalBankForm.java
gui/src/main/java/io/bisq/gui/components/paymentmethods/SameBankForm.java
gui/src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java
gui/src/main/java/io/bisq/gui/components/paymentmethods/SpecificBankForm.java
gui/src/main/java/io/bisq/gui/main/MainView.java
gui/src/main/java/io/bisq/gui/main/MainViewModel.java
gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsView.java
gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.fxml
gui/src/main/java/io/bisq/gui/main/dao/voting/dashboard/VotingDashboardView.fxml
gui/src/main/java/io/bisq/gui/main/dao/wallet/dashboard/BsqDashboardView.fxml
gui/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxListItem.java
gui/src/main/java/io/bisq/gui/main/debug/DebugView.java
gui/src/main/java/io/bisq/gui/main/market/spread/SpreadView.java
gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java
gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java
gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java
gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java
gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java
gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java
gui/src/main/java/io/bisq/gui/main/overlays/windows/AddBitcoinNodesWindow.java
gui/src/main/java/io/bisq/gui/main/overlays/windows/DisputeSummaryWindow.java
gui/src/main/java/io/bisq/gui/main/overlays/windows/TacWindow.java
gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.fxml
gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java
gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.fxml
gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesViewModel.java
gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.fxml
gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java
gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java
gui/src/main/java/io/bisq/gui/main/settings/network/P2pNetworkListItem.java
gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.java
gui/src/main/java/io/bisq/gui/util/GUIUtil.java
gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
gui/src/main/java/io/bisq/gui/util/validation/FiatPriceValidator.java
gui/src/main/java/io/bisq/gui/util/validation/altcoins/OctocoinAddressValidator.java
gui/src/test/java/io/bisq/gui/main/market/trades/TradesChartsViewModelTest.java
gui/src/test/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModelTest.java
gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
jtorproxy/src/main/java/io/nucleo/net/Connection.java
jtorproxy/src/main/java/io/nucleo/net/Node.java
network/pom.xml
network/src/main/java/io/bisq/network/Socks5ProxyProvider.java
network/src/main/java/io/bisq/network/Socks5SeedOnionDiscovery.java
network/src/main/java/io/bisq/network/p2p/storage/payload/ExpirablePayload.java
network/src/main/java/io/bisq/network/p2p/storage/payload/MailboxStoragePayload.java
network/src/main/java/io/bisq/network/p2p/storage/payload/RequiresOwnerIsOnlinePayload.java
network/src/main/java/io/bisq/network/p2p/storage/payload/StoragePayload.java
network/src/main/resources/PersistedEntryMap
network/src/test/java/io/bisq/network/crypto/EncryptionServiceTests.java
network/src/test/java/io/bisq/network/p2p/network/NetworkStressTest.java
network/src/test/java/io/bisq/network/p2p/storage/P2PDataStorageTest.java
package/linux/32bitBuild.sh
package/linux/64bitBuild.sh
package/mac/bisq.icns
package/mac/bisq.iconset/icon_128x128.png
package/mac/bisq.iconset/icon_128x128@2x.png
package/mac/bisq.iconset/icon_16x16.png
package/mac/bisq.iconset/icon_16x16@2x.png
package/mac/bisq.iconset/icon_256x256.png
package/mac/bisq.iconset/icon_256x256@2x.png
package/mac/bisq.iconset/icon_32x32.png
package/mac/bisq.iconset/icon_32x32@2x.png
package/mac/bisq.iconset/icon_512x512.png
package/mac/bisq.iconset/icon_512x512@2x.png
package/mac/create_app.sh
package/osx/Info.plist
package/osx/finalize.sh
package/windows/32bitBuild.bat
package/windows/64bitBuild.bat
package/windows/bisq-setup-icon.bmp
package/windows/bisq.ico
pom.xml
provider/src/main/java/io/bisq/provider/fee/FeeRequestService.java
provider/src/main/java/io/bisq/provider/price/PriceRequestService.java
statistics/src/main/java/io/bisq/statistics/Statistics.java
statistics/src/main/java/io/bitsquare/statistics/Statistics.java
statistics/src/main/resources/logback.xml
2017-06-29 16:40:32 +02:00
Mike Rosseel
a0ecf38cf0
Revert "Revert "bisq -> Bisq""
...
This reverts commit 1dd3245347
2017-06-29 15:29:13 +02:00
Mike Rosseel
e851db1f01
merge
2017-06-29 15:08:33 +02:00
Mike Rosseel
1dd3245347
Revert "bisq -> Bisq"
...
This reverts commit fc863b8278
2017-06-29 14:07:19 +02:00
Mike Rosseel
fc863b8278
bisq -> Bisq
2017-06-29 11:42:59 +02:00
Manfred Karrer
ea7744cf3f
Fix null pointer at failed startup
2017-06-28 11:55:29 +02:00
Manfred Karrer
9c7386eb8b
Update tac
2017-06-27 22:17:21 +02:00
Manfred Karrer
8197be2c8a
Cleanup TODOs
2017-06-27 21:47:03 +02:00
Manfred Karrer
955a8b12ef
Fix validation of BTC, LTC, DOGE
2017-06-27 21:46:51 +02:00
Manfred Karrer
285c7e94fe
Fix email fields
2017-06-27 21:12:35 +02:00
Manfred Karrer
e11b314bbb
Add email to bank accounts. Add warning and info for bank accounts regarding chargeback risk and id verification. Add warning to CXC accounts.
2017-06-27 21:05:47 +02:00
Manfred Karrer
d4269adda7
Update tac
2017-06-27 13:07:41 +02:00
Manfred Karrer
e258b17e7a
Update license with Bisq instead of bisq
2017-06-27 01:39:11 +02:00
Manfred Karrer
f268abe2e1
Merge DAO branch to Development branch
2017-06-27 01:30:24 +02:00
Manfred Karrer
e2fa679a68
Merge DAO branch to Development branch
2017-06-27 01:29:54 +02:00
Manfred Karrer
724615b4ad
Fix navigation issue. adjust logging.
2017-06-26 20:12:15 +02:00
Manfred Karrer
61b9766052
Use BTC as base currency for BSQ.
...
Update PersistedEntryMap (trade statistics)
Remvoe amountTextField from BSQ receive view.
Disable other menu iems in DAO view, show disabled tabs of phase 2.
Fix nullpointer with setTradeCurrencyFromPaymentAccount in CreateOfferDataModel.
2017-06-26 19:24:36 +02:00
Manfred Karrer
728dead33c
Add timeout and resend support for p2p messages in trade process
2017-06-26 16:09:59 +02:00
Manfred Karrer
443f871b58
Remove symbol form TradeCurrency. Make tradeLimit dependent to currency (needed to relax limit for SF)
2017-06-26 02:33:53 +02:00
Manfred Karrer
c7b1ab3d77
Add PaymentAccountList to PB of account export/import.
...
Show MultiSig address in LockedFunds view.
Stop spinner at trade step for failed trades.
Add shortcut to remove failed trade from pending trades view.
2017-06-25 23:02:51 +02:00
Manfred Karrer
43bcff00c1
Use Utilities mothod for detecting key combi.
...
Change cmd key combis to alt (support still cmd and ctrl).
Check for locked fund in failed trades.
Don't move failed trades which have locked funds to failed trades list.
Clean up address entry list at startup.
2017-06-25 18:01:02 +02:00
Manfred Karrer
9e7f20158b
Update debug view
2017-06-25 17:30:21 +02:00
Manfred Karrer
7c1c9a34a4
User getAddressEntry instead of getOrCreateAddressEntry in readOnly access for addressEntries (iteration for lists).
...
Remove addressEntry after trade process entered new state.
2017-06-25 00:57:12 +02:00
Manfred Karrer
f705dc27c1
Adjust logging
2017-06-24 22:14:27 +02:00
Manfred Karrer
2b1734e313
Add isBitcoinLocalhostNodeRunning to BisqEnvironment and checkIfLocalHostNodeIsRunning to MainViewModel for detecting localhost btc node to disable tor in that case.
...
Rename Preferences db file to PreferencesPayload.
Use default MaxConnections (12) instead of 11.
Use Guice for ProvidersRepository and FeeProvider.
Remove BsqUtxoFeedProvider, BsqUtxoFeedRequest, BsqUtxoFeedData and BsqUtxoFeedService.
Improve logging.
Adust logback logging.
2017-06-24 18:56:55 +02:00
Manfred Karrer
f770455ce8
Change estimated size for trade fee tx to 600
2017-06-24 15:28:25 +02:00
Manfred Karrer
4bd299427c
Add timeout to broadcast callbacks in tasks to avoid timeout errors.
...
Add minValue to BtcValidator.
Fix LTC fees.
Log all onStoredInMailbox and onArrived handler calls.
Fix translations.
2017-06-24 15:03:12 +02:00
Manfred Karrer
67e8a1c74d
Fix fiat volume formatter. Change wording: userOffer type instead of Trade type.
2017-06-24 01:20:36 +02:00
