Skip to content

Fix/amount field restriction #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sofia-bobbiesi wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Fix/amount field restriction #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2648c8a
feat(analyzing): enforce AnyAsset type for OutputBlockField amount an…
sofia-bobbiesi Oct 7, 2025
9fa8b8d
Merge branch 'main' into fix/amount-field-restriction
sofia-bobbiesi Oct 15, 2025
ef5b7a2
fix tests
sofia-bobbiesi Oct 17, 2025
974752d
test: add test for mixed amount expressions in output
sofia-bobbiesi Oct 17, 2025
9b26bda
Refactor target_type and analyze methods to include Context parameter
sofia-bobbiesi Oct 21, 2025
072d35b
update tests
sofia-bobbiesi Oct 21, 2025
f37820d
update analyze methods to include Context
sofia-bobbiesi Oct 22, 2025
f5012f4
refactor: change target_type from Vec<Type> to Type in Context
sofia-bobbiesi Oct 22, 2025
4561355
Merge branch 'main' into fix/amount-field-restriction
sofia-bobbiesi Oct 22, 2025
72cb0d4
main
sofia-bobbiesi Oct 29, 2025
3b3d3fe
Merge branch 'main' into fix/amount-field-restriction
sofia-bobbiesi Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
572 changes: 356 additions & 216 deletions crates/tx3-lang/src/analyzing.rs
View file
Open in desktop

Large diffs are not rendered by default.

98 changes: 59 additions & 39 deletions crates/tx3-lang/src/ast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use serde::{Deserialize, Serialize};
use std::{collections::HashMap, rc::Rc};

use crate::cardano::PlutusWitnessBlock;
use crate::analyzing::Context;

#[derive(Debug, PartialEq, Eq)]
pub struct Scope {
Expand Down Expand Up @@ -120,11 +120,20 @@ impl Symbol {
}
}

