jl777 9 years ago
parent
commit
0163052b46
  1. 8
      basilisk/basilisk_swap.c
  2. 3
      iguana/iguana_interpreter.c

8
basilisk/basilisk_swap.c

@ -367,11 +367,15 @@ int32_t basilisk_verify_bobdeposit(struct supernet_info *myinfo,void *ptr,uint8_
int32_t basilisk_bobdeposit_refund(struct supernet_info *myinfo,struct basilisk_swap *swap)
{
uint8_t userdata[512]; int32_t len = 0;
uint8_t userdata[512],revrmd160[20]; int32_t len = 0;
len = basilisk_swapuserdata(userdata,1,swap->privBn,0x03,swap->pubB0,0);
int32_t i; for (i=0; i<len; i++)
printf("%02x",userdata[i]);
printf(" <- basilisk_bobdeposit_refund\n");
char str[65]; printf(" <- basilisk_bobdeposit_refund privBn.(%s)\n",bits256_str(str,swap->privBn));
revcalc_rmd160_sha256(revrmd160,swap->privBn);
for (i=0; i<20; i++)
printf("%02x",revrmd160[i]);
printf(" <- revrmd160\n");
return(basilisk_rawtx_sign(myinfo,swap->bobcoin->blocks.hwmchain.height,swap,&swap->bobrefund,&swap->bobdeposit,swap->myprivs[0],0,userdata,len));
}

3
iguana/iguana_interpreter.c

@ -1323,7 +1323,7 @@ int32_t bitcoin_assembler(struct iguana_info *coin,cJSON *logarray,uint8_t scrip
{
if ( iguana_cmp(&args[0],&args[1]) == 0 )
iguana_pushdata(stacks,1,0,0);
//else
else iguana_pushdata(stacks,0,0,0);
{
for (i=0; i<args[0].size; i++)
printf("%02x",args[0].U.pubkey[i]);
@ -1332,7 +1332,6 @@ int32_t bitcoin_assembler(struct iguana_info *coin,cJSON *logarray,uint8_t scrip
printf("%02x",args[1].U.pubkey[i]);
printf(" <- args[1]\n");
printf("OP_EQUAL.%02x error %d vs %d\n",op->opcode,args[0].size,args[1].size);
iguana_pushdata(stacks,0,0,0);
}
}
else if ( (op->flags & IGUANA_CRYPTOFLAG) != 0 )

Loading…
Cancel
Save