All latest updates, smart contracts, including oracle from KMD/jl777

2018-09-13 13:00:13 -07:00
parent 0f92550056 8dc419675a
commit 0c8fa56a02
156 changed files with 13699 additions and 1126 deletions
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2341,7 +2341,7 @@ std::vector<uint256> CWallet::ResendWalletTransactionsBefore(int64_t nTime)
        // Don't rebroadcast if newer than nTime:
        if (wtx.nTimeReceived > nTime)
            continue;
-        //if ( ASSETCHAINS_SYMBOL[0] == 0 )
+        if ( ASSETCHAINS_SYMBOL[0] == 0 )
        {
            if ( wtx.nLockTime >= LOCKTIME_THRESHOLD && wtx.nLockTime < now-KOMODO_MAXMEMPOOLTIME )
            {
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -1206,4 +1206,8 @@ public:
        READWRITE(vchPubKey);
    }
 };
+
+/** Error status printout */
+#define ERR_RESULT(x) result.push_back(Pair("result", "error")) , result.push_back(Pair("error", x));
+
 #endif // BITCOIN_WALLET_WALLET_H