Commit graph

4944 commits

Author SHA1 Message Date
chimp1984
126f99668d
Update core/src/main/resources/i18n/displayStrings.properties
Co-authored-by: m52go <mfiver@gmail.com>
2020-09-29 01:03:30 -05:00
chimp1984
08e2a2e0b0
Update core/src/main/resources/i18n/displayStrings.properties
Co-authored-by: m52go <mfiver@gmail.com>
2020-09-29 01:03:18 -05:00
chimp1984
c448b1b58d
Update core/src/main/resources/i18n/displayStrings.properties
Co-authored-by: m52go <mfiver@gmail.com>
2020-09-29 01:03:01 -05:00
chimp1984
285003743d
Update core/src/main/resources/i18n/displayStrings.properties
Co-authored-by: m52go <mfiver@gmail.com>
2020-09-29 01:02:49 -05:00
chimp1984
6be21fa86c
Update core/src/main/resources/i18n/displayStrings.properties
Co-authored-by: m52go <mfiver@gmail.com>
2020-09-29 01:02:11 -05:00
chimp1984
f46e132195
Add rocket icon to xmr offers which have enabled autoconf
Add info to tooltip and to offer window
Add center css to actions column. It looks weird that title is left aligned and button is centered.
only "last-column", "avatar-column" worked, making an new style e.g. center-column did not succeed... css is not my friend....
Shorten "Time since signing" to "Signed since" header to avoid truncation
2020-09-29 00:45:31 -05:00
chimp1984
7280fb822d
Add new extraMap entry for offer.
If maker is seller and is a xmr offer and has autoConf enabled we set a flag ("1")
2020-09-28 23:26:29 -05:00
chimp1984
e8ab4c7222
Merge branch 'master_upstream' into fix-delayed-payout-tx-issues 2020-09-28 20:46:34 -05:00
chimp1984
0258205211
Fix typos 2020-09-28 18:10:42 -05:00
chimp1984
eec13cd276
Refactor: Return early if not valid 2020-09-28 18:08:07 -05:00
chimp1984
ad83183cba
Revert copyright text from un-intended change 2020-09-28 18:05:09 -05:00
Oscar Guindzberg
1e65af51ea
Remove unused WalletService.freshKey() 2020-09-28 18:37:53 -03:00
ghubstan
fc94b97a00
Throw exception to CLI if attempted offer placement fails 2020-09-28 18:11:08 -03:00
ghubstan
94996a5e25
Fix tx result handling in GrpcOffersService
Separates offer placement from offer creation to fix tx result
handling problem in GrpcOffersService, and readies the core api
for a new CLI 'placeoffer' implementation.  Offer placement still
happens in the api's 'createoffer', but we may want to change it
to show the created offer to a CLI user for review, prior to manual
placement via a new 'placeoffer offer-id' (of 'confirmoffer offer-id'?)
api method.
2020-09-28 11:48:56 -03:00
ghubstan
f3761530b5
Codacy requires default label in switch 2020-09-28 09:38:08 -03:00
ghubstan
d9ece9f5ba
Revert "Fix 'switch statements should have a default label' codacy problem"
This reverts commit 50d4b9f5e1.
Back out codacy fix;  it did not work.
2020-09-27 17:25:44 -03:00
ghubstan
50d4b9f5e1
Fix 'switch statements should have a default label' codacy problem
This is an ugly, temporary fix.  Need to refactor again.
2020-09-27 17:18:50 -03:00
ghubstan
35a77be7e4
Redefine DisputeAgentType REFUNDAGENT as REFUND_AGENT
The CLI needs to be able to register a REFUND_AGENT using the
'refund_agent' or 'refundagent' parameter value (in any case),
so an alt-name mapping was added to the enum def.
2020-09-27 15:23:19 -03:00
sqrrm
20135a1662
Merge pull request #4561 from oscarguindzberg/codeCleanup
Remove unnecessary WalletService.removeSignatures()
2020-09-27 14:44:43 +02:00
sqrrm
a408dd5a89
Merge pull request #4552 from oscarguindzberg/WalletConfigCleanup
Wallet config cleanup
2020-09-27 14:40:51 +02:00
sqrrm
3174778018
Merge pull request #4560 from jmacxx/fix_xmr_amount_check
XMR autoconf should get amount from trade not offer
2020-09-27 14:40:23 +02:00
chimp1984
2191693946
Apply stupid Codacy rule
https://stackoverflow.com/questions/1750435/comparing-java-enum-members-or-equals

```
enum Color { BLACK, WHITE };

Color nothing = null;
if (nothing == Color.BLACK);      // runs fine
if (nothing.equals(Color.BLACK)); // throws NullPointerException
```
```
enum Color { BLACK, WHITE };
enum Chiral { LEFT, RIGHT };

if (Color.BLACK.equals(Chiral.LEFT)); // compiles fine
if (Color.BLACK == Chiral.LEFT);      // DOESN'T COMPILE!!! Incompatible types!
```

