mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-25 15:29:38 +01:00
Code Issues Projects Releases Packages Wiki Activity
15917 commits 3 branches 150 tags 4.1 GiB
Commit graph

6387 commits

Author SHA1 Message Date
ghubstan
4c8cec54f3
Push Trade->TradeModel mapping down from CoreApi into CoreTradesService 2022-01-25 19:11:24 -03:00
ghubstan
4ab4c3d213
Log exception and return "Not Available" when trade role cannot be found 2022-01-25 12:21:22 -03:00
ghubstan
d902e77710
Add Bisq license banners 2022-01-25 11:44:42 -03:00
ghubstan
3e14bd3fbe
Change var name 2022-01-23 17:05:55 -03:00
ghubstan
0e020e8987
Add payout fields to trade proto msgs, show optional trade/tx fees in swaps 2022-01-23 17:03:43 -03:00
ghubstan
fadaaf9151
Display tx-fee from BsqSwapProtocolModel 2022-01-22 16:22:41 -03:00
ghubstan
6e0299642e
Fill out gettrades-help.txt 2022-01-22 16:03:34 -03:00
ghubstan
69e6c9ce70
Remove duplicated buyer/seller proto fields (already exist no OfferInfo) 2022-01-20 16:50:08 -03:00
ghubstan
2e7346a695
Fix comments 2022-01-20 15:54:19 -03:00
ghubstan
3cd1e05a9f
Try to display accurate status of closed trades, or "Pending" if still open 2022-01-18 13:01:42 -03:00
ghubstan
d98d795c77
Add server impl for gettrades (open|closed), refactor getrole methods 2022-01-16 16:46:45 -03:00
ghubstan
fdd94fe1f2
Remove commented code 2022-01-16 16:44:18 -03:00
ghubstan
a9e7484aee
Add buyer/seller dep & status-desc fields to TradeInfo 2022-01-16 16:43:34 -03:00
ghubstan
5c217793c8
Add buyer/seller dep & status-desc fields to TradeInfoV1Builder 2022-01-16 16:42:34 -03:00
ghubstan
a53fee345f
Add List<OpenOffer> getCanceledOpenOffers() ClosedTradableManager 2022-01-16 16:41:53 -03:00
ghubstan
50bbbfe6c4
Add List<Trade> getTrades() to TradeManager (w/out transitive jfx dep) 2022-01-16 16:41:09 -03:00
ghubstan
b4fa52f4e4
Add List<Trade> getTrades() to FailedTradesManager (w/out transitive jfx dep) 2022-01-16 16:39:07 -03:00
Bisq GitHub Admin
808c3ad9d9
Merge pull request #5930 from xyzmaker123/modify-accepted-countries 
SEPA Account - editable account name and accepted countries
 2022-01-12 10:32:20 +01:00
Bisq GitHub Admin
8401b3885b
Merge pull request #5870 from jmacxx/mediation_payout_ux 
Improve user experience once mediation has been accepted by both parties
 2022-01-12 10:23:02 +01:00
Bisq GitHub Admin
ddead5ef54
Merge pull request #5953 from jmacxx/logs_upload 
Feature enabling log file upload to mediators
 2022-01-12 09:41:32 +01:00
jmacxx
d9ad531b3c
Fix issue of space in file path 2022-01-11 09:23:49 -06:00
Christoph Atteneder
a1d0e570d1
Apply minor improvements and clean-ups 2022-01-11 12:36:44 +01:00
Christoph Atteneder
310b9a97f2
Merge pull request #5949 from jmacxx/fix_trade_fee_validation 
Fix trade fee validation bug
 2022-01-11 11:09:09 +01:00
