Skip to content

Commit

Permalink
enable new builtins (*with gotcha)
Browse files Browse the repository at this point in the history
  We still need to adjust the writeBits one to work around its list<int> argument.
  • Loading branch information
KtorZ committed Dec 7, 2024
1 parent d334452 commit 1105dbf
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
11 changes: 7 additions & 4 deletions crates/aiken-lang/src/builtins.rs
Original file line number Diff line number Diff line change
Expand Up @@ -505,10 +505,13 @@ pub fn plutus(id_gen: &IdGenerator) -> TypeInfo {
annotations: HashMap::new(),
};

for builtin in DefaultFunction::iter().take(75) {
let value = from_default_function(builtin, id_gen);

plutus.values.insert(builtin.aiken_name(), value);
for builtin in DefaultFunction::iter() {
// FIXME: Disabling WriteBits for now, since its signature requires the ability to create
// list of raw integers, which isn't possible through Aiken at the moment.
if !matches!(builtin, DefaultFunction::WriteBits) {
let value = from_default_function(builtin, id_gen);
plutus.values.insert(builtin.aiken_name(), value);
}
}

plutus
Expand Down
1 change: 0 additions & 1 deletion crates/aiken-lang/src/gen_uplc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ use builder::{
introduce_name, introduce_pattern, pop_pattern, softcast_data_to_type_otherwise,
unknown_data_to_type, DISCARDED,
};

use decision_tree::{get_tipo_by_path, Assigned, CaseTest, DecisionTree, TreeGen};
use indexmap::IndexMap;
use interner::AirInterner;
Expand Down
2 changes: 2 additions & 0 deletions crates/uplc/src/machine/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ pub enum Error {
ReadBitOutOfBounds,
#[error("writeBits: index out of bounds")]
WriteBitsOutOfBounds,
#[error("illegal operation on empty ByteArray")]
EmptyByteArray,
#[error("blst error {0:?}")]
Blst(blst::BLST_ERROR),
#[error("blst::hashToGroup")]
Expand Down
4 changes: 4 additions & 0 deletions crates/uplc/src/machine/runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1592,6 +1592,10 @@ impl DefaultFunction {
let bytes = args[0].unwrap_byte_string()?;
let bit_index = args[1].unwrap_integer()?;

if bytes.is_empty() {
return Err(Error::EmptyByteArray);
}

// This ensures there is at least one byte in bytes
if *bit_index < 0.into() || *bit_index >= (bytes.len() * 8).into() {
return Err(Error::ReadBitOutOfBounds);
Expand Down

0 comments on commit 1105dbf

Please sign in to comment.