283 keep order of chain specific outputs

crates/tx3-cardano/src/compile/mod.rs

@@ -288,24 +288,38 @@ fn compile_outputs(
     tx: &tir::Tx,
     network: Network,
 ) -> Result<Vec<primitives::TransactionOutput<'static>>, Error> {
-    let mut resolved: Vec<_> = tx
-        .outputs
-        .iter()
-        .map(|out| (out.optional, compile_output_block(out, network)))
-        .filter(|(optional, output)| !optional || output_has_assets(output))
-        .map(|(_, output)| output)
-        .collect::<Result<Vec<_>, _>>()?;
+    let outputs = tx.outputs.iter().filter_map(|out| {
+        let compiled = compile_output_block(out, network);
+
+        if out.optional && !output_has_assets(&compiled) {
+            return None;
+        }
+
+        let idx = out.declared_index.as_number().map(|n| n as usize);
+        Some(compiled.map(|o| (idx, o)))
+    });
 
     let cardano_outputs = tx
         .adhoc
         .iter()
         .filter(|x| x.name.as_str() == "cardano_publish")
-        .map(|adhoc| compile_cardano_publish_directive(adhoc, network))
+        .map(|adhoc| {
+            let idx = adhoc
+                .data
+                .get("declared_index")
+                .and_then(|expr| expr.as_number())
+                .map(|n| n as usize);
+
+            compile_cardano_publish_directive(adhoc, network).map(|o| (idx, o))
+        });
+
+    let mut all_outputs: Vec<_> = outputs
+        .chain(cardano_outputs)
         .collect::<Result<Vec<_>, _>>()?;
 
-    resolved.extend(cardano_outputs);
+    all_outputs.sort_by_key(|(idx, _)| idx.unwrap_or(usize::MAX));
 
-    Ok(resolved)
+    Ok(all_outputs.into_iter().map(|(_, out)| out).collect())
 }
 
 pub fn compile_cardano_publish_directive(

crates/tx3-lang/src/ast.rs

@@ -404,6 +404,7 @@ pub struct OutputBlock {
     pub optional: bool,
     pub fields: Vec<OutputBlockField>,
     pub span: Span,
+    pub declared_index: Option<usize>,
 }
 
 impl OutputBlock {

crates/tx3-lang/src/cardano.rs

@@ -586,6 +586,7 @@ pub struct CardanoPublishBlock {
     pub name: Option<Identifier>,
     pub fields: Vec<CardanoPublishBlockField>,
     pub span: Span,
+    pub declared_index: Option<usize>,
 }
 
 impl CardanoPublishBlock {
@@ -663,7 +664,12 @@ impl AstNode for CardanoPublishBlock {
             .map(|x| CardanoPublishBlockField::parse(x))
             .collect::<Result<Vec<_>, _>>()?;
 
-        Ok(CardanoPublishBlock { name, fields, span })
+        Ok(CardanoPublishBlock {
+            name,
+            fields,
+            span,
+            declared_index: None,
+        })
     }
 
     fn span(&self) -> &Span {
@@ -727,12 +733,21 @@ impl IntoLower for CardanoPublishBlock {
         &self,
         ctx: &crate::lowering::Context,
     ) -> Result<Self::Output, crate::lowering::Error> {
-        let data = self
+        let mut data: HashMap<String, ir::Expression> = self
             .fields
             .iter()
             .map(|x| x.into_lower(ctx))
             .collect::<Result<_, _>>()?;
 
+        data.insert(
+            "declared_index".to_string(),
+            ir::Expression::Number(
+                self.declared_index
+                    .map(|x| x as i128)
+                    .expect("Publish block must have a declaration index"),
+            ),
+        );
+
         Ok(ir::AdHocDirective {
             name: "cardano_publish".to_string(),
             data,
@@ -938,6 +953,7 @@ mod tests {
                 ))),
             ],
             span: Span::DUMMY,
+            declared_index: None,
         }
     );
 
@@ -967,6 +983,7 @@ mod tests {
                 ))),
             ],
             span: Span::DUMMY,
+            declared_index: None,
         }
     );
 

crates/tx3-lang/src/lowering.rs

@@ -697,12 +697,14 @@ impl IntoLower for ast::OutputBlock {
         let address = self.find("to").into_lower(ctx)?.unwrap_or_default();
         let datum = self.find("datum").into_lower(ctx)?.unwrap_or_default();
         let amount = self.find("amount").into_lower(ctx)?.unwrap_or_default();
+        let declared_ix = self.declared_index.unwrap();
 
         Ok(ir::Output {
             address,
             datum,
             amount,
             optional: self.optional,
+            declared_index: ir::Expression::Number(declared_ix as i128),
         })
     }
 }

crates/tx3-lang/src/parsing.rs

