mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,718 Commits 4 Branches 148 Tags 4.3 GiB
bd1f19c030
Commit Graph

3427 Commits

Author SHA1 Message Date
chimp1984
5d338e693c
Fix merge issues 2019-08-29 17:07:39 +02:00
chimp1984
329572cc5d
Merge branch 'master_upstream' into sq-add-trader-chat 
# Conflicts:
#	core/src/main/java/bisq/core/arbitration/DisputeManager.java
#	core/src/main/java/bisq/core/arbitration/messages/DisputeCommunicationMessage.java
#	core/src/main/java/bisq/core/trade/Trade.java
 2019-08-29 16:50:32 +02:00
Florian Reimair
4e7cb04043
Merge pull request #3154 from chimp1984/Fix-small-P2P-network-issues 
Fix small p2p network issues
 2019-08-29 16:15:18 +02:00
wiz
4eb85b955e
Add toggle switch UI preference for Dark Mode on/off 
* Store preference for Dark Mode as int32 css_theme
 2019-08-29 20:20:25 +09:00
chimp1984
a0e690997a
Merge branch 'master_upstream' into Fix-small-P2P-network-issues 
# Conflicts:
#	core/src/main/java/bisq/core/setup/CoreNetworkCapabilities.java
 2019-08-28 19:49:18 +02:00
Devin Bileck
70a4009e85
Update backup operator 2019-08-28 09:16:06 -07:00
Devin Bileck
9c7c301860
Merge branch 'master' of https://github.com/bisq-network/bisq into add-seednode-backup 
# Conflicts:
#	core/src/main/resources/btc_mainnet.seednodes
 2019-08-28 09:14:14 -07:00
Christoph Atteneder
4478476763
Merge pull request #3151 from chimp1984/dont-send-bsq-blocks-to-full-nodes 
Do not send BSQ blocks to full nodes
 2019-08-28 12:42:16 +02:00
sqrrm
f8fe464ca3
Merge pull request #3121 from sqrrm/arbitrator-to-sign 
Arbitrator to sign
 2019-08-28 11:13:35 +02:00
wiz
80ce113cae
Add @nicolasdorier as backup seednode operator for jhgcy2won7xnslrb 2019-08-28 17:04:44 +09:00
chimp1984
79c08b6e04
Remove Capability.SIGNED_ACCOUNT_AGE_WITNESS 2019-08-28 01:20:10 +02:00
Devin Bileck
1790637c84
Add backup operator for seeds 3f3cu2yw7u457ztq and fl3mmribyxgrv63c 2019-08-27 15:32:55 -07:00
chimp1984
4bc6616e7a
Do not send BSQ blocks to full nodes 2019-08-27 19:27:39 +02:00
ghubstan
39d823a6fb
Validate phone numbers 
Created new PhoneNumberValidator + Test. Validator hides
no arg constructor; public constructor requires two letter
ISO country code for validating inputs.

After successful validation, inputs are transformed into E.164
format and cached in a field, accessible via a getter method.
However, area and region codes are not checked for correctness.
End users are responsible for correctness of area/region codes.

Four i18n properties (validation.phone.*) were added to
displayStrings.properties

This is a partial fix for Issue #3042. The validator
will be integrated into the GUI if PR is approved & patch is
merged.

Question for Bisq devs:
Another new pkg protected class, CountryCallingCodes, contains
an immutable map of ISO country codes -> country calling codes;
it is the only non-validator class in its package. The map
declaration is too large to live in the PhoneNumberValidator class,
even after tweaking idea.properties in an attempt to prevent
the IDE from freezing. Is it OK to leave CountryCallingCodes
where it is, or is there a more appropriate home for it?
 2019-08-27 12:19:52 -03:00
