Merge branch 'FSM' of https://github.com/blackjok3rtt/komodo into blackjok3rtt-FSM

a
2018-12-17 12:40:45 +08:00
parent ca2129e81d a2d19feeba
commit 7ff077b410
14 changed files with 195 additions and 510 deletions
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4216,6 +4216,9 @@ UniValue z_sendmany(const UniValue& params, bool fHelp)
                    if ( fromSprout || toSprout )
                        throw JSONRPCError(RPC_INVALID_PARAMETER,"Sprout usage has expired");
                }
+                if ( toSapling && ASSETCHAINS_SYMBOL[0] == 0 )
+                    throw JSONRPCError(RPC_INVALID_PARAMETER,"Sprout usage will expire soon");
+   
                // If we are sending from a shielded address, all recipient
                // shielded addresses must be of the same type.
                if ((fromSprout && toSapling) || (fromSapling && toSprout)) {