waalge
/
aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IntegerToByteString takes in the second param itself

This commit is contained in:
microproofs 2024-10-17 20:01:01 -04:00
parent 5fd349f571
commit 9dd3ead3df
No known key found for this signature in database
GPG Key ID: 14F93C84DE6AFD17
3 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/uplc/src/machine.rs
View File

@ -320,7 +320,7 @@ impl Machine {
} }
fn eval_builtin_app(&mut self, runtime: BuiltinRuntime) -> Result<Value, Error> { fn eval_builtin_app(&mut self, runtime: BuiltinRuntime) -> Result<Value, Error> {
let cost = runtime.to_ex_budget(&self.costs.builtin_costs); let cost = runtime.to_ex_budget(&self.costs.builtin_costs)?;
self.spend_budget(cost)?; self.spend_budget(cost)?;

30
crates/uplc/src/machine/cost_model.rs
View File

@ -1,5 +1,6 @@
use super::Value; use super::{runtime, Error, Value};
use crate::builtins::DefaultFunction; use crate::builtins::DefaultFunction;
use num_bigint::BigInt;
use pallas_primitives::conway::Language; use pallas_primitives::conway::Language;
use std::collections::HashMap; use std::collections::HashMap;
@ -1741,8 +1742,8 @@ impl Default for BuiltinCosts {
} }
impl BuiltinCosts { impl BuiltinCosts {
pub fn to_ex_budget(&self, fun: DefaultFunction, args: &[Value]) -> ExBudget { pub fn to_ex_budget(&self, fun: DefaultFunction, args: &[Value]) -> Result<ExBudget, Error> {
match fun { Ok(match fun {
DefaultFunction::AddInteger => ExBudget { DefaultFunction::AddInteger => ExBudget {
mem: self mem: self
.add_integer .add_integer
@ -2307,18 +2308,31 @@ impl BuiltinCosts {
.cpu .cpu
.cost(args[0].to_ex_mem(), args[1].to_ex_mem()), .cost(args[0].to_ex_mem(), args[1].to_ex_mem()),
}, },
DefaultFunction::IntegerToByteString => ExBudget { DefaultFunction::IntegerToByteString => {
let uplc_int = args[1].unwrap_integer()?;
if uplc_int > &BigInt::from(runtime::INTEGER_TO_BYTE_STRING_MAXIMUM_OUTPUT_LENGTH) {
return Err(Error::IntegerToByteStringSizeTooBig(
uplc_int.clone(),
runtime::INTEGER_TO_BYTE_STRING_MAXIMUM_OUTPUT_LENGTH,
));
}
let arg1 = u64::try_from(uplc_int).unwrap().try_into().unwrap();
ExBudget {
mem: self.integer_to_byte_string.mem.cost( mem: self.integer_to_byte_string.mem.cost(
args[0].to_ex_mem(), args[0].to_ex_mem(),
args[1].to_ex_mem(), arg1,
args[2].to_ex_mem(), args[2].to_ex_mem(),
), ),
cpu: self.integer_to_byte_string.cpu.cost( cpu: self.integer_to_byte_string.cpu.cost(
args[0].to_ex_mem(), args[0].to_ex_mem(),
args[1].to_ex_mem(), arg1,
args[2].to_ex_mem(), args[2].to_ex_mem(),
), ),
}, }
}
DefaultFunction::ByteStringToInteger => ExBudget { DefaultFunction::ByteStringToInteger => ExBudget {
mem: self mem: self
.byte_string_to_integer .byte_string_to_integer
@ -2329,7 +2343,7 @@ impl BuiltinCosts {
.cpu .cpu
.cost(args[0].to_ex_mem(), args[1].to_ex_mem()), .cost(args[0].to_ex_mem(), args[1].to_ex_mem()),
}, },
} })
} }
} }

17
crates/uplc/src/machine/runtime.rs
View File

@ -31,7 +31,7 @@ const BLST_P1_COMPRESSED_SIZE: usize = 48;
const BLST_P2_COMPRESSED_SIZE: usize = 96; const BLST_P2_COMPRESSED_SIZE: usize = 96;
const INTEGER_TO_BYTE_STRING_MAXIMUM_OUTPUT_LENGTH: i64 = 8192; pub const INTEGER_TO_BYTE_STRING_MAXIMUM_OUTPUT_LENGTH: i64 = 8192;
//#[derive(std::cmp::PartialEq)] //#[derive(std::cmp::PartialEq)]
//pub enum EvalMode { //pub enum EvalMode {
@ -96,7 +96,7 @@ impl BuiltinRuntime {
Ok(()) Ok(())
} }
pub fn to_ex_budget(&self, costs: &BuiltinCosts) -> ExBudget { pub fn to_ex_budget(&self, costs: &BuiltinCosts) -> Result<ExBudget, Error> {
costs.to_ex_budget(self.fun, &self.args) costs.to_ex_budget(self.fun, &self.args)
} }
} }
@ -1388,12 +1388,13 @@ impl DefaultFunction {
return Err(Error::IntegerToByteStringNegativeSize(size.clone())); return Err(Error::IntegerToByteStringNegativeSize(size.clone()));
} }
if size > &INTEGER_TO_BYTE_STRING_MAXIMUM_OUTPUT_LENGTH.into() { // Since this is checked at cost time it is no longer needed
return Err(Error::IntegerToByteStringSizeTooBig( // if size > &INTEGER_TO_BYTE_STRING_MAXIMUM_OUTPUT_LENGTH.into() {
size.clone(), // return Err(Error::IntegerToByteStringSizeTooBig(
INTEGER_TO_BYTE_STRING_MAXIMUM_OUTPUT_LENGTH, // size.clone(),
)); // INTEGER_TO_BYTE_STRING_MAXIMUM_OUTPUT_LENGTH,
} // ));
// }
if size.is_zero() if size.is_zero()
&& integer_log2(input.clone()) && integer_log2(input.clone())