Commit Graph

11771 Commits

Author SHA1 Message Date
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
chimp1984
6c60e1739d
Add support for user name for Revolut accounts
If a user has an existing account with phone number or email as
account ID we show a popup at startup where we require that he sets the
user name. This popup has no close button so he is forced to enter a
value. If there are multiple account multiple popups will be shown.

To not break signed accounts we keep accountId as internal id used for signing.
Old accounts get a popup to add the new required field userName but accountId is
left unchanged. Newly created accounts fill accountId with the value of userName.
In the UI we only use userName.

Input validation does only check for length (5-100 chars). Not sure what
are the requirements at Revolut. Can be changes easily if anyone gets
the specs.
2020-08-30 12:58:31 -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
chimp1984
49d212e654
Fix tests.
I don't know why the tests failed as I just added an overloaded method
and it should not have any impact. There is also one exception which
makes it even more obscure. I guess its some test framework issue.

See comment at the exceptional handling
// If we remove the last argument (isNull()) tests fail. No idea why as the broadcast method has an
/ overloaded method with nullable listener. Seems a testframework issue as it should not matter if the
// method with listener is called with null argument or the other method with no listener. We removed the
// null value from all other calls but here we can't as it breaks the test.
2020-08-30 10:37:46 -05:00
chimp1984
8d13ff8856
Add comment about size 2020-08-30 10:02:19 -05:00
chimp1984
0aa97d39ab
Merge remote-tracking branch 'origin/bundle-msg-at-broadcast' into bundle-msg-at-broadcast 2020-08-30 07:28:02 -05:00
chimp1984
6accd58fc9
Merge branch 'master_upstream' into bundle-msg-at-broadcast
# Conflicts:
#	p2p/src/main/java/bisq/network/p2p/P2PService.java
2020-08-30 07:27:15 -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
chimp1984
ebecd20949
Merge branch 'master_upstream' into add-check-for-option-trade 2020-08-29 20:00:07 -05:00
chimp1984
bedcd9b10e
Add option trade detection message to result message if case was
marked as option trade.

Add repeated calls to price provider it no data available (can happen at
startup).

Show reason in dispute summary.
2020-08-29 19:58:51 -05:00
chimp1984
f2e8ce582e
Remove timeStampMap as it is never read
Add hasPrices method
Remove final keywords
2020-08-29 19:29:59 -05:00
chimp1984
beeac10a99
Change GMT0 to UTC and add UTC time to log at shut down 2020-08-29 19:29:08 -05:00
chimp1984
08632e13ee
Add message after dispute opening to show if trade might be an option trade 2020-08-29 18:00:36 -05:00
chimp1984
bf2ca1fc0c
Add BTC prefix or postfix to Price.toFriendlyString method 2020-08-29 14:07:59 -05:00
chimp1984
01482fb8e6
Refactoring
Separate validation from setting key
2020-08-29 13:21:19 -05:00
chimp1984
b0eea78a03
Remove unused properties (was added again from a merge failure) 2020-08-29 13:14:18 -05:00
chimp1984
366fdb3a09
Merge remote-tracking branch 'origin/bundle-msg-at-broadcast' into bundle-msg-at-broadcast
# Conflicts:
#	p2p/src/main/java/bisq/network/p2p/P2PService.java
2020-08-29 13:13:31 -05:00
chimp1984
be78770369
Merge branch 'master_upstream' into bundle-msg-at-broadcast
# Conflicts:
#	p2p/src/main/java/bisq/network/p2p/P2PService.java
2020-08-29 13:04:42 -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
7a4fc3d6b7
Merge branch 'master_upstream' into refactor-filter 2020-08-29 12:56:29 -05:00
chimp1984
9e4e800cb6
Fix tests 2020-08-29 12:53:35 -05: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
wiz
997a2a5e55
Revert "Header and other visual tweaks" 2020-08-29 18:12:23 +09:00
chimp1984
b5c8bae1fa
Enable check for lock time on mainnet and add a 3 block tolerance. 2020-08-28 22:16:04 -05:00