diff --git a/basilisk/basilisk_CMD.c b/basilisk/basilisk_CMD.c index 8ab28efa6..d647b449f 100755 --- a/basilisk/basilisk_CMD.c +++ b/basilisk/basilisk_CMD.c @@ -33,8 +33,8 @@ struct iguana_peer *basilisk_ensurerelay(struct iguana_info *btcd,uint32_t ipbit char *basilisk_addrelay_info(struct supernet_info *myinfo,uint8_t *pubkey33,uint32_t ipbits,bits256 pubkey) { int32_t i; struct basilisk_relay *rp; struct iguana_info *btcd; - if ( (btcd= iguana_coinfind("BTCD")) == 0 ) - return(clonestr("{\"error\":\"add relay needs BTCD\"}")); + if ( (btcd= iguana_coinfind("BTCD")) == 0 || ipbits == 0 ) + return(clonestr("{\"error\":\"add relay needs BTCD and ipbits\"}")); for (i=0; inumrelays; i++) { rp = &myinfo->relays[i]; @@ -44,7 +44,7 @@ char *basilisk_addrelay_info(struct supernet_info *myinfo,uint8_t *pubkey33,uint rp->pubkey = pubkey; if ( pubkey33 != 0 && pubkey33[0] != 0 ) memcpy(rp->pubkey33,pubkey33,33); - printf("updated %x\n",ipbits); + printf("updated relay[%d] %x\n",i,ipbits); return(clonestr("{\"error\":\"relay already there\"}")); } } @@ -57,48 +57,64 @@ char *basilisk_addrelay_info(struct supernet_info *myinfo,uint8_t *pubkey33,uint if ( myinfo->numrelays < sizeof(myinfo->relays)/sizeof(*myinfo->relays) ) myinfo->numrelays++; for (i=0; inumrelays; i++) + { myinfo->relaybits[i] = myinfo->relays[i].ipbits; + printf("%x ",myinfo->relaybits[i]); + } revsort32(&myinfo->relaybits[0],myinfo->numrelays,sizeof(myinfo->relaybits[0])); + printf(" -> sorted "); + for (i=0; inumrelays; i++) + { + char ipaddr[64]; + expand_ipbits(ipaddr,myinfo->relaybits[i]); + printf("%s ",ipaddr); + } + printf("\n"); return(clonestr("{\"result\":\"relay added\"}")); } char *basilisk_respond_relays(struct supernet_info *myinfo,char *CMD,void *_addr,char *remoteaddr,uint32_t basilisktag,cJSON *valsobj,uint8_t *data,int32_t datalen,bits256 hash,int32_t from_basilisk) { - bits256 txhash2; uint32_t ipbits; int32_t i,n,len,siglen; uint8_t pubkey33[33],sig[128]; char *sigstr = 0,*retstr,pubstr[128]; + bits256 txhash2; uint32_t ipbits; int32_t i,n,len,siglen; uint8_t pubkey33[65],sig[128]; char *sigstr = 0,*retstr,pubstr[128]; if ( (sigstr= jstr(valsobj,"sig")) != 0 ) { siglen = (int32_t)strlen(sigstr) >> 1; - decode_hex(sig,siglen,sigstr); - vcalc_sha256(0,txhash2.bytes,data,datalen); - memset(pubkey33,0,33); - if ( bitcoin_recoververify(myinfo->ctx,"BTCD",sig,txhash2,pubkey33) == 0 ) + if ( siglen < sizeof(sig) ) { - // compare with existing - init_hexbytes_noT(pubstr,pubkey33,33); - printf(" verified relay data siglen.%d pub33.%s\n",siglen,pubstr); - if ( (retstr= basilisk_addrelay_info(myinfo,pubkey33,(uint32_t)calc_ipbits(remoteaddr),hash)) != 0 ) - free(retstr); - n = (int32_t)(datalen / sizeof(uint32_t)); - for (i=len=0; ictx,"BTCD",sig,txhash2,pubkey33) == 0 ) { - len += iguana_rwnum(0,(void *)&data[len],sizeof(uint32_t),&ipbits); - if ( (retstr= basilisk_addrelay_info(myinfo,0,ipbits,GENESIS_PUBKEY)) != 0 ) + // compare with existing + init_hexbytes_noT(pubstr,pubkey33,33); + printf(" verified relay data siglen.%d pub33.%s\n",siglen,pubstr); + if ( (retstr= basilisk_addrelay_info(myinfo,pubkey33,(uint32_t)calc_ipbits(remoteaddr),hash)) != 0 ) free(retstr); - } - } else printf("error relay data sig.%d didnt verify\n",siglen); + n = (int32_t)(datalen / sizeof(uint32_t)); + for (i=len=0; irelaybits)]; cJSON *vals; bits256 hash; char *retstr,hexstr[sizeof(myinfo->relaybits)*2 + 1]; + int32_t i,siglen,len = 0; char strbuf[512]; bits256 txhash2; uint8_t sig[128],serialized[sizeof(myinfo->relaybits)]; cJSON *vals; bits256 hash; char *retstr,hexstr[sizeof(myinfo->relaybits)*2 + 1]; if ( myinfo != 0 ) { vals = cJSON_CreateObject(); hash = myinfo->myaddr.persistent; for (i=0; inumrelays; i++) len += iguana_rwnum(1,&serialized[len],sizeof(uint32_t),&myinfo->relaybits[i]); + init_hexbytes_noT(hexstr,serialized,len); + printf("send relays.(%s)\n",hexstr); vcalc_sha256(0,txhash2.bytes,serialized,len); if ( (siglen= bitcoin_sign(myinfo->ctx,"BTCD",sig,txhash2,myinfo->persistent_priv,1)) > 0 ) { diff --git a/iguana/iguana_secp.c b/iguana/iguana_secp.c index d9588f387..ce95fa522 100755 --- a/iguana/iguana_secp.c +++ b/iguana/iguana_secp.c @@ -158,14 +158,15 @@ int32_t bitcoin_recoververify(void *ctx,char *symbol,uint8_t *sig65,bits256 mess secp256k1_ecdsa_recoverable_signature_convert(ctx,&SIG,&rSIG); if ( secp256k1_ecdsa_recover(ctx,&PUB,&rSIG,messagehash2.bytes) != 0 ) { - secp256k1_ec_pubkey_serialize(ctx,pubkey,&plen,&PUB,plen == 65 ? SECP256K1_EC_UNCOMPRESSED : SECP256K1_EC_COMPRESSED); + plen = 33; + secp256k1_ec_pubkey_serialize(ctx,pubkey,&plen,&PUB,SECP256K1_EC_COMPRESSED);//plen == 65 ? SECP256K1_EC_UNCOMPRESSED : SECP256K1_EC_COMPRESSED); if ( secp256k1_ecdsa_verify(ctx,&SIG,messagehash2.bytes,&PUB) != 0 ) { retval = 0; - if ( pubkey[0] == 4 ) // experimentally looks like 04 is set + /*if ( pubkey[0] == 4 ) // experimentally looks like 04 is set pubkey[0] = 2; else if ( pubkey[0] != 2 ) - pubkey[0] = 3; + pubkey[0] = 3;*/ } else printf("secp256k1_ecdsa_verify error\n"); } else printf("secp256k1_ecdsa_recover error\n");