13337 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Christoph Atteneder	c7b92c36c9	Merge pull request #4850 from chimp1984/improve-stratup-info-display ... Improve startup info display	2020-11-27 16:08:07 +01:00
sqrrm	cae09f8ff5	Merge pull request #4860 from stejbac/add-deposit-amount-taker-check ... Add taker check for deposit amount	2020-11-27 12:56:14 +01:00
ghubstan	965b003f61	Remove unnecessary use of fully qualified name for codacy	2020-11-27 06:45:31 -03:00
Steven Barclay	d59b425c94	Add missing output value check to takerSignsDepositTx ... Make sure the taker checks the value of the 2-of-2 multisig output of the deposit tx created by the maker, before signing it. This avoids a potential security hole, where the maker attempts to steal most of the deposit by using the wrong output value and adding an extra 'change' output to himself. Note that there's no actual vulnerability at present, as the output value is indirectly checked via the validation of the delayed payout tx. In particular, the extra checks added in 345426f as part of #4789 (Fix remaining blackmail vulnerabilities) place a lower bound on the delayed payout tx input value and with it the deposit tx output value. However, explicitly checking the amount is more robust.	2020-11-26 23:39:51 +00:00
Oscar Guindzberg	f2acf42edc	Set payoutTx as parent tx	2020-11-26 20:30:23 -03:00
Oscar Guindzberg	0b834a94f8	Use empty byte array for script sig	2020-11-26 20:30:00 -03:00
Oscar Guindzberg	91a2def86e	Use AddressEntry.getAddress()	2020-11-26 20:28:50 -03:00
ghubstan	06eb3786c0	Test new tx fee rate api methods	2020-11-26 18:36:58 -03:00
ghubstan	0b0f9f1120	Add gettxfeerate, settxfeerate, unsettxfeerate implementations	2020-11-26 18:36:15 -03:00
ghubstan	abe7160608	Add TxFeeRateInfo proto wrapper	2020-11-26 18:35:24 -03:00
ghubstan	9662f26b23	Add protbuf TxFeeRateInfo	2020-11-26 18:03:42 -03:00
ghubstan	44646763ef	Add protobuf defs for gettxfeerate, settxfeerate, unsettxfeerate	2020-11-26 18:02:32 -03:00
ghubstan	8fd578614d	Adjust test for a new payment method	2020-11-26 17:20:29 -03:00
ghubstan	5a06e4ea3e	Adjust to changed CoinUtil	2020-11-26 17:19:47 -03:00
ghubstan	8f13b85e19	Merge branch 'master' into 20-pr-change-requests-A	2020-11-26 17:19:00 -03:00
ghubstan	15592887dd	Implement fromProto ... This is marked unused, but it will be in future tests.	2020-11-26 15:06:14 -03:00
ghubstan	baf300afae	Add missing newlines to console output statements ... And remove some unecessary single quotes.	2020-11-26 15:02:30 -03:00
ghubstan	9d863e5a40	Remove deprecated method long getAvailableBalance	2020-11-26 14:25:24 -03:00
Deus Max	9d8939c0ca	Touch ups on the DAO BSQ supply page. ... * Formatting changes to chart lines and axes. * Removed middle chart as it displays no new info. * Function getMonthTickLabelFormatter rounds the tick label display to the nearest month. Only used for chart1. * New variable chart1XBounds to keep track of chart1 X-axis limits, as autoRanging set false.	2020-11-26 18:58:14 +02:00
ghubstan	f50634ee4a	Resolve BsqSendView file conflict ... Restore BsqSendView to version @ commit 48a515be01. Author: jmacxx Date: Tue Nov 10 19:35:31 2020 -0600 Add encrypted wallet password prompt when sending funds from BSQ wallet Correct wording of transaction confirmation popup to use 'mining fee' instead of 'transaction fee' to make it consistent with wording of the BTC confirmation popup.	2020-11-26 13:34:05 -03:00
chimp1984	1b68b02857	Shut down rpc service at app shut down routine	2020-11-26 11:31:05 -05:00
chimp1984	81a41a25bb	Improve chainHeightSyncing display	2020-11-26 11:20:51 -05:00
chimp1984	673a4d8718	Improve block % and fee display	2020-11-26 11:19:01 -05:00
chimp1984	3ded086808	Add stateStartingOrRunning check (if we close before state ... is ready we would get an exception in walletConfig.chain())	2020-11-26 11:18:38 -05:00
chimp1984	e1180d9662	Reformat, org imports (no code change)	2020-11-26 11:16:10 -05:00
Christoph Atteneder	99d5652aef	Merge pull request #4841 from jmacxx/fix_issue_4833 ... Prompt for confirmation before initiating SPV resync	2020-11-26 16:13:00 +01:00
Christoph Atteneder	4e4711a6f5	Merge pull request #4845 from jmacxx/fix_issue_4641 ... Show price deviation in portfolio open offers and history view	2020-11-26 15:33:50 +01:00
sqrrm	3cc9e63593	Merge pull request #4846 from bisq-network/release/v1.5.0 ... Release/v1.5.0	2020-11-26 12:42:14 +01:00
sqrrm	1110fb5d7d	Merge pull request #4822 from ripcurlx/improve-error-logging-for-disputes ... Add error log for dispute failure	2020-11-26 12:41:32 +01:00
Christoph Atteneder	e7dbb973c6	Merge pull request #4848 from wiz/dont-install-git-lfs-from-packagecloud ... In seednode installer, don't run random shell script to install git lfs	2020-11-25 19:37:57 +01:00
wiz	c0a03c7187	In seednode installer, don't run random shell script to install git lfs	2020-11-25 23:34:26 +09:00
Christoph Atteneder	11b0a466ce	Merge branch 'master' of github.com:bisq-network/bisq into release/v1.5.0 ... # Conflicts: # core/src/main/java/bisq/core/provider/fee/FeeService.java # core/src/main/resources/i18n/displayStrings.properties # seednode/src/main/java/bisq/seednode/SeedNodeMain.java	2020-11-25 14:05:37 +01:00
Christoph Atteneder	dbb0160a35	Revert to SNAPSHOT version	2020-11-25 13:46:24 +01:00
jmacxx	2e52b5472f	Show price deviation in portfolio open offers and closed trades ... Fixes #4641	2020-11-24 23:03:53 -06:00
sqrrm	3a5fba8196	Merge pull request #4838 from ripcurlx/update-resources-for-v1.5.0 ... Update resources for v1.5.0	2020-11-24 10:27:53 +01:00
Christoph Atteneder	f054e92cc6	Merge pull request #4843 from chimp1984/add-delay-to-exit ... Add 1 sec delay before calling exit	2020-11-24 10:12:37 +01:00
Christoph Atteneder	788e0259d8	Merge branch 'release/v1.5.0' of github.com:bisq-network/bisq into add-delay-to-exit ... # Conflicts: # core/src/main/java/bisq/core/app/BisqExecutable.java	2020-11-24 09:23:16 +01:00
Christoph Atteneder	94453cf27c	Merge pull request #4829 from chimp1984/prevent-downgrade ... Check if user has downgraded to an older version	2020-11-24 09:15:47 +01:00
Christoph Atteneder	2e51805eb3	Merge pull request #4840 from oscarguindzberg/fixBitcoinSync ... Upgrade bitcoinj to commit 60b4f2f	2020-11-24 09:11:39 +01:00
chimp1984	6b3a002b1c	Add 1 sec delay before calling exit ... To persist in the very last moment before exit might cause problems on some OS. We do not have confirmed that this might be an issue but to be on the safe side we add a 1 sec. delay between persistence completed and exit.	2020-11-23 18:22:44 -05:00
Oscar Guindzberg	e667f8fbad	Upgrade bitcoinj to commit 60b4f2f	2020-11-23 14:39:26 -03:00
jmacxx	395af3c4c8	Prompt for confirmation before initiating SPV resync ... Allows user to back off if invoked by accident.	2020-11-23 11:37:31 -06:00
ghubstan	c88543848d	Fix minor error & help msg bugs	2020-11-23 12:06:57 -03:00
Christoph Atteneder	06a7d6fb14	Update translations for v1.5.0 (update 2)	2020-11-23 11:23:25 +01:00
Christoph Atteneder	dd55beabac	Update data stores for v1.5.0 (update 2)	2020-11-23 11:23:15 +01:00
Christoph Atteneder	06c16a1734	Update bitcoinj checkpoints for v1.5.0 (update 2)	2020-11-23 11:23:04 +01:00
Christoph Atteneder	3c944722e9	Merge pull request #4831 from jmacxx/json_dump_active_currencies ... Create JSON files of actively traded crypto and fiat assets	2020-11-23 09:46:13 +01:00
ghubstan	ab5780e0e1	Print 'no offers found' msg in CLI if list is empty	2020-11-22 18:58:43 -03:00
ghubstan	08d56733a8	Fix getbalance out bug in CLI ... Running the bats test exposed a bug that shows BSQ and BTC balance info no matter what currency code argument is passed to the server.	2020-11-22 16:54:24 -03:00
ghubstan	daeb34b3d2	Add two new api method tests ... Keeping the bats test simple. More complex use cases are tested in apitest, and we don't want to be trading on mainnet with a bats test. - Add new getunusedbsqaddress test, assert success return status. - Add new getpaymentmethods test, assert success return status.	2020-11-22 16:25:21 -03:00