This commit is contained in:
jl777
2016-11-17 18:29:04 -03:00
parent 9fb3716807
commit 40d4047da2
3 changed files with 12 additions and 11 deletions

View File

@@ -97,6 +97,11 @@ struct komodo_state *komodo_stateptr(char *symbol,char *dest)
return(sp); return(sp);
} }
void komodo_setkmdheight(int32_t kmdheight)
{
if ( kmdheight > KMDHEIGHT )
KMDHEIGHT = kmdheight;
}
#include "cJSON.c" #include "cJSON.c"
#include "komodo_bitcoind.h" #include "komodo_bitcoind.h"
@@ -106,11 +111,6 @@ struct komodo_state *komodo_stateptr(char *symbol,char *dest)
#include "komodo_gateway.h" #include "komodo_gateway.h"
#include "komodo_events.h" #include "komodo_events.h"
void komodo_setkmdheight(int32_t kmdheight)
{
if ( kmdheight > KMDHEIGHT )
KMDHEIGHT = kmdheight;
}
void komodo_currentheight_set(int32_t height) void komodo_currentheight_set(int32_t height)
{ {

View File

@@ -463,7 +463,7 @@ void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height)
} }
} }
void komodo_currentheight_set(int32_t height); void komodo_currentheight();
int8_t komodo_minerid(int32_t height) int8_t komodo_minerid(int32_t height)
{ {
static uint32_t depth; static uint32_t depth;

View File

@@ -63,7 +63,7 @@ struct komodo_event *komodo_eventadd(int32_t height,char *symbol,uint8_t type,ui
strcpy(ep->symbol,symbol); strcpy(ep->symbol,symbol);
if ( datalen != 0 ) if ( datalen != 0 )
memcpy(ep->space,data,datalen); memcpy(ep->space,data,datalen);
Komodo_events = realloc(Komodo_events,(1 + Komodo_numevents) * sizeof(*Komodo_events)); Komodo_events = (struct komodo_event **)realloc(Komodo_events,(1 + Komodo_numevents) * sizeof(*Komodo_events));
Komodo_events[Komodo_numevents++] = ep; Komodo_events[Komodo_numevents++] = ep;
return(ep); return(ep);
} }
@@ -72,8 +72,8 @@ void komodo_eventadd_notarized(struct komodo_state *sp,char *symbol,int32_t heig
{ {
struct komodo_event_notarized N; struct komodo_event_notarized N;
memset(&N,0,sizeof(N)); memset(&N,0,sizeof(N));
N.blockhash = blockhash; N.blockhash = notarized_hash;
N.desttxid = desttxid; N.desttxid = notarized_desttxid;
N.notarizedheight = notarizedheight; N.notarizedheight = notarizedheight;
strcpy(N.dest,dest); strcpy(N.dest,dest);
komodo_eventadd(height,symbol,KOMODO_EVENT_NOTARIZED,(uint8_t *)&N,sizeof(N)); komodo_eventadd(height,symbol,KOMODO_EVENT_NOTARIZED,(uint8_t *)&N,sizeof(N));
@@ -92,7 +92,7 @@ void komodo_eventadd_pubkeys(struct komodo_state *sp,char *symbol,int32_t height
komodo_notarysinit(height,pubkeys,num); komodo_notarysinit(height,pubkeys,num);
} }
void komodo_eventadd_utxo(struct komodo_state *sp,char *symbol,int32_t height,uint8_t notaryid,bits256 txid,uint64_t voutmask,uint8_t numvouts) void komodo_eventadd_utxo(struct komodo_state *sp,char *symbol,int32_t height,uint8_t notaryid,uint256 txid,uint64_t voutmask,uint8_t numvouts)
{ {
struct komodo_event_utxo U; struct komodo_event_utxo U;
memset(&U,0,sizeof(U)); memset(&U,0,sizeof(U));
@@ -122,7 +122,7 @@ void komodo_eventadd_kmdheight(struct komodo_state *sp,char *symbol,int32_t heig
komodo_setkmdheight(kmdheight); komodo_setkmdheight(kmdheight);
} }
void komodo_eventadd_opreturn(struct komodo_state *sp,char *symbol,int32_t height,bits256 txid,uint64_t value,uint16_t vout,uint8_t *buf,uint16_t opretlen) void komodo_eventadd_opreturn(struct komodo_state *sp,char *symbol,int32_t height,uint256 txid,uint64_t value,uint16_t vout,uint8_t *buf,uint16_t opretlen)
{ {
struct komodo_event_opreturn O; uint8_t opret[10000]; struct komodo_event_opreturn O; uint8_t opret[10000];
memset(&O,0,sizeof(O)); memset(&O,0,sizeof(O));
@@ -153,6 +153,7 @@ void komodo_event_undo(struct komodo_event *ep)
void komodo_event_rewind(int32_t height) void komodo_event_rewind(int32_t height)
{ {
struct komodo_event *ep;
while ( Komodo_numevents > 0 ) while ( Komodo_numevents > 0 )
{ {
if ( (ep= Komodo_events[Komodo_numevents-1]) != 0 ) if ( (ep= Komodo_events[Komodo_numevents-1]) != 0 )