10941 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
sqrrm	2db90cf132	Merge pull request #4175 from bisq-network/release/v1.3.2 ... Release/v1.3.2	2020-04-16 16:41:37 +02:00
Christoph Atteneder	1105a78d51	Revert to SNAPSHOT version	2020-04-16 14:25:59 +02:00
Christoph Atteneder	dc692f5749	Merge pull request #4173 from sqrrm/add-donation-address ... Add second donation address as valid	2020-04-15 22:01:03 +02:00
sqrrm	26f30b6ec4	Add second donation address as valid	2020-04-15 21:30:50 +02:00
Christoph Atteneder	cfc4705058	Update translations for v1.3.2	2020-04-14 18:08:27 +02:00
Christoph Atteneder	9ce26e6dd4	Update data stores for v1.3.2	2020-04-14 18:06:30 +02:00
sqrrm	0a8b74bec8	Merge pull request #4169 from ripcurlx/update-data-stores-v1.3.2 ... Update data stores for v1.3.2	2020-04-14 18:01:46 +02:00
Christoph Atteneder	8b75637aed	Update data stores for v1.3.2	2020-04-14 17:38:03 +02:00
ghubstan	be09682435	Replace mock arg with SEPA PaymentMethod instance ... Test AccountAgeWitnessServiceTest > testArbitratorSignWitness failed in full gradle build, but passed when run as a single test: ./gradlew :core:cleanTest :core:test \ --tests "bisq.core.account.witness.AccountAgeWitnessServiceTest" This test also passed when run in the IDE. Solved by not passing a mocked PaymentMethod.SEPA argument into the test's service.getTraderPaymentAccounts() method, where mock paymentId field was null when running full build's test suites. Fix for #4158	2020-04-13 11:46:35 +02:00
Christoph Atteneder	e4ae28e052	Merge pull request #4161 from ghubstan/fix-4158 ... Replace mock arg with SEPA PaymentMethod instance	2020-04-13 11:46:01 +02:00
sqrrm	1a1f71a0a7	Change command line argument default	2020-04-13 11:38:30 +02:00
sqrrm	6fc087c72c	Add option to allow faulty delay payout tx ... Add more logging during unfail process	2020-04-13 11:38:15 +02:00
sqrrm	016a552836	Allow completion of trades with amount mismatch delayed tx	2020-04-13 11:38:08 +02:00
sqrrm	efee2e43c4	Init unfailed trade when moved to pending trades	2020-04-13 11:38:00 +02:00
sqrrm	e739f9465f	Don't unfail if deposit or delayedpayout txs are missing	2020-04-13 11:37:54 +02:00
sqrrm	c889fbdb8d	Reattach addresses when unfailing trade	2020-04-13 11:37:46 +02:00
sqrrm	77835b95b0	Add shortcut to move failed trade to pending trades	2020-04-13 11:32:54 +02:00
Christoph Atteneder	2a040f4687	Merge pull request #4157 from sqrrm/unfail-with-reattach ... Unfail with reattach	2020-04-13 11:32:24 +02:00
sqrrm	2bd00c8c01	Change command line argument default	2020-04-12 16:17:23 +02:00
sqrrm	790db8c731	Add option to allow faulty delay payout tx ... Add more logging during unfail process	2020-04-12 16:12:43 +02:00
sqrrm	be3158427e	Allow completion of trades with amount mismatch delayed tx	2020-04-12 13:03:09 +02:00
ghubstan	fc458e7a7d	Replace mock arg with SEPA PaymentMethod instance ... Test AccountAgeWitnessServiceTest > testArbitratorSignWitness failed in full gradle build, but passed when run as a single test: ./gradlew :core:cleanTest :core:test \ --tests "bisq.core.account.witness.AccountAgeWitnessServiceTest" This test also passed when run in the IDE. Solved by not passing a mocked PaymentMethod.SEPA argument into the test's service.getTraderPaymentAccounts() method, where mock paymentId field was null when running full build's test suites. Fix for #4158	2020-04-11 14:02:22 -03:00
sqrrm	f6b7762d26	Init unfailed trade when moved to pending trades	2020-04-11 18:02:18 +02:00
Christoph Atteneder	782921ec55	Bump version number for v1.3.2	2020-04-10 20:02:39 +02:00
Christoph Atteneder	edc4df1826	Merge pull request #4099 from jmacxx/fix_getsupport_traderchat ... Replace the Get Support button with Open Trader Chat until trade period is over	2020-04-10 19:53:38 +02:00
sqrrm	486f254773	Don't unfail if deposit or delayedpayout txs are missing	2020-04-10 16:42:02 +02:00
sqrrm	817819dc51	Reattach addresses when unfailing trade	2020-04-10 16:42:02 +02:00
sqrrm	bd8e30c708	Add shortcut to move failed trade to pending trades	2020-04-10 16:42:02 +02:00
Christoph Atteneder	34734c6fe4	Merge pull request #4122 from stejbac/make-UserThread-runAfter-thread-safe ... Make UserThread::run* methods thread safe	2020-04-10 15:55:03 +02:00
sqrrm	062dc6ef76	Merge pull request #4053 from freimair/too-long-mempool-chain ... Limit number of unconfirmed offers	2020-04-10 15:23:29 +02:00
sqrrm	09141eba92	Add signed witness filter (#4124) ... * Add signed witness filter - Add a filter to pubkeys used in AccountAgeWitness signing - Fix inverted arbitrator signing of initial account age witnesses from disputes - Add test to verify that signed witness filter works - Add test to verify that the arbitrator signing was fixed * Fix codacy complaints * Prevent NullPointerException during toggle group initialization * Add scrollbar to filter window * Format test class Co-authored-by: Christoph Atteneder <christoph.atteneder@gmail.com>	2020-04-10 15:14:01 +02:00
Christoph Atteneder	aeda234ef1	Merge pull request #4154 from freimair/prevent_misuse_of_dev_cmdline_option ... Limit abuse of `--useLocalhostForP2P` option	2020-04-10 12:08:32 +02:00
Florian Reimair	609b8b066d	Limit abuse of useLocalhostForP2P option ... Until now, the --useLocalhostForP2P option could be used even for BTC_MAINNET. That is bad and caused mediation cases.	2020-04-09 18:05:51 +02:00
sqrrm	e4d975ebf4	Merge pull request #4147 from bisq-network/release/v1.3.1 ... Release/v1.3.1	2020-04-09 11:15:21 +02:00
Christoph Atteneder	4b826eb2a9	Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.1 ... # 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-04-08 23:03:19 +02:00
Christoph Atteneder	224b140c46	Revert to SNAPSHOT version	2020-04-08 22:59:10 +02:00
chimp1984	79e4572f64	Fix issues when buyer has dao deactivated	2020-04-08 21:52:30 +02:00
chimp1984	b145616038	Allow daoActivated to be set to false for non mainnet networks	2020-04-08 21:52:18 +02:00
chimp1984	495b9b58b3	Fix inverted check, add more error logs	2020-04-08 21:52:07 +02:00
chimp1984	005a87b553	Fix issue with tx connected output being null ... The moment we are validating the tx is not committed and therefore the connected tx output is not wired up and thus null. Refactor and consolidate the validation code to the static class and improve error handling.	2020-04-08 21:51:52 +02:00
sqrrm	eb0834a1df	Merge pull request #4143 from chimp1984/fix-issue-with-connected-txoutput ... Fix issue with connected txoutput	2020-04-08 21:17:33 +02:00
chimp1984	526bd0091a	Fix issues when buyer has dao deactivated	2020-04-08 13:29:04 -05:00
chimp1984	86d9e8c89e	Allow daoActivated to be set to false for non mainnet networks	2020-04-08 13:28:44 -05:00
Christoph Atteneder	51ffd9d95c	Bump version number for v1.3.1	2020-04-08 20:04:13 +02:00
chimp1984	fd04909c79	Fix inverted check, add more error logs	2020-04-08 12:24:37 -05:00
chimp1984	38dcb27140	Fix issue with tx connected output being null ... The moment we are validating the tx is not committed and therefore the connected tx output is not wired up and thus null. Refactor and consolidate the validation code to the static class and improve error handling.	2020-04-08 12:10:06 -05:00
Christoph Atteneder	6ae9608966	Remove duplicate restart/connection information	2020-04-08 14:10:59 +02:00
sqrrm	97b1a10ae8	Fix value of delayedpayouttx for ranged trades	2020-04-08 14:05:44 +02:00
chimp1984	1c5fc600f4	Add check for donation address at pending trades	2020-04-08 14:05:30 +02:00
chimp1984	96e42954c9	Add more checks for delayed payout tx ... Merge Conflict in TradeWalletService	2020-04-08 14:05:18 +02:00