sync with upstream change: channel digest location change

src/bitcoin_script/fiat_shamir.rs

@@ -226,7 +226,7 @@ impl FibonacciFiatShamirGadget {
             { Sha256ChannelGadget::draw_numbers_with_hint(N_QUERIES, (FIB_LOG_SIZE + LOG_BLOWUP_FACTOR + 1) as usize) }
 
             // drop channel digest
-            { N_QUERIES } OP_ROLL OP_DROP
+            OP_DROP
 
             // stack:
             //    c1, oods point (8)

src/fiat_shamir.rs

@@ -183,6 +183,10 @@ pub fn compute_fiat_shamir_hints(
     let column_log_sizes = components.components().column_log_sizes();
     commitment_scheme.commit(proof.commitments[0], &column_log_sizes[0], channel);
 
+    if column_log_sizes.len() == 2 {
+        commitment_scheme.commit(proof.commitments[1], &column_log_sizes[1], channel);
+    }
+
     channel.mix_felts(
         &proof
             .lookup_values

src/split/mod.rs

@@ -349,16 +349,13 @@ impl CovenantProgram for FibonacciSplitProgram {
             };
 
             let witness = convert_to_witness(script! {
-                    { *fiat_shamir_hints.clone() }
-                })
-                .unwrap();
+                { *fiat_shamir_hints.clone() }
+            })
+            .unwrap();
 
             println!("fiat-shamir witness size: {}", witness.len());
 
-            let final_stack = get_final_stack(
-                script,
-                witness,
-            );
+            let final_stack = get_final_stack(script, witness);
 
             let stack_hash = StackHash::compute(&final_stack);