Merge #858: fix: include varints for Taproot script and control block sizes

9483366 fix: include varints for Taproot script and control block sizes (Michael Mallan)

Pull request description:

  This is a simple fix for #771.


ACKs for top commit:
  apoelstra:
    ACK 9483366; successfully ran local tests; thanks!!


Tree-SHA512: 329406258b83fd0f6e68d1b6f7ea04d3d37b9dacc47809517c584086fb16f74bb4b5f262dd42fc2cc855c298503d681b294bcb9beb263362fa72cb682b4fded1

Author: apoelstra

src/plan.rs

@@ -984,23 +984,29 @@ mod test {
         // expected weight: 4 (scriptSig len) + 1 (witness len) + 1 (OP_PUSH) + 64 (sig)
         let internal_key_sat_weight = Some(70);
         // expected weight: 4 (scriptSig len) + 1 (witness len) + 1 (OP_PUSH) + 64 (sig)
+        // + 1 (script len)
         // + 34 [script: 1 (OP_PUSHBYTES_32) + 32 (key) + 1 (OP_CHECKSIG)]
+        // + 1 (control block len)
         // + 65 [control block: 1 (control byte) + 32 (internal key) + 32 (hash BC)]
-        let first_leaf_sat_weight = Some(169);
+        let first_leaf_sat_weight = Some(171);
         // expected weight: 4 (scriptSig len) + 1 (witness len) + 1 (OP_PUSH) + 64 (sig)
         // + 1 (OP_ZERO)
+        // + 1 (script len)
         // + 70 [script: 1 (OP_PUSHBYTES_32) + 32 (key) + 1 (OP_CHECKSIG)
         //       + 1 (OP_PUSHBYTES_32) + 32 (key) + 1 (OP_CHECKSIGADD)
         //       + 1 (OP_PUSHNUM1) + 1 (OP_NUMEQUAL)]
+        // + 1 (control block len)
         // + 97 [control block: 1 (control byte) + 32 (internal key) + 32 (hash C) + 32 (hash
         //       A)]
-        let second_leaf_sat_weight = Some(238);
+        let second_leaf_sat_weight = Some(240);
         // expected weight: 4 (scriptSig len) + 1 (witness len) + 1 (OP_PUSH) + 64 (sig)
+        // + 1 (script len)
         // + 36 [script: 1 (OP_PUSHBYTES_32) + 32 (key) + 1 (OP_CHECKSIGVERIFY)
         //       + 1 (OP_PUSHNUM_10) + 1 (OP_CLTV)]
+        // + 1 (control block len)
         // + 97 [control block: 1 (control byte) + 32 (internal key) + 32 (hash B) + 32 (hash
         //       A)]
-        let third_leaf_sat_weight = Some(203);
+        let third_leaf_sat_weight = Some(205);
 
         let tests = vec![
             // Don't give assets

src/util.rs

@@ -33,8 +33,11 @@ impl<Pk: MiniscriptKey> ItemSize for Placeholder<Pk> {
             | Placeholder::Hash160Preimage(_) => 33,
             Placeholder::PushOne => 2, // On legacy this should be 1 ?
             Placeholder::PushZero => 1,
-            Placeholder::TapScript(s) => s.len(),
-            Placeholder::TapControlBlock(cb) => cb.serialize().len(),
+            Placeholder::TapScript(s) => s.len() + varint_len(s.len()),
+            Placeholder::TapControlBlock(cb) => {
+                let block_len = cb.serialize().len();
+                block_len + varint_len(block_len)
+            }
         }
     }
 }