Major updates integration from all upstreams

2018-09-18 14:33:53 -07:00
parent 0c8fa56a02 0e0f5e4ea7
commit 9feb4b9e08
396 changed files with 25517 additions and 6854 deletions
--- a/src/cc/CCtx.cpp
+++ b/src/cc/CCtx.cpp
@@ -14,6 +14,7 @@
 ******************************************************************************/

 #include "CCinclude.h"
+#include "key_io.h"

 /*
 FinalizeCCTx is a very useful function that will properly sign both CC and normal inputs, adds normal change and the opreturn.