jl777 8 years ago
parent
commit
46a02fd116
  1. 4
      basilisk/basilisk_swap.c
  2. 4
      iguana/iguana_interpreter.c

4
basilisk/basilisk_swap.c

@ -169,7 +169,7 @@ int32_t basilisk_bobscript(uint8_t *rmd160,uint8_t *redeemscript,int32_t *redeem
*secretstartp = n + 2; *secretstartp = n + 2;
if ( 1 ) if ( 1 )
{ {
if ( 0 && bits256_nonz(privkey) != 0 ) if ( 1 && bits256_nonz(privkey) != 0 )
{ {
uint8_t bufA[20],bufB[20]; uint8_t bufA[20],bufB[20];
revcalc_rmd160_sha256(bufA,privkey); revcalc_rmd160_sha256(bufA,privkey);
@ -179,7 +179,7 @@ int32_t basilisk_bobscript(uint8_t *rmd160,uint8_t *redeemscript,int32_t *redeem
else if ( memcmp(bufB,secret160,sizeof(bufB)) == 0 ) else if ( memcmp(bufB,secret160,sizeof(bufB)) == 0 )
printf("MATCHES BUFB\n"); printf("MATCHES BUFB\n");
else printf("secret160 matches neither\n"); else printf("secret160 matches neither\n");
memcpy(secret160,bufA,20); memcpy(secret160,bufB,20);
} }
n = bitcoin_secret160verify(redeemscript,n,secret160); n = bitcoin_secret160verify(redeemscript,n,secret160);
} }

4
iguana/iguana_interpreter.c

@ -1354,11 +1354,11 @@ int32_t bitcoin_assembler(struct iguana_info *coin,cJSON *logarray,uint8_t scrip
iguana_pushdata(stacks,0,rmd160,sizeof(rmd160)); iguana_pushdata(stacks,0,rmd160,sizeof(rmd160));
break; break;
case IGUANA_OP_HASH160: case IGUANA_OP_HASH160:
/*if ( datalen == 32 ) if ( datalen == 32 )
{ {
revcalc_rmd160_sha256(rmd160,*(bits256 *)databuf); revcalc_rmd160_sha256(rmd160,*(bits256 *)databuf);
printf("SPECIAL CASE REVERSE\n"); printf("SPECIAL CASE REVERSE\n");
} else*/ } else
calc_rmd160_sha256(rmd160,databuf,datalen); calc_rmd160_sha256(rmd160,databuf,datalen);
iguana_pushdata(stacks,0,rmd160,sizeof(rmd160)); iguana_pushdata(stacks,0,rmd160,sizeof(rmd160));
break; break;

Loading…
Cancel
Save