merge lastest jl-dev branch

2018-09-29 15:59:47 +00:00
parent 396d4e4209 1513c37f65
commit 78e10a3b60
34 changed files with 2695 additions and 384 deletions
--- a/src/komodo_notary.h
+++ b/src/komodo_notary.h
@@ -202,6 +202,7 @@ const char *Notaries_elected1[][2] =
    {"webworker01_NA", "03bb7d005e052779b1586f071834c5facbb83470094cff5112f0072b64989f97d7" },
    {"xrobesx_NA", "03f0cc6d142d14a40937f12dbd99dbd9021328f45759e26f1877f2a838876709e1" },
 };
+#define CRYPTO777_PUBSECPSTR "020e46e79a2a8d12b9b5d12c7a91adb4e454edfae43c0a0cb805427d2ac7613fd9"

 int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height,uint32_t timestamp)
 {