diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index 44656808c..4d51f8df6 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -463,7 +463,7 @@ void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height) } } -void komodo_currentheight(); +int32_t komodo_currentheight(); int8_t komodo_minerid(int32_t height) { static uint32_t depth; diff --git a/src/komodo_events.h b/src/komodo_events.h index 18853ef0f..600dac2d6 100644 --- a/src/komodo_events.h +++ b/src/komodo_events.h @@ -35,10 +35,10 @@ #define KOMODO_OPRETURN_WITHDRAW 'W' // assetchain #define KOMODO_OPRETURN_REDEEMED 'X' -struct komodo_event_notarized { bits256 blockhash,desttxid; int32_t notarizedheight; char dest[16]; } PACKED; +struct komodo_event_notarized { uint256 blockhash,desttxid; int32_t notarizedheight; char dest[16]; } PACKED; struct komodo_event_pubkeys { uint8_t num; uint8_t pubkeys[64][33]; } PACKED; -struct komodo_event_utxo { bits256 txid; uint64_t voutmask; uint8_t numvouts; } PACKED; -struct komodo_event_opreturn { bits256 txid; uint64_t value; uint16_t vout,oplen; uint8_t opret[]; } PACKED; +struct komodo_event_utxo { uint256 txid; uint64_t voutmask; uint8_t numvouts; } PACKED; +struct komodo_event_opreturn { uint256 txid; uint64_t value; uint16_t vout,oplen; uint8_t opret[]; } PACKED; struct komodo_event_pricefeed { uint8_t num; uint32_t prices[35]; } PACKED; struct komodo_event