Commit Graph

3281 Commits

Author SHA1 Message Date
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
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
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