diff --git a/iguana/databases/cdb-0.75/cdb_make.c b/iguana/databases/cdb-0.75/cdb_make.c index 91a7e60b5..790c7bdac 100644 --- a/iguana/databases/cdb-0.75/cdb_make.c +++ b/iguana/databases/cdb-0.75/cdb_make.c @@ -154,63 +154,3 @@ int cdb_make_finish(struct cdb_make *c) return buffer_putflush(&c->b,c->final,sizeof c->final); } -#include "../../../includes/cJSON.h" -int32_t cdb_jsonmake(struct cdb_make c,cJSON *array,char *dest,char *tmpname) -{ - uint32_t klen,dlen,i,n,h; char *field,*value; int32_t fd; cJSON *item; - if ( (fd= open_trunc(tmpname)) == -1 ) - return(-1); - if ( cdb_make_start(&c,fd) == -1 ) - { - close(fd); - return(-2); - } - if ( (n= cJSON_GetArraySize(array)) > 0 ) - { - for (i=0; i 0) - { - value = jprint(item,0); - if ( (dlen= str_len(value)) > 0 ) - { - if ( klen > 429496720 || dlen > 429496720 || cdb_make_addbegin(&c,klen,dlen) == -1 ) - { - close(fd); - free(value); - return(-3); - } - h = CDB_HASHSTART; - for (i=0; i 0 ) + { + for (i=0; i 0) + { + value = jprint(item,0); + if ( (dlen= str_len(value)) > 0 ) + { + if ( klen > 429496720 || dlen > 429496720 || cdb_make_addbegin(&cdb,klen,dlen) == -1 ) + { + close(fd); + free(value); + return(-3); + } + h = CDB_HASHSTART; + for (i=0; iRTheight,bp->hdrsi); + printf("RTspendvectors calculated to %d [%d]\n",coin->RTheight,bp->hdrsi); bp->converted = 1; for (hdrsi=num=0; hdrsihdrsi; hdrsi++) { @@ -2373,7 +2373,7 @@ void iguana_RTspendvectors(struct iguana_info *coin,struct iguana_bundle *bp) #endif num += iguana_convert(coin,IGUANA_NUMHELPERS,coin->bundles[hdrsi],1,orignumemit); } - printf("spendvectors converted.%d to %d\n",num,coin->RTheight); + printf("RTspendvectors converted.%d to %d\n",num,coin->RTheight); bp->converted = (uint32_t)time(NULL); if ( iguana_balancegen(coin,1,bp,coin->RTstarti,coin->RTheight > 0 ? coin->RTheight-1 : bp->n-1,orignumemit) < 0 ) coin->RTdatabad = 1; diff --git a/iguana/m_unix b/iguana/m_unix index 59f3c04d2..52f17d6e6 100755 --- a/iguana/m_unix +++ b/iguana/m_unix @@ -1,6 +1,6 @@ #./configure --enable-endomorphism --enable-module-ecdh --enable-module-schnorr --enable-module-rangeproof --enable-experimental rm ../agents/iguana git pull -gcc -g -Wno-deprecated -c -O2 *.c +gcc -g -Wno-deprecated -c -O2 *.c databases/iguana_DB.c gcc -g -Wno-deprecated -c main.c iguana777.c iguana_bundles.c gcc -g -o ../agents/iguana *.o ../agents/libcrypto777.a -lcurl -lssl -lcrypto -lpthread -lm ../includes/libsecp256k1.a -lgmp