From 7e4d87f051d0bc84b1d6160b1b81424d84d1eeb7 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 11 Jul 2016 12:59:34 -0300 Subject: [PATCH] test --- basilisk/basilisk.h | 2 +- basilisk/basilisk_swap.c | 2 ++ iguana/iguana_msg.c | 2 +- includes/iguana_defines.h | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/basilisk/basilisk.h b/basilisk/basilisk.h index 91f4ff95a..3cdf565f9 100755 --- a/basilisk/basilisk.h +++ b/basilisk/basilisk.h @@ -23,7 +23,7 @@ #define BASILISK_MAXFANOUT 64 #define BASILISK_DEFAULTDIFF 0x1effffff #define BASILISK_MAXRELAYS 64 -#define BASILISK_DEXDURATION 300 +#define BASILISK_DEXDURATION 180 #define BASILISK_MAXFUTUREBLOCK 60 //#define BASILISK_MAXBLOCKLAG 600 diff --git a/basilisk/basilisk_swap.c b/basilisk/basilisk_swap.c index de8f5c18b..db06e3bd6 100755 --- a/basilisk/basilisk_swap.c +++ b/basilisk/basilisk_swap.c @@ -271,6 +271,8 @@ int32_t basilisk_rawtx_spendscript(struct supernet_info *myinfo,struct basilisk_ } if ( (txobj= bitcoin_data2json(rawtx->coin,&rawtx->signedtxid,&rawtx->msgtx,rawtx->extraspace,sizeof(rawtx->extraspace),rawtx->txbytes,rawtx->datalen)) != 0 ) { + rawtx->actualtxid = rawtx->signedtxid; + char str[65]; printf("got txid.%s\n",bits256_str(str,rawtx->signedtxid)); rawtx->locktime = rawtx->msgtx.lock_time; if ( (vouts= jarray(&n,txobj,"vout")) != 0 && v < n ) { diff --git a/iguana/iguana_msg.c b/iguana/iguana_msg.c index 39fbb50ce..dcfcf65fc 100755 --- a/iguana/iguana_msg.c +++ b/iguana/iguana_msg.c @@ -311,7 +311,7 @@ int32_t iguana_rwmsgalert(struct iguana_info *coin,int32_t rwflag,uint8_t *seria void iguana_gotversion(struct supernet_info *myinfo,struct iguana_info *coin,struct iguana_peer *addr,struct iguana_msgversion *vers) { uint8_t serialized[sizeof(struct iguana_msghdr)]; char *retstr; - //printf("gotversion from %s: starting height.%d services.%llx proto.%d (%s)\n",addr->ipaddr,vers->nStartingHeight,(long long)vers->nServices,vers->nVersion,vers->strSubVer); + printf("gotversion from %s: starting height.%d services.%llx proto.%d (%s)\n",addr->ipaddr,vers->nStartingHeight,(long long)vers->nServices,vers->nVersion,vers->strSubVer); if ( 0 && strncmp(vers->strSubVer,"/iguana",strlen("/iguana")) == 0 ) { addr->supernet = 1, addr->basilisk = 0; diff --git a/includes/iguana_defines.h b/includes/iguana_defines.h index ecb10719b..aa16d430d 100755 --- a/includes/iguana_defines.h +++ b/includes/iguana_defines.h @@ -134,7 +134,6 @@ extern int32_t IGUANA_NUMHELPERS; #define NODE_GETUTXO (1 << 1) #define NODE_BLOOM (1 << 2) -#define PROTOCOL_VERSION 70002 #define INIT_PROTO_VERSION 209 // initial proto version, to be increased after version/verack negotiation #define GETHEADERS_VERSION 31800 // In this version, 'getheaders' was introduced. #define MIN_PEER_PROTO_VERSION GETHEADERS_VERSION // disconnect from peers older than this proto version @@ -148,6 +147,8 @@ extern int32_t IGUANA_NUMHELPERS; #define MEMPOOL_GD_VERSION 60002 // "mempool" command, enhanced "getdata" behavior starts with this version #define NO_BLOOM_VERSION 70011 // "filter*" disabled without NODE_BLOOM after and including this version #define PROTOCOL_HEADERS_VERSION 70012 +//#define PROTOCOL_VERSION 70002 +#define PROTOCOL_VERSION PROTOCOL_HEADERS_VERSION #define MSG_TX 1 #define MSG_BLOCK 2