Manfred Karrer
2a4270db3c
Merge branch 'master' into add-hash-of-dao-state
2019-03-08 13:58:41 -05:00
Manfred Karrer
22c03884d5
Add comment
2019-03-08 13:51:49 -05:00
Manfred Karrer
0d0713bad5
Remove optional setting of pubKeyScript
...
We want to have a deterministic dao state. The PubKeyScript in the
TxOutput was the only optional field which was only set in the
dumpBlockchainData program argument was set as it was only required for
the json dump for the explorer. It has 50 bytes of data which is about
20% of the txOutput data size. We prefer atm to avoid additional
complexity which would be created if we would handle that optional
field (e.g. exclude from hash creation).
The property might be useful as well for other use cases in future.
2019-03-08 13:47:35 -05:00
Manfred Karrer
257550ac81
Merge pull request #2515 from ManfredKarrer/make-vote-result-json-determinisitic
...
Make vote result json deterministic
2019-03-08 13:06:23 -05:00
Manfred Karrer
07c0d6a4ff
Update seed node operator
2019-03-08 13:01:23 -05:00
Manfred Karrer
ee0fef4d2f
Remove duplicate entry for number of proposals
2019-03-08 12:20:06 -05:00
Manfred Karrer
ca01376ffc
Merge pull request #2517 from ManfredKarrer/fix-missing-balance-at-restore-from-seed-words
...
Fix missing balance at restore from seed words
2019-03-08 12:08:49 -05:00
Christoph Atteneder
ced71361b4
Merge pull request #2519 from ben-kaufman/txid-proposal-display
...
Add txId to proposal display
2019-03-08 17:51:23 +01:00
Ben Kaufman
864fc55c25
Use correct method to open bisq explorer
2019-03-08 18:20:28 +02:00
Manfred Karrer
03023d6338
Remove myAddress from docs and scripts as it is not used/needed anymore
2019-03-08 10:58:53 -05:00
Ben Kaufman
a5af75961c
Add txId to proposal display
2019-03-08 12:03:00 +02:00
Manfred Karrer
28a28983dc
Add missing address entry items at restore from seed words
2019-03-07 23:41:21 -05:00
Manfred Karrer
9152733bb1
Set wallet date 1 day earlier to cover timezone issues
...
We subtract 1 day to be sure to not have any issues with timezones.
Even if we can be sure that the timezone
is handled correctly it could be that the user created the wallet in
one timezone and make a restore at
a different timezone which could lead in the worst case that he miss
the first day of the wallet transactions.
2019-03-07 21:46:25 -05:00
Manfred Karrer
855ca062c6
Add missing @EqualsAndHashCode to Capabilities
...
Peer extends Capabilities and we use a HashSet to manage persisted
peers. Without the @EqualsAndHashCode we would add endlessly peers to
the hashsets.
2019-03-07 20:41:40 -05:00
Manfred Karrer
01f3bdc557
Make vote result json deterministic
2019-03-07 17:53:30 -05:00
Manfred Karrer
9a5695dedc
Fix missing support for localhost seed node addresses
2019-03-07 17:23:05 -05:00
Manfred Karrer
d475c82b9b
Merge branch 'master' of https://github.com/bisq-network/bisq
2019-03-07 16:46:41 -05:00
Manfred Karrer
1a29dbec19
Merge pull request #2476 from freimair/seedNodeRepo_refactoring
...
Seed node repo refactoring
2019-03-07 16:46:30 -05:00
Manfred Karrer
1292f77daa
Merge branch 'master' of https://github.com/bisq-network/bisq
2019-03-07 16:36:54 -05:00
Manfred Karrer
6481a53f5c
Merge pull request #2512 from ripcurlx/fix-problem-with-display-of-zero-trading-fees
...
Show the correct BSQ or BTC trading fee if it is maker or taker
2019-03-07 15:53:28 -05:00
Christoph Atteneder
85274b1e52
Show the correct BSQ or BTC trading fee if it is maker or taker
2019-03-07 18:43:27 +01:00
Manfred Karrer
a7b4a566d6
Merge pull request #2511 from ripcurlx/fix-change-of-deposit-before-amount-was-set
...
Fix error and improve wording for security deposit
2019-03-07 12:27:27 -05:00
Christoph Atteneder
0a42b15972
Improve wording for security deposit
2019-03-07 18:15:17 +01:00
Christoph Atteneder
eefa649836
Fix null pointer if security deposit percentage is changed before amount was set
2019-03-07 17:48:52 +01:00
Manfred Karrer
d9f9baf87a
Update comments
2019-03-07 11:29:56 -05:00
Florian Reimair
9418c1d7a3
Fix default regtest seednodes
2019-03-07 17:08:49 +01:00
Florian Reimair
b27befed63
--myAddress property is not needed anymore
2019-03-07 17:08:49 +01:00
Florian Reimair
e15d99e8ae
Use resourceAsStream so it works on files in .jar as well
2019-03-07 17:08:49 +01:00
Florian Reimair
de93a6fa1b
Revert "Revert 2473067b090603dec983fa18995453bdd6d8de94"
...
This reverts commit a9ee15d9f6
2019-03-07 17:08:49 +01:00
Manfred Karrer
80fa5c029f
Merge pull request #2507 from freimair/monitor
...
Monitor tweaks, fixes and a new Metric
2019-03-07 10:46:41 -05:00
Manfred Karrer
dca9eff047
Merge pull request #2508 from freimair/netlayer_update
...
Netlayer 0.6.4
2019-03-07 10:44:40 -05:00
Christoph Atteneder
bb2ecc9a40
Merge pull request #2505 from ManfredKarrer/add-deprecated-payment-methods-again
...
Add removed deprecated payment methods again as it would break trade history
2019-03-07 15:09:24 +01:00
Florian Reimair
1ff7f008cd
Introduced netlayer 0.6.4
2019-03-07 13:29:12 +01:00
Florian Reimair
35914b8682
Fix sign error in Seed node snapshot diffs
2019-03-07 12:53:16 +01:00
Florian Reimair
004634ed23
Cleanup monitor gradle
2019-03-07 12:53:16 +01:00
Florian Reimair
dbca87be65
Added Market metric i.e. trades and their volumes
2019-03-07 12:53:16 +01:00
Florian Reimair
1c4535eab8
Cosmetics
2019-03-07 12:53:16 +01:00
Florian Reimair
9f464b3d50
Remove HS from Snapshot Metrics
2019-03-07 12:51:54 +01:00
Florian Reimair
6c376778a2
Updated monitor systemd service file
2019-03-07 12:51:54 +01:00
Florian Reimair
36cac06a89
Cleanup directory constants for monitor
2019-03-07 12:51:54 +01:00
Manfred Karrer
13dfadddcb
Change log level for log when msgThrottle is triggered
2019-03-06 22:46:02 -05:00
Manfred Karrer
75f90e56ba
Add dummy instance for deprecated payment methods
...
To show display string of payment method we need to create an instance
2019-03-06 22:44:49 -05:00
Manfred Karrer
1eeb47cef7
Add removed deprecated payment methods again as it would break
...
trade history
We got some reports that the trade history was gone and it turned out
the removal of the deprecated payment methods caused an exception when
reading the persisted closed trades. So we have to keep that code to not
break old db files.
2019-03-06 22:38:40 -05:00
Manfred Karrer
1ef854f510
Merge pull request #2127 from oscarguindzberg/bisq-version2-tx-support
...
Basic support for version 2 transactions.
2019-03-06 18:46:42 -05:00
Manfred Karrer
76e753f35a
Merge pull request #2478 from oscarguindzberg/bitcoinj-0.14.7
...
Use bitcoinj 0.14.7
2019-03-06 18:43:41 -05:00
Manfred Karrer
9638f58f7b
Add callSuper = true to EqualsAndHashCode in Peer
2019-03-06 18:39:43 -05:00
Manfred Karrer
73eea7927a
Merge pull request #2469 from freimair/refactor_capabilities
...
Refactor capabilities and other P2P-related stuff
2019-03-06 18:38:23 -05:00
Manfred Karrer
ab921b5c97
Merge pull request #2499 from freimair/netlayer_tweaks
...
WIP Updated netlayer, jtorctl and tor-binary
2019-03-06 17:50:06 -05:00
Manfred Karrer
7d59e1a67a
Adjust layout of export Json button
2019-03-06 17:27:07 -05:00
Manfred Karrer
ff023ce32f
Merge pull request #2504 from ben-kaufman/export-voting-history
...
Added button to export voting history into JSON
2019-03-06 16:52:59 -05:00
