69
69
SEQ_TYPE_FLAG = 1 << 22
70
70
SEQ_RANDOM_LOW_BIT = 1 << 18
71
71
72
+
72
73
def relative_locktime (sdf , srhb , stf , srlb ):
73
74
"""Returns a locktime with certain bits set."""
74
75
@@ -83,6 +84,7 @@ def relative_locktime(sdf, srhb, stf, srlb):
83
84
locktime |= SEQ_RANDOM_LOW_BIT
84
85
return locktime
85
86
87
+
86
88
def all_rlt_txs (txs ):
87
89
return [tx ['tx' ] for tx in txs ]
88
90
@@ -144,13 +146,13 @@ def create_bip112txs(self, bip112inputs, varyOP_CSV, txversion, locktime_delta=0
144
146
for i , (sdf , srhb , stf , srlb ) in enumerate (product (* [[True , False ]] * 4 )):
145
147
locktime = relative_locktime (sdf , srhb , stf , srlb )
146
148
tx = self .create_self_transfer_from_utxo (bip112inputs [i ])
147
- if ( varyOP_CSV ) : # if varying OP_CSV, nSequence is fixed
149
+ if varyOP_CSV : # if varying OP_CSV, nSequence is fixed
148
150
tx .vin [0 ].nSequence = BASE_RELATIVE_LOCKTIME + locktime_delta
149
151
else : # vary nSequence instead, OP_CSV is fixed
150
152
tx .vin [0 ].nSequence = locktime + locktime_delta
151
153
tx .nVersion = txversion
152
154
self .miniwallet .sign_tx (tx )
153
- if ( varyOP_CSV ) :
155
+ if varyOP_CSV :
154
156
tx .vin [0 ].scriptSig = CScript ([locktime , OP_CHECKSEQUENCEVERIFY , OP_DROP ] + list (CScript (tx .vin [0 ].scriptSig )))
155
157
else :
156
158
tx .vin [0 ].scriptSig = CScript ([BASE_RELATIVE_LOCKTIME , OP_CHECKSEQUENCEVERIFY , OP_DROP ] + list (CScript (tx .vin [0 ].scriptSig )))
@@ -198,7 +200,7 @@ def run_test(self):
198
200
199
201
# Activation height is hardcoded
200
202
# We advance to block height five below BIP112 activation for the following tests
201
- test_blocks = self .generate_blocks (CSV_ACTIVATION_HEIGHT - 5 - COINBASE_BLOCK_COUNT )
203
+ test_blocks = self .generate_blocks (CSV_ACTIVATION_HEIGHT - 5 - COINBASE_BLOCK_COUNT )
202
204
self .send_blocks (test_blocks )
203
205
assert not softfork_active (self .nodes [0 ], 'csv' )
204
206
@@ -483,5 +485,6 @@ def run_test(self):
483
485
self .send_blocks ([self .create_test_block (time_txs )])
484
486
self .nodes [0 ].invalidateblock (self .nodes [0 ].getbestblockhash ())
485
487
488
+
486
489
if __name__ == '__main__' :
487
490
BIP68_112_113Test ().main ()
0 commit comments