Christoph Atteneder
90d00a2c7f
Merge pull request #4603 from ncstdc/patch-2
...
Update displayStrings.properties for Mediation Popup
2020-10-08 09:30:45 +02:00
ghubstan
29d1905f31
Add new 'getoffer offer-id' api method
...
There are a number of use cases where a user may want to see a single
offer instead of every offer for a currency pair on the buy or sell side.
The changes are:
- Add getoffer to grpc.proto
- Add new method to GrpcOffersService, CoreApi, CoreOffersService
- Add new method to CLI
- Adjust create offer tests to use this new convenience
2020-10-07 12:09:13 -03:00
chimp1984
076af0a3e1
Do not log full tiler object in case of an invalid Filter
...
Instead log signerPubKeyAsHex and creation date. We have currently the old filter still around (intended) so we get that log called and it would confuse ppl reading the log without knowing more about the context.
2020-10-07 09:42:01 -05:00
ghubstan
449a0b25bd
Delete redundant core.api.StatusCheck
...
We are migrating to the new core.app.AppStartupState class.
2020-10-07 11:28:46 -03:00
sqrrm
723a1f5cf9
Merge pull request #4592 from chimp1984/improve-bisq-setup
...
Improve bisq setup
2020-10-07 14:08:10 +02:00
Christoph Atteneder
7d14ff37d8
Merge pull request #4595 from ghubstan/remove-duplicated-supporttype-enum
...
Remove redundant DisputeAgentType enum
2020-10-07 09:37:15 +02:00
Christoph Atteneder
66f6e49f83
Merge pull request #4596 from ghubstan/refactor-placeoffer-tx-handling
...
Simplify GrpcOffersService#createOffer (refactor)
2020-10-07 09:30:40 +02:00
chimp1984
7ecae0e5be
Set amounts before setting state, as the state triggers the check where the amount is needed
2020-10-06 11:30:44 -05:00
dchoe
39d37e1070
Update displayStrings.properties
...
Better wording
2020-10-06 10:44:09 -05:00
chimp1984
4a0fe3e62e
Move checks to enable confirm to Trade
...
Use it in view to disable button
2020-10-06 10:40:39 -05:00
chimp1984
0e89c27021
Add mediationResultAppliedPenaltyToSeller method to Trade
...
Add util methods to DisputeState
Impl. paymentReceivedEnabled method for SellerProtocol
Impl. paymentStartedEnabled method for BuyerProtocol
Remove notDisputed method as not used anymore
Add final keywords
2020-10-06 10:22:22 -05:00
ghubstan
5f9b1e6e1a
Format exception message
2020-10-06 11:30:17 -03:00
ghubstan
30e6dae90b
Change return type to void
...
The prior Offer return type is redundant and confusing given the
new offer is passed up via the Consumer<Offer> resultHandler.
2020-10-06 11:19:08 -03:00
Christoph Atteneder
049b6209b7
Merge pull request #4594 from ghubstan/refactor-api-price-service
...
Tidy up CorePriceService (refactor)
2020-10-06 10:04:00 +02:00
ghubstan
3f3f4f06f5
Use consumer::accept instead of a countdown latch
...
This is more readable and stylistically consistent.
2020-10-05 14:32:05 -03:00
ghubstan
2d34730bd8
Fix method name
2020-10-05 13:51:48 -03:00
ghubstan
dd67acc153
Simplify GrpcOffersService#createOffer (refactor)
...
Push the placeOffer call down into CoreOffersService#createOffer,
and use a countdown latch to wait for async placeOffer to
complete.
2020-10-05 12:23:54 -03:00
chimp1984
474c4138d2
Refactor: rearrange methods
2020-10-04 17:24:03 -05:00
chimp1984
52f5f2f064
Extract domain initialisation to domainInitialisation class
2020-10-04 17:24:03 -05:00
chimp1984
d6c3ccd605
Add AppStartupState and DomainInitialisation.accountAgeWitnessService
...
See comments to classes for reasoning.
2020-10-04 17:24:03 -05:00
chimp1984
e179ee4e32
Use Collection for constructor which is called from the fromProto methods.
...
We do not set the collection as list but we fill the list created via the createList method.
2020-10-04 16:13:45 -05:00
chimp1984
d18b243322
Do not use persistNow for snapshots but requestPersistence
...
This avoids frequent write at dao sync and better performance.
2020-10-04 13:34:28 -05:00
chimp1984
f9f33aa16d
Add PersistableListAsObservable
...
Remove ObservableList methods from PersistableList
Let DisputeList and TradableList extend PersistableListAsObservable
Fix param names
2020-10-04 13:18:25 -05:00
chimp1984
f7c2464fbc
Fix typo
2020-10-04 13:16:49 -05:00
ghubstan
9942529448
Remove redundant DisputeAgentType enum
...
Use existing SupportType enum instead, and map the valid api
'registerdisputeagent' method's dispute-agent-type parameter
names to SupportType.
2020-10-03 15:42:27 -03:00
ghubstan
0cc998c4e2
Tidy up CorePriceService
...
Remove unnecessary String.format call and do a null check.
2020-10-03 14:48:49 -03:00
chimp1984
e9db7c6808
Rename Priority to Source. This should make it more clear what is the intention of the usage.
...
Rename:
LOW to NETWORK
MID to PRIVATE_LOW_PRIO
HIGH to PRIVATE
Change delay of MID/PRIVATE_LOW_PRIO from 30 min to 2 hours (we had different datastores before using it, now its only real low prio stores)
Add comment to each enum
2020-10-03 12:48:23 -05:00
chimp1984
137b5e81d1
Enforce that clients set the priority. Remove the initialize methods which did not have priority as a param.
...
Make initializePersistenceManager in StorageService abstract to enforce in concrete class to define priority.
Change priorities for future renaming to a different meaning. instead of priority we want to describe the category: private data, public data,.... will come in next commit
2020-10-03 12:48:22 -05:00
chimp1984
b712445e34
Remove duplicate startApplication call. Remove checkCryptoSetup call and fields used only for that.
2020-10-03 12:48:22 -05:00
chimp1984
32238f2050
Rename getClosedTradables and getFailedTrades to getObservableList
2020-10-03 12:48:22 -05:00
chimp1984
c789650d0b
Move methods to base class
2020-10-03 12:48:22 -05:00
chimp1984
e88a810dd0
Revert exit code to 1 as it was before. Not sure if there have been some scripts for seeds which expect an error code at shutdown for auto restart. I remotely remember there have been something...
2020-10-03 12:48:22 -05:00
chimp1984
e242c54dab
Refactor: Rename getTradesAsObservableList to getObservableList
2020-10-03 12:48:22 -05:00
chimp1984
5f47ed20d8
Use decrementAndGet instead of getAndDecrement
2020-10-03 12:48:21 -05:00
chimp1984
ccfda5b043
Cleanups, add generics, add final, remove unused code/comments/todos,
2020-10-03 12:48:21 -05:00
chimp1984
fa0d261397
Fix remaining issues, cleanups, add persit calls, remove unused code,...
...
Sorry too tired to create another 20 commits...
2020-10-03 12:48:21 -05:00
chimp1984
253c6c3336
Remove unneeded param. Add requestPersistence calls. Cleanup removeTrade and addTrade methods
2020-10-03 12:48:21 -05:00
chimp1984
b901f358a7
Add missing persist calls. Add generics. Remove persist method. Add final.
2020-10-03 12:48:21 -05:00
chimp1984
7b4611e177
Add requestPersistence call
...
Cleanups
2020-10-03 12:48:21 -05:00
chimp1984
a797413c7e
Remove persist method
2020-10-03 12:48:21 -05:00
chimp1984
42e10f28b7
Apply generics
2020-10-03 12:48:21 -05:00
chimp1984
482bc56036
Use PersistenceManager
2020-10-03 12:48:20 -05:00
chimp1984
9da13c35f2
Refactor: Rename persist to requestPersistence
2020-10-03 12:48:20 -05:00
chimp1984
fac4200825
Remove unused fields, apply new params
2020-10-03 12:48:20 -05:00
chimp1984
e825613f5c
Use PersistenceManager
2020-10-03 12:48:20 -05:00
chimp1984
e0ea742a47
Use PersistenceManager
2020-10-03 12:48:20 -05:00
chimp1984
986f1bf33c
Use PersistenceManager. We do not persist inside openOffer anymore but from outside
2020-10-03 12:48:19 -05:00
chimp1984
406afa9dad
Use PersistenceManager. Add setAll method
2020-10-03 12:48:19 -05:00
chimp1984
c3c869b5ad
Use PersistenceManager
2020-10-03 12:48:19 -05:00
chimp1984
f4165dc9af
Use PersistenceManager
2020-10-03 12:48:19 -05:00
chimp1984
2582f58e0a
Use PersistenceManager
2020-10-03 12:48:19 -05:00
chimp1984
f6be9b0f6b
Use PersistenceManager
2020-10-03 12:48:19 -05:00
chimp1984
4f18577002
Extend PersistableList, remvoe storage
2020-10-03 12:48:19 -05:00
chimp1984
63fe1c9dbd
Remove storage
2020-10-03 12:48:18 -05:00
chimp1984
2d91c268d0
Remove storage and persist calls. Remove unused methods
2020-10-03 12:48:18 -05:00
chimp1984
8a6b2a77d6
Use PersistenceManager. Make disputeList final
2020-10-03 12:48:18 -05:00
chimp1984
158b7a92f9
Remove storage from dispute. We do persistence from outside now.
...
Impl. PersistablePayload
Make openingDate final and contr param
2020-10-03 12:48:18 -05:00
chimp1984
8f38de30e9
Use PersistableList as base class
2020-10-03 12:48:18 -05:00
chimp1984
0eb99f77ef
Use PersistenceManager
2020-10-03 12:48:18 -05:00
chimp1984
5d6cbf5e23
Refactor: Move classes to new package
2020-10-03 12:48:18 -05:00
chimp1984
878f64555c
Use PersistenceManager
2020-10-03 12:48:18 -05:00
chimp1984
308c970b68
Use PersistenceManager
2020-10-03 12:48:17 -05:00
chimp1984
80e16a05ef
Use PersistenceManager
2020-10-03 12:48:17 -05:00
chimp1984
9190f17966
Update TradeStatistics2Storage classes
2020-10-03 12:48:17 -05:00
chimp1984
e6211ef9fe
Update TempProposalStore and ProposalStore classes
2020-10-03 12:48:17 -05:00
chimp1984
8781c80fb0
Update AccountAgeWitnessStorage classes
2020-10-03 12:48:17 -05:00
chimp1984
d9a7aacf98
Update SignedWitness classes
2020-10-03 12:48:17 -05:00
chimp1984
dc77b5cab8
Use PersistenceManager
2020-10-03 12:48:17 -05:00
chimp1984
a4acddac4a
Apply generics and super class methods
2020-10-03 12:48:17 -05:00
chimp1984
3a348d5a0f
Remove ThreadedPersistableEnvelope and use PersistableEnvelope instead
...
We will not need threading support anymore once we use the new persistenceManager as serialisation is done on the userThread.
2020-10-03 12:48:16 -05:00
chimp1984
d3be8dd48b
Remove UserThreadMappedPersistableEnvelope and use PersistableEnvelope instead
...
We will not need threading support anymore once we use the new persistenceManager as serialisation is done on the userThread.
2020-10-03 12:48:16 -05:00
chimp1984
35d9338615
Remove UserThreadMappedPersistableList and use PersistableList instead
...
We will not need threading support anymore once we use the new persistenceManager as serialisation is done on the userThread.
2020-10-03 12:48:15 -05:00
chimp1984
93f1108a77
Add PersistenceManager.flushAllDataToDisk to shutdown to write all pending data to disk
...
Use new readAllPersisted method instead of setupPersistedDataHosts. Run read tasks in a thread in parallel.
Read is only done at startup.
Remove unused restart method
2020-10-03 12:48:15 -05:00
chimp1984
fd0cc63e7c
Refactor: use FileUtil.removeAndBackupFile instead of FileManager.removeAndBackupFile
2020-10-03 12:48:15 -05:00
chimp1984
802dcad2fb
Refactor: Rename CorruptedDatabaseFilesHandler
2020-10-03 12:48:14 -05:00
chimp1984
cda9d9eccf
Refactor: Move other 2 classes to file package
2020-10-03 12:48:14 -05:00
chimp1984
23507102dd
Refactor: Move CorruptedDatabaseFilesHandler
2020-10-03 12:48:14 -05:00
chimp1984
8aff1f8665
Refactor: Move FileUtil
2020-10-03 12:48:14 -05:00
sqrrm
f051a03d29
Merge pull request #4559 from ghubstan/cli-create-offer
...
Build out 'createoffer' API method
2020-10-03 17:04:11 +02:00
ghubstan
c71ad8489c
Change 'break' to 'return' at end of switch.
2020-10-02 17:57:31 -03:00
ghubstan
f1693a6cf4
Add switch statement break to make codacy happy
2020-10-02 15:25:32 -03:00
ghubstan
033271189f
Ignore codacy complaint about (dead) default switch labels
2020-10-02 15:10:13 -03:00
chimp1984
25a7979b02
Merge branch 'master_upstream' into reduce-initial-date-request
2020-10-02 13:05:56 -05:00
sqrrm
12628dcde6
Merge pull request #4588 from chimp1984/fix-incorrect-startup-order
...
UserThread must not be used before application is created.
2020-10-02 10:30:30 +02:00
Chris Beams
e623d9638e
Fix typo in 'available for withdrawal' popup
2020-10-02 08:54:42 +02:00
chimp1984
f5862ec2f6
UserThread must not be used before application is created.
2020-10-01 23:01:49 -05:00
chimp1984
6f5bfde92f
Deactivate usage of HistoricalDataStoreService for now.
...
This is intended to be able to merge the code base before https://github.com/bisq-network/bisq/pull/4577 is merged.
We can add the code base but not using the feature yet. Once we are ready for deployment we can revert this commit and have the feature activated.
2020-10-01 15:20:32 -05:00
chimp1984
65de106df0
Use HistoricalDataStoreService for TradeStatistics2StorageService
2020-10-01 15:13:11 -05:00
chimp1984
e44fdbdea2
Refactoring: Rename variable
2020-10-01 15:06:57 -05:00
chimp1984
431debe05e
Unrelated to PR topic fix: Only log warnings if banned object is not isEmpty
2020-10-01 14:59:27 -05:00
chimp1984
240f0b903c
Use PersistableNetworkPayloadStore as base class for stores which had a map with PersistableNetworkPayloads
2020-10-01 14:57:48 -05:00
chimp1984
d84122259b
Fix merge conflicts
2020-10-01 10:35:30 -05:00
chimp1984
ff1380481d
Merge branch 'master_upstream' into improve-startup-routines
...
# Conflicts:
# core/src/main/java/bisq/core/app/BisqSetup.java
2020-10-01 10:34:43 -05:00
chimp1984
a8a881ea3e
Fix wrong printSystemLoad calls
2020-10-01 09:56:26 -05:00
chimp1984
9fce06832d
Rename baseCurrencyNetworkParameters to networkParameters
2020-10-01 09:46:11 -05:00
chimp1984
8a3cacd867
Revert renaming from InputsForDepositTxRequest to TakeOfferRequest
...
Prefer to keep it in sync with protobuf entry.
2020-10-01 09:45:19 -05:00
chimp1984
0af9e133a4
Cleanups
2020-10-01 09:42:33 -05:00
chimp1984
fb41a1984b
Merge branch 'master_upstream' into fix-delayed-payout-tx-issues
...
# Conflicts:
# core/src/main/java/bisq/core/trade/TradeManager.java
# desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java
2020-10-01 09:24:46 -05:00
sqrrm
0b1894a939
Merge pull request #4554 from ghubstan/create-offer
...
Change 'createoffer' api method return type
2020-10-01 14:48:38 +02:00
Christoph Atteneder
0a88ee6bd3
Merge pull request #4581 from oscarguindzberg/fixHostnameSerialization
...
Use bitcoinj 0.15.8 (commit 44ddbdc)
2020-10-01 09:15:47 +02:00
Christoph Atteneder
a1778ed701
Merge pull request #4578 from chimp1984/show-if-maker-has-xmr-autoconf-enabled
...
Show if maker has xmr autoconf enabled
2020-10-01 09:11:45 +02:00
chimp1984
a44ba62c77
Merge branch 'fix-delayed-payout-tx-issues' of https://github.com/chimp1984/bisq into fix-delayed-payout-tx-issues
2020-10-01 00:06:03 -05:00
chimp1984
1b1888673c
Refactor: Move handler code to domain classes
2020-09-30 23:12:06 -05:00
chimp1984
11383b9e84
Refactor: Rename startAppSetup to runBisqSetup
2020-09-30 22:45:11 -05:00
chimp1984
346ad517a1
Refactor: Move osUserDataDir method to Utilities, rename to getUserDataDir
2020-09-30 22:43:11 -05:00
chimp1984
c3e1ae691b
Remove cryptoSetupFailedHandler
2020-09-30 22:39:13 -05:00
chimp1984
a38f59a88a
Refactor: Move common bases setup code to CommonSetup
2020-09-30 22:36:18 -05:00
chimp1984
fe577b3651
Remove checkCryptoSetup as not needed anymore
2020-09-30 22:30:40 -05:00
chimp1984
907fd66dc2
Remove empty loop
2020-09-30 22:27:09 -05:00
chimp1984
bb99eef059
Refactor: Move AvoidStandbyModeService from BisqApp to BisqExecutable.setupAvoidStandbyMode
2020-09-30 22:26:42 -05:00
chimp1984
b927f9719e
Refactor: Move DevEnv setup to CommonSetup
2020-09-30 22:11:29 -05:00
chimp1984
9d12bf7d52
Refactor: Move sig int handlers to CommonSetup
2020-09-30 22:10:44 -05:00
chimp1984
9232a5765b
Improve handling of UncaughtExceptionHandler
2020-09-30 22:06:51 -05:00
chimp1984
7ea3676c55
Refactor: Rename setup to setupUncaughtExceptionHandler
...
rename setupErrorHandler to checkCryptoPolicySetup
move UncaughtExceptionHandler code to setupUncaughtExceptionHandler
2020-09-30 21:55:50 -05:00
chimp1984
b6e97e371e
Refactor: add new setup method to CommonSetup with config (WIP) and call it at doExecute. Move AsciiLogo to CommonSetup
2020-09-30 21:53:29 -05:00
chimp1984
b73fff0aad
Refactor: Move AsciiLogo to common
2020-09-30 21:50:47 -05:00
chimp1984
7e847cd95b
Only check pubKey for trade messages. Before we got it called for instance when the mediator sent the dispute-opened-by-peer msg, causing an error as its mediators key not peers key.
...
We need to check first for the message type and then apply the check.
2020-09-30 13:45:27 -05:00
chimp1984
24e1155eea
Set peers pubkey at constructor instead of onInitialized
2020-09-30 13:44:15 -05:00
Oscar Guindzberg
5db273010f
Use bitcoinj 0.15.8 (commit 44ddbdc)
2020-09-30 13:10:05 -03:00
Christoph Atteneder
4d7e26d87d
Merge pull request #4576 from chimp1984/fix-filter-bug
...
Fix bug with missing remove of old filter when new filter is added.
2020-09-30 16:30:48 +02:00
chimp1984
5d41574931
Refactor: Rename TradeDataValidation.validatePayoutTx to TradeDataValidation.validateDelayedPayoutTx
2020-09-29 23:46:38 -05:00
chimp1984
18c1fc1410
Fix bug with missing remove of old filter when new filter is added.
...
- Add handling for removing invalid filters
When adding a new filter invalid filters get removed if they have been created with the same priv key.
2020-09-29 23:25:22 -05:00
chimp1984
3926a36c3a
Use params for trace logs.
2020-09-29 12:55:23 -05:00
chimp1984
e9d7e53882
Merge branch 'fix-delayed-payout-tx-issues' of https://github.com/chimp1984/bisq into fix-delayed-payout-tx-issues
2020-09-29 01:07:42 -05:00
chimp1984
25e64cd6b5
Update core/src/main/resources/i18n/displayStrings.properties
...
Co-authored-by: m52go <mfiver@gmail.com>
2020-09-29 01:06:44 -05:00
chimp1984
e071d5e025
Update core/src/main/resources/i18n/displayStrings.properties
...
Co-authored-by: m52go <mfiver@gmail.com>
2020-09-29 01:06:28 -05:00
chimp1984
9cf368c449
Update core/src/main/resources/i18n/displayStrings.properties
...
Co-authored-by: m52go <mfiver@gmail.com>
2020-09-29 01:06:09 -05:00
chimp1984
c3d3e5230e
Update core/src/main/resources/i18n/displayStrings.properties
...
Co-authored-by: m52go <mfiver@gmail.com>
2020-09-29 01:05:46 -05:00
chimp1984
6c114b44e8
Update core/src/main/resources/i18n/displayStrings.properties
...
Co-authored-by: m52go <mfiver@gmail.com>
2020-09-29 01:05:21 -05:00
chimp1984
77ae1bddfa
Update core/src/main/resources/i18n/displayStrings.properties
...
Co-authored-by: m52go <mfiver@gmail.com>
2020-09-29 01:04:45 -05:00
chimp1984
92902102ec
Update core/src/main/resources/i18n/displayStrings.properties
...
Co-authored-by: m52go <mfiver@gmail.com>
2020-09-29 01:04:27 -05:00
chimp1984
4e2ccf249b
Update core/src/main/resources/i18n/displayStrings.properties
...
Co-authored-by: m52go <mfiver@gmail.com>
2020-09-29 01:04:17 -05:00
chimp1984
1fef02e6f1
Update core/src/main/resources/i18n/displayStrings.properties
...
Co-authored-by: m52go <mfiver@gmail.com>
2020-09-29 01:04:04 -05:00
chimp1984
dc15c7dfa7
Update core/src/main/resources/i18n/displayStrings.properties
...
Co-authored-by: m52go <mfiver@gmail.com>
2020-09-29 01:03:53 -05:00
chimp1984
e3cc62ed60
Update core/src/main/resources/i18n/displayStrings.properties
...
Co-authored-by: m52go <mfiver@gmail.com>
2020-09-29 01:03:41 -05:00
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
chimp1984
0b81db5a60
Refactor: return early
2020-09-25 22:52:54 -05:00
chimp1984
35b758431d
Refactor: Move methods, rename methods
2020-09-25 22:50:42 -05:00
chimp1984
1c824f140c
Refactor: Cleanups
2020-09-25 22:37:54 -05:00
chimp1984
246d1e3ddf
Refactor: Remove onCancelAvailabilityRequest method
2020-09-25 22:31:08 -05:00
chimp1984
346d793d87
Refactor: Remove onOfferRemovedFromRemoteOfferBook method
2020-09-25 22:29:52 -05:00
chimp1984
4d40ca580c
Refactor: Remove handleTakeOfferRequest method
2020-09-25 22:28:31 -05:00
chimp1984
96ec87b50a
Refactor: let TradeManager implement DecryptedDirectMessageListener, DecryptedMailboxListener
2020-09-25 22:27:19 -05:00
chimp1984
a07fe30ac3
Refactor: Move method
2020-09-25 22:16:25 -05:00
chimp1984
82749cee70
Refactor:
...
- Rename handlePayDepositRequest to handleTakeOfferRequest
- Add initTrade method without the redundant params
- Use early returns in handleTakeOfferRequest
2020-09-25 22:15:40 -05:00
chimp1984
2fc753bde4
Rename InputsForDepositTxRequest to TakeOfferRequest
...
The protobuf file is not renamed. This breaks our convention to keep both the same but I think the added clarity for the trade protocol justifies the exception.
2020-09-25 22:02:43 -05:00
chimp1984
86569b1b2d
Apply fluent protocol to MediationProtocol
...
Rename acceptMediationResult to onAcceptMediationResult
2020-09-25 21:58:32 -05:00
chimp1984
5d312ae1ba
Refactor: add TODOs
2020-09-25 21:43:56 -05:00
chimp1984
6af9cb3dfe
Refactor: rename getTradableList to getTradesAsObservableList
2020-09-25 21:38:49 -05:00
chimp1984
a5f4cb8e85
Refactor: use getTradableList instead of tradableList.getList()
2020-09-25 21:38:06 -05:00
chimp1984
7023b2acf5
Remove onPaymentReceived method from TradeManager
2020-09-25 21:35:34 -05:00