Expire Overwinter transactions before the Sapling activation height

2018-05-03 12:27:56 +01:00
parent dc889d7f52
commit fa70084c87
4 changed files with 7 additions and 18 deletions
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpcrawtransaction.cpp
@@ -454,7 +454,6 @@ UniValue createrawtransaction(const UniValue& params, bool fHelp)
        Params().GetConsensus(), nextBlockHeight);
    
    if (NetworkUpgradeActive(nextBlockHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER)) {
-        rawTx.nExpiryHeight = nextBlockHeight + expiryDelta;
        if (rawTx.nExpiryHeight >= TX_EXPIRY_HEIGHT_THRESHOLD){
            throw JSONRPCError(RPC_INVALID_PARAMETER, "nExpiryHeight must be less than TX_EXPIRY_HEIGHT_THRESHOLD.");
        }