From 6c9966d210020168f4f791dde560a09226ea1cf5 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 8 Aug 2016 19:27:26 -0300 Subject: [PATCH] test --- basilisk/basilisk.h | 2 ++ basilisk/basilisk_swap.c | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/basilisk/basilisk.h b/basilisk/basilisk.h index a16267f81..86837e342 100755 --- a/basilisk/basilisk.h +++ b/basilisk/basilisk.h @@ -16,6 +16,8 @@ #ifndef H_BASILISK_H #define H_BASILISK_H +//#define BASILISK_DISABLETX + #include "../iguana/iguana777.h" #define BASILISK_TIMEOUT 30000 diff --git a/basilisk/basilisk_swap.c b/basilisk/basilisk_swap.c index 18f9a7892..f7451b561 100755 --- a/basilisk/basilisk_swap.c +++ b/basilisk/basilisk_swap.c @@ -53,7 +53,6 @@ Alice timeout event is triggered if INSTANTDEX_LOCKTIME elapses from the start of a FSM instance. Bob timeout event is triggered after INSTANTDEX_LOCKTIME*2 */ -#define BASILISK_DISABLETX #define SCRIPT_OP_IF 0x63 #define SCRIPT_OP_ELSE 0x67 #define SCRIPT_OP_ENDIF 0x68 @@ -314,10 +313,13 @@ int32_t basilisk_rawtx_spendscript(struct supernet_info *myinfo,int32_t height,s int32_t basilisk_swapuserdata(uint8_t *userdata,int32_t pushpriv,bits256 privkey,uint8_t addrtype,bits256 pubkey,int32_t ifpath) { int32_t i,len = 0; - userdata[len++] = 33; - userdata[len++] = addrtype; - for (i=0; i