More cleaning and updates in prep for 3.6.0

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

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; };

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

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

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
  *

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
  *

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.                             *
  *                                                                            *

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.                             *
  *                                                                            *

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.

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
  *

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
  *

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
  *

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
  *

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
  *

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
  *

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
  *

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
  *

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);

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
 

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
  *

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
  *

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
  *

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

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

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
  *

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
  *

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;

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
  *

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

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
 
 /*

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
  *

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.                             *
  *                                                                            *

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
  *

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
  *

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
  *

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
  *

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
 

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.

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.

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.

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
  *

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)

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>

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);

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

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;

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