From 2b322c794a75be431de332c324c31bc92d89e049 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 10 May 2018 13:01:26 +0300 Subject: [PATCH 1/3] Prevent relaying expired tx --- src/wallet/wallet.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index eadf7f36d..e4f13e749 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2102,12 +2102,21 @@ std::vector CWallet::ResendWalletTransactionsBefore(int64_t nTime) LOCK(cs_wallet); // Sort them in chronological order multimap mapSorted; + uint32_t now = (uint32_t)time(NULL); BOOST_FOREACH(PAIRTYPE(const uint256, CWalletTx)& item, mapWallet) { CWalletTx& wtx = item.second; // Don't rebroadcast if newer than nTime: if (wtx.nTimeReceived > nTime) continue; + if ( ASSETCHAINS_SYMBOL[0] == 0 ) + { + if ( wtx.nLockTime >= LOCKTIME_THRESHOLD && wtx.nLockTime < now-KOMODO_MAXMEMPOOLTIME ) + { + LogPrintf("skip Relaying wtx %s nLockTime %u vs now.%u\n", wtx.GetHash().ToString(),(uint32_t)wtx.nLockTime,now); + continue; + } + } mapSorted.insert(make_pair(wtx.nTimeReceived, &wtx)); } BOOST_FOREACH(PAIRTYPE(const unsigned int, CWalletTx*)& item, mapSorted) From 4f9e2254e27ccea01afd664de605e5e7c5df3ed8 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 10 May 2018 13:15:18 +0300 Subject: [PATCH 2/3] Update libgmp url --- depends/packages/libgmp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends/packages/libgmp.mk b/depends/packages/libgmp.mk index f06e4a6c4..d8e41573a 100644 --- a/depends/packages/libgmp.mk +++ b/depends/packages/libgmp.mk @@ -18,7 +18,7 @@ $(package)_dependencies= $(package)_config_opts=--enable-cxx --disable-shared else $(package)_version=6.1.1 -$(package)_download_path=https://gmplib.org/download/gmp/ +$(package)_download_path=https://supernetorg.bintray.com/misc $(package)_file_name=gmp-$($(package)_version).tar.bz2 $(package)_sha256_hash=a8109865f2893f1373b0a8ed5ff7429de8db696fc451b1036bd7bdf95bbeffd6 $(package)_dependencies= From afd62a9688809da0e8864d772da92deabe7c1136 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 10 May 2018 17:51:45 +0300 Subject: [PATCH 3/3] KOMODO_MAXMEMPOOLTIME --- src/komodo_defs.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/komodo_defs.h b/src/komodo_defs.h index db792c44e..ac4e1f6b0 100644 --- a/src/komodo_defs.h +++ b/src/komodo_defs.h @@ -5,5 +5,7 @@ #define KOMODO_ELECTION_GAP 2000 #define ROUNDROBIN_DELAY 61 #define KOMODO_ASSETCHAIN_MAXLEN 65 +#define KOMODO_MAXMEMPOOLTIME 3600 + #endif