0 locktime issue #10990

2536 | @@ -2537,7 +2537,9 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nC
2537 |          }
2538 |      }
2539 |  
2540 | -
2541 | +    // If the transaction has not provided a locktime, let's use the default locktime chosen in CreateTransaction
2542 | +    // so that the miner fee sniping prevention implemented there works
2543 | +    if (tx.nLockTime == 0) tx.nLockTime = wtx.tx->nLockTime;

promag commented at 10:53 PM on August 4, 2017:

Nit, newline after.

 108 | +            fee = rawtxfund['fee']
 109 | +            dec_tx  = self.nodes[2].decoderawtransaction(rawtxfund['hex'])
 110 | +            if dec_tx["locktime"] == blockcount:
 111 | +                break
 112 | +            assert(dec_tx["locktime"] > 0)
 113 | +            assert(i<18)  # incrediably unlikely to never produce the current blockcount

promag commented at 10:53 PM on August 4, 2017:

Nit, i < 18 (add spaces).

 101 | +        outputs = { self.nodes[0].getnewaddress() : 1.0 }
 102 | +        rawtx   = self.nodes[2].createrawtransaction(inputs, outputs)
 103 | +        dec_tx  = self.nodes[2].decoderawtransaction(rawtx)
 104 | +
 105 | +        # there's a random chance of an earlier locktime so iterate a few times
 106 | +        for i in range(0,20):

promag commented at 10:54 PM on August 4, 2017:

Nit, (0, 20) (add space).

  80 | @@ -81,6 +81,37 @@ def run_test(self):
  81 |          dec_tx  = self.nodes[2].decoderawtransaction(rawtxfund['hex'])
  82 |          assert(len(dec_tx['vin']) > 0) #test that we have enough inputs
  83 |  
  84 | +        #############################
  85 | +        # test preserving nLockTime #
  86 | +        #############################
  87 | +        inputs  = [ ]
  88 | +        outputs = { self.nodes[0].getnewaddress() : 1.0 }
  89 | +        rawtx   = self.nodes[2].createrawtransaction(inputs, outputs,1234)

promag commented at 10:54 PM on August 4, 2017:

Nit, , 1234 (add space).