forked from dimxy/komodo
/
patches
9072 lines (8484 loc) · 939 KB
/
patches
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff -crB ./configure.ac ../../komodo-jl777/configure.ac
*** ./configure.ac 2017-01-03 10:40:50.155326332 +0000
--- ../../komodo-jl777/configure.ac 2017-01-03 09:49:08.848505929 +0000
***************
*** 2,8 ****
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 0)
! define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 50)
define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
--- 2,8 ----
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 0)
! define(_CLIENT_VERSION_REVISION, 3)
define(_CLIENT_VERSION_BUILD, 50)
define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
Only in ../../komodo-jl777/contrib: bitcoin-cli.bash-completion
diff -crB ./contrib/bitcoind.bash-completion ../../komodo-jl777/contrib/bitcoind.bash-completion
*** ./contrib/bitcoind.bash-completion 2017-01-03 10:40:50.159326534 +0000
--- ../../komodo-jl777/contrib/bitcoind.bash-completion 2017-01-03 09:49:08.848505929 +0000
***************
*** 1,102 ****
! # bash programmable completion for bitcoind(1) and bitcoin-cli(1)
! # Copyright (c) 2012,2014 Christian von Roques <roques@mti.ag>
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
! have bitcoind && {
!
! # call $bitcoind for RPC
! _bitcoin_rpc() {
! # determine already specified args necessary for RPC
! local rpcargs=()
! for i in ${COMP_LINE}; do
! case "$i" in
! -conf=*|-proxy*|-rpc*)
! rpcargs=( "${rpcargs[@]}" "$i" )
! ;;
! esac
! done
! $bitcoind "${rpcargs[@]}" "$@"
! }
!
! # Add bitcoin accounts to COMPREPLY
! _bitcoin_accounts() {
! local accounts
! accounts=$(_bitcoin_rpc listaccounts | awk '/".*"/ { a=$1; gsub(/"/, "", a); print a}')
! COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$accounts" -- "$cur" ) )
! }
!
! _bitcoind() {
local cur prev words=() cword
local bitcoind
! # save and use original argument to invoke bitcoind
! # bitcoind might not be in $PATH
bitcoind="$1"
COMPREPLY=()
_get_comp_words_by_ref -n = cur prev words cword
- if ((cword > 4)); then
- case ${words[cword-4]} in
- listtransactions)
- COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
- return 0
- ;;
- signrawtransaction)
- COMPREPLY=( $( compgen -W "ALL NONE SINGLE ALL|ANYONECANPAY NONE|ANYONECANPAY SINGLE|ANYONECANPAY" -- "$cur" ) )
- return 0
- ;;
- esac
- fi
-
- if ((cword > 3)); then
- case ${words[cword-3]} in
- addmultisigaddress)
- _bitcoin_accounts
- return 0
- ;;
- getbalance|gettxout|importaddress|importprivkey|listreceivedbyaccount|listreceivedbyaddress|listsinceblock)
- COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
- return 0
- ;;
- esac
- fi
-
- if ((cword > 2)); then
- case ${words[cword-2]} in
- addnode)
- COMPREPLY=( $( compgen -W "add remove onetry" -- "$cur" ) )
- return 0
- ;;
- getblock|getrawtransaction|gettransaction|listaccounts|listreceivedbyaccount|listreceivedbyaddress|sendrawtransaction)
- COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
- return 0
- ;;
- move|setaccount)
- _bitcoin_accounts
- return 0
- ;;
- esac
- fi
-
- case "$prev" in
- backupwallet|dumpwallet|importwallet)
- _filedir
- return 0
- ;;
- getmempool|lockunspent|setgenerate)
- COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
- return 0
- ;;
- getaccountaddress|getaddressesbyaccount|getbalance|getnewaddress|getreceivedbyaccount|listtransactions|move|sendfrom|sendmany)
- _bitcoin_accounts
- return 0
- ;;
- esac
-
case "$cur" in
! -conf=*|-pid=*|-loadblock=*|-wallet=*|-rpcsslcertificatechainfile=*|-rpcsslprivatekeyfile=*)
cur="${cur#*=}"
_filedir
return 0
--- 1,21 ----
! # bash programmable completion for bitcoind(1) and bitcoin-qt(1)
! # Copyright (c) 2012-2016 The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
! _zcashd() {
local cur prev words=() cword
local bitcoind
! # save and use original argument to invoke bitcoind for -help
! # it might not be in $PATH
bitcoind="$1"
COMPREPLY=()
_get_comp_words_by_ref -n = cur prev words cword
case "$cur" in
! -conf=*|-pid=*|-loadblock=*|-rootcertificates=*|-rpccookiefile=*|-wallet=*|-rpcsslcertificatechainfile=*|-rpcsslprivatekeyfile=*)
cur="${cur#*=}"
_filedir
return 0
***************
*** 110,129 ****
return 0
;;
*)
- local helpopts commands
! # only parse --help if senseful
if [[ -z "$cur" || "$cur" =~ ^- ]]; then
! helpopts=$($bitcoind --help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' )
fi
- # only parse help if senseful
- if [[ -z "$cur" || "$cur" =~ ^[a-z] ]]; then
- commands=$(_bitcoin_rpc help 2>/dev/null | awk '$1 ~ /^[a-z]/ { print $1; }')
- fi
-
- COMPREPLY=( $( compgen -W "$helpopts $commands" -- "$cur" ) )
-
# Prevent space if an argument is desired
if [[ $COMPREPLY == *= ]]; then
compopt -o nospace
--- 29,42 ----
return 0
;;
*)
! # only parse -help if senseful
if [[ -z "$cur" || "$cur" =~ ^- ]]; then
! local helpopts
! helpopts=$($bitcoind -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' )
! COMPREPLY=( $( compgen -W "$helpopts" -- "$cur" ) )
fi
# Prevent space if an argument is desired
if [[ $COMPREPLY == *= ]]; then
compopt -o nospace
***************
*** 131,140 ****
return 0
;;
esac
! }
!
! complete -F _bitcoind bitcoind bitcoin-cli
! }
# Local variables:
# mode: shell-script
--- 44,51 ----
return 0
;;
esac
! } &&
! complete -F _zcashd zcashd
# Local variables:
# mode: shell-script
Only in ../../komodo-jl777/contrib: bitcoin-tx.bash-completion
diff -crB ./contrib/DEBIAN/changelog ../../komodo-jl777/contrib/DEBIAN/changelog
*** ./contrib/DEBIAN/changelog 2017-01-03 10:40:50.155326332 +0000
--- ../../komodo-jl777/contrib/DEBIAN/changelog 2017-01-03 09:49:08.848505929 +0000
***************
*** 1,3 ****
--- 1,21 ----
+ zcash (1.0.3) jessie; urgency=medium
+
+ * 1.0.3 release.
+
+ -- Zcash Company <team@z.cash> Wed, 17 Nov 2016 15:56:00 -0700
+
+ zcash (1.0.2) jessie; urgency=medium
+
+ * 1.0.2 release.
+
+ -- Zcash Company <team@z.cash> Mon, 07 Nov 2016 19:01:35 -0600
+
+ zcash (1.0.1) jessie; urgency=medium
+
+ * 1.0.1 release.
+
+ -- Zcash Company <team@z.cash> Thu, 03 Nov 2016 23:21:09 -0500
+
zcash (1.0.0-sprout) jessie; urgency=medium
* 1.0.0 release.
diff -crB ./contrib/DEBIAN/control ../../komodo-jl777/contrib/DEBIAN/control
*** ./contrib/DEBIAN/control 2017-01-03 10:40:50.155326332 +0000
--- ../../komodo-jl777/contrib/DEBIAN/control 2017-01-03 09:49:08.848505929 +0000
***************
*** 10,16 ****
Vcs-Git: https://github.com/zcash/zcash.git
Vcs-Browser: https://github.com/zcash/zcash
Package: zcash
! Version: 1.0.0-sprout
Architecture: amd64
Depends: libgomp1
Description: An implementation of the "Zerocash" protocol.
--- 10,16 ----
Vcs-Git: https://github.com/zcash/zcash.git
Vcs-Browser: https://github.com/zcash/zcash
Package: zcash
! Version: 1.0.3
Architecture: amd64
Depends: libgomp1
Description: An implementation of the "Zerocash" protocol.
diff -crB ./contrib/DEBIAN/manpages/zcash-cli.1 ../../komodo-jl777/contrib/DEBIAN/manpages/zcash-cli.1
*** ./contrib/DEBIAN/manpages/zcash-cli.1 2017-01-03 10:40:50.155326332 +0000
--- ../../komodo-jl777/contrib/DEBIAN/manpages/zcash-cli.1 2017-01-03 09:49:08.848505929 +0000
***************
*** 1,9 ****
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
! .TH ZCASH-CLI "1" "October 2016" "Zcash RPC client version v1.0.0-409dcb7" "User Commands"
.SH NAME
zcash-cli \- RPC client for the Zcash daemon
.SH DESCRIPTION
! Zcash RPC client version v1.0.0
.SS "Usage:"
.TP
zcash\-cli [options] <command> [params]
--- 1,9 ----
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
! .TH ZCASH-CLI "1" "November 2016" "Zcash RPC client version v1.0.3" "User Commands"
.SH NAME
zcash-cli \- RPC client for the Zcash daemon
.SH DESCRIPTION
! Zcash RPC client version v1.0.3
.SS "Usage:"
.TP
zcash\-cli [options] <command> [params]
diff -crB ./contrib/DEBIAN/manpages/zcashd.1 ../../komodo-jl777/contrib/DEBIAN/manpages/zcashd.1
*** ./contrib/DEBIAN/manpages/zcashd.1 2017-01-03 10:40:50.155326332 +0000
--- ../../komodo-jl777/contrib/DEBIAN/manpages/zcashd.1 2017-01-03 09:49:08.848505929 +0000
***************
*** 1,9 ****
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
! .TH ZCASHD "1" "October 2016" "Zcash Daemon version v1.0.0-409dcb7" "User Commands"
.SH NAME
zcashd \- Network daemon for interacting with the Zcash blockchain
.SH DESCRIPTION
! Zcash Daemon version v1.0.0
.SS "Usage:"
.TP
zcashd [options]
--- 1,9 ----
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
! .TH ZCASHD "1" "November 2016" "Zcash Daemon version v1.0.3" "User Commands"
.SH NAME
zcashd \- Network daemon for interacting with the Zcash blockchain
.SH DESCRIPTION
! Zcash Daemon version v1.0.3
.SS "Usage:"
.TP
zcashd [options]
***************
*** 62,68 ****
.HP
\fB\-par=\fR<n>
.IP
! Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 =
leave that many cores free, default: 0)
.HP
\fB\-pid=\fR<file>
--- 62,68 ----
.HP
\fB\-par=\fR<n>
.IP
! Set the number of script verification threads (\fB\-8\fR to 16, 0 = auto, <0 =
leave that many cores free, default: 0)
.HP
\fB\-pid=\fR<file>
diff -crB ./contrib/gitian-descriptors/gitian-linux.yml ../../komodo-jl777/contrib/gitian-descriptors/gitian-linux.yml
*** ./contrib/gitian-descriptors/gitian-linux.yml 2017-01-03 10:40:50.159326534 +0000
--- ../../komodo-jl777/contrib/gitian-descriptors/gitian-linux.yml 2017-01-03 09:49:08.848505929 +0000
***************
*** 1,5 ****
---
! name: "zcash-1.0.0"
enable_cache: true
distro: "debian"
suites:
--- 1,5 ----
---
! name: "zcash-1.0.3"
enable_cache: true
distro: "debian"
suites:
diff -crB ./depends/packages/miniupnpc.mk ../../komodo-jl777/depends/packages/miniupnpc.mk
*** ./depends/packages/miniupnpc.mk 2017-01-03 10:40:50.179327547 +0000
--- ../../komodo-jl777/depends/packages/miniupnpc.mk 2017-01-03 09:49:08.848505929 +0000
***************
*** 3,8 ****
--- 3,9 ----
$(package)_download_path=http://miniupnp.free.fr/files
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=d434ceb8986efbe199c5ca53f90ed53eab290b1e6d0530b717eb6fa49d61f93b
+ $(package)_patches=fix-solaris-compilation.patch strlen-before-memcmp.patch patch-strlen-patch.patch
define $(package)_set_vars
$(package)_build_opts=CC="$($(package)_cc)"
***************
*** 14,20 ****
define $(package)_preprocess_cmds
mkdir dll && \
sed -e 's|MINIUPNPC_VERSION_STRING \"version\"|MINIUPNPC_VERSION_STRING \"$($(package)_version)\"|' -e 's|OS/version|$(host)|' miniupnpcstrings.h.in > miniupnpcstrings.h && \
! sed -i.old "s|miniupnpcstrings.h: miniupnpcstrings.h.in wingenminiupnpcstrings|miniupnpcstrings.h: miniupnpcstrings.h.in|" Makefile.mingw
endef
define $(package)_build_cmds
--- 15,24 ----
define $(package)_preprocess_cmds
mkdir dll && \
sed -e 's|MINIUPNPC_VERSION_STRING \"version\"|MINIUPNPC_VERSION_STRING \"$($(package)_version)\"|' -e 's|OS/version|$(host)|' miniupnpcstrings.h.in > miniupnpcstrings.h && \
! sed -i.old "s|miniupnpcstrings.h: miniupnpcstrings.h.in wingenminiupnpcstrings|miniupnpcstrings.h: miniupnpcstrings.h.in|" Makefile.mingw && \
! patch -p2 < $($(package)_patch_dir)/fix-solaris-compilation.patch && \
! patch -p2 < $($(package)_patch_dir)/strlen-before-memcmp.patch && \
! patch -p2 < $($(package)_patch_dir)/patch-strlen-patch.patch
endef
define $(package)_build_cmds
Only in ../../komodo-jl777/depends/patches: miniupnpc
Only in ../../komodo-jl777/doc: authors.md
diff -crB ./doc/developer-notes.md ../../komodo-jl777/doc/developer-notes.md
*** ./doc/developer-notes.md 2017-01-03 10:40:50.191328153 +0000
--- ../../komodo-jl777/doc/developer-notes.md 2017-01-03 09:49:08.848505929 +0000
***************
*** 102,108 ****
If the code is behaving strangely, take a look in the debug.log file in the data directory;
error and debugging messages are written there.
! The -debug=... command-line option controls debugging; running with just -debug will turn
on all categories (and give you a very large debug.log file).
The Qt code routes qDebug() output to debug.log under category "qt": run with -debug=qt
--- 102,108 ----
If the code is behaving strangely, take a look in the debug.log file in the data directory;
error and debugging messages are written there.
! The -debug=... command-line option controls debugging; running with just -debug or -debug=1 will turn
on all categories (and give you a very large debug.log file).
The Qt code routes qDebug() output to debug.log under category "qt": run with -debug=qt
diff -crB ./doc/payment-api.md ../../komodo-jl777/doc/payment-api.md
*** ./doc/payment-api.md 2017-01-03 10:40:50.191328153 +0000
--- ../../komodo-jl777/doc/payment-api.md 2017-01-03 09:49:08.848505929 +0000
***************
*** 29,35 ****
RPC calls by category:
* Accounting: z_getbalance, z_gettotalbalance
! * Addresses : z_getnewaddress, z_listaddresses
* Keys : z_exportkey, z_importkey, z_exportwallet, z_importwallet
* Operation: z_getoperationresult, z_getoperationstatus, z_listoperationids
* Payment : z_listreceivedbyaddress, z_sendmany
--- 29,35 ----
RPC calls by category:
* Accounting: z_getbalance, z_gettotalbalance
! * Addresses : z_getnewaddress, z_listaddresses, z_validateaddress
* Keys : z_exportkey, z_importkey, z_exportwallet, z_importwallet
* Operation: z_getoperationresult, z_getoperationstatus, z_listoperationids
* Payment : z_listreceivedbyaddress, z_sendmany
***************
*** 55,60 ****
--- 55,61 ----
--- | --- | ---
z_getnewaddress | | Return a new zaddr for sending and receiving payments. The spending key for this zaddr will be added to the node’s wallet.<br><br>Output:<br>zN68D8hSs3...
z_listaddresses | | Returns a list of all the zaddrs in this node’s wallet for which you have a spending key.<br><br>Output:<br>{ [“z123…”, “z456...”, “z789...”] }
+ z_validateaddress | | Return information about a given zaddr.<br><br>Output:<br>{"isvalid" : true,<br>"address" : "zcWsmq...",<br>"payingkey" : "f5bb3c...",<br>"transmissionkey" : "7a58c7...",<br>"ismine" : true}
### Key Management
***************
*** 70,76 ****
Command | Parameters | Description
--- | --- | ---
z_listreceivedbyaddress<br> | zaddr [minconf=1] | Return a list of amounts received by a zaddr belonging to the node’s wallet.<br><br>Optionally set the minimum number of confirmations which a received amount must have in order to be included in the result. Use 0 to count unconfirmed transactions.<br><br>Output:<br>[{<br>“txid”: “4a0f…”,<br>“amount”: 0.54,<br>“memo”:”F0FF…”,}, {...}, {...}<br>]
! z_sendmany<br> | fromaddress amounts [minconf=1] | _This is an Asynchronous RPC call_<br><br>Send funds from an address to multiple outputs. The address can be either a taddr or a zaddr.<br><br>Amounts is a list containing key/value pairs corresponding to the addresses and amount to pay. Each output address can be in taddr or zaddr format.<br><br>When sending to a zaddr, you also have the option of attaching a memo in hexadecimal format.<br><br>**NOTE:**When sending coinbase funds to a zaddr, the node's wallet does not allow any change. Put another way, spending a partial amount of a coinbase utxo is not allowed. This is not a consensus rule but a local wallet rule due to the current implementation of z_sendmany. In future, this rule may be removed.<br><br>Example of Outputs parameter:<br>[{“address”:”t123…”, “amount”:0.005},<br>,{“address”:”z010…”,”amount”:0.03, “memo”:”f508af…”}]<br><br>Optionally set the minimum number of confirmations which a private or transparent transaction must have in order to be used as an input.<br><br>The transaction fee will be determined by the node’s wallet. Any transparent change will be sent to a new transparent address. Any private change will be sent back to the zaddr being used as the source of funds.<br><br>Returns an operationid. You use the operationid value with z_getoperationstatus and z_getoperationresult to obtain the result of sending funds, which if successful, will be a txid.
### Operations
--- 71,77 ----
Command | Parameters | Description
--- | --- | ---
z_listreceivedbyaddress<br> | zaddr [minconf=1] | Return a list of amounts received by a zaddr belonging to the node’s wallet.<br><br>Optionally set the minimum number of confirmations which a received amount must have in order to be included in the result. Use 0 to count unconfirmed transactions.<br><br>Output:<br>[{<br>“txid”: “4a0f…”,<br>“amount”: 0.54,<br>“memo”:”F0FF…”,}, {...}, {...}<br>]
! z_sendmany<br> | fromaddress amounts [minconf=1] [fee=0.0001] | _This is an Asynchronous RPC call_<br><br>Send funds from an address to multiple outputs. The address can be either a taddr or a zaddr.<br><br>Amounts is a list containing key/value pairs corresponding to the addresses and amount to pay. Each output address can be in taddr or zaddr format.<br><br>When sending to a zaddr, you also have the option of attaching a memo in hexadecimal format.<br><br>**NOTE:**When sending coinbase funds to a zaddr, the node's wallet does not allow any change. Put another way, spending a partial amount of a coinbase utxo is not allowed. This is not a consensus rule but a local wallet rule due to the current implementation of z_sendmany. In future, this rule may be removed.<br><br>Example of Outputs parameter:<br>[{“address”:”t123…”, “amount”:0.005},<br>,{“address”:”z010…”,”amount”:0.03, “memo”:”f508af…”}]<br><br>Optionally set the minimum number of confirmations which a private or transparent transaction must have in order to be used as an input.<br><br>Optionally set a transaction fee, which by default is 0.0001 ZEC.<br><br>Any transparent change will be sent to a new transparent address. Any private change will be sent back to the zaddr being used as the source of funds.<br><br>Returns an operationid. You use the operationid value with z_getoperationstatus and z_getoperationresult to obtain the result of sending funds, which if successful, will be a txid.
### Operations
***************
*** 97,99 ****
--- 98,168 ----
z_getoperationresult <br>| [operationids] | Return OperationStatus JSON objects for all completed operations the node is currently aware of, and then remove the operation from memory.<br><br>Operationids is an optional array to filter which operations you want to receive status objects for.<br><br>Output is a list of operation status objects, where the status is either "failed", "cancelled" or "success".<br>[<br>{“operationid”: “opid-11ee…”,<br>“status”: “cancelled”},<br>{“operationid”: “opid-9876”, “status”: ”failed”},<br>{“operationid”: “opid-0e0e”,<br>“status”:”success”,<br>“execution_time”:”25”,<br>“result”: {“txid”:”af3887654…”,...}<br>},<br>]
z_getoperationstatus <br>| [operationids] | Return OperationStatus JSON objects for all operations the node is currently aware of.<br><br>Operationids is an optional array to filter which operations you want to receive status objects for.<br><br>Output is a list of operation status objects.<br>[<br>{“operationid”: “opid-12ee…”,<br>“status”: “queued”},<br>{“operationid”: “opd-098a…”, “status”: ”executing”},<br>{“operationid”: “opid-9876”, “status”: ”failed”}<br>]<br><br>When the operation succeeds, the status object will also include the result.<br><br>{“operationid”: “opid-0e0e”,<br>“status”:”success”,<br>“execution_time”:”25”,<br>“result”: {“txid”:”af3887654…”,...}<br>}
z_listoperationids <br>| [state] | Return a list of operationids for all operations which the node is currently aware of.<br><br>State is an optional string parameter to filter the operations you want listed by their state. Acceptable parameter values are ‘queued’, ‘executing’, ‘success’, ‘failed’, ‘cancelled’.<br><br>[“opid-0e0e…”, “opid-1af4…”, … ]
+
+ ## Asynchronous RPC call Error Codes
+
+ Zcash error codes are defined in https://github.com/zcash/zcash/blob/master/src/rpcprotocol.h
+
+ ### z_sendmany error codes
+
+ RPC_INVALID_PARAMETER (-8) | _Invalid, missing or duplicate parameter_
+ ---------------------------| -------------------------------------------------
+ "Minconf cannot be negative" | Cannot accept negative minimum confirmation number.
+ "Minimum number of confirmations cannot be less than 0" | Cannot accept negative minimum confirmation number.
+ "From address parameter missing" | Missing an address to send funds from.
+ "No recipients" | Missing recipient addresses.
+ "Memo must be in hexadecimal format" | Encrypted memo field data must be in hexadecimal format.
+ "Memo size of __ is too big, maximum allowed is __ " | Encrypted memo field data exceeds maximum size of 512 bytes.
+ "From address does not belong to this node, zaddr spending key not found." | Sender address spending key not found.
+ "Invalid parameter, expected object" | Expected object.
+ "Invalid parameter, unknown key: __" | Unknown key.
+ "Invalid parameter, expected valid size" | Invalid size.
+ "Invalid parameter, expected hex txid" | Invalid txid.
+ "Invalid parameter, vout must be positive" | Invalid vout.
+ "Invalid parameter, duplicated address" | Address is duplicated.
+ "Invalid parameter, amounts array is empty" | Amounts array is empty.
+ "Invalid parameter, unknown key" | Key not found.
+ "Invalid parameter, unknown address format" | Unknown address format.
+ "Invalid parameter, size of memo" | Invalid memo field size.
+ "Invalid parameter, amount must be positive" | Invalid or negative amount.
+ "Invalid parameter, too many zaddr outputs" | z_address outputs exceed maximum allowed.
+ "Invalid parameter, expected memo data in hexadecimal format" | Encrypted memo field is not in hexadecimal format.
+ "Invalid parameter, size of memo is larger than maximum allowed __ " | Encrypted memo field data exceeds maximum size of 512 bytes.
+
+
+ RPC_INVALID_ADDRESS_OR_KEY (-5) | _Invalid address or key_
+ --------------------------------| ---------------------------
+ "Invalid from address, no spending key found for zaddr" | z_address spending key not found.
+ "Invalid output address, not a valid taddr." | Transparent output address is invalid.
+ "Invalid from address, should be a taddr or zaddr." | Sender address is invalid.
+ "From address does not belong to this node, zaddr spending key not found." | Sender address spending key not found.
+
+
+ RPC_WALLET_INSUFFICIENT_FUNDS (-6) | _Not enough funds in wallet or account_
+ -----------------------------------| ------------------------------------------
+ "Insufficient funds, no UTXOs found for taddr from address." | Insufficient funds for sending address.
+ "Could not find any non-coinbase UTXOs to spend. Coinbase UTXOs can only be sent to a single zaddr recipient." | Must send Coinbase UTXO to a single z_address.
+ "Could not find any non-coinbase UTXOs to spend." | No available non-coinbase UTXOs.
+ "Insufficient funds, no unspent notes found for zaddr from address." | Insufficient funds for sending address.
+ "Insufficient transparent funds, have __, need __ plus fee __" | Insufficient funds from transparent address.
+ "Insufficient protected funds, have __, need __ plus fee __" | Insufficient funds from shielded address.
+
+ RPC_WALLET_ERROR (-4) | _Unspecified problem with wallet_
+ ----------------------| -------------------------------------
+ "Could not find previous JoinSplit anchor" | Try restarting node with `-reindex`.
+ "Error decrypting output note of previous JoinSplit: __" |
+ "Could not find witness for note commitment" | Try restarting node with `-reindex`.
+ "Witness for note commitment is null" | Missing witness for note commitement.
+ "Witness for spendable note does not have same anchor as change input" | Invalid anchor for spendable note witness.
+ "Not enough funds to pay miners fee" | Retry with sufficient funds.
+ "Missing hex data for raw transaction" | Raw transaction data is null.
+ "Missing hex data for signed transaction" | Hex value for signed transaction is null.
+ "Send raw transaction did not return an error or a txid." |
+
+ RPC_WALLET_ENCRYPTION_FAILED (-16) | _Failed to encrypt the wallet_
+ -------------------------------------------------------------------------| -------------------------------------
+ "Failed to sign transaction" | Transaction was not signed, sign transaction and retry.
+
+ RPC_WALLET_KEYPOOL_RAN_OUT (-12) | _Keypool ran out, call keypoolrefill first_
+ -------------------------------------------------------------------------| -----------------------------------------------
+ "Could not generate a taddr to use as a change address" | Call keypoolrefill and retry.
diff -crB ./doc/release-notes/release-notes-0.11.2.z6.md ../../komodo-jl777/doc/release-notes/release-notes-0.11.2.z6.md
*** ./doc/release-notes/release-notes-0.11.2.z6.md 2017-01-03 10:40:50.191328153 +0000
--- ../../komodo-jl777/doc/release-notes/release-notes-0.11.2.z6.md 2017-01-03 09:49:08.848505929 +0000
***************
*** 1,19 ****
! Jack Grigg:
Equihash: Only compare the first n/(k+1) bits when sorting.
Randomise the nonce in the block header.
Clear mempool before using it for benchmark test, fix parameter name.
Fix memory leak in large tx benchmark.
! Sean Bowe:
Increase block size to 2MB and update performance test.
Make sigop limit `20000` just as in Bitcoin, ignoring our change to the blocksize limit.
Remove the mainnet checkpoints.
Fix performance test for block verification.
Make `validatelargetx` test more accurate.
! Taylor Hornby:
Add example mock test of CheckTransaction.
! aniemerg:
Suppress Libsnark Debugging Info.
-
--- 1,18 ----
! Jack Grigg (4):
Equihash: Only compare the first n/(k+1) bits when sorting.
Randomise the nonce in the block header.
Clear mempool before using it for benchmark test, fix parameter name.
Fix memory leak in large tx benchmark.
! Sean Bowe (5):
Increase block size to 2MB and update performance test.
Make sigop limit `20000` just as in Bitcoin, ignoring our change to the blocksize limit.
Remove the mainnet checkpoints.
Fix performance test for block verification.
Make `validatelargetx` test more accurate.
! Taylor Hornby (1):
Add example mock test of CheckTransaction.
! aniemerg (1):
Suppress Libsnark Debugging Info.
diff -crB ./doc/release-notes/release-notes-0.11.2.z9.md ../../komodo-jl777/doc/release-notes/release-notes-0.11.2.z9.md
*** ./doc/release-notes/release-notes-0.11.2.z9.md 2017-01-03 10:40:50.191328153 +0000
--- ../../komodo-jl777/doc/release-notes/release-notes-0.11.2.z9.md 2017-01-03 09:49:08.848505929 +0000
***************
*** 1,5 ****
!
! Sean Bowe:
Change memo field size and relocate `ciphertexts` field of JoinSplit description.
Implement zkSNARK compression.
Perform curve parameter initialization at start of gtest suite.
--- 1,4 ----
! Sean Bowe (6):
Change memo field size and relocate `ciphertexts` field of JoinSplit description.
Implement zkSNARK compression.
Perform curve parameter initialization at start of gtest suite.
***************
*** 7,13 ****
Enable MONTGOMERY_OUTPUT everywhere.
Update proving/verifying keys.
! Jack Grigg:
Add support for spending keys to the basic key store.
Merge AddSpendingKeyPaymentAddress into AddSpendingKey to simplify API.
Add methods for byte array expansion and compression.
--- 6,12 ----
Enable MONTGOMERY_OUTPUT everywhere.
Update proving/verifying keys.
! Jack Grigg (11):
Add support for spending keys to the basic key store.
Merge AddSpendingKeyPaymentAddress into AddSpendingKey to simplify API.
Add methods for byte array expansion and compression.
***************
*** 20,26 ****
Add separate lock for SpendingKey key store operations.
Test conversion between solution indices and minimal representation.
! Daira Hopwood:
Move bigint arithmetic implementations to libsnark.
Add mostly-static checks on consistency of Equihash parameters, MAX_HEADERS_RESULTS, and MAX_PROTOCOL_MESSAGE_LENGTH.
Change some asserts in equihash.cpp to be static.
--- 19,25 ----
Add separate lock for SpendingKey key store operations.
Test conversion between solution indices and minimal representation.
! Daira Hopwood (6):
Move bigint arithmetic implementations to libsnark.
Add mostly-static checks on consistency of Equihash parameters, MAX_HEADERS_RESULTS, and MAX_PROTOCOL_MESSAGE_LENGTH.
Change some asserts in equihash.cpp to be static.
***************
*** 28,57 ****
Increment version numbers for z9 release.
Add these release notes for z9.
! Taylor Hornby:
Disable hardening when building for coverage reports.
Upgrade libsodium for AVX2-detection bugfix.
Fix inconsistent optimization flags; single source of truth.
Add -fwrapv -fno-strict-aliasing; fix libzcash flags.
Use libsodium's s < L check, instead checking that libsodium checks that.
! Simon Liu:
Fixes #1193 so that during verification benchmarking it does not unncessarily create thousands of CTransaction objects.
Closes #701 by adding documentation about the Payment RPC interface.
Add note about zkey and encrypted wallets.
! Gaurav Rana:
Update zcash-cli stop message.
! Tom Ritter:
Clarify comment about nonce space for Note Encryption.
! Robert C. Seacord:
Memory safety and correctness fixes found in NCC audit.
! Patrick Strateman (merged by Taylor Hornby):
Pull in some DoS mitigations from upstream. (#1258)
! Wladimir J. van der Laan:
net: correctly initialize nMinPingUsecTime.
-
--- 27,55 ----
Increment version numbers for z9 release.
Add these release notes for z9.
! Taylor Hornby (5):
Disable hardening when building for coverage reports.
Upgrade libsodium for AVX2-detection bugfix.
Fix inconsistent optimization flags; single source of truth.
Add -fwrapv -fno-strict-aliasing; fix libzcash flags.
Use libsodium's s < L check, instead checking that libsodium checks that.
! Simon Liu (3):
Fixes #1193 so that during verification benchmarking it does not unncessarily create thousands of CTransaction objects.
Closes #701 by adding documentation about the Payment RPC interface.
Add note about zkey and encrypted wallets.
! Gaurav Rana (1):
Update zcash-cli stop message.
! Tom Ritter (1):
Clarify comment about nonce space for Note Encryption.
! Robert C. Seacord (1):
Memory safety and correctness fixes found in NCC audit.
! Patrick Strateman (1):
Pull in some DoS mitigations from upstream. (#1258)
! Wladimir J. van der Laan (1):
net: correctly initialize nMinPingUsecTime.
Only in ../../komodo-jl777/doc/release-notes: release-notes-1.0.1.md
Only in ../../komodo-jl777/doc/release-notes: release-notes-1.0.2.md
Only in ../../komodo-jl777/doc/release-notes: release-notes-1.0.3.md
diff -crB ./doc/release-process.md ../../komodo-jl777/doc/release-process.md
*** ./doc/release-process.md 2017-01-03 10:40:50.191328153 +0000
--- ../../komodo-jl777/doc/release-process.md 2017-01-03 09:49:08.848505929 +0000
***************
*** 38,43 ****
--- 38,45 ----
contrib/DEBIAN/control
contrib/gitian-descriptors/gitian-linux.yml
+ Build and commit to update versions, and then perform the following commands:
+
help2man -n "RPC client for the Zcash daemon" src/zcash-cli > contrib/DEBIAN/manpages/zcash-cli.1
help2man -n "Network daemon for interacting with the Zcash blockchain" src/zcashd > contrib/DEBIAN/manpages/zcashd.1
***************
*** 57,66 ****
### B2. Write release notes
! git shortlog helps a lot, for example:
! $ git shortlog --no-merges v${ZCASH_RELEASE_PREV}..HEAD \
! > ./doc/release-notes/release-notes-${ZCASH_RELEASE}.md
Update the Debian package changelog:
--- 59,67 ----
### B2. Write release notes
! Run the release-notes.py script to generate release notes and update authors.md file. For example:
! $ python zcutil/release-notes.py --version $ZCASH_RELEASE
Update the Debian package changelog:
diff -crB ./doc/security-warnings.md ../../komodo-jl777/doc/security-warnings.md
*** ./doc/security-warnings.md 2017-01-03 10:40:50.191328153 +0000
--- ../../komodo-jl777/doc/security-warnings.md 2017-01-03 09:49:08.848505929 +0000
***************
*** 35,44 ****
from the earlier issue).
- We were concerned about the resistance of the algorithm used to derive wallet
! encryption keys (inherited from Bitcoin) to dictionary attacks by a powerful
! attacker. If and when we re-enable wallet encryption, it is likely to be with
! a modern passphrase-based key derivation algorithm designed for greater
! resistance to dictionary attack, such as Argon2i.
You should use full-disk encryption (or encryption of your home directory) to
protect your wallet at rest, and should assume (even unprivileged) users who are
--- 35,44 ----
from the earlier issue).
- We were concerned about the resistance of the algorithm used to derive wallet
! encryption keys (inherited from [Bitcoin](https://bitcoin.org/en/secure-your-wallet))
! to dictionary attacks by a powerful attacker. If and when we re-enable wallet
! encryption, it is likely to be with a modern passphrase-based key derivation
! algorithm designed for greater resistance to dictionary attack, such as Argon2i.
You should use full-disk encryption (or encryption of your home directory) to
protect your wallet at rest, and should assume (even unprivileged) users who are
diff -crB ./doc/tor.md ../../komodo-jl777/doc/tor.md
*** ./doc/tor.md 2017-01-03 10:40:50.191328153 +0000
--- ../../komodo-jl777/doc/tor.md 2017-01-03 09:49:08.848505929 +0000
***************
*** 18,24 ****
-proxy=ip:port Set the proxy server. If SOCKS5 is selected (default), this proxy
server will be used to try to reach .onion addresses as well.
! -onion=ip:port Set the proxy server to use for tor hidden services. You do not
need to set this if it's the same as -proxy. You can use -noonion
to explicitly disable access to hidden service.
--- 18,24 ----
-proxy=ip:port Set the proxy server. If SOCKS5 is selected (default), this proxy
server will be used to try to reach .onion addresses as well.
! -onion=ip:port Set the proxy server to use for Tor hidden services. You do not
need to set this if it's the same as -proxy. You can use -noonion
to explicitly disable access to hidden service.
diff -crB ./Dockerfile ../../komodo-jl777/Dockerfile
*** ./Dockerfile 2017-01-03 10:40:50.151326129 +0000
--- ../../komodo-jl777/Dockerfile 2017-01-03 09:49:08.848505929 +0000
***************
*** 1,15 ****
! FROM ubuntu:16.04
! MAINTAINER Mihail Fedorov <mit-license@fedorov.net>
!
! # All the stuff
! # And clean out packages, keep space minimal
! RUN apt-get -y update && \
! apt-get -y upgrade && \
! apt-get -y install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev \
! unzip python zlib1g-dev wget bsdmainutils automake libboost-all-dev libssl-dev libprotobuf-dev \
! protobuf-compiler libqt4-dev libqrencode-dev libdb++-dev software-properties-common libcurl4-openssl-dev && \
! apt-get clean && \
! rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ADD ./ /komodo
ENV HOME /komodo
--- 1,5 ----
! FROM kolobus/ubuntu:komodo
! MAINTAINER Mihail Fedorov <tech@fedorov.net>
ADD ./ /komodo
ENV HOME /komodo
***************
*** 19,25 ****
RUN cd /komodo && \
./autogen.sh && \
./configure --with-incompatible-bdb --with-gui || true && \
! ./zcutil/build.sh -j4
# Unknown stuff goes here
--- 9,15 ----
RUN cd /komodo && \
./autogen.sh && \
./configure --with-incompatible-bdb --with-gui || true && \
! ./zcutil/build.sh -j$(nproc)
# Unknown stuff goes here
diff -crB ./.git/config ../../komodo-jl777/.git/config
*** ./.git/config 2017-01-03 10:40:50.131325117 +0000
--- ../../komodo-jl777/.git/config 2017-01-03 09:49:08.884507813 +0000
***************
*** 4,11 ****
bare = false
logallrefupdates = true
[remote "origin"]
! url = https://github.com/j-cimb-barker/komodo.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
--- 4,14 ----
bare = false
logallrefupdates = true
[remote "origin"]
! url = https://github.com/jl777/komodo.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
+ [branch "dev"]
+ remote = origin
+ merge = refs/heads/dev
diff -crB ./.git/HEAD ../../komodo-jl777/.git/HEAD
*** ./.git/HEAD 2017-01-03 10:40:50.131325117 +0000
--- ../../komodo-jl777/.git/HEAD 2017-01-03 09:49:08.884507813 +0000
***************
*** 1 ****
! ref: refs/heads/master
--- 1 ----
! ref: refs/heads/dev
Binary files ./.git/index and ../../komodo-jl777/.git/index differ
diff -crB ./.git/logs/HEAD ../../komodo-jl777/.git/logs/HEAD
*** ./.git/logs/HEAD 2017-01-03 10:40:50.131325117 +0000
--- ../../komodo-jl777/.git/logs/HEAD 2017-01-03 09:49:08.884507813 +0000
***************
*** 1 ****
! 0000000000000000000000000000000000000000 d03fbd981fce86504b78d2a9582e4da988d59823 joel <joel@abigail> 1483440050 +0000 clone: from https://github.com/j-cimb-barker/komodo.git
--- 1,2 ----
! 0000000000000000000000000000000000000000 d03fbd981fce86504b78d2a9582e4da988d59823 joel <joel@abigail> 1483436901 +0000 clone: from https://github.com/jl777/komodo.git
! d03fbd981fce86504b78d2a9582e4da988d59823 26ac06c4f5a6b4dc3163b36a1e5d24bfa7eccbd2 joel <joel@abigail> 1483436948 +0000 checkout: moving from master to dev
Only in ../../komodo-jl777/.git/logs/refs/heads: dev
diff -crB ./.git/logs/refs/heads/master ../../komodo-jl777/.git/logs/refs/heads/master
*** ./.git/logs/refs/heads/master 2017-01-03 10:40:50.131325117 +0000
--- ../../komodo-jl777/.git/logs/refs/heads/master 2017-01-03 09:48:21.598032424 +0000
***************
*** 1 ****
! 0000000000000000000000000000000000000000 d03fbd981fce86504b78d2a9582e4da988d59823 joel <joel@abigail> 1483440050 +0000 clone: from https://github.com/j-cimb-barker/komodo.git
--- 1 ----
! 0000000000000000000000000000000000000000 d03fbd981fce86504b78d2a9582e4da988d59823 joel <joel@abigail> 1483436901 +0000 clone: from https://github.com/jl777/komodo.git
diff -crB ./.git/logs/refs/remotes/origin/HEAD ../../komodo-jl777/.git/logs/refs/remotes/origin/HEAD
*** ./.git/logs/refs/remotes/origin/HEAD 2017-01-03 10:40:50.131325117 +0000
--- ../../komodo-jl777/.git/logs/refs/remotes/origin/HEAD 2017-01-03 09:48:21.598032424 +0000
***************
*** 1 ****
! 0000000000000000000000000000000000000000 d03fbd981fce86504b78d2a9582e4da988d59823 joel <joel@abigail> 1483440050 +0000 clone: from https://github.com/j-cimb-barker/komodo.git
--- 1 ----
! 0000000000000000000000000000000000000000 d03fbd981fce86504b78d2a9582e4da988d59823 joel <joel@abigail> 1483436901 +0000 clone: from https://github.com/jl777/komodo.git
Only in ./.git/objects/pack: pack-12e7bdf654b29f95604673fb1b3ee01a9bd52369.idx
Only in ./.git/objects/pack: pack-12e7bdf654b29f95604673fb1b3ee01a9bd52369.pack
Only in ../../komodo-jl777/.git/objects/pack: pack-3d08e40e89111c75a81ccd6099e05e09fd0e0f08.idx
Only in ../../komodo-jl777/.git/objects/pack: pack-3d08e40e89111c75a81ccd6099e05e09fd0e0f08.pack
diff -crB ./.git/packed-refs ../../komodo-jl777/.git/packed-refs
*** ./.git/packed-refs 2017-01-03 10:40:50.131325117 +0000
--- ../../komodo-jl777/.git/packed-refs 2017-01-03 09:48:21.598032424 +0000
***************
*** 2,10 ****
fcd361184f09fe17546698b0d13caddac5b63500 refs/remotes/origin/PoS
730a5006cbbfb0607ed93067db1a74d57584eb1f refs/remotes/origin/acspeed
80259d4b4f193c7c438f3c057ce70af3beb1a099 refs/remotes/origin/auto
! 060c9a92939c62bbedb5fe560bf8ef6856e2b8f1 refs/remotes/origin/beta
ba9104dd7e9b6ba2b68ad352253ac8f3298092f4 refs/remotes/origin/dPoW
! cb42e5518262235ed4e4dbff43179e0308114d6a refs/remotes/origin/dev
76b6eacf41395ddd2badd5d5dc3352e603c59df2 refs/remotes/origin/kolo
bb40eb8b043a1e63c3dc3b1c2e4d0f6e67e771d4 refs/remotes/origin/kolo-dev
d03fbd981fce86504b78d2a9582e4da988d59823 refs/remotes/origin/master
--- 2,10 ----
fcd361184f09fe17546698b0d13caddac5b63500 refs/remotes/origin/PoS
730a5006cbbfb0607ed93067db1a74d57584eb1f refs/remotes/origin/acspeed
80259d4b4f193c7c438f3c057ce70af3beb1a099 refs/remotes/origin/auto
! f6f296f1acf8c2b177451ed0c9f8660f3a80ec3d refs/remotes/origin/beta
ba9104dd7e9b6ba2b68ad352253ac8f3298092f4 refs/remotes/origin/dPoW
! 26ac06c4f5a6b4dc3163b36a1e5d24bfa7eccbd2 refs/remotes/origin/dev
76b6eacf41395ddd2badd5d5dc3352e603c59df2 refs/remotes/origin/kolo
bb40eb8b043a1e63c3dc3b1c2e4d0f6e67e771d4 refs/remotes/origin/kolo-dev
d03fbd981fce86504b78d2a9582e4da988d59823 refs/remotes/origin/master
Only in ../../komodo-jl777/.git/refs/heads: dev
diff -crB ./.gitignore ../../komodo-jl777/.gitignore
*** ./.gitignore 2017-01-03 10:40:50.151326129 +0000
--- ../../komodo-jl777/.gitignore 2017-01-03 09:49:08.848505929 +0000
***************
*** 65,70 ****
--- 65,71 ----
*.a
*.pb.cc
*.pb.h
+ .vscode
*.log
*.trs
diff -crB ./Makefile.am ../../komodo-jl777/Makefile.am
*** ./Makefile.am 2017-01-03 10:40:50.151326129 +0000
--- ../../komodo-jl777/Makefile.am 2017-01-03 09:49:08.848505929 +0000
***************
*** 258,267 ****
@qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS) 2>&1
endif
! dist_noinst_SCRIPTS = autogen.sh
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-bitcoin-cli qa/rpc-tests qa/zcash $(DIST_DOCS) $(BIN_CHECKS)
CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
.INTERMEDIATE: $(COVERAGE_INFO)
--- 258,271 ----
@qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS) 2>&1
endif
! dist_bin_SCRIPTS = zcutil/fetch-params.sh
! dist_noinst_SCRIPTS = autogen.sh zcutil/build-debian-package.sh zcutil/build.sh
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-bitcoin-cli qa/rpc-tests qa/zcash $(DIST_DOCS) $(BIN_CHECKS)
+ install-exec-hook:
+ mv $(DESTDIR)$(bindir)/fetch-params.sh $(DESTDIR)$(bindir)/zcash-fetch-params
+
CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
.INTERMEDIATE: $(COVERAGE_INFO)
Only in .: patches
diff -crB ./qa/pull-tester/rpc-tests.sh ../../komodo-jl777/qa/pull-tester/rpc-tests.sh
*** ./qa/pull-tester/rpc-tests.sh 2017-01-03 10:40:50.195328356 +0000
--- ../../komodo-jl777/qa/pull-tester/rpc-tests.sh 2017-01-03 09:49:08.848505929 +0000
***************
*** 11,16 ****
--- 11,17 ----
#Run the tests
testScripts=(
+ 'wallet_treestate.py'
'wallet_protectcoinbase.py'
'wallet.py'
'wallet_nullifiers.py'
diff -crB ./qa/rpc-tests/httpbasics.py ../../komodo-jl777/qa/rpc-tests/httpbasics.py
*** ./qa/rpc-tests/httpbasics.py 2017-01-03 10:40:50.195328356 +0000
--- ../../komodo-jl777/qa/rpc-tests/httpbasics.py 2017-01-03 09:49:08.856506348 +0000
***************
*** 38,50 ****
conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
out1 = conn.getresponse().read();
assert_equal('"error":null' in out1, True)
! assert_equal(conn.sock!=None, True) #according to http/1.1 connection must still be open!
!
! #send 2nd request without closing connection
! conn.request('POST', '/', '{"method": "getchaintips"}', headers)
! out2 = conn.getresponse().read();
! assert_equal('"error":null' in out1, True) #must also response with a correct json-rpc message
! assert_equal(conn.sock!=None, True) #according to http/1.1 connection must still be open!
conn.close()
#same should be if we add keep-alive because this should be the std. behaviour
--- 38,46 ----
conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
out1 = conn.getresponse().read();
assert_equal('"error":null' in out1, True)
!
! # TODO #1856: Re-enable support for persistent connections.
! assert_equal(conn.sock!=None, False)
conn.close()
#same should be if we add keep-alive because this should be the std. behaviour
***************
*** 55,67 ****
conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
out1 = conn.getresponse().read();
assert_equal('"error":null' in out1, True)
! assert_equal(conn.sock!=None, True) #according to http/1.1 connection must still be open!
!
! #send 2nd request without closing connection
! conn.request('POST', '/', '{"method": "getchaintips"}', headers)
! out2 = conn.getresponse().read();
! assert_equal('"error":null' in out1, True) #must also response with a correct json-rpc message
! assert_equal(conn.sock!=None, True) #according to http/1.1 connection must still be open!
conn.close()
#now do the same with "Connection: close"
--- 51,59 ----
conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
out1 = conn.getresponse().read();
assert_equal('"error":null' in out1, True)
!
! # TODO #1856: Re-enable support for persistent connections.
! assert_equal(conn.sock!=None, False)
conn.close()
#now do the same with "Connection: close"
***************
*** 96,102 ****
conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
out1 = conn.getresponse().read();
assert_equal('"error":null' in out1, True)
! assert_equal(conn.sock!=None, True) #connection must be closed because bitcoind should use keep-alive by default