Christoph Atteneder
4a3e29daf5
Improve wording of trade completed notification popups 2022-01-11 11:02:55 +01:00
Christoph Atteneder
9759cebc4d
Remove unused translations 2022-01-11 10:48:06 +01:00
Christoph Atteneder
5c26c635e5
Merge pull request #5961 from ghubstan/2-api-fail-unfail-trade 
Add API methods 'failtrade', 'unfailtrade' + test case (#2)
 2022-01-10 12:29:54 +01:00
Christoph Atteneder
96878e5789
Merge pull request #5957 from jmacxx/fix_issue_5956 
Wording for Bsq swap cancellation popups & withdrawal prompt
 2022-01-10 12:01:33 +01:00
xyzmaker123
1da71f6c66
SEPA Account - possibility to modify account name 2022-01-10 10:52:39 +01:00
xyzmaker123
b3bf1903be
SEPA Account - possibility to modify accepted countries 2022-01-10 10:52:25 +01:00
jmacxx
3ea1543882
fixes for Windows compatability, test added 2022-01-07 19:42:24 -06:00
ghubstan
7690ffd953
Add API methods 'failtrade', 'unfailtrade' 
Prerequisite for next PR: Add API method 'gettrades'

The `gettrades` method will show 'open', 'closed', and 'failed' trades.
Users already needed to be able to fail and unfail trades for the
same reasons they do in the UI.  API test cases will need to be able to
fail and unfail trades to check correct behavior of 'gettrades' method.

Based on branch `rename-keepfunds2closetrade`.
 2022-01-07 19:11:34 -03:00
jmacxx
99b4071bdf
Wording for Bsq swap cancellation popups & withdrawal prompt 2022-01-07 10:03:14 -06:00
jmacxx
9334cffc89
Feature enabling log file upload to mediators 2022-01-06 13:22:44 -06:00
ghubstan
a9aaba87fa
Rename API method keepfunds -> closetrade 
Trade proceeds and deposits have already been transfered to Bisq wallets
before the `keepfunds` command is (was) executed;  `keepfunds` merely moves
open trades to closed trades lists and persistence files.  Renaming `keepfunds`
as `closetrade` makes its purpose clear to API users.

The commit modifies only method names and comments in api server+cli classes,
apitest cases, and api trade simulation scripts.

Based on `master`
 2022-01-05 12:10:46 -03:00
jmacxx
298aca40bc
Fix trade fee validation bug when two BSQ UTXOs used to pay the fee. 
A test has been added to validate the UTXO issue above.
Other tests have been updated as a result of the changes in PR 5826
where fee parameter is now supplied from a filter; this results
in more accurate (less lenient) fee checking.
 2022-01-04 09:25:05 -06:00
Christoph Atteneder
dde48f7d9e
Merge pull request #5935 from jmacxx/dao_state_store_and_statistics 
Improve DAO state store persistence and statistics logging [chimp1984]
 2022-01-03 12:24:18 +01:00
Stan
53d693d710
Merge branch 'master' into 7-deprecate-api-getmyoffer 2021-12-27 12:09:22 -03:00
ghubstan
5f571cccca
Deprecate API 'getmyoffer' 
The method 'getoffer' should support looking up a user's open-offers, and other users' available offers.

- Adjust api-beta-test-guide.md to use only 'getoffer'.
- Adjust trade simulation scripts to use only 'getoffer'.
- Adjust api testcases to use 'getoffer' in place of 'getmyoffer'.
- Mark appropriate methods and protobuf msgs as deprecated.
 2021-12-27 12:05:17 -03:00
jmacxx
1162060e28
Simplify the trade complete summary dialog 2021-12-24 14:22:59 -06:00
jmacxx
9378fe4603
Patch from chimp1984 improving the DaoState persistence 2021-12-23 14:40:11 -06:00
Christoph Atteneder
23d1856a60
Merge pull request #5852 from ghubstan/create-swift-acct-with-api 
Support and test creation of Swift accounts via API
 2021-12-20 11:49:20 +01:00
KanoczTomas
dfbde480c6
Remove trailing spaces. 2021-12-18 23:41:33 +01:00
KanoczTomas
364560e348
Correct typo in list/array of nodes 2021-12-18 22:37:04 +01:00
KanoczTomas
6969ed7a84
Add @KanoczTomas btc node with onion v3 address 2021-12-14 23:58:07 +01:00
sqrrm
cf81fd451c
Merge pull request #5876 from ghubstan/5-api-bsqswap-simulation-n-docs-update 
API BSQ swap simulation script and doc updates #5
 2021-12-14 15:47:51 +01:00
Christoph Atteneder
a7c38630e8
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.8.0 
Conflicts:
	core/src/main/resources/i18n/displayStrings_pl.properties
 2021-12-13 11:51:16 +01:00
chimp1984
97e4ed5a59
Revert usage of File.separator 
File.separator doesn't appear to work on Windows. It has to be "/", not "\".
See: https://github.com/bisq-network/bisq/pull/5909#pullrequestreview-827992563
 2021-12-09 20:07:21 +01:00
chimp1984
0f65567e1a
In case the BSQ blocks directory does not exist in resources (as in case of REG_TEST) 
we do not want to log an error stacktrace but just an info message.

Use `File.separator` instead of "/"
 2021-12-09 20:07:20 +01:00
chimp1984
225b78317f
Revert usage of File.separator 
File.separator doesn't appear to work on Windows. It has to be "/", not "\".
See: https://github.com/bisq-network/bisq/pull/5909#pullrequestreview-827992563
 2021-12-09 13:13:37 -05:00
chimp1984
d74bffb595
In case the BSQ blocks directory does not exist in resources (as in case of REG_TEST) 
we do not want to log an error stacktrace but just an info message.

Use `File.separator` instead of "/"
 2021-12-09 11:04:55 -05:00