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

test

dPoW2
jl777 8 years ago
parent
912636dae4
commit
c09068c1d5
3 changed files with 23 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. 2
      iguana/iguana_interpreter.c
  2. 6
      iguana/iguana_payments.c
  3. 29
      iguana/iguana_sign.c

2
iguana/iguana_interpreter.c
View File

@ -1065,7 +1065,7 @@ int32_t bitcoin_assembler(struct iguana_info *coin,cJSON *logarray,uint8_t scrip
free(stacks); free(stacks);
return(-1); return(-1);
} }
printf("user data stackdepth.%d dlen.%d\n",stacks->stackdepth,dlen); //printf("user data stackdepth.%d dlen.%d\n",stacks->stackdepth,dlen);
} }
if ( len != V->userdatalen ) if ( len != V->userdatalen )
{ {

6
iguana/iguana_payments.c
View File

@ -338,7 +338,7 @@ char *iguana_signrawtx(struct supernet_info *myinfo,struct iguana_info *coin,int
if ( flag != 0 ) if ( flag != 0 )
free_json(privkeys); free_json(privkeys);
} }
printf("signed.(%s)\n",signedtx!=0?signedtx:""); printf("completed.%d signed.(%s)\n",*completedp,signedtx!=0?signedtx:"");
return(signedtx); return(signedtx);
} }
@ -413,11 +413,9 @@ char *iguana_calcrawtx(struct supernet_info *myinfo,struct iguana_info *coin,cJS
bitcoin_addr2rmd160(&addrtype,rmd160,changeaddr); bitcoin_addr2rmd160(&addrtype,rmd160,changeaddr);
spendlen = bitcoin_standardspend(spendscript,0,rmd160); spendlen = bitcoin_standardspend(spendscript,0,rmd160);
bitcoin_txoutput(txobj,spendscript,spendlen,change); bitcoin_txoutput(txobj,spendscript,spendlen,change);
int32_t i; for (i=0; i<oplen; i++)
printf("%02x",spendscript[i]);
printf(" changeaddr.%s\n",changeaddr);
if ( opreturn != 0 ) if ( opreturn != 0 )
{ {
int32_t i;
for (i=0; i<oplen; i++) for (i=0; i<oplen; i++)
printf("%02x",opreturn[i]); printf("%02x",opreturn[i]);
printf(" <- got opret\n"); printf(" <- got opret\n");

29
iguana/iguana_sign.c
View File

@ -503,7 +503,7 @@ bits256 bitcoin_sigtxid(struct iguana_info *coin,int32_t height,uint8_t *seriali
int32_t iguana_rwmsgtx(struct iguana_info *coin,int32_t height,int32_t rwflag,cJSON *json,uint8_t *serialized,int32_t maxsize,struct iguana_msgtx *msg,bits256 *txidp,char *vpnstr,uint8_t *extraspace,int32_t extralen,cJSON *vins,int32_t suppress_pubkeys) int32_t iguana_rwmsgtx(struct iguana_info *coin,int32_t height,int32_t rwflag,cJSON *json,uint8_t *serialized,int32_t maxsize,struct iguana_msgtx *msg,bits256 *txidp,char *vpnstr,uint8_t *extraspace,int32_t extralen,cJSON *vins,int32_t suppress_pubkeys)
{ {
int32_t i,n,len = 0,extraused=0; uint8_t *txstart = serialized,*sigser=0; char txidstr[65],*redeemstr; cJSON *vin,*array=0; bits256 sigtxid; int32_t i,n,len = 0,extraused=0; uint8_t spendscript[8192],*txstart = serialized,*sigser=0; char txidstr[65],*redeemstr,*hexstr; cJSON *vin,*sobj,*array=0; bits256 sigtxid;
len += iguana_rwnum(rwflag,&serialized[len],sizeof(msg->version),&msg->version); len += iguana_rwnum(rwflag,&serialized[len],sizeof(msg->version),&msg->version);
if ( json != 0 ) if ( json != 0 )
{ {
@ -543,6 +543,15 @@ int32_t iguana_rwmsgtx(struct iguana_info *coin,int32_t height,int32_t rwflag,cJ
{ {
if ( (redeemstr= jstr(vin,"redeemScript")) != 0 && is_hexstr(redeemstr,0) > 0 ) if ( (redeemstr= jstr(vin,"redeemScript")) != 0 && is_hexstr(redeemstr,0) > 0 )
msg->vins[i].p2shlen = (int32_t)strlen(redeemstr) >> 1; msg->vins[i].p2shlen = (int32_t)strlen(redeemstr) >> 1;
if ( (sobj= jobj(vin,"scriptPubkey")) != 0 && (hexstr= jstr(sobj,"hex")) != 0 && is_hexstr(hexstr,0) > 0 && msg->vins[i].spendlen == 0 )
{
msg->vins[i].spendlen = (int32_t)strlen(hexstr) >> 1;
if ( msg->vins[i].spendscript == 0 && msg->vins[i].spendlen < sizeof(spendscript) )
{
msg->vins[i].spendscript = spendscript;
decode_hex(spendscript,msg->vins[i].spendlen,hexstr);
}
}
} }
if ( (n= iguana_vinparse(coin,rwflag,&serialized[len],&msg->vins[i])) < 0 ) if ( (n= iguana_vinparse(coin,rwflag,&serialized[len],&msg->vins[i])) < 0 )
return(-1); return(-1);
@ -563,6 +572,8 @@ int32_t iguana_rwmsgtx(struct iguana_info *coin,int32_t height,int32_t rwflag,cJ
} else memset(sigtxid.bytes,0,sizeof(sigtxid)); } else memset(sigtxid.bytes,0,sizeof(sigtxid));
jaddi(array,iguana_vinjson(coin,&msg->vins[i],sigtxid)); jaddi(array,iguana_vinjson(coin,&msg->vins[i],sigtxid));
} }
if ( msg->vins[i].spendscript == spendscript )
msg->vins[i].spendscript = 0;
} }
if ( array != 0 ) if ( array != 0 )
{ {
@ -785,7 +796,7 @@ cJSON *bitcoin_hex2json(struct iguana_info *coin,int32_t height,bits256 *txidp,s
int32_t iguana_msgtx_Vset(struct iguana_info *coin,uint8_t *serialized,int32_t maxlen,struct iguana_msgtx *msgtx,struct vin_info *V) int32_t iguana_msgtx_Vset(struct iguana_info *coin,uint8_t *serialized,int32_t maxlen,struct iguana_msgtx *msgtx,struct vin_info *V)
{ {
int32_t vini,j,scriptlen,p2shlen,userdatalen,need_op0=0,siglen,plen,len = 0; uint8_t *script,*redeemscript=0,*userdata=0; struct vin_info *vp; int32_t vini,j,scriptlen,p2shlen,userdatalen,siglen,plen,len = 0; uint8_t *script,*redeemscript=0,*userdata=0; struct vin_info *vp;
for (vini=0; vini<msgtx->tx_in; vini++) for (vini=0; vini<msgtx->tx_in; vini++)
{ {
vp = &V[vini]; vp = &V[vini];
@ -806,17 +817,17 @@ int32_t iguana_msgtx_Vset(struct iguana_info *coin,uint8_t *serialized,int32_t m
} }
if ( msgtx->vins[vini].spendlen > 33 && msgtx->vins[vini].spendscript[msgtx->vins[vini].spendlen - 1] == SCRIPT_OP_CHECKMULTISIG ) if ( msgtx->vins[vini].spendlen > 33 && msgtx->vins[vini].spendscript[msgtx->vins[vini].spendlen - 1] == SCRIPT_OP_CHECKMULTISIG )
{ {
need_op0 = 1; //need_op0 = 1;
printf("found multisig spendscript\n"); //printf("found multisig spendscript\n");
} }
if ( redeemscript != 0 && p2shlen > 33 && redeemscript[p2shlen - 1] == SCRIPT_OP_CHECKMULTISIG ) if ( redeemscript != 0 && p2shlen > 33 && redeemscript[p2shlen - 1] == SCRIPT_OP_CHECKMULTISIG )
{ {
need_op0 = 1; //need_op0 = 1;
printf("found multisig redeemscript\n"); //printf("found multisig redeemscript\n");
} }
msgtx->vins[vini].vinscript = script = &serialized[len]; msgtx->vins[vini].vinscript = script = &serialized[len];
msgtx->vins[vini].vinscript[0] = 0; msgtx->vins[vini].vinscript[0] = 0;
scriptlen = need_op0; scriptlen = 0;//need_op0;
for (j=0; j<vp->N; j++) for (j=0; j<vp->N; j++)
{ {
if ( (siglen= vp->signers[j].siglen) > 0 ) if ( (siglen= vp->signers[j].siglen) > 0 )
@ -1099,8 +1110,8 @@ void iguana_addscript(struct iguana_info *coin,cJSON *dest,uint8_t *script,int32
return; return;
scriptstr = scriptbuf, maxlen = sizeof(scriptbuf); scriptstr = scriptbuf, maxlen = sizeof(scriptbuf);
init_hexbytes_noT(scriptstr,script,scriptlen); init_hexbytes_noT(scriptstr,script,scriptlen);
if ( strcmp(fieldname,"userdata") == 0 ) //if ( strcmp(fieldname,"userdata") == 0 )
printf("SCRIPT_USERDATA.(%s)\n",scriptstr); // printf("SCRIPT_USERDATA.(%s)\n",scriptstr);
if ( strcmp(fieldname,"coinbase") == 0 ) if ( strcmp(fieldname,"coinbase") == 0 )
jaddstr(dest,"coinbase",scriptstr); jaddstr(dest,"coinbase",scriptstr);
else else

Write Preview
Loading…
Cancel
Save