feat(elements): pass annex pointer explicitly to new_raw_input

Author: stringhandler

src/jet/elements/c_env.rs

@@ -73,14 +73,10 @@ fn new_raw_input<'raw>(
     inp: &'raw elements::TxIn,
     in_utxo: &'raw ElementsUtxo,
     inp_data: &'raw RawInputData,
+    annex: *const c_elements::CRawBuffer,
 ) -> c_elements::CRawInput<'raw> {
     c_elements::CRawInput {
-        annex: inp_data
-            .annex
-            .as_ref()
-            .map(|annex| c_elements::CRawBuffer::new(annex))
-            .as_ref()
-            .map_or(core::ptr::null(), |ptr| ptr as *const _),
+        annex,
         prev_txid: inp.previous_output.txid.as_ref(),
         pegin: inp_data.genesis_hash.as_ref(),
         issuance: if inp.has_issuance() {
@@ -152,10 +148,6 @@ pub(super) fn new_tx(
 ) -> *mut c_elements::CTransaction {
     let mut raw_inputs = Vec::new();
     let mut raw_outputs = Vec::new();
-    // Allocate space for the raw annexes. This dumb `Vec::from_iter` construction is
-    // equivalent to `vec![None; tx.input.len()]`, but that won't compile because it
-    // requires Option::<CRawBuffer>::None to be cloneable, which it's not because
-    // CRawBuffer isn't.
 
     // SAFETY: this allocation *must* live until after the `simplicity_mallocTransaction`
     //  at the bottom of this function. We convert the vector to a boxed slice to ensure
@@ -175,7 +167,10 @@ pub(super) fn new_tx(
             .annex
             .as_ref()
             .map(|annex| c_elements::CRawBuffer::new(annex));
-        let res = new_raw_input(inp, in_utxo, inp_data);
+        let annex_ptr = raw_annexes[n]
+            .as_ref()
+            .map_or(core::ptr::null(), |b| b as *const _);
+        let res = new_raw_input(inp, in_utxo, inp_data, annex_ptr);
         raw_inputs.push(res);
     }
     for (out, out_data) in tx.output.iter().zip(tx_data.outputs.iter()) {