From 7d215c71c2c9653eb351167b9641d7ea60d5a7aa Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 24 May 2016 00:32:05 -0500 Subject: [PATCH] test --- iguana/swaps/iguana_BTCswap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/iguana/swaps/iguana_BTCswap.c b/iguana/swaps/iguana_BTCswap.c index 635972231..816b20d5e 100755 --- a/iguana/swaps/iguana_BTCswap.c +++ b/iguana/swaps/iguana_BTCswap.c @@ -589,7 +589,8 @@ void instantdex_swapbits256update(bits256 *txidp,cJSON *argjson,char *fieldname) void instantdex_newjson(struct supernet_info *myinfo,struct bitcoin_swapinfo *swap,cJSON *newjson) { - uint8_t pubkey[33]; int32_t deckflag = 1; + uint8_t pubkey[33]; int32_t deckflag; + deckflag = (newjson != 0 && swap->otherchoosei < 0) ? 1 : 0; if ( instantdex_pubkeyargs(myinfo,swap,2 + deckflag*INSTANTDEX_DECKSIZE,myinfo->persistent_priv,swap->myorderhash,0x02+instantdex_isbob(swap)) != 2 + deckflag*INSTANTDEX_DECKSIZE ) printf("ERROR: couldnt generate pubkeys deckflag.%d\n",deckflag); jaddnum(newjson,"have",swap->havestate);