DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Prevent sprout after deadline

Browse Source
This commit is contained in:
jl777
2018-11-23 09:01:21 -11:00
parent 0b876f9224
commit 58d94f6cdd
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/wallet/rpcwallet.cpp
View File

@@ -3540,6 +3540,8 @@ UniValue z_getnewaddress(const UniValue& params, bool fHelp)
} }
if (addrType == ADDR_TYPE_SPROUT) { if (addrType == ADDR_TYPE_SPROUT) {
if ( GetTime() >= KOMODO_SAPLING_DEADLINE )
throw JSONRPCError(RPC_INVALID_PARAMETER, "sprout not valid anymore");
return EncodePaymentAddress(pwalletMain->GenerateNewSproutZKey()); return EncodePaymentAddress(pwalletMain->GenerateNewSproutZKey());
} else if (addrType == ADDR_TYPE_SAPLING) { } else if (addrType == ADDR_TYPE_SAPLING) {
return EncodePaymentAddress(pwalletMain->GenerateNewSaplingZKey()); return EncodePaymentAddress(pwalletMain->GenerateNewSaplingZKey());
@@ -4101,7 +4103,11 @@ UniValue z_sendmany(const UniValue& params, bool fHelp)
RPC_INVALID_PARAMETER, RPC_INVALID_PARAMETER,
"Cannot send to both Sprout and Sapling addresses using z_sendmany"); "Cannot send to both Sprout and Sapling addresses using z_sendmany");
} }
if ( GetTime() > KOMODO_SAPLING_DEADLINE )
{
if ( fromSprout || toSprout )
throw JSONRPCError(RPC_INVALID_PARAMETER,"Sprout usage has expired");
}
// If we are sending from a shielded address, all recipient // If we are sending from a shielded address, all recipient
// shielded addresses must be of the same type. // shielded addresses must be of the same type.
if (fromSprout && toSapling) { if (fromSprout && toSapling) {