More cleaning and updates in prep for 3.6.0

2020-12-16 23:20:06 -05:00
parent 97887c9166
commit 1a481f401c
48 changed files with 149 additions and 25 deletions
--- a/src/cc/CCMarmara.h
+++ b/src/cc/CCMarmara.h
@@ -20,8 +20,10 @@
 #ifndef CC_MARMARA_H
 #define CC_MARMARA_H

+/*
+
 #include "CCinclude.h"
-#include "../komodo_cJSON.h"
+#include "../hush_cJSON.h"

 #define MARMARA_GROUPSIZE 60
 #define MARMARA_MINLOCK (1440 * 3 * 30)
@@ -46,5 +48,6 @@ bool MarmaraValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &t

 // CCcustom
 UniValue MarmaraInfo();
+*/

 #endif
--- a/src/cc/CCinclude.h
+++ b/src/cc/CCinclude.h
@@ -69,8 +69,8 @@ Details.
 #include "../utlist.h"
 #include "../uthash.h"
 #include "merkleblock.h"
-#include "../komodo_nSPV_defs.h"
-#include "../komodo_cJSON.h"
+#include "../hush_nSPV_defs.h"
+#include "../hush_cJSON.h"
 #include "../init.h"
 #include "rpc/server.h"

@@ -85,7 +85,7 @@ Details.
 #define CCDISABLEALL memset(ASSETCHAINS_CCDISABLES,1,sizeof(ASSETCHAINS_CCDISABLES))
 #define CCENABLE(x) ASSETCHAINS_CCDISABLES[((uint8_t)x)] = 0

-/* moved to komodo_cJSON.h
+/* moved to hush_cJSON.h
 #ifndef _BITS256
 #define _BITS256
    union _bits256 { uint8_t bytes[32]; uint16_t ushorts[16]; uint32_t uints[8]; uint64_t ulongs[4]; uint64_t txid; };
--- a/src/cc/crypto777/OS_portable.h
+++ b/src/cc/crypto777/OS_portable.h
--- a/src/cc/rogue/Makefile.in
+++ b/src/cc/rogue/Makefile.in
@@ -1,3 +1,6 @@
+# Copyright (c) 2016-2020 The Hush developers
+# Distributed under the GPLv3 software license, see the accompanying
+# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 ###############################################################################
 #
 # Makefile for rogue
--- a/src/cc/rogue/armor.c
+++ b/src/cc/rogue/armor.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * This file contains misc functions for dealing with armor
 * @(#)armor.c	4.14 (Berkeley) 02/05/99
--- a/src/cc/rogue/chase.c
+++ b/src/cc/rogue/chase.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Code for one creature to chase another
 *
--- a/src/cc/rogue/command.c
+++ b/src/cc/rogue/command.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Read and execute the user commands
 *
--- a/src/cc/rogue/cursesd.c
+++ b/src/cc/rogue/cursesd.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /******************************************************************************
 * Copyright © 2014-2019 The SuperNET Developers.                             *
 *                                                                            *
--- a/src/cc/rogue/cursesd.h
+++ b/src/cc/rogue/cursesd.h
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /******************************************************************************
 * Copyright © 2014-2019 The SuperNET Developers.                             *
 *                                                                            *
--- a/src/cc/rogue/daemon.c
+++ b/src/cc/rogue/daemon.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Contains functions for dealing with things that happen in the
 * future.
--- a/src/cc/rogue/daemons.c
+++ b/src/cc/rogue/daemons.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * All the daemon and fuse functions are in here
 *
--- a/src/cc/rogue/extern.c
+++ b/src/cc/rogue/extern.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * global variable initializaton
 *
--- a/src/cc/rogue/extern.h
+++ b/src/cc/rogue/extern.h
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Defines for things used in mach_dep.c
 *
--- a/src/cc/rogue/fight.c
+++ b/src/cc/rogue/fight.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * All the fighting gets done here
 *
--- a/src/cc/rogue/init.c
+++ b/src/cc/rogue/init.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * global variable initializaton
 *
--- a/src/cc/rogue/io.c
+++ b/src/cc/rogue/io.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Various input/output functions
 *
--- a/src/cc/rogue/list.c
+++ b/src/cc/rogue/list.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Functions for dealing with linked lists of goodies
 *
--- a/src/cc/rogue/mach_dep.c
+++ b/src/cc/rogue/mach_dep.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Various installation dependent routines
 *
--- a/src/cc/rogue/main.c
+++ b/src/cc/rogue/main.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /******************************************************************************
 * Copyright © 2014-2019 The SuperNET Developers.                             *
 *                                                                            *
@@ -12,8 +15,6 @@
 * Removal or modification of this copyright notice is prohibited.            *
 *                                                                            *
 ******************************************************************************/
