Commit Graph

29229 Commits

Author SHA1 Message Date
Duke Leto
73dcf87f10 Merge upstream FSM into duke 2019-10-09 22:00:02 -04:00
jl777
141c8e76b4 Merge branch 'dev' into FSM 2019-10-09 01:33:40 -11:00
jl777
2925c70483 Merge pull request #1715 from KomodoPlatform/dev
sync dev
2019-10-06 21:55:08 -11:00
Duke Leto
db8acab3de Merge pull request #35 from MyHush/newzview
z_viewtransaction
2019-10-06 07:16:29 -07:00
Duke Leto
5dc358dfa4 more stuff 2019-10-06 06:10:43 -04:00
ca333
6b79766999 Merge pull request #205 from KomodoPlatform/fix_PING
fix PING/REJECT attack [CVE-2019-17048, CVE-2019-16930]
2019-10-06 00:38:09 +02:00
Duke Leto
2d707c541e Merge pull request #34 from MyHush/newzview
z_viewtransaction
2019-10-05 12:51:13 -07:00
Duke Leto
a8cfe6ae4a Add nullifier, anchor, commitment and rk 2019-10-05 15:44:07 -04:00
Duke Leto
cae920cf69 More stuff 2019-10-05 13:05:54 -04:00
Duke Leto
812078e212 We don't want no sprout around here 2019-10-05 12:36:27 -04:00
Jonathan "Duke" Leto
5b94d6e4fa still not happy 2019-10-05 12:06:06 -04:00
Jonathan "Duke" Leto
04c4435497 safe mode is ok 2019-10-05 12:06:06 -04:00
Jonathan "Duke" Leto
0ebd33efa6 fix compile 2019-10-05 12:06:06 -04:00
Jonathan "Duke" Leto
a9e6edeed9 more stuff 2019-10-05 12:06:06 -04:00
Jonathan "Duke" Leto
7920cbc7e7 Merge z_viewtransaction from str4d zcash PR4146 2019-10-05 12:06:06 -04:00
ca333
41a7dcf549 add mempool tests 2019-10-02 23:57:21 +02:00
ca333
95f35796b6 include 2019-10-02 22:47:41 +02:00
ca333
85aad4be5d fix PING attack [CVE-2019-17048] 2019-10-02 21:53:47 +02:00
jl777
3508d17707 Merge pull request #1712 from letolabs/memofix
Ignore exceptions when deserializing note plaintexts
2019-09-27 01:21:15 -11:00
jl777
346c332326 Merge pull request #1713 from Mixa84/FSM
Fix [cc]address RPCs
2019-09-26 00:55:06 -11:00
Mihailo Milenkovic
93427a86f4 Fix [cc]address RPCs 2019-09-26 11:33:17 +02:00
Duke Leto
ac8e1c966e Merge pull request #31 from MyHush/memofix
Ignore exceptions when deserializing note plaintexts
2019-09-25 07:46:28 -07:00
Jack Grigg
4c0c4b9de8 Ignore exceptions when deserializing note plaintexts 2019-09-25 07:46:02 -07:00
Jack Grigg
41baeb2bc2 Ignore exceptions when deserializing note plaintexts 2019-09-25 07:41:37 -07:00
TonyL
4d3fb1a1a0 Merge pull request #195 from kulcsarbela/master
modify fetch_params to handle accents and whitespaces in user folder
2019-09-17 23:09:28 +07:00
jl777
92f4e52f96 Merge pull request #1709 from letolabs/debian
Fix Debian package metadata
2019-09-11 19:43:17 -11:00
Jonathan "Duke" Leto
35ea73387f Fix debian package metadata 2019-09-11 14:45:12 -07:00
Jonathan "Duke" Leto
dbe2188d3f Correct debian package metadata 2019-09-11 14:41:29 -07:00
ca333
8278a1b883 Merge pull request #203 from jl777/dev
sync dev
2019-09-11 09:02:27 +02:00
Jonathan "Duke" Leto
03be877ca9 bump version 2019-09-08 19:02:47 -07:00
jl777
cb1c9e525d Merge pull request #1707 from jl777/FSM
FSM
2019-09-07 20:13:07 -11:00
jl777
c8e4ccb4c5 Merge pull request #1706 from jl777/jl777
Jl777
2019-09-07 20:12:37 -11:00
jl777
798f68a05c Merge pull request #1705 from jl777/nSPV
NSPV
2019-09-07 20:10:54 -11:00
jl777
bcf242808b Fix adaptive pow else 2019-09-07 20:10:09 -11: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