pub fn target_type(&self) -> Option<Type> {
pub fn target_type(&self, ctx: Option<&Context>) -> Option<Type> {
match self {
Symbol::ParamVar(_, ty) => Some(ty.as_ref().clone()),
Symbol::RecordField(x) => Some(x.r#type.clone()),
Symbol::Input(x) => x.datum_is().cloned(),
Symbol::Input(x) => {
let datum_type = x.datum_is().cloned();

match ctx {
Some(ctx) if ctx.target_type == Type::AnyAsset => Some(Type::AnyAsset),
_ => datum_type,
}
}
Symbol::LocalExpr(expr) => expr.target_type(ctx),
Symbol::Fees => Some(Type::AnyAsset),
x => {
dbg!(x);
None
Expand Down Expand Up @@ -161,8 +170,8 @@ impl Identifier {
}
}

pub fn target_type(&self) -> Option<Type> {
self.symbol.as_ref().and_then(|x| x.target_type())
pub fn target_type(&self, ctx: Option<&Context>) -> Option<Type> {
self.symbol.as_ref().and_then(|x| x.target_type(ctx))
}
}

Expand Down Expand Up @@ -546,7 +555,7 @@ pub struct StaticAssetConstructor {
}

impl StaticAssetConstructor {
pub fn target_type(&self) -> Option<Type> {
pub fn target_type(&self, _ctx: Option<&Context>) -> Option<Type> {
Some(Type::AnyAsset)
}
}
Expand All @@ -560,7 +569,7 @@ pub struct AnyAssetConstructor {
}

impl AnyAssetConstructor {
pub fn target_type(&self) -> Option<Type> {
pub fn target_type(&self, _ctx: Option<&Context>) -> Option<Type> {
Some(Type::AnyAsset)
}
}
Expand All @@ -584,8 +593,8 @@ pub struct StructConstructor {
}

impl StructConstructor {
pub fn target_type(&self) -> Option<Type> {
self.r#type.symbol.as_ref().and_then(|x| x.target_type())
pub fn target_type(&self, ctx: Option<&Context>) -> Option<Type> {
self.r#type.symbol.as_ref().and_then(|x| x.target_type(ctx))
}
}

Expand Down Expand Up @@ -617,8 +626,8 @@ pub struct ListConstructor {
}

impl ListConstructor {
pub fn target_type(&self) -> Option<Type> {
self.elements.first().and_then(|x| x.target_type())
pub fn target_type(&self, ctx: Option<&Context>) -> Option<Type> {
self.elements.first().and_then(|x| x.target_type(ctx))
}
}

Expand All @@ -630,8 +639,8 @@ pub struct MapField {
}

impl MapField {
pub fn target_type(&self) -> Option<Type> {
self.key.target_type()
pub fn target_type(&self, ctx: Option<&Context>) -> Option<Type> {
self.key.target_type(ctx)
}
}

Expand All @@ -642,10 +651,10 @@ pub struct MapConstructor {
}

impl MapConstructor {
pub fn target_type(&self) -> Option<Type> {
pub fn target_type(&self, ctx: Option<&Context>) -> Option<Type> {
if let Some(first_field) = self.fields.first() {
let key_type = first_field.key.target_type()?;
let value_type = first_field.value.target_type()?;
let key_type = first_field.key.target_type(ctx)?;
let value_type = first_field.value.target_type(ctx)?;
Some(Type::Map(Box::new(key_type), Box::new(value_type)))
} else {
None
Expand All @@ -667,8 +676,8 @@ pub struct NegateOp {
}

impl NegateOp {
pub fn target_type(&self) -> Option<Type> {
self.operand.target_type()
pub fn target_type(&self, ctx: Option<&Context>) -> Option<Type> {
self.operand.target_type(ctx)
}
}

Expand All @@ -684,8 +693,8 @@ pub struct PropertyOp {
}

impl PropertyOp {
pub fn target_type(&self) -> Option<Type> {
self.property.target_type()
pub fn target_type(&self, ctx: Option<&Context>) -> Option<Type> {
self.property.target_type(ctx)
}
}

Expand All @@ -697,8 +706,8 @@ pub struct AddOp {
}

impl AddOp {
pub fn target_type(&self) -> Option<Type> {
self.lhs.target_type()
pub fn target_type(&self, ctx: Option<&Context>) -> Option<Type> {
self.lhs.target_type(ctx)
}
}

Expand All @@ -710,8 +719,8 @@ pub struct SubOp {
}

impl SubOp {
pub fn target_type(&self) -> Option<Type> {
self.lhs.target_type()
pub fn target_type(&self, ctx: Option<&Context>) -> Option<Type> {
self.lhs.target_type(ctx)
}
}

Expand All @@ -723,8 +732,8 @@ pub struct ConcatOp {
}

impl ConcatOp {
pub fn target_type(&self) -> Option<Type> {
self.lhs.target_type()
pub fn target_type(&self, ctx: Option<&Context>) -> Option<Type> {
self.lhs.target_type(ctx)
}
}

Expand Down Expand Up @@ -762,28 +771,39 @@ impl DataExpr {
}
}

pub fn target_type(&self) -> Option<Type> {
pub fn target_type(&self, ctx: Option<&Context>) -> Option<Type> {
let default_ctx = Context::default();
let ctx = ctx.unwrap_or(&default_ctx);
match self {
DataExpr::Identifier(x) => x.target_type(),
DataExpr::Identifier(x) => match &x.symbol {
Some(Symbol::Input(def)) => {
if ctx.target_type == Type::AnyAsset {
Some(Type::AnyAsset)
} else {
def.datum_is().cloned()
}
}
_ => x.target_type(Some(ctx)),
},
DataExpr::None => Some(Type::Undefined),
DataExpr::Unit => Some(Type::Unit),
DataExpr::Number(_) => Some(Type::Int),
DataExpr::Bool(_) => Some(Type::Bool),
DataExpr::String(_) => Some(Type::Bytes),
DataExpr::HexString(_) => Some(Type::Bytes),
DataExpr::StructConstructor(x) => x.target_type(),
DataExpr::MapConstructor(x) => x.target_type(),
DataExpr::ListConstructor(x) => match x.target_type() {
DataExpr::StructConstructor(x) => x.target_type(Some(ctx)),
DataExpr::MapConstructor(x) => x.target_type(Some(ctx)),
DataExpr::ListConstructor(x) => match x.target_type(Some(ctx)) {
Some(inner) => Some(Type::List(Box::new(inner))),
None => None,
},
DataExpr::AddOp(x) => x.target_type(),
DataExpr::SubOp(x) => x.target_type(),
DataExpr::ConcatOp(x) => x.target_type(),
DataExpr::NegateOp(x) => x.target_type(),
DataExpr::PropertyOp(x) => x.target_type(),
DataExpr::StaticAssetConstructor(x) => x.target_type(),
DataExpr::AnyAssetConstructor(x) => x.target_type(),
DataExpr::AddOp(x) => x.target_type(Some(ctx)),
DataExpr::SubOp(x) => x.target_type(Some(ctx)),
DataExpr::ConcatOp(x) => x.target_type(Some(ctx)),
DataExpr::NegateOp(x) => x.target_type(Some(ctx)),
DataExpr::PropertyOp(x) => x.target_type(Some(ctx)),
DataExpr::StaticAssetConstructor(x) => x.target_type(Some(ctx)),
DataExpr::AnyAssetConstructor(x) => x.target_type(Some(ctx)),
DataExpr::UtxoRef(_) => Some(Type::UtxoRef),
DataExpr::MinUtxo(_) => Some(Type::AnyAsset),
DataExpr::ComputeTipSlot => Some(Type::Int),
Expand Down Expand Up @@ -887,7 +907,7 @@ impl Type {
.map(|index| DataExpr::Number(index as i64))
}
Type::List(_) => property
.target_type()
.target_type(None)
.filter(|ty| *ty == Type::Int)
.map(|_| property),
_ => None,
Expand Down
Loading