jl777 8 years ago
parent
commit
731ee76104
  1. 2
      iguana/dpow/dpow_network.c
  2. 8
      iguana/dpow/dpow_tx.c

2
iguana/dpow/dpow_network.c

@ -279,7 +279,7 @@ void dpow_sigsend(struct supernet_info *myinfo,struct dpow_block *bp,int32_t myi
{
struct dpow_sigentry dsig; int32_t i,len; uint8_t data[4096]; struct dpow_entry *ep;
ep = &bp->notaries[myind];
printf("sigsend: myind.%d bestk.%d %llx >>>>>> broadcast\n",myind,bestk,(long long)bestmask);
printf("sigsend.%s: myind.%d bestk.%d %llx >>>>>> broadcast\n",sigchannel == DPOW_SIGCHANNEL ? bp->srccoin->symbol : bp->destcoin->symbol,myind,bestk,(long long)bestmask);
memset(&dsig,0,sizeof(dsig));
for (i=0; i<33; i++)
dsig.senderpub[i] = myinfo->DPOW.minerkey33[i];

8
iguana/dpow/dpow_tx.c

@ -182,9 +182,10 @@ void dpow_rawtxsign(struct supernet_info *myinfo,struct iguana_info *coin,struct
m = 0;
ep = &bp->notaries[myind];
cp = (src_or_dest != 0) ? &bp->notaries[myind].dest : &bp->notaries[myind].src;
if ( src_or_dest == 0 )
printf("bestk.%d mask.%llx dpowsign.(%s)\n",bestk,(long long)bestmask,rawtx);
if ( (jsonstr= dpow_signrawtransaction(myinfo,coin,rawtx,vins)) != 0 )
{
//printf("bestk.%d mask.%llx dpowsign.(%s)\n",bestk,(long long)bestmask,jsonstr);
if ( (signobj= cJSON_Parse(jsonstr)) != 0 )
{
if ( ((signedtx= jstr(signobj,"hex")) != 0 || (signedtx= jstr(signobj,"result")) != 0) && (rawtx2= dpow_decoderawtransaction(myinfo,coin,signedtx)) != 0 )
@ -228,6 +229,8 @@ int32_t dpow_signedtxgen(struct supernet_info *myinfo,struct iguana_info *coin,s
if ( bp->numnotaries < 8 )
incr = 1;
else incr = sqrt(bp->numnotaries) + 1;
if ( src_or_dest == 0 )
printf("signedtxgen KMD\n");
bestmask = dpow_maskmin(bestmask,bp,&bestk);
ep = &bp->notaries[myind];
memset(&zero,0,sizeof(zero));
@ -264,7 +267,7 @@ void dpow_sigscheck(struct supernet_info *myinfo,struct dpow_block *bp,uint32_t
if ( bp->state != 0xffffffff && coin != 0 )
{
signedtxid = dpow_notarytx(bp->signedtx,&numsigs,coin->chain->isPoS,bp,bp->bestk,bp->bestmask,bp->opret_symbol,1,src_or_dest);
printf("%s numsigs.%d signedtx.(%s)\n",bits256_str(str,signedtxid),numsigs,bp->signedtx);
printf("bestk.%d %llx %s numsigs.%d signedtx.(%s)\n",bp->bestk,(long long)bp->bestmask,bits256_str(str,signedtxid),numsigs,bp->signedtx);
bp->state = 1;
if ( bits256_nonz(signedtxid) != 0 && numsigs == DPOW_M(bp) )
{
@ -279,6 +282,7 @@ void dpow_sigscheck(struct supernet_info *myinfo,struct dpow_block *bp,uint32_t
if ( src_or_dest != 0 )
{
bp->desttxid = txid;
printf("send out KMD sig\n");
dpow_signedtxgen(myinfo,bp->srccoin,bp,bp->bestk,bp->bestmask,myind,bp->srccoin->symbol,DPOW_SIGCHANNEL,0);
}
else bp->srctxid = txid;

Loading…
Cancel
Save