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

11593 commits

This branch
This branch
All branches
Author SHA1 Message Date
chimp1984
e9e7b489be
Various refactorings, bug fixes and improvements. 
Sorry for the messy commit... its late ;-)
 2020-08-31 00:10:41 -05:00
chimp1984
4f0e574bf9
Use static field for dev test values 2020-08-30 21:38:32 -05:00
chimp1984
2967530878
Max amount was set to 0.1 BTC, should be 1 BTC 2020-08-30 21:37:17 -05:00
chimp1984
aab478a63c
Refactor: 
- Rename XmrAutoConfirmationManager to XmrTxProofService
 2020-08-30 19:38:29 -05:00
chimp1984
f3ad669fab
Refactor: 
- Rename XmrTransferProofService to XmrTxProofRequestService
 2020-08-30 19:38:05 -05:00
chimp1984
0e2268d6fe
Refactor: 
- Rename XmrTransferProofRequest to XmrTxProofRequest
 2020-08-30 19:37:43 -05:00
chimp1984
a758880211
Refactor: 
- Rename XmrProofInfo to XmrTxProofModel
 2020-08-30 19:37:22 -05:00
chimp1984
87070531dd
Refactor: 
- Rename XmrProofParser to XmrTxProofParser (and rename test)
 2020-08-30 19:36:54 -05:00
chimp1984
44782223ec
Refactor: 
- Rename XmrAutoConfirmResult to XmrTxProofResult
 2020-08-30 19:35:56 -05:00
chimp1984
f8b5c30fb4
Refactor: 
- Rename AutoConfirmResult to AssetTxProofResult
- Update protobuf entry
 2020-08-30 19:35:26 -05:00
chimp1984
40a7320f32
Refactor: 
- Rename XmrTransferProofRequester to XmrTransferProofRequest
 2020-08-30 19:25:02 -05:00
chimp1984
6f56f90a66
Refactor: 
- Rename processCounterCurrencyExtraData to startRequestTxProofProcess
- Change activeTrades from Stream to List
 2020-08-30 19:23:41 -05:00
chimp1984
0740f8d12b
Remove @nullable from socks5ProxyProvider param 
Remove @Inject from XmrTxProofHttpClient as we pass the
Socks5ProxyProvider anyway
 2020-08-30 19:15:32 -05:00
chimp1984
ef9ac12519
Refactoring: 
-Reduce visibility
 2020-08-30 19:09:04 -05:00
chimp1984
b76357e620
Refactoring: 
Change test package from bisq.core.trade.asset.xmr to bisq.core.trade.autoconf.xmr
 2020-08-30 19:07:04 -05:00
chimp1984
213dffbef9
Refactoring: 
- Rename getKey to getUID
- Rename key to uid
 2020-08-30 19:05:18 -05:00
chimp1984
c6c8a3e5cb
Refactoring: 
- Move xmrProofInfo.checkApiResponse to XmrProofParser.parse
 2020-08-30 19:03:37 -05:00
chimp1984
38ac145213
Add devMode check for NO_MATCH case. 
Inline method
 2020-08-30 17:56:44 -05:00
chimp1984
867e023e87
Merge branch 'master_upstream' into add-xmr-tx-key-service-3 2020-08-30 17:02:15 -05:00
chimp1984
2a887e1f01
Improve SetXmrTxKeyWindow 2020-08-30 17:01:21 -05:00
chimp1984
94c84b6f50
Add @Override, cleanup 2020-08-30 16:47:39 -05:00
chimp1984
2fb625642a
Refactoring: Rename getTextStatus to getStatusAsDisplayString 2020-08-30 16:45:46 -05:00
chimp1984
595c968f2d
Various small cleanups... 2020-08-30 16:44:45 -05:00
chimp1984
67723fa1a7
Do not pass over xmrAutoConfirmationManager to ProcessModel but use a 
getter from tradeManager. Avoids boilerplate code (I know there is more
in the existing code to optimize here ;-))
 2020-08-30 16:43:32 -05:00
chimp1984
219094e9d1
Merge branch 'add-xmr-tx-key-service-2' into add-xmr-tx-key-service-3 2020-08-30 16:11:12 -05:00
chimp1984
77c203e87e
No functional change, pure refactoring 
Move to convertToRawHex CryptoNoteUtils as well as the classes inside
the validator.
 2020-08-30 16:08:07 -05:00
chimp1984
5143b1ed59
Apply suggested changes from code analysis 2020-08-30 15:56:44 -05:00
chimp1984
bfab6ffc2e
Replace success/failure with booleans 2020-08-30 15:51:43 -05:00
chimp1984
e5aee1ca07
No functionality has been changed by that refactoring, just moved 
classes and renamed package and adjusted access modifiers.
 2020-08-30 15:50:15 -05:00
