From 0db8cd28d8831f96427d6d2502f25f868a1113e1 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 17 Nov 2016 18:53:12 -0300 Subject: [PATCH] test --- src/bitcoin-cli.cpp | 1 - src/komodo.h | 11 ----------- src/komodo_globals.h | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 982e27688..53204a8c4 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -59,7 +59,6 @@ public: #include "uint256.h" #include "arith_uint256.h" -int8_t Minerids[1024 * 1024 * 5]; // 5 million blocks #include "komodo_structs.h" #include "komodo_globals.h" diff --git a/src/komodo.h b/src/komodo.h index 069019fd5..38f9a68b1 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -39,17 +39,6 @@ #include "komodo_structs.h" -FILE *Minerfp; -int8_t Minerids[KOMODO_MAXBLOCKS]; // 5 million blocks -#define KOMODO_ELECTION_GAP ((ASSETCHAINS_SYMBOL[0] == 0) ? 2000 : 100) - -int32_t KMDHEIGHT = 43000; - -struct pax_transaction *PAX; -int32_t NUM_PRICES; uint32_t *PVALS; -struct knotaries_entry *Pubkeys; -struct nutxo_entry *NUTXOS; int32_t Num_nutxos; -struct notarized_checkpoint *NPOINTS; int32_t NUM_NPOINTS; struct komodo_state { diff --git a/src/komodo_globals.h b/src/komodo_globals.h index bd04931ae..cf3241407 100644 --- a/src/komodo_globals.h +++ b/src/komodo_globals.h @@ -22,6 +22,20 @@ void komodo_assetchain_pubkeys(char *jsonstr); int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33); pthread_mutex_t komodo_mutex; + +FILE *Minerfp; +int8_t Minerids[KOMODO_MAXBLOCKS]; // 5 million blocks +#define KOMODO_ELECTION_GAP ((ASSETCHAINS_SYMBOL[0] == 0) ? 2000 : 100) + +int32_t KMDHEIGHT = 43000; + +struct pax_transaction *PAX; +int32_t NUM_PRICES; uint32_t *PVALS; +struct knotaries_entry *Pubkeys; +struct nutxo_entry *NUTXOS; int32_t Num_nutxos; +struct notarized_checkpoint *NPOINTS; int32_t NUM_NPOINTS; + + int COINBASE_MATURITY = 100; int32_t IS_KOMODO_NOTARY,USE_EXTERNAL_PUBKEY,KOMODO_CHOSEN_ONE,ASSETCHAINS_SEED,KOMODO_ON_DEMAND;