Skip to content

Commit fc466a8

Browse files
roconnor-blockstreamroconnor-blockstream
committed
Deprecate Broken Jets
The specifications for some of the relative time lock jets are nonsensical and based on a gross misunderstanding of how relative time locks work. They should not be used. However, they are already consensus in Liquid so we cannot elimiante them. But what we can do is rename them in order to dissuade their use. Users can and should use other jets to parse the sequence numbers of individual inputs in order to properly validate relative timelocks.
1 parent d47bfc6 commit fc466a8

11 files changed

Lines changed: 110 additions & 110 deletions

File tree

‎C/elements/decodeElementsJets.inc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
switch (code) {
5353
case 1: *result = CHECK_LOCK_HEIGHT; return SIMPLICITY_NO_ERROR;
5454
case 2: *result = CHECK_LOCK_TIME; return SIMPLICITY_NO_ERROR;
55-
case 3: *result = CHECK_LOCK_DISTANCE; return SIMPLICITY_NO_ERROR;
56-
case 4: *result = CHECK_LOCK_DURATION; return SIMPLICITY_NO_ERROR;
55+
case 3: *result = BROKEN_DO_NOT_USE_CHECK_LOCK_DISTANCE; return SIMPLICITY_NO_ERROR;
56+
case 4: *result = BROKEN_DO_NOT_USE_CHECK_LOCK_DURATION; return SIMPLICITY_NO_ERROR;
5757
case 5: *result = TX_LOCK_HEIGHT; return SIMPLICITY_NO_ERROR;
5858
case 6: *result = TX_LOCK_TIME; return SIMPLICITY_NO_ERROR;
59-
case 7: *result = TX_LOCK_DISTANCE; return SIMPLICITY_NO_ERROR;
60-
case 8: *result = TX_LOCK_DURATION; return SIMPLICITY_NO_ERROR;
59+
case 7: *result = BROKEN_DO_NOT_USE_TX_LOCK_DISTANCE; return SIMPLICITY_NO_ERROR;
60+
case 8: *result = BROKEN_DO_NOT_USE_TX_LOCK_DURATION; return SIMPLICITY_NO_ERROR;
6161
case 9: *result = TX_IS_FINAL; return SIMPLICITY_NO_ERROR;
6262
}
6363
break;

‎C/elements/elementsJets.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -733,14 +733,14 @@ bool simplicity_tx_lock_time(frameItem* dst, frameItem src, const txEnv* env) {
733733
}
734734

