Browse Source
Merge pull request #234 from jl777/dev
Update from upstream repo jl777/SuperNET@dev
blackjok3r
jl777
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
iguana/dpow/dpow_rpc.c
-
iguana/m_unix
|
|
|
@ -288,7 +288,7 @@ int32_t dpow_paxpending(struct supernet_info *myinfo,uint8_t *hex,int32_t hexsiz |
|
|
|
n += iguana_rwbignum(1,&hex[n],sizeof(MoM),MoM.bytes); |
|
|
|
MoMdepth = (MoMdepth & 0xffff) | ((uint32_t)CCid<<16); |
|
|
|
n += iguana_rwnum(1,&hex[n],sizeof(MoMdepth),(uint32_t *)&MoMdepth); |
|
|
|
if ( strncmp(bp->srccoin->symbol,"TXSCL",5) == 0 && src_or_dest == 0 && strcmp(bp->destcoin->symbol,"KMD") == 0 ) |
|
|
|
if ( src_or_dest == 0 && strcmp(bp->destcoin->symbol,"KMD") == 0 ) //strncmp(bp->srccoin->symbol,"TXSCL",5) == 0 &&
|
|
|
|
{ |
|
|
|
kmdcoin = bp->destcoin; |
|
|
|
if ( (infojson= dpow_getinfo(myinfo,kmdcoin)) != 0 ) |
|
|
|
@ -301,7 +301,7 @@ int32_t dpow_paxpending(struct supernet_info *myinfo,uint8_t *hex,int32_t hexsiz |
|
|
|
if ( (hexstr= jstr(retjson,"data")) != 0 && (hexlen= (int32_t)strlen(hexstr)) > 0 && n+hexlen/2 <= hexsize ) |
|
|
|
{ |
|
|
|
hexlen >>= 1; |
|
|
|
printf("add MoMoMdata.(%s)\n",hexstr); |
|
|
|
//printf("add MoMoMdata.(%s)\n",hexstr);
|
|
|
|
decode_hex(&hex[n],hexlen,hexstr), n += hexlen; |
|
|
|
} |
|
|
|
free_json(retjson); |
|
|
|
|
|
|
|
@ -9,4 +9,4 @@ cd secp256k1; ./m_unix; cd .. |
|
|
|
cd ../crypto777; ./m_unix; cd ../iguana |
|
|
|
gcc -g -fno-aggressive-loop-optimizations -Wno-deprecated -c *.c ../basilisk/basilisk.c ../gecko/gecko.c ../datachain/datachain.c |
|
|
|
gcc -g -fno-aggressive-loop-optimizations -Wno-deprecated -c main.c iguana777.c iguana_bundles.c ../basilisk/basilisk.c |
|
|
|
gcc -g -o ../agents/iguana *.o ../agents/libcrypto777.a -lpthread -lm -lnanomsg -lcurl |
|
|
|
gcc -g -o ../agents/iguana *.o ../agents/libcrypto777.a -lpthread -lm -lnanomsg -lcurl -lsodium |
|
|
|
|
