Skip to content

fix(flat): decode list/pair elements without type tags #5

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
rodrigomd94 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(flat): decode list/pair elements without type tags #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
63 changes: 60 additions & 3 deletions crates/uplc/src/flat/decode/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,71 @@ fn decode_constant<'a>(
}
Type::Unit => Ok(Constant::unit(ctx.arena)),
Type::List(sub_typ) => {
let fields = d.list_with(ctx, |ctx, d| decode_constant(ctx, d))?;
let fields = d.list_with(ctx, |ctx, d| decode_constant_value(ctx, d, sub_typ))?;
let fields = ctx.arena.alloc(fields);

Ok(Constant::proto_list(ctx.arena, sub_typ, fields))
}
Type::Pair(sub_typ1, sub_typ2) => {
let fst = decode_constant(ctx, d)?;
let snd = decode_constant(ctx, d)?;
let fst = decode_constant_value(ctx, d, sub_typ1)?;
let snd = decode_constant_value(ctx, d, sub_typ2)?;

Ok(Constant::proto_pair(
ctx.arena, sub_typ1, sub_typ2, fst, snd,
))
}
Type::Data => {
let cbor = d.bytes(ctx.arena)?;
let data = minicbor::decode_with(&cbor, ctx)?;

Ok(Constant::data(ctx.arena, data))
}
Type::Bls12_381G1Element => Err(FlatDecodeError::BlsTypeNotSupported),
Type::Bls12_381G2Element => Err(FlatDecodeError::BlsTypeNotSupported),
Type::Bls12_381MlResult => Err(FlatDecodeError::BlsTypeNotSupported),
}
}

// Decode a constant value without reading type tags (type is already known)
fn decode_constant_value<'a>(
ctx: &mut Ctx<'a>,
d: &mut Decoder,
ty: &'a Type<'a>,
) -> Result<&'a Constant<'a>, FlatDecodeError> {
match ty {
Type::Integer => {
let v = d.integer()?;
let v = ctx.arena.alloc(v);

Ok(Constant::integer(ctx.arena, v))
}
Type::ByteString => {
let b = d.bytes(ctx.arena)?;
let b = ctx.arena.alloc(b);

Ok(Constant::byte_string(ctx.arena, b))
}
Type::Bool => {
let v = d.bit()?;

Ok(Constant::bool(ctx.arena, v))
}
Type::String => {
let s = d.utf8(ctx.arena)?;
let s = ctx.arena.alloc(s);

Ok(Constant::string(ctx.arena, s))
}
Type::Unit => Ok(Constant::unit(ctx.arena)),
Type::List(sub_typ) => {
let fields = d.list_with(ctx, |ctx, d| decode_constant_value(ctx, d, sub_typ))?;
let fields = ctx.arena.alloc(fields);

Ok(Constant::proto_list(ctx.arena, sub_typ, fields))
}
Type::Pair(sub_typ1, sub_typ2) => {
let fst = decode_constant_value(ctx, d, sub_typ1)?;
let snd = decode_constant_value(ctx, d, sub_typ2)?;

Ok(Constant::proto_pair(
ctx.arena, sub_typ1, sub_typ2, fst, snd,
Expand Down