735735
/* tx_lock_distance : ONE |- TWO^16 */
736-
bool simplicity_tx_lock_distance(frameItem* dst, frameItem src, const txEnv* env) {
736+
bool simplicity_broken_do_not_use_tx_lock_distance(frameItem* dst, frameItem src, const txEnv* env) {
737737
(void) src; // src is unused;
738738
simplicity_write16(dst, lockDistance(env->tx));
739739
return true;
740740
}
741741

742742
/* tx_lock_duration : ONE |- TWO^16 */
743-
bool simplicity_tx_lock_duration(frameItem* dst, frameItem src, const txEnv* env) {
743+
bool simplicity_broken_do_not_use_tx_lock_duration(frameItem* dst, frameItem src, const txEnv* env) {
744744
(void) src; // src is unused;
745745
simplicity_write16(dst, lockDuration(env->tx));
746746
return true;
@@ -761,14 +761,14 @@ bool simplicity_check_lock_time(frameItem* dst, frameItem src, const txEnv* env)
761761
}
762762

763763
/* check_lock_distance : TWO^16 |- ONE */
764-
bool simplicity_check_lock_distance(frameItem* dst, frameItem src, const txEnv* env) {
764+
bool simplicity_broken_do_not_use_check_lock_distance(frameItem* dst, frameItem src, const txEnv* env) {
765765
(void) dst; // dst is unused;
766766
uint_fast16_t x = simplicity_read16(&src);
767767
return x <= lockDistance(env->tx);
768768
}
769769

770770
/* check_lock_duration : TWO^16 |- ONE */
771-
bool simplicity_check_lock_duration(frameItem* dst, frameItem src, const txEnv* env) {
771+
bool simplicity_broken_do_not_use_check_lock_duration(frameItem* dst, frameItem src, const txEnv* env) {
772772
(void) dst; // dst is unused;
773773
uint_fast16_t x = simplicity_read16(&src);
774774
return x <= lockDuration(env->tx);

‎C/elements/elementsJets.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ bool simplicity_num_outputs(frameItem* dst, frameItem src, const txEnv* env);
5959
bool simplicity_tx_is_final(frameItem* dst, frameItem src, const txEnv* env);
6060
bool simplicity_tx_lock_height(frameItem* dst, frameItem src, const txEnv* env);
6161
bool simplicity_tx_lock_time(frameItem* dst, frameItem src, const txEnv* env);
62-
bool simplicity_tx_lock_distance(frameItem* dst, frameItem src, const txEnv* env);
63-
bool simplicity_tx_lock_duration(frameItem* dst, frameItem src, const txEnv* env);
62+
bool simplicity_broken_do_not_use_tx_lock_distance(frameItem* dst, frameItem src, const txEnv* env);
63+
bool simplicity_broken_do_not_use_tx_lock_duration(frameItem* dst, frameItem src, const txEnv* env);
6464
bool simplicity_check_lock_height(frameItem* dst, frameItem src, const txEnv* env);
6565
bool simplicity_check_lock_time(frameItem* dst, frameItem src, const txEnv* env);
66-
bool simplicity_check_lock_distance(frameItem* dst, frameItem src, const txEnv* env);
67-
bool simplicity_check_lock_duration(frameItem* dst, frameItem src, const txEnv* env);
66+
bool simplicity_broken_do_not_use_check_lock_distance(frameItem* dst, frameItem src, const txEnv* env);
67+
bool simplicity_broken_do_not_use_check_lock_duration(frameItem* dst, frameItem src, const txEnv* env);
6868
bool simplicity_calculate_issuance_entropy(frameItem* dst, frameItem src, const txEnv* env);
6969
bool simplicity_calculate_asset(frameItem* dst, frameItem src, const txEnv* env);
7070
bool simplicity_calculate_explicit_token(frameItem* dst, frameItem src, const txEnv* env);

‎C/elements/primitiveEnumJet.inc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ AND_8,
1515
ANNEX_HASH,
1616
ASSET_AMOUNT_HASH,
1717
BIP_0340_VERIFY,
18+
BROKEN_DO_NOT_USE_CHECK_LOCK_DISTANCE,
19+
BROKEN_DO_NOT_USE_CHECK_LOCK_DURATION,
20+
BROKEN_DO_NOT_USE_TX_LOCK_DISTANCE,
21+
BROKEN_DO_NOT_USE_TX_LOCK_DURATION,
1822
BUILD_TAPBRANCH,
1923
BUILD_TAPLEAF_SIMPLICITY,
2024
BUILD_TAPTWEAK,
@@ -27,8 +31,6 @@ CH_16,
2731
CH_32,
2832
CH_64,
2933
CH_8,
30-
CHECK_LOCK_DISTANCE,
31-
CHECK_LOCK_DURATION,
3234
CHECK_LOCK_HEIGHT,
3335
CHECK_LOCK_TIME,
3436
CHECK_SIG_VERIFY,
@@ -454,8 +456,6 @@ TOTAL_FEE,
454456
TRANSACTION_ID,
455457
TX_HASH,
456458
TX_IS_FINAL,
457-
TX_LOCK_DISTANCE,
458-
TX_LOCK_DURATION,
459459
TX_LOCK_HEIGHT,
460460
TX_LOCK_TIME,
461461
VERIFY,

‎C/elements/primitiveJetNode.inc‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,38 @@
127127
, .targetIx = ty_u
128128
, .cost = 49087 /* milli weight units */
129129
}
130+
,[BROKEN_DO_NOT_USE_CHECK_LOCK_DISTANCE] =
131+
{ .tag = JET
132+
, .jet = simplicity_broken_do_not_use_check_lock_distance
133+
, .cmr = {{0x7f78c7a7u, 0x7a25ada2u, 0x23267d23u, 0x9a5922f7u, 0x64b8ac0cu, 0x2fcef68eu, 0xb93c0d92u, 0xda4af515u}}
134+
, .sourceIx = ty_w16
135+
, .targetIx = ty_u
136+
, .cost = 105 /* milli weight units */
137+
}
138+
,[BROKEN_DO_NOT_USE_CHECK_LOCK_DURATION] =
139+
{ .tag = JET
140+
, .jet = simplicity_broken_do_not_use_check_lock_duration
141+
, .cmr = {{0x73dac8e2u, 0x5d87eaf3u, 0x82c2a772u, 0x06ad38b9u, 0x384361e7u, 0xd0dc87c0u, 0xfa7af7eau, 0x524597b7u}}
142+
, .sourceIx = ty_w16
143+
, .targetIx = ty_u
144+
, .cost = 102 /* milli weight units */
145+
}
146+
,[BROKEN_DO_NOT_USE_TX_LOCK_DISTANCE] =
147+
{ .tag = JET
148+
, .jet = simplicity_broken_do_not_use_tx_lock_distance
149+
, .cmr = {{0x4c7773b8u, 0x18cb7ee5u, 0xf54f925au, 0xad015677u, 0xa043a72fu, 0x316a187cu, 0xc28c696cu, 0xfcb90807u}}
150+
, .sourceIx = ty_u
151+
, .targetIx = ty_w16
152+
, .cost = 91 /* milli weight units */
153+
}
154+
,[BROKEN_DO_NOT_USE_TX_LOCK_DURATION] =
155+
{ .tag = JET
156+
, .jet = simplicity_broken_do_not_use_tx_lock_duration
157+
, .cmr = {{0xcc9c64c8u, 0xb6eb4bf0u, 0x9694af5au, 0x35d957a4u, 0x05e66c1bu, 0x35224ed6u, 0x75878918u, 0x452440b2u}}
158+
, .sourceIx = ty_u
159+
, .targetIx = ty_w16
160+
, .cost = 84 /* milli weight units */
161+
}
130162
,[BUILD_TAPBRANCH] =
131163
{ .tag = JET
132164
, .jet = simplicity_build_tapbranch
@@ -223,22 +255,6 @@
223255
, .targetIx = ty_w8
224256
, .cost = 77 /* milli weight units */
225257
}
226-
,[CHECK_LOCK_DISTANCE] =
227-
{ .tag = JET
228-
, .jet = simplicity_check_lock_distance
229-
, .cmr = {{0x7f78c7a7u, 0x7a25ada2u, 0x23267d23u, 0x9a5922f7u, 0x64b8ac0cu, 0x2fcef68eu, 0xb93c0d92u, 0xda4af515u}}
230-
, .sourceIx = ty_w16
231-
, .targetIx = ty_u
232-
, .cost = 105 /* milli weight units */
233-
}
234-
,[CHECK_LOCK_DURATION] =
235-
{ .tag = JET
236-
, .jet = simplicity_check_lock_duration
237-
, .cmr = {{0x73dac8e2u, 0x5d87eaf3u, 0x82c2a772u, 0x06ad38b9u, 0x384361e7u, 0xd0dc87c0u, 0xfa7af7eau, 0x524597b7u}}
238-
, .sourceIx = ty_w16
239-
, .targetIx = ty_u
240-
, .cost = 102 /* milli weight units */
241-
}
242258
,[CHECK_LOCK_HEIGHT] =
243259
{ .tag = JET
244260
, .jet = simplicity_check_lock_height
@@ -3639,22 +3655,6 @@
36393655
, .targetIx = ty_b
36403656
, .cost = 71 /* milli weight units */
36413657
}
3642-
,[TX_LOCK_DISTANCE] =
3643-
{ .tag = JET
3644-
, .jet = simplicity_tx_lock_distance
3645-
, .cmr = {{0x4c7773b8u, 0x18cb7ee5u, 0xf54f925au, 0xad015677u, 0xa043a72fu, 0x316a187cu, 0xc28c696cu, 0xfcb90807u}}
3646-
, .sourceIx = ty_u
3647-
, .targetIx = ty_w16
3648-
, .cost = 91 /* milli weight units */
3649-
}
3650-
,[TX_LOCK_DURATION] =
3651-
{ .tag = JET
3652-
, .jet = simplicity_tx_lock_duration
3653-
, .cmr = {{0xcc9c64c8u, 0xb6eb4bf0u, 0x9694af5au, 0x35d957a4u, 0x05e66c1bu, 0x35224ed6u, 0x75878918u, 0x452440b2u}}
3654-
, .sourceIx = ty_u
3655-
, .targetIx = ty_w16
3656-
, .cost = 84 /* milli weight units */
3657-
}
36583658
,[TX_LOCK_HEIGHT] =
36593659
{ .tag = JET
36603660
, .jet = simplicity_tx_lock_height

‎Haskell/Simplicity/Elements/FFI/Jets.hs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ module Simplicity.Elements.FFI.Jets
5454
, tx_is_final
5555
, tx_lock_height
5656
, tx_lock_time
57-
, tx_lock_distance
58-
, tx_lock_duration
57+
, broken_do_not_use_tx_lock_distance
58+
, broken_do_not_use_tx_lock_duration
5959
, check_lock_height
6060
, check_lock_time
61-
, check_lock_distance
62-
, check_lock_duration
61+
, broken_do_not_use_check_lock_distance
62+
, broken_do_not_use_check_lock_duration
6363
, calculate_issuance_entropy
6464
, calculate_asset
6565
, calculate_explicit_token
@@ -174,12 +174,12 @@ foreign import ccall unsafe "" c_num_outputs :: Ptr FrameItem -> Ptr FrameItem -
174174
foreign import ccall unsafe "" c_tx_is_final :: Ptr FrameItem -> Ptr FrameItem -> Ptr CTxEnv -> IO CBool
175175
foreign import ccall unsafe "" c_tx_lock_height :: Ptr FrameItem -> Ptr FrameItem -> Ptr CTxEnv -> IO CBool
176176
foreign import ccall unsafe "" c_tx_lock_time :: Ptr FrameItem -> Ptr FrameItem -> Ptr CTxEnv -> IO CBool
177-
foreign import ccall unsafe "" c_tx_lock_distance :: Ptr FrameItem -> Ptr FrameItem -> Ptr CTxEnv -> IO CBool
178-
foreign import ccall unsafe "" c_tx_lock_duration :: Ptr FrameItem -> Ptr FrameItem -> Ptr CTxEnv -> IO CBool
177+
foreign import ccall unsafe "" c_broken_do_not_use_tx_lock_distance :: Ptr FrameItem -> Ptr FrameItem -> Ptr CTxEnv -> IO CBool
178+
foreign import ccall unsafe "" c_broken_do_not_use_tx_lock_duration :: Ptr FrameItem -> Ptr FrameItem -> Ptr CTxEnv -> IO CBool
179179
foreign import ccall unsafe "" c_check_lock_height :: Ptr FrameItem -> Ptr FrameItem -> Ptr CTxEnv -> IO CBool
180180
foreign import ccall unsafe "" c_check_lock_time :: Ptr FrameItem -> Ptr FrameItem -> Ptr CTxEnv -> IO CBool
181-
foreign import ccall unsafe "" c_check_lock_distance :: Ptr FrameItem -> Ptr FrameItem -> Ptr CTxEnv -> IO CBool
182-
foreign import ccall unsafe "" c_check_lock_duration :: Ptr FrameItem -> Ptr FrameItem -> Ptr CTxEnv -> IO CBool
181+
foreign import ccall unsafe "" c_broken_do_not_use_check_lock_distance :: Ptr FrameItem -> Ptr FrameItem -> Ptr CTxEnv -> IO CBool
182+
foreign import ccall unsafe "" c_broken_do_not_use_check_lock_duration :: Ptr FrameItem -> Ptr FrameItem -> Ptr CTxEnv -> IO CBool
183183
foreign import ccall unsafe "" c_calculate_issuance_entropy :: Ptr FrameItem -> Ptr FrameItem -> IO CBool
184184
foreign import ccall unsafe "" c_calculate_asset :: Ptr FrameItem -> Ptr FrameItem -> IO CBool
185185
foreign import ccall unsafe "" c_calculate_explicit_token :: Ptr FrameItem -> Ptr FrameItem -> IO CBool
@@ -384,23 +384,23 @@ tx_lock_height = unsafeLocalJet c_tx_lock_height
384384
tx_lock_time :: PrimEnv -> () -> Maybe Word32
385385
tx_lock_time = unsafeLocalJet c_tx_lock_time
386386

387-
tx_lock_distance :: PrimEnv -> () -> Maybe Word16
388-
tx_lock_distance = unsafeLocalJet c_tx_lock_distance
387+
broken_do_not_use_tx_lock_distance :: PrimEnv -> () -> Maybe Word16
388+
broken_do_not_use_tx_lock_distance = unsafeLocalJet c_broken_do_not_use_tx_lock_distance
389389

390-
tx_lock_duration :: PrimEnv -> () -> Maybe Word16
391-
tx_lock_duration = unsafeLocalJet c_tx_lock_duration
390+
broken_do_not_use_tx_lock_duration :: PrimEnv -> () -> Maybe Word16
391+
broken_do_not_use_tx_lock_duration = unsafeLocalJet c_broken_do_not_use_tx_lock_duration
392392

393393
check_lock_height :: PrimEnv -> Word32 -> Maybe ()
394394
check_lock_height = unsafeLocalJet c_check_lock_height
395395

396396
check_lock_time :: PrimEnv -> Word32 -> Maybe ()
397397
check_lock_time = unsafeLocalJet c_check_lock_time
398398

399-
check_lock_distance :: PrimEnv -> Word16 -> Maybe ()
400-
check_lock_distance = unsafeLocalJet c_check_lock_distance
399+
broken_do_not_use_check_lock_distance :: PrimEnv -> Word16 -> Maybe ()
400+
broken_do_not_use_check_lock_distance = unsafeLocalJet c_broken_do_not_use_check_lock_distance
401401

402-
check_lock_duration :: PrimEnv -> Word16 -> Maybe ()
403-
check_lock_duration = unsafeLocalJet c_check_lock_duration
402+
broken_do_not_use_check_lock_duration :: PrimEnv -> Word16 -> Maybe ()
403+
broken_do_not_use_check_lock_duration = unsafeLocalJet c_broken_do_not_use_check_lock_duration
404404

405405
calculate_issuance_entropy :: ((Word256, Word32), Word256) -> Maybe Word256
406406
calculate_issuance_entropy = unsafeLocalCoreJet c_calculate_issuance_entropy

‎Haskell/Simplicity/Elements/Jets.hs‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,12 @@ deriving instance Show (SigHashJet a b)
126126
data TimeLockJet a b where
127127
CheckLockHeight :: TimeLockJet TimeLock.Height ()
128128
CheckLockTime :: TimeLockJet TimeLock.Time ()
129-
CheckLockDistance :: TimeLockJet TimeLock.Distance ()
130-
CheckLockDuration :: TimeLockJet TimeLock.Duration ()
129+
BrokenDoNotUseCheckLockDistance :: TimeLockJet TimeLock.Distance ()
130+
BrokenDoNotUseCheckLockDuration :: TimeLockJet TimeLock.Duration ()
131131
TxLockHeight :: TimeLockJet () TimeLock.Height
132132
TxLockTime :: TimeLockJet () TimeLock.Time
133-
TxLockDistance :: TimeLockJet () TimeLock.Distance
134-
TxLockDuration :: TimeLockJet () TimeLock.Duration
133+
BrokenDoNotUseTxLockDistance :: TimeLockJet () TimeLock.Distance
134+
BrokenDoNotUseTxLockDuration :: TimeLockJet () TimeLock.Duration
135135
TxIsFinal :: TimeLockJet () TimeLock.Bit
136136
deriving instance Eq (TimeLockJet a b)
137137
deriving instance Show (TimeLockJet a b)
@@ -249,12 +249,12 @@ specificationSigHash BuildTaptweak = Prog.buildTaptweak
249249
specificationTimeLock :: (Assert term, Primitive term) => TimeLockJet a b -> term a b
250250
specificationTimeLock CheckLockHeight = TimeLock.checkLockHeight
251251
specificationTimeLock CheckLockTime = TimeLock.checkLockTime
252-
specificationTimeLock CheckLockDistance = TimeLock.checkLockDistance
253-
specificationTimeLock CheckLockDuration = TimeLock.checkLockDuration
252+
specificationTimeLock BrokenDoNotUseCheckLockDistance = TimeLock.checkLockDistance
253+
specificationTimeLock BrokenDoNotUseCheckLockDuration = TimeLock.checkLockDuration
254254
specificationTimeLock TxLockHeight = TimeLock.txLockHeight
255255
specificationTimeLock TxLockTime = TimeLock.txLockTime
256-
specificationTimeLock TxLockDistance = TimeLock.txLockDistance
257-
specificationTimeLock TxLockDuration = TimeLock.txLockDuration
256+
specificationTimeLock BrokenDoNotUseTxLockDistance = TimeLock.txLockDistance
257+
specificationTimeLock BrokenDoNotUseTxLockDuration = TimeLock.txLockDuration
258258
specificationTimeLock TxIsFinal = TimeLock.txIsFinal
259259

260260
specificationIssuance :: (Assert term, Primitive term) => IssuanceJet a b -> term a b
@@ -420,10 +420,10 @@ implementationTimeLock CheckLockTime env x | txIsFinal (envTx env) = guard $ fro
420420
| otherwise = guard $ fromWord32 x <= 0
421421
where
422422
lock = fromIntegral . sigTxLock . envTx $ env
423-
implementationTimeLock CheckLockDistance env x | fromWord16 x <= fromIntegral (txLockDistance (envTx env)) = Just ()
424-
| otherwise = Nothing
425-
implementationTimeLock CheckLockDuration env x | fromWord16 x <= fromIntegral (txLockDuration (envTx env)) = Just ()
426-
| otherwise = Nothing
423+
implementationTimeLock BrokenDoNotUseCheckLockDistance env x | fromWord16 x <= fromIntegral (txLockDistance (envTx env)) = Just ()
424+
| otherwise = Nothing
425+
implementationTimeLock BrokenDoNotUseCheckLockDuration env x | fromWord16 x <= fromIntegral (txLockDuration (envTx env)) = Just ()
426+
| otherwise = Nothing
427427
implementationTimeLock TxLockHeight env () | txIsFinal (envTx env) = Just (toWord32 0)
428428
| Left l <- parseLock lock = Just . toWord32 $ fromIntegral l
429429
| otherwise = Just (toWord32 0)
@@ -434,8 +434,8 @@ implementationTimeLock TxLockTime env () | txIsFinal (envTx env) = Just (toWord3
434434
| otherwise = Just (toWord32 0)
435435
where
436436
lock = fromIntegral . sigTxLock . envTx $ env
437-
implementationTimeLock TxLockDistance env () = Just . toWord16 . fromIntegral $ txLockDistance (envTx env)
438-
implementationTimeLock TxLockDuration env () = Just . toWord16 . fromIntegral $ txLockDuration (envTx env)
437+
implementationTimeLock BrokenDoNotUseTxLockDistance env () = Just . toWord16 . fromIntegral $ txLockDistance (envTx env)
438+
implementationTimeLock BrokenDoNotUseTxLockDuration env () = Just . toWord16 . fromIntegral $ txLockDuration (envTx env)
439439
implementationTimeLock TxIsFinal env () = Just $ toBit (txIsFinal (envTx env))
440440

441441
implementationIssuance :: IssuanceJet a b -> PrimEnv -> a -> Maybe b
@@ -553,12 +553,12 @@ sigHashCatalogue = book
553553
timeLockCatalogue = book
554554
[ SomeArrow CheckLockHeight
555555
, SomeArrow CheckLockTime
556-
, SomeArrow CheckLockDistance
557-
, SomeArrow CheckLockDuration
556+
, SomeArrow BrokenDoNotUseCheckLockDistance
557+
, SomeArrow BrokenDoNotUseCheckLockDuration
558558
, SomeArrow TxLockHeight
559559
, SomeArrow TxLockTime
560-
, SomeArrow TxLockDistance
561-
, SomeArrow TxLockDuration
560+
, SomeArrow BrokenDoNotUseTxLockDistance
561+
, SomeArrow BrokenDoNotUseTxLockDuration
562562
, SomeArrow TxIsFinal
563563
]
564564
issuanceCatalogue = book
@@ -671,12 +671,12 @@ putJetBitSigHash BuildTaptweak = putPositive 35
671671
putJetBitTimeLock :: TimeLockJet a b -> DList Bool
672672
putJetBitTimeLock CheckLockHeight = putPositive 1
673673
putJetBitTimeLock CheckLockTime = putPositive 2
674-
putJetBitTimeLock CheckLockDistance = putPositive 3
675-
putJetBitTimeLock CheckLockDuration = putPositive 4
674+
putJetBitTimeLock BrokenDoNotUseCheckLockDistance = putPositive 3
675+
putJetBitTimeLock BrokenDoNotUseCheckLockDuration = putPositive 4
676676
putJetBitTimeLock TxLockHeight = putPositive 5
677677
putJetBitTimeLock TxLockTime = putPositive 6
678-
putJetBitTimeLock TxLockDistance = putPositive 7
679-
putJetBitTimeLock TxLockDuration = putPositive 8
678+
putJetBitTimeLock BrokenDoNotUseTxLockDistance = putPositive 7
679+
putJetBitTimeLock BrokenDoNotUseTxLockDuration = putPositive 8
680680
putJetBitTimeLock TxIsFinal = putPositive 9
681681

682682
putJetBitIssuance :: IssuanceJet a b -> DList Bool
@@ -1294,12 +1294,12 @@ jetCostSigHash BuildTaptweak = cost "BuildTaptweak"
12941294
jetCostTimeLock :: TimeLockJet a b -> Weight
12951295
jetCostTimeLock CheckLockHeight = cost "CheckLockHeight"
12961296
jetCostTimeLock CheckLockTime = cost "CheckLockTime"
1297-
jetCostTimeLock CheckLockDistance = cost "CheckLockDistance"
1298-
jetCostTimeLock CheckLockDuration = cost "CheckLockDuration"
1297+
jetCostTimeLock BrokenDoNotUseCheckLockDistance = cost "CheckLockDistance"
1298+
jetCostTimeLock BrokenDoNotUseCheckLockDuration = cost "CheckLockDuration"
12991299
jetCostTimeLock TxLockHeight = cost "TxLockHeight"
13001300
jetCostTimeLock TxLockTime = cost "TxLockTime"
1301-
jetCostTimeLock TxLockDistance = cost "TxLockDistance"
1302-
jetCostTimeLock TxLockDuration = cost "TxLockDuration"
1301+
jetCostTimeLock BrokenDoNotUseTxLockDistance = cost "TxLockDistance"
1302+
jetCostTimeLock BrokenDoNotUseTxLockDuration = cost "TxLockDuration"
13031303
jetCostTimeLock TxIsFinal = cost "TxIsFinal"
13041304

13051305
jetCostIssuance :: IssuanceJet a b -> Weight

0 commit comments

Comments
 (0)