wiz
f5d75c4f60
Improve TempProposal processing (fixes #3143) 2019-08-27 22:36:37 +09:00
Christoph Atteneder
66e963aaa7
Merge pull request #3059 from camthegeek/list-masari 
List Masari (MSR)
 2019-08-27 14:19:11 +02:00
sqrrm
e3bd3a99e3
Merge remote-tracking branch 'origin/master' into arbitrator-to-sign 2019-08-27 11:27:33 +02:00
Christoph Atteneder
e93370ccd5
Merge pull request #3122 from christophsturm/fix-defaultseednoderepository 
fix random test failure.
 2019-08-27 10:01:16 +02:00
Christoph Atteneder
db823dda60
Merge pull request #3131 from christophsturm/improve-logging 
fix logging of peer address
 2019-08-27 09:43:23 +02:00
Christoph Atteneder
70e304e828
Merge pull request #3135 from TyphooN-/list-solo 
List Solo (XSL)
 2019-08-27 09:35:53 +02:00
sqrrm
74244c4ad9
Add non static ChargeBackRisk wrapper 2019-08-26 14:33:50 +02:00
sqrrm
972dda655b
Test BuyerDataItem, use lombok generated equals and hash 2019-08-26 11:33:42 +02:00
TyphooN
8e237b23ef
List Solo (XSL) 2019-08-23 17:11:51 -04:00
Christoph Sturm
31285b4419 Fix logging 
don't log peer as optional [....onion]
 2019-08-23 17:16:58 +02:00
Devin Bileck
7da3bab9ca
Suppress RPC service log entries when running as DAO lite node 
When running as DAO lite node, the following would get logged:

> INFO  b.c.dao.node.full.RpcService: The value of rpchost is
> INFO b.c.dao.node.full.RpcService: Starting RPCService with btcd-cli4j
version 0.5.8.4 on 127.0.0.1:8332 with user null

So instead of logging it when instantiating the RPCService, log it when
setting up the service.
 2019-08-23 01:38:08 -07:00
Christoph Sturm
5a67d9f092 fix random test failure. 2019-08-21 19:04:43 +02:00
sqrrm
61895102fd
Arbitrator sign accountAgeWitnesses 
Automatically filter to only sign accounts that
- have chargeback risk
- bought BTC
- was winner in dispute
 2019-08-21 17:43:29 +02:00
sqrrm
aed1e8027e
Publish signed witness 2019-08-21 17:35:43 +02:00
sqrrm
ad9715a2cd
Merge pull request #3108 from christophsturm/test-signed-witness 
make sure that signed witness is immutable.
 2019-08-21 16:31:37 +02:00
wiz
4d2a819a65
Add wiz's 2nd Bitcoin node 2019-08-21 18:17:18 +09:00
sqrrm
f2f62c7033
Merge pull request #3112 from freimair/optimizations 
Various optimizations
 2019-08-20 22:08:19 +02:00
Christoph Sturm
856630d1f0 Improve naming 2019-08-20 12:49:42 +02:00
Florian Reimair
ecd01fd91d
Adjust log levels of price feed service 2019-08-20 12:08:02 +02:00
Florian Reimair
5ff4bc2201
Adjust log level for DAO logging statements 2019-08-20 12:08:02 +02:00
Florian Reimair
bd3f999e5c
Only validate param change after parsing is done 2019-08-20 12:06:22 +02:00
Florian Reimair
0501412d8e
Fix performance issue with DaoResultView 2019-08-20 11:18:17 +02:00
Christoph Sturm
f3b3ca9fc4 make sure that signed witness is immutable. 
btw I do hate byte arrays
 2019-08-19 20:14:21 +02:00
Christoph Sturm
2ccecd2738 fix formatting 2019-08-19 18:26:39 +02:00
Christoph Sturm
aae430887e fix formatting, set method parameter wrapping to "chop if long" 2019-08-19 18:13:05 +02:00
Christoph Sturm
79b3e5baf3 inject storage where possible 2019-08-19 17:21:35 +02:00
Christoph Sturm
7694d4e7d1 change some storage creations to injection. ensure its not a singleton 2019-08-19 17:19:45 +02:00
Christoph Sturm
b77cff9e26 inject CorruptedDataFilesHandler instead of making it static 2019-08-19 16:54:46 +02:00
sqrrm
4381eea242
Merge pull request #3086 from christophsturm/p2ptest 
inject publickeyring
 2019-08-16 18:22:38 +02:00
battleofwizards
7ea3ce0443
Replace "P2P network" with "Bisq network" in GUI 
Rationale: it is not obvious whether "P2P network" in GUI
refers to Bitcoin network, Tor network, traded altcoin network,
or Bisq.
 2019-08-16 13:56:26 +02:00
sqrrm
b1e293efb3
Merge pull request #3093 from wiz/jhgcy2won7xnslrb-transfer 
Takeover jhgcy2won7xnslrb.onion from @devinbileck
 2019-08-15 09:20:08 +02:00
wiz
d39f9f7499
Takeover jhgcy2won7xnslrb.onion from @devinbileck 2019-08-15 16:07:12 +09:00
Florian Reimair
963d569382
Merge pull request #3088 from wiz/wiz-bitcoin-node 
Add wiz bitcoin node to BtcNodes list
 2019-08-14 18:51:30 +02:00
Christoph Sturm
9b41cb8f90 fix seednode guice config 2019-08-14 17:58:04 +02:00
Christoph Sturm
9eb174bc88 provide PubKeyRing and use it where appropriate instead of keyring 2019-08-14 17:58:04 +02:00
Christoph Sturm
ac6068b728 start testing MyProposalListService. 2019-08-14 17:58:04 +02:00
sqrrm
e010ba8fa1
Merge pull request #3081 from christophsturm/remove-powermock 
fix build on jdk11 and jdk12. remove powermock and jmockit
 2019-08-14 17:52:30 +02:00
wiz
32db1019b5
Add wiz bitcoin node to BtcNodes list 2019-08-14 23:23:25 +09:00
Christoph Sturm
bd06d2a7df document what this is for 2019-08-14 10:42:38 +02:00
Oscar65
a97b9078ea typo in usuario 2019-08-14 08:13:03 +02:00
Christoph Sturm
95b65976ad simplify 2019-08-13 19:55:03 +02:00
Christoph Sturm
0af6097ab0 make final classes final again 2019-08-13 19:54:30 +02:00
Christoph Sturm
0babe82d09 remove jmockit 2019-08-13 19:47:40 +02:00
Christoph Sturm
e9a45196a8 remove powermock from core. 2019-08-13 18:13:10 +02:00
Christoph Sturm
9a587609dd WIP remove powermock 2019-08-13 18:08:33 +02:00
Christoph Sturm
a8494a993a fix missing annotation 2019-08-13 15:58:14 +02:00
Christoph Sturm
c6f07ed945 singletonify the rest of the core module 2019-08-13 15:58:14 +02:00
Christoph Sturm
7500887484 even more singletoning 2019-08-13 15:58:14 +02:00
Christoph Sturm
3f097ebf63 more singletoning 2019-08-13 15:58:13 +02:00
Christoph Sturm
a4e8ec5ebf convert some of the core config 2019-08-13 15:58:13 +02:00
sqrrm
e52c255446
Merge pull request #3058 from christophsturm/bump-guice 
use singleton annotation instead of binding as singleton
 2019-08-13 15:19:41 +02:00
sqrrm
fb1c96d24c
Merge pull request #2976 from niyid/master 
Fixes for issues #2741, #2944, #2955
 2019-08-09 15:35:21 +02:00
sqrrm
b92b4becfb
Merge pull request #3040 from bisq-2106-2/master 
Fix for #2106
 2019-08-09 15:32:50 +02:00
Christoph Atteneder
8164116c86
Update bitcoinj checkpoint file 2019-08-08 09:44:37 +02:00
Christoph Atteneder
a1bc159df0
Update translations 2019-08-07 22:43:09 +02:00
sqrrm
26329281ec
Check that proposal is in correct cycle 2019-08-07 20:12:20 +02:00
camthegeek
f4cba8ccc1 list Masari 2019-08-06 17:09:31 -04:00
Christoph Sturm
643c0daef0 use singleton annotation instead of binding as singleton. 
this is the correct way to do it. the way it is currently done means
that if a component is not declared in a module, guice still finds it
but does not use the singleton lifecycle

binding as singleton in the module is meant to be used for classes that
we don't have the sourcecode for (i.e. jdk classes)
 2019-08-06 17:44:47 +02:00
sqrrm
47c7910e88
Move Clock binding to P2PModule 2019-08-01 11:43:43 +02:00
Niyi Dada
0fffbe670e Columns added to export but hidden from view table. 
- Transaction Fee
 - Maker Fee
 - Buyer Deposit
 - Seller Deposit
 2019-07-31 22:55:22 +01:00
sqrrm
360dc0b4e8
Merge pull request #3037 from christophsturm/inject-clock 
inject clock for usage in isDateInTolerance
 2019-07-30 16:12:48 +02:00
Christoph Sturm
de01018368 remove empty lines 2019-07-30 15:42:12 +02:00
Christoph Sturm
8d0a9b38ba make test nicer 2019-07-30 15:40:17 +02:00
Christoph Sturm
c715aa2d5d start unit testing SignedWitness 2019-07-30 15:40:17 +02:00
Christoph Sturm
022534643e rename 2019-07-30 15:40:08 +02:00
Christoph Sturm
c38ef06d04 inject clock for usage in isDateInTolerance 2019-07-30 15:27:32 +02:00
Christoph Sturm
e62e718d89 make local what can be local 2019-07-30 13:07:12 +02:00
Christoph Sturm
00c0168aea inline test method and simplify 2019-07-30 13:07:12 +02:00
Christoph Sturm
9f54f480e6 move all init code to setUp 2019-07-30 13:07:12 +02:00
Christoph Atteneder
ec6c23d09d Improve documentation 2019-07-30 11:41:30 +02:00
Christoph Atteneder
d0d819221d Remove old TODO and remove unused duplicate constant for safe account age date 2019-07-30 11:41:02 +02:00
Christoph Atteneder
5dc321cc43 Change scope of safe account age point in time as long as it is not used anywhere else 2019-07-30 11:40:20 +02:00
Christoph Atteneder
aa2e3eadcc Fix typos 2019-07-30 11:39:42 +02:00
Christoph Atteneder
fdf5364c47 Add domain layer for signed account age witnesses (credits ManfredKarrer and oscarguindzberg) 2019-07-30 11:38:57 +02:00
Christoph Atteneder
db25293d62
Merge branch 'master' of github.com:bisq-network/bisq into hotfix-for-v1.1.3 
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
 2019-07-29 19:00:37 +02:00
sqrrm
2570e9b728
Merge pull request #2999 from christophsturm/christoph/rename-clock 
rename Clock to ClockWatcher
 2019-07-29 14:39:22 +02:00
Christoph Atteneder
cec7d780c7
Update translations 2019-07-29 11:36:28 +02:00
J. Maurice
6eaa2e0072
Add Japanese translations 2019-07-29 11:33:25 +02:00
sqrrm
50f350445c
Add checkpoint at block 586920 
A checkpoint at block 586920 with hash
523aaad4e760f6ac6196fec1b3ec9a2f42e5b272 to avoid that clients in
a corrupt state continue running.

Ignore checkpointing if ignoreDevMsg is set
 2019-07-28 20:32:19 +02:00
sqrrm
70b7660e6c
Merge pull request #3005 from christophsturm/christoph/split-pb 
split the pb.java file into multiple files
 2019-07-26 16:14:57 +02:00
sqrrm
514f5e40a5
Merge pull request #3002 from devinbileck/update-seed-operator 
Reflect change in operator for seed node jhgcy2won7xnslrb
 2019-07-26 15:08:36 +02:00
sqrrm
36632030d1
Fix block without braces 2019-07-26 10:33:18 +02:00
sqrrm
63785b1db7
Avoid validating proposals during initial sync 2019-07-26 10:32:49 +02:00
huey735
37a996a117
Correct "County" typo 2019-07-25 22:06:04 +01:00
sqrrm
30b8e7b55d
Merge pull request #3003 from sqrrm/proposal-parsing-fix 
Avoid validating proposals during initial sync
 2019-07-25 15:15:08 +02:00
sqrrm
5170fd83ff
Fix block without braces 2019-07-25 14:23:18 +02:00
Christoph Sturm
de4e1d7b58 move protobuf to proto package 2019-07-25 14:08:00 +02:00
Christoph Sturm
1c0fe2673f split pb.java file into separate files. 2019-07-25 13:40:02 +02:00
Devin Bileck
2d204c1306
Reflect change in operator for seed node jhgcy2won7xnslrb 2019-07-24 15:49:44 -07:00
Christoph Sturm
c3d21806c4 rename Clock to ClockWatcher 
* this class is not a clock but it watches the clock, detects standby
and runs periodic tasks.
* there is already a jdk method called clock
First i thought it should be called PeriodicTaskManager, now i find
ClockWatcher more fitting.
 2019-07-24 16:39:03 +02:00
Niyi Dada
bd85dbc990 Fix for issue #2741 2019-07-23 20:19:13 +01:00
sqrrm
7547b3bb62
Avoid validating proposals during initial sync 2019-07-23 13:04:46 +02:00
Niyi Dada
6e8212e20f Fixed label name for median. 2019-07-23 09:04:18 +01:00
Mike Rosseel
9b6bc38f71
make rpc host configurable 2019-07-21 16:31:11 +02:00
Niyi Dada
91c3337c37 Fixes for issues 2944 and 2955 2019-07-18 18:58:55 +01:00
sqrrm
26c35cc0c0
Change log level from error to debug 2019-07-16 21:51:03 +02:00
Christoph Atteneder
f1bc157f57
Update btcj checkpoints 2019-07-15 10:21:12 +02:00
Christoph Atteneder
c48739fd3b
Update translations 2019-07-15 10:04:37 +02:00
sqrrm
a8bb8322af
Continue requesting blocks if not in sync 2019-07-15 00:30:20 +02:00
sqrrm
5c15e29f49
Parse block only if height is right 2019-07-15 00:30:16 +02:00
Christoph Atteneder
78865dc0ff
Merge pull request #2954 from sqrrm/ignore-local-node 
Add option to ignore local bitcoin node
 2019-07-12 18:55:29 +02:00
sqrrm
93cebf4145
Add option to ignore local bitcoin node 2019-07-12 16:03:04 +02:00
sqrrm
a0104c03ec
Limit number of blocks sent in GetBlocksResponse 2019-07-12 16:00:44 +02:00
Christoph Atteneder
d9e088f469
Merge pull request #2952 from freimair/envelope_of_envelopes 
Envelope of envelopes #2
 2019-07-12 10:29:22 +02:00
Christoph Atteneder
e2bb538202
Merge pull request #2937 from sqrrm/exclude-bsq-nontrade 
Exclude non executed BSQ trade
 2019-07-12 10:28:14 +02:00
sqrrm
b623092afb
Don't dump blockchain data during initial parsing 2019-07-12 00:17:32 +02:00
Florian Reimair
b44cb452f9
Rename stuff 2019-07-10 16:31:58 +02:00
Harry MacFinned
8914b5b96b
Add files via upload 
add DAC + RDD to the list of removed assets.
Should solve #2189 for those assets
I built the code and it seems to work.
 2019-07-09 17:24:29 +00:00
Christoph Atteneder
7b29511415
Merge pull request #2939 from freimair/envelope_of_envelopes 
Bundle of envelopes
 2019-07-08 19:45:34 +02:00
Florian Reimair
3fb8be3481
Rename 2019-07-08 09:33:50 +02:00
sqrrm
6d195725ec
Exclude non executed BSQ trade 2019-07-05 09:05:57 +02:00
Christoph Atteneder
a0debe1766
Merge pull request #2909 from devinbileck/update-checkpoints 
Update BitcoinJ checkpoint files
 2019-07-03 10:28:36 +02:00
a123b
affa1b16fa Use tempTradingPeerNodeAddress if the trade doesn't have a trading peer set yet 
This should fix the errors on the maker side when there's a disagreement
about market price.

Fixes #2910
Fixes #2924
 2019-06-28 13:22:37 +02:00
sqrrm
e13faba79a
Merge pull request #2920 from devinbileck/resurrect-testnet 
Resurrect testnet
 2019-06-24 22:49:03 +02:00
Devin Bileck
03bc06819f
Use new testnet genesis transaction 2019-06-24 13:15:38 -07:00
sqrrm
f62261719a
Include check for services in readyForTxBroadcast 2019-06-24 21:42:42 +02:00
Devin Bileck
2ba3c0f915
Update new testnet seednode address 2019-06-24 12:24:35 -07:00
Florian Reimair
b101035d99
Sketch of businesslogic regarding EnvelopeOfEnvelopes 2019-06-24 16:55:58 +02:00
Florian Reimair
16392f5f0a
Added EnvelopeOfEnvelopes Network Message 2019-06-24 16:53:53 +02:00
sqrrm
cf5c03f43d
Wait for initialized wallet before processing dispute msgs, fix #2914 2019-06-23 17:32:46 +02:00
Devin Bileck
1af7c99089
Update BitcoinJ checkpoint files 2019-06-20 12:45:06 -07:00
Christoph Atteneder
d53c3b387c
Merge pull request #2890 from sqrrm/display-param-change-value 
Display changed param value at proposal time, fix #2692
 2019-06-19 18:06:27 +02:00
Christoph Atteneder
e52cff8049
Merge pull request #2903 from sqrrm/better-null-tx-handling 
Check not null tx
 2019-06-19 18:03:24 +02:00
sqrrm
4243776aa5
Check not null tx 2019-06-19 14:32:06 +02:00
sqrrm
29c48e9548
Display changed param value at proposal time, fix #2692 2019-06-16 15:49:30 +02:00
sqrrm
12e46f027a
Indicate when vote wasn't included in result in proposalDisplay 2019-06-16 00:34:49 +02:00
sqrrm
2375880d3c
Change message box aid 2019-06-05 19:26:04 +02:00
sqrrm
0217c3d63f
Add comments on BSQ trade fee calculation 2019-06-05 14:57:37 +02:00
Christoph Atteneder
5db568f982
Update translations 2019-06-04 10:13:36 +02:00
Stephan Oeste
1f1c6be0d5
node1.emzy.de has moved to a new server 
New IP address for node1.emzy.de is 167.86.90.239
 2019-06-03 22:37:31 +02:00
sqrrm
b93e7bac56
Add trader chat 
- Add communication messages to Trade protobuf message to be able to
save chat messages per trade
- Add Type enum and field to DisputeCommunicationMessage protobuf to
be able to dispatch Dispute and Trade chat messages properly
- Rename some function as isClient instead of isTrader to make it easier
to understand who is who when two traders are communicating with each
other
 2019-06-02 15:40:50 +02:00
y3v63n
03d3125531
Update displayStrings.properties 
Fixing linguistic issues in the English version
 2019-05-31 14:31:18 +03:00
sqrrm
1b1dce1012
Add ChatManager 
Move session classes to core. Break out DisputeCommunicationMessage
handling from DisputeManager and put in ChatMananger prepare for other
uses of ChatManager.

Renaming of DisputeCommunicationMessage would be nice but it's
representing the protobuf messages so the name has to stay.
 2019-05-30 18:49:54 +02:00
Christoph Atteneder
126afd2d0f
Merge pull request #2854 from sqrrm/fix-peer-handling 
Fix peer handling
 2019-05-30 12:45:25 +02:00
Christoph Atteneder
a1477699af
Merge pull request #2811 from KrzysiekJ/list-burnt-blackcoin 
List burnt BlackCoin (BLK-BURNT)
 2019-05-30 12:41:50 +02:00
sqrrm
78a837ec68
Handle encrypted BSQ wallet 2019-05-28 18:27:27 +02:00