This commit is contained in:
jl777
2019-02-21 22:05:27 -11:00
parent d84a9afe6f
commit 101a415379

View File

@@ -297,17 +297,12 @@ UniValue musig_session(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
MUSIG = musig_infocreate(myind,num); MUSIG = musig_infocreate(myind,num);
if ( musig_parsepubkey(ctx,MUSIG->combined_pk,jitem(params,2)) < 0 ) if ( musig_parsepubkey(ctx,MUSIG->combined_pk,jitem(params,2)) < 0 )
return(cclib_error(result,"error parsing combined_pubkey")); return(cclib_error(result,"error parsing combined_pubkey"));
{ else if ( musig_parsehash32(MUSIG->pkhash,jitem(params,3)) < 0 )
if ( musig_parsehash32(MUSIG->pkhash,jitem(params,3)) < 0 )
return(cclib_error(result,"error parsing pkhash")); return(cclib_error(result,"error parsing pkhash"));
if ( musig_parsehash32(MUSIG->msg,jitem(params,4)) < 0 ) else if ( musig_parsehash32(MUSIG->msg,jitem(params,4)) < 0 )
return(cclib_error(result,"error parsing msg")); return(cclib_error(result,"error parsing msg"));
Myprivkey(privkey); Myprivkey(privkey);
GetRandBytes(session,32); GetRandBytes(session,32);
for (i=0; i<32; i++)
sprintf(&str[i<<1],"%02x",session[i]);
str[64] = 0;
fprintf(stderr,"session %s\n",str);
/** Initializes a signing session for a signer /** Initializes a signing session for a signer
* *
* Returns: 1: session is successfully initialized * Returns: 1: session is successfully initialized
@@ -351,7 +346,6 @@ UniValue musig_session(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
memset(session,0,sizeof(session)); memset(session,0,sizeof(session));
return(cclib_error(result,"couldnt initialize session")); return(cclib_error(result,"couldnt initialize session"));
} }
} else return(cclib_error(result,"couldnt parse combined pubkey"));
} else return(cclib_error(result,"wrong number of params, need 5: myindex, numsigners, combined_pk, pkhash, msg32")); } else return(cclib_error(result,"wrong number of params, need 5: myindex, numsigners, combined_pk, pkhash, msg32"));
} }