"To summarize, the arguments for using == on enum are:

     It works.
     It's faster.
     It's safer at run-time.
     It's safer at compile-time.
"
2020-09-27 02:13:39 -05:00
chimp1984
28a85c1ce5
Fix display strings 2020-09-27 02:04:35 -05:00
chimp1984
ab30e546b0
Merge branch 'master_upstream' into fix-delayed-payout-tx-issues 2020-09-27 01:28:51 -05:00
chimp1984
d08591551b
Add state listeners to warn icon columns to get correct state updates 2020-09-27 01:26:48 -05:00
chimp1984
6deeecb846
Move handling of mailbox messages from TradeManager to TradeProtocol
Make removal of mailbox messages automated in TradeProtocol
2020-09-26 23:38:01 -05:00
chimp1984
84a4982732
Remove TradeProtocol from Trade
We keep the TradeProtocol now in TradeManager in a hashmap.
As TradeProtocol constructors get called now earlier we need to add an onInitialized method which signals that the TradeProtocol is ready.
The processModel needs to get set the transient fields after construction.
2020-09-26 21:34:28 -05:00
chimp1984
cabc5af2c6
Make processModel in Trade final and pass in constructor instead of in init method 2020-09-26 19:36:07 -05:00
chimp1984
5309f04b40
DO not deactivate move to failed trades button. Use different text in popup if all txs are valid.
Fix icon style issues.
2020-09-26 18:33:25 -05:00
chimp1984
6c6332d68d
Allow also Trade.Phase.PAYOUT_PUBLISHED in onPaymentReceived to support in failure situations to resend the msg 2020-09-26 17:37:34 -05:00
chimp1984
07bcf6c38f
Refactor: improve logs 2020-09-26 17:36:57 -05:00
chimp1984
3ce1ac9285
Refactor: improve logs 2020-09-26 17:36:41 -05:00
chimp1984
74317636b0
Apply code inspection suggestions 2020-09-26 16:00:03 -05:00
chimp1984
d6c242922b
Remove timeouts as it was not used before. 2020-09-26 15:52:09 -05:00
chimp1984
143377b7e5
Make some fields in ProcessModel final.
Make init methods more clear

There will be more refactoring commits in that area...
2020-09-26 13:36:24 -05:00
chimp1984
c39a9b074f
Remove onPaymentReceived delegate method in seller trade 2020-09-26 12:56:42 -05:00
chimp1984
a661ce6ed5
Remove onPaymentStarted delegate method in buyer trade 2020-09-26 12:55:23 -05:00
chimp1984
7e16982b2b
Remove onTakeOffer delegate method in taker trade 2020-09-26 12:53:25 -05:00
chimp1984
456f16ddf4
Remove handleTakeOfferRequest delegate method in maker trade 2020-09-26 12:51:43 -05:00
chimp1984
766b1e2e1e
Add check to not add a duplicate address entry with same offer ID and context.
In debugging trade protocol and taking same offer I could generate problems where the multisig entry was twice but with diff. keys, so take offer failed. I remember the error log to have seen in the past and I assume this was a rare bug we encountered when users took again the same offer which failed with an uncritical state earlier.
2020-09-26 12:42:17 -05:00
chimp1984
2bb4bff41d
Refactor: move method, remove unneeded stream call 2020-09-26 12:40:09 -05:00
chimp1984
62a71e2173
Remove unused method 2020-09-26 12:28:52 -05:00
chimp1984
0c4af92f86
Refactor: rename methods 2020-09-26 12:28:38 -05:00
chimp1984
e61d04284e
Add ProcessModelServiceProvider to provide all the domain services to process model 2020-09-26 12:24:57 -05:00
chimp1984
9e5cdada5d
Remove precondition as trade was added at that moment 2020-09-26 12:14:10 -05:00
Oscar Guindzberg
93d321b995
Use bitcoinj 0.15.8 (commit 5312aa3) 2020-09-26 11:36:48 -03:00
chimp1984
191b031f38
Refactor: Rename MediationProtocol to DisputeProtocol 2020-09-25 23:56:58 -05:00
chimp1984
fded97fb9c
Refactor: Use task runner for peer publish delayed payout tx 2020-09-25 23:55:45 -05:00
chimp1984
561abd7a49
Refactor: Move publishDelayedPayoutTx from TradeManager to MediationProtocol 2020-09-25 23:07:16 -05:00
chimp1984
9f3fe7ad6d
Refactor: Move getAddressEntriesForAvailableBalanceStream to btcWalletService
Rename WithdrawalView.walletService to btcWalletService
2020-09-25 22:56:00 -05:00