From e4e76989a06934e369704b2f13f4a1e3ba68cded Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 17 Nov 2016 18:21:56 -0300 Subject: [PATCH] test --- src/komodo.h | 32 ++++++++++++++++---------------- src/komodo_bitcoind.h | 1 + src/komodo_notary.h | 2 +- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index 5dde73472..f0276b46e 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -71,23 +71,7 @@ struct komodo_state // gateway state } KOMODO_STATES[33]; -#include "komodo_globals.h" #include "komodo_utils.h" - -#include "cJSON.c" -#include "komodo_bitcoind.h" -#include "komodo_interest.h" -#include "komodo_pax.h" -#include "komodo_notary.h" -#include "komodo_gateway.h" -#include "komodo_events.h" - -void komodo_setkmdheight(int32_t kmdheight) -{ - if ( kmdheight > KMDHEIGHT ) - KMDHEIGHT = kmdheight; -} - struct komodo_state *komodo_stateptr(char *symbol,char *dest) { int32_t baseid; struct komodo_state *sp; @@ -112,6 +96,22 @@ struct komodo_state *komodo_stateptr(char *symbol,char *dest) return(sp); } +#include "komodo_globals.h" + +#include "cJSON.c" +#include "komodo_bitcoind.h" +#include "komodo_interest.h" +#include "komodo_pax.h" +#include "komodo_notary.h" +#include "komodo_gateway.h" +#include "komodo_events.h" + +void komodo_setkmdheight(int32_t kmdheight) +{ + if ( kmdheight > KMDHEIGHT ) + KMDHEIGHT = kmdheight; +} + void komodo_currentheight_set(int32_t height) { char symbol[16],dest[16]; struct komodo_state *sp; diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index c4e5b9822..60dc16c97 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -463,6 +463,7 @@ void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height) } } +void komodo_currentheight_set(int32_t height); int8_t komodo_minerid(int32_t height) { static uint32_t depth; diff --git a/src/komodo_notary.h b/src/komodo_notary.h index 8fc4f765a..195d8c210 100644 --- a/src/komodo_notary.h +++ b/src/komodo_notary.h @@ -120,7 +120,7 @@ int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height) void komodo_notarysinit(int32_t origheight,uint8_t pubkeys[64][33],int32_t num) { static int32_t hwmheight; - int32_t k,i,htind,nonz; struct knotary_entry *kp; struct knotaries_entry N; + int32_t k,i,htind,nonz,height; struct knotary_entry *kp; struct knotaries_entry N; if ( Pubkeys == 0 ) Pubkeys = (struct knotaries_entry *)calloc(KOMODO_MAXBLOCKS / KOMODO_ELECTION_GAP,sizeof(*Pubkeys)); memset(&N,0,sizeof(N));