chimp1984
ed5078c0f1
Add abstract AutoConfirmResult class to get better support if we want 
to add auto confirm for other currencies in the future. The generic part
is only used where we would have issues with backward compatibility like
in the protobuf objects. Most of the current classes are kept XMR
specific and could be generalized once we add other assets, but that
would be an internal refactoring without breaking any network or
storage data. I think it would be premature to go further here as we
don't know the details of other use cases. I added the methods used from
clients to AutoConfirmResult, not sure if the API is well defined by
that, but as said that could become subject of a future refactoring once
another auto confirm feature gets added. Goal of that refactoring was
to avoid that we need more fields for trade and the the UI would have to
deal with lots of switch cases based on currency.

Sorry that is a larger commit, would have been hard to break up...
 2020-08-30 15:45:47 -05:00
chimp1984
2f1566bb06
Add NO_MATCH_FOUND in comment 2020-08-30 14:48:15 -05:00
chimp1984
2f7b24d1c8
- Add @Nullable 
- Add curly brackets to one liners
- Log improvements
 2020-08-30 14:46:04 -05:00
chimp1984
07a761255d
- Make REPEAT_REQUEST_PERIOD and MAX_REQUEST_PERIOD static 
- Replace httpClient.toString() with httpClient.getBaseUrl() as toString
would deliver too much for those use cases.
- Add @Nullable
- Log improvements
 2020-08-30 14:45:05 -05:00
chimp1984
2dbc4645ec
- Change tolerance from 1 day to 2 hours. 
- Add case if no match is found -> NO_MATCH_FOUND.
- Add test case for NO_MATCH_FOUND
- Add curley brackets to one liners
- Log improvements
 2020-08-30 14:42:52 -05:00
chimp1984
008ae93b88
Add null check for name 2020-08-30 14:40:21 -05:00
chimp1984
3e728c69f7
- Remove AutoConfirmResult enum from protobuf and add a AutoConfirmResult 
instead which stores the stateName. [1]

- Adjust protobuf methods

- Add UNDEFINED to AutoConfirmResult.State to support cases where we
get no data to set the enum.

- Add NO_MATCH_FOUND (used in follow up commits)

- Refactoring: Improve constructors

[1]
Enums in protobuf are not well supported. They are global so an enum
with name (e.g. State) inside Trade conflicts with another enum inside
Message with the same name. So they do not reflect encapsulation in the
class like in java.
We moved over time to the strategy to use strings (from enum.name())
instead of the enum, avoiding also cumbersome fromProto and toProto
code and being more flexible with updates.
The autoConfirmResultState enum inside Trade was a bit confusing to me
as it was a different structure as in the java code. We try to mirror
the structure as far as possible.
 2020-08-30 14:39:44 -05:00
James Cox
ca9f61ecde
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-08-30 12:39:23 -05:00
James Cox
36e2f71f1b
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-08-30 12:39:05 -05:00
jmacxx
d9d0814064
Re-word the XMR account creation message per @m52go 2020-08-30 11:52:04 -05:00
Christoph Atteneder
51e66d5763
Merge pull request #4447 from wiz/tweak-bitcoin-conf-timeout 
Tweak seednode bitcoin.conf, remove timeout, separate testnet block
 2020-08-30 14:25:29 +02:00
chimp1984
5501822128
Merge branch 'master_upstream' into xmr 2020-08-29 23:03:13 -05:00
Christoph Atteneder
ecb8db3a4e
Merge pull request #4440 from jmacxx/fix_low_bsq_offer 
Improve warning message regarding insufficient BSQ
 2020-08-29 20:03:03 +02:00
Christoph Atteneder
835c511cf5
Merge pull request #4448 from wiz/revert-4398-header-tweaks 
Revert "Header and other visual tweaks"
 2020-08-29 20:01:15 +02:00
Christoph Atteneder
589266966c
Merge pull request #4450 from chimp1984/fix-getMinRefundAtMediatedDispute 
Fix null pointer in case if selectedMarketPrice is null
 2020-08-29 19:57:55 +02:00
chimp1984
ef11e2ad89
Fix comment 2020-08-29 12:29:07 -05:00
chimp1984
8253957cb2
Fix null pointer in case if selectedMarketPrice is null 2020-08-29 12:19:36 -05:00
sqrrm
38f9d251ae
Merge pull request #4435 from chimp1984/improve-network-statistics 
Add more detailed network statistics
 2020-08-29 19:01:43 +02:00
jmacxx
cccc6de595
Default to clearnet XMR proof providers when in dev mode 2020-08-29 10:21:03 -05:00
sqrrm
591d68a6fd
Merge pull request #4445 from chimp1984/restart-seednodes-deterministically 
Use the index of a seed node address in the list of nodes at the
 2020-08-29 15:20:03 +02:00
sqrrm
79a26aa95d
Merge pull request #4446 from chimp1984/add-report-button-for-dispute-views 
Improve dispute views
 2020-08-29 14:18:21 +02:00