Merge branch 'FSM' of https://github.com/jl777/komodo

fix
2018-12-20 23:23:24 +08:00
parent f128d49d2f 8ee384869f
commit 227a0cec3c
6 changed files with 35 additions and 19 deletions
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4809,6 +4809,7 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
        saplingNoteLimit = nNoteLimit;
    }

+    std::string memo;
    CAmount maximum_utxo_size;
    if (params.size() > 5) {
      maximum_utxo_size = AmountFromValue( params[5] );
@@ -4891,7 +4892,7 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
            }

            utxoCounter++;
-
+            CAmount nValue = out.tx->vout[out.i].nValue;
            if (!maxedOutUTXOsFlag) {
                size_t increase = (boost::get<CScriptID>(&address) != nullptr) ? CTXIN_SPEND_P2SH_SIZE : CTXIN_SPEND_DUST_SIZE;
                if (estimatedTxSize + increase >= max_tx_size ||