DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix

Browse Source
This commit is contained in:
jl777
2019-02-21 22:05:27 -11:00
parent d84a9afe6f
commit 101a415379
1 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/cc/musig.cpp
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")); else if ( musig_parsehash32(MUSIG->msg,jitem(params,4)) < 0 )
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
@@ -334,24 +329,23 @@ UniValue musig_session(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
* my_index: index of this signer in the signers array * my_index: index of this signer in the signers array
* seckey: the signer's 32-byte secret key (cannot be NULL) * seckey: the signer's 32-byte secret key (cannot be NULL)
*/ */
if ( secp256k1_musig_session_initialize(ctx,&MUSIG->musig_session,MUSIG->signer_data, &MUSIG->nonce_commitments[MUSIG->myind * 32],session,MUSIG->msg,&MUSIG->combined_pk,MUSIG->pkhash,MUSIG->num,MUSIG->myind,privkey) > 0 ) if ( secp256k1_musig_session_initialize(ctx,&MUSIG->musig_session,MUSIG->signer_data, &MUSIG->nonce_commitments[MUSIG->myind * 32],session,MUSIG->msg,&MUSIG->combined_pk,MUSIG->pkhash,MUSIG->num,MUSIG->myind,privkey) > 0 )
{ {
memset(session,0,sizeof(session)); memset(session,0,sizeof(session));
result.push_back(Pair("myind",(int64_t)myind)); result.push_back(Pair("myind",(int64_t)myind));
result.push_back(Pair("numsigners",(int64_t)num)); result.push_back(Pair("numsigners",(int64_t)num));
for (i=0; i<32; i++) for (i=0; i<32; i++)
sprintf(&str[i<<1],"%02x",MUSIG->nonce_commitments[MUSIG->myind*32 + i]); sprintf(&str[i<<1],"%02x",MUSIG->nonce_commitments[MUSIG->myind*32 + i]);
str[64] = 0; str[64] = 0;
result.push_back(Pair("commitment",str)); result.push_back(Pair("commitment",str));
result.push_back(Pair("result","success")); result.push_back(Pair("result","success"));
return(result); return(result);
} }
else else
{ {
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"));
} }