jl777 8 years ago
parent
commit
6518a0eb6a
  1. 1
      iguana/dpow/dpow_network.c
  2. 2
      iguana/dpow/dpow_rpc.c
  3. 6
      iguana/dpow/dpow_tx.c
  4. 2
      iguana/iguana_sign.c
  5. 3
      iguana/tests/sign

1
iguana/dpow/dpow_network.c

@ -239,7 +239,6 @@ void dpow_ratify_update(struct supernet_info *myinfo,struct dpow_info *dp,struct
if ( bp->state < 1000 ) if ( bp->state < 1000 )
{ {
dpow_sigscheck(myinfo,dp,bp,bp->myind,1,bp->pendingratifybestk,bp->pendingratifybestmask,bp->ratified_pubkeys,bp->numratified); dpow_sigscheck(myinfo,dp,bp,bp->myind,1,bp->pendingratifybestk,bp->pendingratifybestmask,bp->ratified_pubkeys,bp->numratified);
bp->state = 1000;
} }
if ( bp->ratifysigmasks[0] == bp->pendingratifybestmask ) // have all sigs if ( bp->ratifysigmasks[0] == bp->pendingratifybestmask ) // have all sigs
{ {

2
iguana/dpow/dpow_rpc.c

@ -192,7 +192,7 @@ cJSON *dpow_listunspent(struct supernet_info *myinfo,struct iguana_info *coin,ch
char *dpow_signrawtransaction(struct supernet_info *myinfo,struct iguana_info *coin,char *rawtx,cJSON *vins) char *dpow_signrawtransaction(struct supernet_info *myinfo,struct iguana_info *coin,char *rawtx,cJSON *vins)
{ {
cJSON *array,*privkeys,*item; char *wifstr,*str,*paramstr,*retstr; uint8_t script[256]; int32_t i,n,len,hashtype; struct vin_info V; struct iguana_waddress *waddr; struct iguana_waccount *wacct; cJSON *array,*privkeys,*item; char *wifstr,*str,*paramstr,*retstr; uint8_t script[256]; int32_t i,n,len,hashtype; struct vin_info V; struct iguana_waddress *waddr; struct iguana_waccount *wacct;
if ( coin->FULLNODE < 0 ) if ( 0 && coin->FULLNODE < 0 )
{ {
array = cJSON_CreateArray(); array = cJSON_CreateArray();
jaddistr(array,rawtx); jaddistr(array,rawtx);

6
iguana/dpow/dpow_tx.c

@ -448,7 +448,11 @@ int32_t dpow_signedtxgen(struct supernet_info *myinfo,struct dpow_info *dp,struc
} }
} }
} }
} else printf("signrawtransaction error vins.(%s) rawtx.(%s)\n",jprint(vins,0),rawtx); }
else
{
printf("signrawtransaction error vins.(%s) rawtx.(%s)\n",jprint(vins,0),rawtx);
}
} else dpow_rawtxsign(myinfo,dp,coin,bp,rawtx,vins,bestk,bestmask,myind,src_or_dest); } else dpow_rawtxsign(myinfo,dp,coin,bp,rawtx,vins,bestk,bestmask,myind,src_or_dest);
} else printf("signedtxgen zero txid or null rawtx\n"); } else printf("signedtxgen zero txid or null rawtx\n");
free_json(vins); free_json(vins);

2
iguana/iguana_sign.c

@ -1491,7 +1491,7 @@ STRING_ARRAY_OBJ_STRING(bitcoinrpc,signrawtransaction,rawtx,vins,privkeys,sighas
return(clonestr("{\"error\":\"no remote\"}")); return(clonestr("{\"error\":\"no remote\"}"));
if ( myinfo->expiration == 0 ) if ( myinfo->expiration == 0 )
return(clonestr("{\"error\":\"need to unlock wallet\"}")); return(clonestr("{\"error\":\"need to unlock wallet\"}"));
//printf("rawtx.(%s) vins.(%s) privkeys.(%s) sighash.(%s)\n",rawtx,jprint(vins,0),jprint(privkeys,0),sighash); printf("rawtx.(%s) vins.(%s) privkeys.(%s) sighash.(%s)\n",rawtx,jprint(vins,0),jprint(privkeys,0),sighash);
if ( sighash == 0 || sighash[0] == 0 ) if ( sighash == 0 || sighash[0] == 0 )
sighash = "ALL"; sighash = "ALL";
if ( strcmp(sighash,"ALL") != 0 ) if ( strcmp(sighash,"ALL") != 0 )

3
iguana/tests/sign

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save