-
-
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -254,9 +255,9 @@ int32_t safecopy(char *dest,char *src,long len)
 #define true 1
 #define false 0
 #ifdef STANDALONE
-#include "../komodo/src/komodo_cJSON.c"
+#include "../hush3/src/hush_cJSON.c"
 #else
-#include "../../komodo_cJSON.c"
+#include "../../hush_cJSON.c"
 #endif

 int32_t rogue_replay(uint64_t seed,int32_t sleeptime);
--- a/src/cc/rogue/mdport.c
+++ b/src/cc/rogue/mdport.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
    mdport.c - Machine Dependent Code for Porting Unix/Curses games

--- a/src/cc/rogue/misc.c
+++ b/src/cc/rogue/misc.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * All sorts of miscellaneous routines
 *
--- a/src/cc/rogue/monsters.c
+++ b/src/cc/rogue/monsters.c
@@ -1,5 +1,8 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
- * File with various monster functions in it
+ * File with various monster functions in it, none as evil as KYC
 *
 * @(#)monsters.c	4.46 (Berkeley) 02/05/99
 *
--- a/src/cc/rogue/move.c
+++ b/src/cc/rogue/move.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * hero movement commands
 *
--- a/src/cc/rogue/new_level.c
+++ b/src/cc/rogue/new_level.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * new_level:
 *	Dig and draw a new level
--- a/src/cc/rogue/options.c
+++ b/src/cc/rogue/options.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * This file has all the code for the option command.  I would rather
 * this command were not necessary, but it is the only way to keep the
--- a/src/cc/rogue/pack.c
+++ b/src/cc/rogue/pack.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Routines to deal with the pack
 *
--- a/src/cc/rogue/passages.c
+++ b/src/cc/rogue/passages.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Draw the connecting passages
 *
--- a/src/cc/rogue/potions.c
+++ b/src/cc/rogue/potions.c
@@ -1,5 +1,8 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
- * Function(s) for dealing with potions
+ * Function(s) for dealing with potions, mmmmmmmmmm, potionzzzzzzz
 *
 * @(#)potions.c	4.46 (Berkeley) 06/07/83
 *
@@ -55,8 +58,7 @@ static PACT p_actions[] =
 *	Quaff a potion from the pack
 */

-void
-quaff(struct rogue_state *rs)
+void quaff(struct rogue_state *rs)
 {
    THING *obj, *tp, *mp;
    bool discardit = FALSE;
--- a/src/cc/rogue/rings.c
+++ b/src/cc/rogue/rings.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Routines dealing specifically with rings
 *
--- a/src/cc/rogue/rip.c
+++ b/src/cc/rogue/rip.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * File for the fun ends
 * Death or a total win
--- a/src/cc/rogue/rogue.c
+++ b/src/cc/rogue/rogue.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Rogue: Exploring the Dungeons of Doom
 * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman
@@ -16,9 +19,9 @@

 #include "rogue.h"
 #ifdef STANDALONE
-#include "../komodo/src/komodo_cJSON.h"
+#include "../hush3/src/hush_cJSON.h"
 #else
-#include "../../komodo_cJSON.h"
+#include "../../hush_cJSON.h"
 #endif

 /*
--- a/src/cc/rogue/rogue.h
+++ b/src/cc/rogue/rogue.h
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Rogue definitions and variable declarations
 *
--- a/src/cc/rogue/rogue_player.h
+++ b/src/cc/rogue/rogue_player.h
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /******************************************************************************
 * Copyright © 2014-2019 The SuperNET Developers.                             *
 *                                                                            *
--- a/src/cc/rogue/rooms.c
+++ b/src/cc/rogue/rooms.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Create the layout for the new level
 *
--- a/src/cc/rogue/save.c
+++ b/src/cc/rogue/save.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * save and restore routines
 *
--- a/src/cc/rogue/score.h
+++ b/src/cc/rogue/score.h
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Score file structure
 *
--- a/src/cc/rogue/scrolls.c
+++ b/src/cc/rogue/scrolls.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Read a scroll and let it happen
 *
--- a/src/cc/rogue/state.c
+++ b/src/cc/rogue/state.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
    state.c - Portable Rogue Save State Code

--- a/src/cc/rogue/sticks.c
+++ b/src/cc/rogue/sticks.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Functions to implement the various sticks one might find
 * while wandering around the dungeon.
--- a/src/cc/rogue/things.c
+++ b/src/cc/rogue/things.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Contains functions for dealing with things like potions, scrolls,
 * and other items.
--- a/src/cc/rogue/vers.c
+++ b/src/cc/rogue/vers.c
@@ -1,5 +1,8 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
- * Version number.  Whenever a new version number is desired, use sccs
+ * Version number.  Whenever a new version number is desired, use sccs(!)
 * to get vers.c.  encstr is declared here to force it to be loaded
 * before the version number, and therefore not to be written in saved
 * games.
--- a/src/cc/rogue/weapons.c
+++ b/src/cc/rogue/weapons.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Functions for dealing with problems brought about by weapons
 *
--- a/src/cc/rogue/wizard.c
+++ b/src/cc/rogue/wizard.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 * Special wizard commands (some of which are also non-wizard commands
 * under strange circumstances)
--- a/src/cc/rogue/xcrypt.c
+++ b/src/cc/rogue/xcrypt.c
@@ -1,3 +1,6 @@
+// Copyright (c) 2016-2020 The Hush developers
+// Distributed under the GPLv3 software license, see the accompanying
+// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 /*
 *  FreeSec: libcrypt
 *
@@ -47,6 +50,7 @@
 * This file has a static version of des_setkey() so that crypt.o exports
 * only the crypt() interface. This is required to make binaries linked
 * against crypt.o exportable or re-exportable from the USA.
+ * NOTE2: Math is freedom of speech. -- Duke Leto
 */

 #include <sys/types.h>
--- a/src/hush.h
+++ b/src/hush.h
@@ -45,16 +45,16 @@ bool check_pprevnotarizedht();
 #include "hush_globals.h"
 #include "hush_utils.h"
 #include "hush_curve25519.h"
-#include "komodo_cJSON.c"
+#include "hush_cJSON.c"
 #include "hush_bitcoind.h"
-#include "komodo_pax.h"
+#include "hush_pax.h"
 #include "hush_notary.h"

 int32_t hush_parsestatefile(struct hush_state *sp,FILE *fp,char *symbol,char *dest);
-#include "komodo_kv.h"
+#include "hush_kv.h"
 #include "hush_gateway.h"
-#include "komodo_events.h"
-#include "komodo_ccdata.h"
+#include "hush_events.h"
+#include "hush_ccdata.h"

 void hush_currentheight_set(int32_t height)
 {
@@ -98,7 +98,7 @@ int32_t hush_parsestatefile(struct hush_state *sp,FILE *fp,char *symbol,char *de
                else
                {
                    //printf("updated %d pubkeys at %s ht.%d\n",num,symbol,ht);
-                    if ( (KOMODO_EXTERNAL_NOTARIES != 0 && matched != 0) || (strcmp(symbol,"KMD") == 0 && KOMODO_EXTERNAL_NOTARIES == 0) )
+                    if ( (HUSH_EXTERNAL_NOTARIES != 0 && matched != 0) || (strcmp(symbol,"KMD") == 0 && HUSH_EXTERNAL_NOTARIES == 0) )
                        komodo_eventadd_pubkeys(sp,symbol,ht,num,pubkeys);
                }
            } else printf("illegal num.%d\n",num);
@@ -243,7 +243,7 @@ int32_t hush_parsestatefiledata(struct hush_state *sp,uint8_t *filedata,long *fp
                else
                {
                    //printf("updated %d pubkeys at %s ht.%d\n",num,symbol,ht);
-                    if ( (KOMODO_EXTERNAL_NOTARIES != 0 && matched != 0) || (strcmp(symbol,"KMD") == 0 && KOMODO_EXTERNAL_NOTARIES == 0) )
+                    if ( (HUSH_EXTERNAL_NOTARIES != 0 && matched != 0) || (strcmp(symbol,"KMD") == 0 && HUSH_EXTERNAL_NOTARIES == 0) )
                        komodo_eventadd_pubkeys(sp,symbol,ht,num,pubkeys);
                }
            } else printf("illegal num.%d\n",num);
--- a/src/hush_cJSON.c
+++ b/src/hush_cJSON.c
@@ -26,7 +26,7 @@
 #include <math.h>

 #include "cJSON.h"
-#include "komodo_cJSON.h"
+#include "hush_cJSON.h"
 #include "cJSON.c"

 #ifndef DBL_EPSILON
--- a/src/hush_globals.h
+++ b/src/hush_globals.h
@@ -47,7 +47,7 @@ int COINBASE_MATURITY = _COINBASE_MATURITY;//100;
 unsigned int WITNESS_CACHE_SIZE = _COINBASE_MATURITY+10;
 uint256 HUSH_EARLYTXID;

-int32_t HUSH_MININGTHREADS = -1,IS_HUSH_NOTARY,USE_EXTERNAL_PUBKEY,KOMODO_CHOSEN_ONE,ASSETCHAINS_SEED,KOMODO_ON_DEMAND,KOMODO_EXTERNAL_NOTARIES,HUSH_PASSPORT_INITDONE,KOMODO_PAX,HUSH_EXCHANGEWALLET,HUSH_REWIND,HUSH_CONNECTING = -1,KOMODO_DEALERNODE,HUSH_EXTRASATOSHI,ASSETCHAINS_FOUNDERS,ASSETCHAINS_CBMATURITY,HUSH_NSPV;
+int32_t HUSH_MININGTHREADS = -1,IS_HUSH_NOTARY,USE_EXTERNAL_PUBKEY,KOMODO_CHOSEN_ONE,ASSETCHAINS_SEED,KOMODO_ON_DEMAND,HUSH_EXTERNAL_NOTARIES,HUSH_PASSPORT_INITDONE,KOMODO_PAX,HUSH_EXCHANGEWALLET,HUSH_REWIND,HUSH_CONNECTING = -1,KOMODO_DEALERNODE,HUSH_EXTRASATOSHI,ASSETCHAINS_FOUNDERS,ASSETCHAINS_CBMATURITY,HUSH_NSPV;
 int32_t HUSH_INSYNC,KOMODO_LASTMINED,prevKOMODO_LASTMINED,KOMODO_CCACTIVATE,JUMBLR_PAUSE = 1;
 std::string NOTARY_PUBKEY,ASSETCHAINS_NOTARIES,ASSETCHAINS_OVERRIDE_PUBKEY,DONATION_PUBKEY,ASSETCHAINS_SCRIPTPUB,NOTARY_ADDRESS,ASSETCHAINS_SELFIMPORT,ASSETCHAINS_CCLIB;
 uint8_t NOTARY_PUBKEY33[33],ASSETCHAINS_OVERRIDE_PUBKEY33[33],ASSETCHAINS_OVERRIDE_PUBKEYHASH[20],ASSETCHAINS_PUBLIC,ASSETCHAINS_PRIVATE,ASSETCHAINS_TXPOW,ASSETCHAINS_MARMARA;
--- a/src/hush_notary.h
+++ b/src/hush_notary.h
@@ -17,7 +17,7 @@
 ******************************************************************************/

 #include "hush_defs.h"
-#include "komodo_cJSON.h"
+#include "hush_cJSON.h"

 #define KOMODO_MAINNET_START 178999
 #define KOMODO_NOTARIES_HEIGHT1 814000