Duke Leto
|
9de6e8a404
|
Merge branch 'duke' of https://github.com/MyHush/hush3 into duke
|
2019-09-05 08:49:53 -04:00 |
|
Duke Leto
|
22c2aa8fda
|
shielded is a better name for this key
|
2019-09-05 08:49:35 -04:00 |
|
Jonathan "Duke" Leto
|
4b97017077
|
Correctly return organic json
|
2019-09-05 08:19:04 +02:00 |
|
Jonathan "Duke" Leto
|
c1dd6e5b96
|
Add organic payment percents, organic paymentrate and txrate and organic payment count
|
2019-09-04 14:04:49 -07:00 |
|
jl777
|
bd9daad278
|
Merge pull request #1703 from Mixa84/CCnSPV
Use SetCCtxids optimized for nSPV on other CCs
|
2019-09-04 04:08:45 -11:00 |
|
jl777
|
873ae098c7
|
Merge pull request #1702 from Mixa84/FSM
Fix oracles pubkey spoofing
|
2019-09-03 04:11:05 -11:00 |
|
Mihailo Milenkovic
|
482cd0eed6
|
Fix
|
2019-09-03 16:09:52 +02:00 |
|
Mihailo Milenkovic
|
6a51a00364
|
Fix oracles pubkey spoofing
|
2019-09-03 16:01:02 +02:00 |
|
jl777
|
60b851a77a
|
Merge branch 'jl777' into nSPV
|
2019-08-29 05:15:48 -11:00 |
|
jl777
|
7c2a73ee8e
|
Merge branch 'FSM' into jl777
|
2019-08-29 05:15:14 -11:00 |
|
jl777
|
bbb27ca080
|
Merge branch 'dev' into FSM
|
2019-08-29 05:14:43 -11:00 |
|
jl777
|
e252fef150
|
Merge branch 'dev' into FSM
|
2019-08-29 05:14:21 -11:00 |
|
jl777
|
9c66e5251a
|
Merge pull request #1697 from artemii235/dev
Apply chainparams_commandline to currently selected chain params.
|
2019-08-29 05:13:52 -11:00 |
|
jl777
|
f4c370162e
|
Chainparams
|
2019-08-28 22:08:55 -11:00 |
|
jl777
|
5e44ab3988
|
Merge pull request #1701 from jl777/FSM
FSM
|
2019-08-28 22:06:41 -11:00 |
|
jl777
|
43ef31a367
|
Merge pull request #1700 from jl777/jl777
Jl777
|
2019-08-28 22:06:02 -11:00 |
|
jl777
|
fd1260d785
|
Merge pull request #1699 from jl777/nSPV
NSPV
|
2019-08-28 22:05:27 -11:00 |
|
jl777
|
401f522463
|
Ondemand fix
|
2019-08-28 22:01:27 -11:00 |
|
jl777
|
ca8b518e5a
|
Bump nspv protocol version
|
2019-08-28 06:24:00 -11:00 |
|
jl777
|
02ec038298
|
Merge pull request #1698 from Mixa84/nSPV
Fix SetCCtxids for nSPV (#31)
|
2019-08-28 06:03:22 -11:00 |
|
Mihailo Milenkovic
|
feb16224f8
|
Fix SetCCtxids for nSPV (#31)
|
2019-08-28 17:14:05 +02:00 |
|
jl777
|
ad5f6f8489
|
Different handling between chains without notarisation
|
2019-08-27 20:44:52 -11:00 |
|
Artem Pikulin
|
89687d9041
|
Apply chainparams_commandline to currently selected chain params.
|
2019-08-28 13:06:04 +07:00 |
|
jl777
|
e02a215757
|
-print
|
2019-08-27 08:45:56 -11:00 |
|
jl777
|
28d3cff284
|
Fix dpowconfs
|
2019-08-27 08:43:51 -11:00 |
|
jl777
|
7027cb5e4d
|
Syntax
|
2019-08-27 08:28:33 -11:00 |
|
jl777
|
3ecd6a16f9
|
Test version
|
2019-08-27 08:23:59 -11:00 |
|
Jonathan "Duke" Leto
|
715dc7cb36
|
These organic stats actually make sense
|
2019-08-27 06:23:02 -07:00 |
|
Jonathan "Duke" Leto
|
024f6ff43d
|
More organic stats
|
2019-08-27 05:58:49 -07:00 |
|
Jonathan "Duke" Leto
|
5e26d8ec4c
|
WIP organic txstats and add some missing stats
|
2019-08-27 04:42:24 -07:00 |
|
jl777
|
43e2b5f124
|
Merge pull request #1696 from Mixa84/FSM
Add error message on return in gatewaysclaim tx
|
2019-08-26 23:35:41 -11:00 |
|
Mihailo Milenkovic
|
89842a56b7
|
Add error message on return in gatewaysclaim tx
|
2019-08-27 12:12:40 +02:00 |
|
Jonathan "Duke" Leto
|
80c0a3b039
|
Merge remote-tracking branch 'jl777/FSM' into duke
Conflicts:
README.md
src/cc/gateways.cpp
|
2019-08-26 13:48:58 -07:00 |
|
jl777
|
007af83260
|
Merge pull request #1695 from jl777/FSM
FSM
|
2019-08-26 02:35:39 -11:00 |
|
jl777
|
cea537ff95
|
Merge pull request #1694 from jl777/jl777
Merge branch 'FSM' into jl777
|
2019-08-26 02:34:58 -11:00 |
|
jl777
|
34f6908ae6
|
Merge pull request #1693 from jl777/nSPV
NSPV
|
2019-08-26 02:34:21 -11:00 |
|
jl777
|
9fac123016
|
Don't change adaptivepow to default on: -ADAPTIVEPOW_CHANGETO_DEFAULTON
|
2019-08-26 02:32:24 -11:00 |
|
jl777
|
6c8947b0b5
|
Merge pull request #1692 from letolabs/FSM
Fix os x build
|
2019-08-25 20:12:33 -11:00 |
|
Jonathan "Duke" Leto
|
7c7fad183f
|
fix compile
|
2019-08-25 10:55:34 -07:00 |
|
Jonathan "Duke" Leto
|
6a3e69d344
|
fix
|
2019-08-25 10:52:23 -07:00 |
|
jl777
|
6db9e3b9f2
|
Merge branch 'jl777' into nSPV
|
2019-08-24 20:22:16 -11:00 |
|
jl777
|
5c80a6656e
|
Merge branch 'FSM' into jl777
|
2019-08-24 20:21:36 -11:00 |
|
jl777
|
784e93c677
|
Merge branch 'dev' into FSM
|
2019-08-24 20:20:29 -11:00 |
|
Jonathan "Duke" Leto
|
f686d9288c
|
blockindex bugfix suggested by blackjoker
|
2019-08-23 04:08:47 -07:00 |
|
Jonathan "Duke" Leto
|
13dad469c7
|
add missing zstat and new dep
|
2019-08-22 05:43:51 -07:00 |
|
Jonathan "Duke" Leto
|
d0d6a9cea9
|
Merge remote-tracking branch 'jl777/FSM' into duke
Conflicts:
README.md
|
2019-08-22 05:23:03 -07:00 |
|
Duke Leto
|
2390a7e499
|
Merge pull request #27 from MyHush/ztxstats
Add shielded stats to getchaintxstats via zindex
|
2019-08-22 08:19:06 -04:00 |
|
Jonathan "Duke" Leto
|
e3a2e008fa
|
Merge branch 'dev'
|
2019-08-22 05:18:12 -07:00 |
|
jl777
|
65dd98f02f
|
-prints
|
2019-08-22 00:31:37 -11:00 |
|
Jonathan "Duke" Leto
|
76543056ab
|
Changing -zindex on or off requires reindex
|
2019-08-21 19:50:50 -07:00 |
|