lukechilds
/
SuperNET
mirror of https://github.com/lukechilds/SuperNET.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

dex_notaries

etomic
jl777 8 years ago
parent
5f6ab3476f
commit
99a5389331
6 changed files with 87 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      iguana/dPoW.h
  2. 2
      iguana/dpow/dpow_fsm.c
  3. 74
      iguana/dpow/dpow_network.c
  4. 2
      iguana/dpow/dpow_rpc.c
  5. 2
      iguana/iguana777.h
  6. 18
      iguana/main.c

3
iguana/dPoW.h
View File

@ -178,5 +178,8 @@ char *_dex_validateaddress(struct supernet_info *myinfo,char *symbol,char *addre
char *_dex_listunspent(struct supernet_info *myinfo,char *symbol,char *address); char *_dex_listunspent(struct supernet_info *myinfo,char *symbol,char *address);
char *_dex_listtransactions(struct supernet_info *myinfo,char *symbol,char *coinaddr,int32_t count,int32_t skip); char *_dex_listtransactions(struct supernet_info *myinfo,char *symbol,char *coinaddr,int32_t count,int32_t skip);
char *_dex_alladdresses(struct supernet_info *myinfo,char *symbol); char *_dex_alladdresses(struct supernet_info *myinfo,char *symbol);
int32_t _dex_getheight(struct supernet_info *myinfo,char *symbol);
char *_dex_notaries(struct supernet_info *myinfo,char *symbol);
int32_t komodo_notaries(char *symbol,uint8_t pubkeys[64][33],int32_t height);
#endif #endif

2
iguana/dpow/dpow_fsm.c
View File

@ -293,7 +293,7 @@ void dpow_statemachinestart(void *ptr)
//printf(" <= pubkey[%d]\n",i); //printf(" <= pubkey[%d]\n",i);
memcpy(bp->notaries[i].pubkey,pubkeys[i],33); memcpy(bp->notaries[i].pubkey,pubkeys[i],33);
if ( strcmp("KMD",src->symbol) == 0 ) if ( strcmp("KMD",src->symbol) == 0 )
memcpy(myinfo->notaries[i].pubkey,pubkeys[i],33); memcpy(myinfo->notaries[i],pubkeys[i],33);
if ( memcmp(bp->notaries[i].pubkey,dp->minerkey33,33) == 0 ) if ( memcmp(bp->notaries[i].pubkey,dp->minerkey33,33) == 0 )
{ {
myind = i; myind = i;

74
iguana/dpow/dpow_network.c
View File

@ -13,9 +13,6 @@
* * * *
******************************************************************************/ ******************************************************************************/
// 1. add rpc hooks, debug
// 2. sig validate in fsm
struct signed_nnpacket struct signed_nnpacket
{ {
uint8_t sig64[64]; uint8_t sig64[64];
@ -52,8 +49,8 @@ int32_t signed_nn_send(void *ctx,bits256 privkey,int32_t sock,void *packet,int32
} }
return(-1); return(-1);
} }
//dex* api
int32_t signed_nn_recv(void **freeptrp,void *ctx,struct dpow_entry *notaries,int32_t n,int32_t sock,void *packetp) int32_t signed_nn_recv(void **freeptrp,void *ctx,uint8_t notaries[64][33],int32_t n,int32_t sock,void *packetp)
{ {
int32_t i,recvbytes; uint8_t pubkey33[33]; bits256 packethash; struct signed_nnpacket *sigpacket=0; int32_t i,recvbytes; uint8_t pubkey33[33]; bits256 packethash; struct signed_nnpacket *sigpacket=0;
*(void **)packetp = 0; *(void **)packetp = 0;
@ -66,9 +63,9 @@ int32_t signed_nn_recv(void **freeptrp,void *ctx,struct dpow_entry *notaries,int
{ {
if ( bitcoin_recoververify(ctx,"nnrecv",sigpacket->sig64,sigpacket->packethash,pubkey33,33) == 0 ) if ( bitcoin_recoververify(ctx,"nnrecv",sigpacket->sig64,sigpacket->packethash,pubkey33,33) == 0 )
{ {
for (i=0; i<n; i++) for (i=0; i<n && i<64; i++)
{ {
if ( memcmp(pubkey33,notaries[i].pubkey,33) == 0 ) if ( memcmp(pubkey33,notaries[i],33) == 0 )
{ {
*(void **)packetp = (void **)((uint64_t)sigpacket + sizeof(*sigpacket)); *(void **)packetp = (void **)((uint64_t)sigpacket + sizeof(*sigpacket));
//printf("got signed packet from notary.%d\n",i); //printf("got signed packet from notary.%d\n",i);
@ -79,13 +76,13 @@ int32_t signed_nn_recv(void **freeptrp,void *ctx,struct dpow_entry *notaries,int
{ {
int32_t j; int32_t j;
for (j=0; j<33; j++) for (j=0; j<33; j++)
printf("%02x",notaries[i].pubkey[j]); printf("%02x",notaries[i][j]);
printf(" pubkey[%d]\n",i); printf(" pubkey[%d]\n",i);
} }
} }
//for (i=0; i<33; i++) for (i=0; i<33; i++)
// printf("%02x",pubkey33[i]); printf("%02x",pubkey33[i]);
//printf(" invalid pubkey33 n.%d\n",n); printf(" invalid pubkey33 n.%d\n",n);
} else printf("recoververify error nonce.%u packetlen.%d\n",sigpacket->nonce,sigpacket->packetlen); } else printf("recoververify error nonce.%u packetlen.%d\n",sigpacket->nonce,sigpacket->packetlen);
} else printf("hash mismatch or bad nonce.%u packetlen.%d\n",sigpacket->nonce,sigpacket->packetlen); } else printf("hash mismatch or bad nonce.%u packetlen.%d\n",sigpacket->nonce,sigpacket->packetlen);
} //else printf("recvbytes.%d mismatched packetlen.%d + %ld\n",recvbytes,sigpacket!=0?sigpacket->packetlen:-1,sizeof(*sigpacket)); } //else printf("recvbytes.%d mismatched packetlen.%d + %ld\n",recvbytes,sigpacket!=0?sigpacket->packetlen:-1,sizeof(*sigpacket));
@ -325,7 +322,7 @@ void dpow_randipbits(struct supernet_info *myinfo,struct iguana_info *coin,cJSON
char *dex_response(int32_t *broadcastflagp,struct supernet_info *myinfo,struct dex_nanomsghdr *dexp) char *dex_response(int32_t *broadcastflagp,struct supernet_info *myinfo,struct dex_nanomsghdr *dexp)
{ {
char buf[65],*retstr = 0; int32_t datalen; bits256 hash2; cJSON *retjson; struct iguana_info *coin; struct dex_request dexreq; char buf[65],*retstr = 0; int32_t i,datalen; bits256 hash2; cJSON *retjson=0; struct iguana_info *coin; struct dex_request dexreq;
*broadcastflagp = 0; *broadcastflagp = 0;
if ( strcmp(dexp->handler,"request") == 0 ) if ( strcmp(dexp->handler,"request") == 0 )
{ {
@ -432,6 +429,34 @@ char *dex_response(int32_t *broadcastflagp,struct supernet_info *myinfo,struct d
retstr = jprint(retjson,1); retstr = jprint(retjson,1);
} }
} }
else if ( dexreq.func == 'N' )
{
uint8_t pubkeys[64][33]; char str[128]; int32_t numnotaries; cJSON *array,*item;
if ( (numnotaries= komodo_notaries("KMD",pubkeys,-1)) > 0 && numnotaries < 64 )
{
retjson = cJSON_CreateObject();
array = cJSON_CreateArray();
for (i=0; i<numnotaries; i++)
{
item = cJSON_CreateObject();
init_hexbytes_noT(str,pubkeys[i],33);
jaddstr(item,"pubkey",str);
bitcoin_address(str,0,pubkeys[i],33);
jaddstr(item,"BTCaddress",str);
bitcoin_address(str,60,pubkeys[i],33);
jaddstr(item,"KMDaddress",str);
jaddi(array,item);
}
jadd(retjson,"notaries",array);
jaddnum(retjson,"numnotaries",numnotaries);
}
if ( retjson != 0 )
{
dpow_randipbits(myinfo,coin,retjson);
free(retstr);
retstr = jprint(retjson,1);
}
}
} else printf("(%s) not active\n",dexreq.name); } else printf("(%s) not active\n",dexreq.name);
if ( retstr == 0 ) if ( retstr == 0 )
return(clonestr("{\"error\":\"null return\"}")); return(clonestr("{\"error\":\"null return\"}"));
@ -568,6 +593,31 @@ char *_dex_getinfo(struct supernet_info *myinfo,char *symbol)
return(_dex_sendrequest(myinfo,&dexreq,1,"")); return(_dex_sendrequest(myinfo,&dexreq,1,""));
} }
int32_t _dex_getheight(struct supernet_info *myinfo,char *symbol)
{
char *retstr; cJSON *retjson; int32_t height = -1;
if ( (retstr= _dex_getinfo(myinfo,symbol)) != 0 )
{
if ( (retjson= cJSON_Parse(retstr)) != 0 )
{
height = jint(retjson,"blocks") - 1;
free_json(retjson);
}
free(retstr);
}
return(height);
}
char *_dex_notaries(struct supernet_info *myinfo,char *symbol)
{
struct dex_request dexreq;
memset(&dexreq,0,sizeof(dexreq));
safecopy(dexreq.name,symbol,sizeof(dexreq.name));
dexreq.func = 'N';
dexreq.intarg = -1;
return(_dex_sendrequest(myinfo,&dexreq,1,""));
}
char *_dex_alladdresses(struct supernet_info *myinfo,char *symbol) char *_dex_alladdresses(struct supernet_info *myinfo,char *symbol)
{ {
struct dex_request dexreq; struct dex_request dexreq;

2
iguana/dpow/dpow_rpc.c
View File

@ -20,6 +20,8 @@ int32_t komodo_notaries(char *symbol,uint8_t pubkeys[64][33],int32_t height)
int32_t i,num=-1; struct iguana_info *coin; char params[256],*retstr,*pubkeystr; cJSON *retjson,*item,*array; int32_t i,num=-1; struct iguana_info *coin; char params[256],*retstr,*pubkeystr; cJSON *retjson,*item,*array;
if ( (coin= iguana_coinfind(symbol)) != 0 ) if ( (coin= iguana_coinfind(symbol)) != 0 )
{ {
if ( height < 0 )
height = coin->longestchain;
if ( coin->FULLNODE < 0 ) if ( coin->FULLNODE < 0 )
{ {
sprintf(params,"[\"%d\"]",height); sprintf(params,"[\"%d\"]",height);

2
iguana/iguana777.h
View File

@ -137,7 +137,7 @@ struct supernet_info
uint8_t logs[256],exps[510]; uint8_t logs[256],exps[510];
struct message_info msgids[8192]; struct message_info msgids[8192];
double *svmfeatures; double *svmfeatures;
struct dpow_entry notaries[64]; int32_t numnotaries; uint8_t notaries[64][33]; int32_t numnotaries;
}; };
#include "../includes/iguana_funcs.h" #include "../includes/iguana_funcs.h"

18
iguana/main.c
View File

@ -1644,6 +1644,24 @@ void iguana_main(void *arg)
iguana_appletests(myinfo); iguana_appletests(myinfo);
#endif #endif
} }
char *retstr,*pubkeystr; cJSON *retjson,*array,*item; int32_t i,n;
if ( (retstr= _dex_notaries(myinfo,"KMD")) != 0 )
{
if ( (retjson= cJSON_Parse(retstr)) != 0 )
{
if ( (myinfo->numnotaries= jint(retjson,"numnotaries")) != 0 && (array= jarray(&n,retjson,"notaries")) != 0 && n == myinfo->numnotaries )
{
for (i=0; i<n; i++)
{
item = jitem(array,i);
if ( (pubkeystr= jstr(item,"pubkey")) != 0 && strlen(pubkeystr) == 33*2 )
decode_hex(myinfo->notaries[i],33,pubkeystr);
}
}
free_json(retjson);
}
free(retstr);
}
} else basilisks_init(myinfo); } else basilisks_init(myinfo);
if ( 0 ) if ( 0 )
{ {

Write Preview
Loading…
Cancel
Save