From 98f2e4331e5b615cb58dcf2464b7be97cf5ef1e6 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 29 Oct 2016 13:02:44 -0300 Subject: [PATCH] test --- src/bitcoin-cli.cpp | 1 + src/komodo.h | 2 +- src/komodo_globals.h | 32 ++++++++++++++++++++++++++++++++ src/komodo_utils.h | 18 ------------------ 4 files changed, 34 insertions(+), 19 deletions(-) create mode 100644 src/komodo_globals.h diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 5eba11036..b456e5c05 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -58,6 +58,7 @@ public: #include "uint256.h" #include "arith_uint256.h" +#include "komodo_globals.h" #include "komodo_utils.h" static bool AppInitRPC(int argc, char* argv[]) diff --git a/src/komodo.h b/src/komodo.h index b71124fc7..18fb286a4 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -29,7 +29,7 @@ int32_t komodo_notarizeddata(int32_t nHeight,uint256 *notarized_hashp,uint256 *n char *komodo_issuemethod(char *method,char *params,uint16_t port); #define GENESIS_NBITS 0x1f00ffff - +#include "komodo_globals.h" #include "komodo_utils.h" queue_t DepositsQ,PendingsQ; diff --git a/src/komodo_globals.h b/src/komodo_globals.h new file mode 100644 index 000000000..119a722ef --- /dev/null +++ b/src/komodo_globals.h @@ -0,0 +1,32 @@ +/****************************************************************************** + * Copyright © 2014-2016 The SuperNET Developers. * + * * + * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * + * the top-level directory of this distribution for the individual copyright * + * holder information and the developer policies on copyright and licensing. * + * * + * Unless otherwise agreed in a custom licensing agreement, no part of the * + * SuperNET software, including this file may be copied, modified, propagated * + * or distributed except according to the terms contained in the LICENSE file * + * * + * Removal or modification of this copyright notice is prohibited. * + * * + ******************************************************************************/ + +int32_t IS_KOMODO_NOTARY,USE_EXTERNAL_PUBKEY; +std::string NOTARY_PUBKEY; +uint8_t NOTARY_PUBKEY33[33]; + +int32_t ASSETCHAINS_SHORTFLAG; +char ASSETCHAINS_SYMBOL[16]; +uint16_t ASSETCHAINS_PORT; +uint32_t ASSETCHAIN_INIT; +uint32_t ASSETCHAINS_MAGIC = 2387029918; +uint64_t ASSETCHAINS_SUPPLY = 10; + +int32_t NOTARIZED_HEIGHT,Num_nutxos,KMDHEIGHT = 43000; +uint256 NOTARIZED_HASH,NOTARIZED_DESTTXID; +pthread_mutex_t komodo_mutex; +uint32_t KOMODO_INITDONE; +char KMDUSERPASS[1024]; uint16_t BITCOIND_PORT = 7771; +uint64_t KOMODO_DEPOSIT,PENDING_KOMODO_TX; diff --git a/src/komodo_utils.h b/src/komodo_utils.h index 990a3e294..f495865b8 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -13,24 +13,6 @@ * * ******************************************************************************/ -int32_t IS_KOMODO_NOTARY,USE_EXTERNAL_PUBKEY; -std::string NOTARY_PUBKEY; -uint8_t NOTARY_PUBKEY33[33]; - -int32_t ASSETCHAINS_SHORTFLAG; -char ASSETCHAINS_SYMBOL[16]; -uint16_t ASSETCHAINS_PORT; -uint32_t ASSETCHAIN_INIT; -uint32_t ASSETCHAINS_MAGIC = 2387029918; -uint64_t ASSETCHAINS_SUPPLY = 10; - -int32_t NOTARIZED_HEIGHT,Num_nutxos,KMDHEIGHT = 43000; -uint256 NOTARIZED_HASH,NOTARIZED_DESTTXID; -pthread_mutex_t komodo_mutex; -uint32_t KOMODO_INITDONE; -char KMDUSERPASS[1024]; uint16_t BITCOIND_PORT = 7771; -uint64_t KOMODO_DEPOSIT,PENDING_KOMODO_TX; - #define SATOSHIDEN ((uint64_t)100000000L) #define dstr(x) ((double)(x) / SATOSHIDEN) #define portable_mutex_t pthread_mutex_t