@@ -208,16 +208,32 @@ impl AstNode for TxDef {
         let mut signers = None;
         let mut metadata = None;
 
+        let mut declared_index: usize = 0;
+
         for item in inner {
             match item.as_rule() {
                 Rule::locals_block => locals = Some(LocalsBlock::parse(item)?),
                 Rule::reference_block => references.push(ReferenceBlock::parse(item)?),
                 Rule::input_block => inputs.push(InputBlock::parse(item)?),
-                Rule::output_block => outputs.push(OutputBlock::parse(item)?),
+                Rule::output_block => {
+                    let mut ob = OutputBlock::parse(item)?;
+                    ob.declared_index = Some(declared_index);
+                    declared_index += 1;
+                    outputs.push(ob);
+                }
                 Rule::validity_block => validity = Some(ValidityBlock::parse(item)?),
                 Rule::mint_block => mints.push(MintBlock::parse(item)?),
                 Rule::burn_block => burns.push(MintBlock::parse(item)?),
-                Rule::chain_specific_block => adhoc.push(ChainSpecificBlock::parse(item)?),
+                Rule::chain_specific_block => {
+                    let mut csb = ChainSpecificBlock::parse(item)?;
+                    let ChainSpecificBlock::Cardano(cardano_block) = &mut csb;
+                    if let crate::cardano::CardanoBlock::Publish(pb) = cardano_block {
+                        pb.declared_index = Some(declared_index);
+                        declared_index += 1;
+                    }
+
+                    adhoc.push(csb);
+                }
                 Rule::collateral_block => collateral.push(CollateralBlock::parse(item)?),
                 Rule::signers_block => signers = Some(SignersBlock::parse(item)?),
                 Rule::metadata_block => metadata = Some(MetadataBlock::parse(item)?),
@@ -617,6 +633,7 @@ impl AstNode for OutputBlock {
             optional,
             fields,
             span,
+            declared_index: None,
         })
     }
 
@@ -2464,6 +2481,7 @@ mod tests {
                 }))),
             ],
             span: Span::DUMMY,
+            declared_index: None,
         }
     );
 

crates/tx3-tir/src/model/v1beta0.rs

@@ -305,6 +305,8 @@ pub struct Output {
     pub datum: Expression,
     pub amount: Expression,
     pub optional: bool,
+    #[serde(default)]
+    pub declared_index: Expression,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -522,6 +524,7 @@ impl Node for Output {
             datum: self.datum.apply(visitor)?,
             amount: self.amount.apply(visitor)?,
             optional: self.optional,
+            declared_index: self.declared_index,
         };
 
         Ok(visited)

crates/tx3-tir/src/reduce/mod.rs

@@ -1159,6 +1159,7 @@ impl Composite for Output {
             datum: f(self.datum)?,
             amount: f(self.amount)?,
             optional: self.optional,
+            declared_index: self.declared_index,
         })
     }
 }

examples/asteria.ast

@@ -597,7 +597,8 @@
             "dummy": false,
             "start": 1158,
             "end": 1379
-          }
+          },
+          "declared_index": 0
         },
         {
           "name": null,
@@ -651,7 +652,8 @@
             "dummy": false,
             "start": 1385,
             "end": 1449
-          }
+          },
+          "declared_index": 1
         }
       ],
       "validity": null,

examples/asteria.move_ship.tir

@@ -1168,7 +1168,10 @@
           ]
         }
       },
-      "optional": false
+      "optional": false,
+      "declared_index": {
+        "Number": 0
+      }
     },
     {
       "address": {
@@ -1262,7 +1265,10 @@
           ]
         }
       },
-      "optional": false
+      "optional": false,
+      "declared_index": {
+        "Number": 1
+      }
     }
   ],
   "validity": null,

examples/buidler_fest_2026.ast

@@ -537,7 +537,8 @@
             "dummy": false,
             "start": 958,
             "end": 1063
-          }
+          },
+          "declared_index": 0
         },
         {
           "name": {
@@ -672,7 +673,8 @@
             "dummy": false,
             "start": 1069,
             "end": 1246
-          }
+          },
+          "declared_index": 1
         },
         {
           "name": {
@@ -733,7 +735,8 @@
             "dummy": false,
             "start": 1252,
             "end": 1331
-          }
+          },
+          "declared_index": 2
         }
       ],
       "validity": {

examples/buidler_fest_2026.buy_ticket.tir

@@ -324,7 +324,10 @@
           ]
         }
       },
-      "optional": false
+      "optional": false,
+      "declared_index": {
+        "Number": 0
+      }
     },
     {
       "address": {
@@ -458,7 +461,10 @@
           }
         }
       },
-      "optional": false
+      "optional": false,
+      "declared_index": {
+        "Number": 1
+      }
     },
     {
       "address": {
@@ -486,7 +492,10 @@
           }
         ]
       },
-      "optional": false
+      "optional": false,
+      "declared_index": {
+        "Number": 2
+      }
     }
   ],
   "validity": {

examples/burn.ast

@@ -222,7 +222,8 @@
             "dummy": false,
             "start": 337,
             "end": 412
-          }
+          },
+          "declared_index": 0
         }
       ],
       "validity": null,

examples/burn.burn_stuff.tir

@@ -244,7 +244,10 @@
           ]
         }
       },
-      "optional": false
+      "optional": false,
+      "declared_index": {
+        "Number": 0
+      }
     }
   ],
   "validity": null,

examples/cardano_witness.ast

@@ -203,7 +203,8 @@
             "dummy": false,
             "start": 404,
             "end": 481
-          }
+          },
+          "declared_index": 0
         }
       ],
       "validity": null,
@@ -525,7 +526,8 @@
             "dummy": false,
             "start": 972,
             "end": 1049
-          }
+          },
+          "declared_index": 0
         }
       ],
       "validity": null,

examples/cardano_witness.mint_from_native_script.tir

@@ -134,7 +134,10 @@
           ]
         }
       },
-      "optional": false
+      "optional": false,
+      "declared_index": {
+        "Number": 0
+      }
     }
   ],
   "validity": null,

examples/cardano_witness.mint_from_plutus.tir

@@ -134,7 +134,10 @@
           ]
         }
       },
-      "optional": false
+      "optional": false,
+      "declared_index": {
+        "Number": 0
+      }
     }
   ],
   "validity": null,