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

chore: bump pallas version

Browse Source
This commit is contained in:
rvcas
2022-09-14 12:26:35 -04:00
parent 806d98e5fc
commit 336af376e1
5 changed files with 48 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/uplc/Cargo.toml
View File

@@ -17,8 +17,8 @@ cryptoxide = "0.4.2"
flat-rs = { path = "../flat", version = "0.0.10" }
hex = "0.4.3"
minicbor = { version = "0.18.0", features = ["std"] }
pallas-codec = "0.13.2"
pallas-primitives = "0.13.2"
pallas-codec = "0.14.0-alpha.2"
pallas-primitives = "0.14.0-alpha.2"
peg = "0.8.0"
pretty = "0.11.3"
thiserror = "1.0.31"

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

@@ -488,9 +488,9 @@ impl Value {
PlutusData::Map(m) => {
let mut new_stack: VecDeque<&PlutusData>;
// create new stack with of items from the list of pairs of data
new_stack = m.deref().iter().fold(VecDeque::new(), |mut acc, d| {
acc.push_back(&d.0);
acc.push_back(&d.1);
new_stack = m.iter().fold(VecDeque::new(), |mut acc, d| {
acc.push_back(d.0);
acc.push_back(d.1);
acc
});
// Append old stack to the back of the new stack
@@ -499,7 +499,7 @@ impl Value {
}
PlutusData::BigInt(i) => {
if let BigInt::Int(g) = i {
let numb: i64 = (*g).try_into().unwrap();
let numb: i128 = (*g).try_into().unwrap();
total += Value::Con(Constant::Integer(numb as isize)).to_ex_mem();
} else {
unreachable!()
@@ -517,14 +517,6 @@ impl Value {
new_stack.append(&mut stack);
stack = new_stack;
}
PlutusData::ArrayIndef(a) => {
// create new stack with of items from the list of data
let mut new_stack: VecDeque<&PlutusData> =
VecDeque::from_iter(a.deref().iter());
// Append old stack to the back of the new stack
new_stack.append(&mut stack);
stack = new_stack;
}
}
}
total

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

@@ -1,6 +1,5 @@
use std::ops::Deref;
use std::{collections::BTreeMap, ops::Deref};
use pallas_codec::utils::{KeyValuePairs, MaybeIndefArray};
use pallas_primitives::babbage::{BigInt, Constr, PlutusData};
use crate::{
@@ -664,8 +663,7 @@ impl DefaultFunction {
DefaultFunction::ChooseData => match &args[0] {
Value::Con(Constant::Data(PlutusData::Constr(_))) => Ok(args[1].clone()),
Value::Con(Constant::Data(PlutusData::Map(_))) => Ok(args[2].clone()),
Value::Con(Constant::Data(PlutusData::Array(_)))
| Value::Con(Constant::Data(PlutusData::ArrayIndef(_))) => Ok(args[3].clone()),
Value::Con(Constant::Data(PlutusData::Array(_))) => Ok(args[3].clone()),
Value::Con(Constant::Data(PlutusData::BigInt(_))) => Ok(args[4].clone()),
Value::Con(Constant::Data(PlutusData::BoundedBytes(_))) => Ok(args[5].clone()),
_ => unreachable!(),
@@ -687,7 +685,7 @@ impl DefaultFunction {
// TODO: handle other types of constructor tags
tag: convert_constr_to_tag(*i as u64),
any_constructor: None,
fields: MaybeIndefArray::Indef(data_list),
fields: data_list,
});
Ok(Value::Con(Constant::Data(constr_data)))
}
@@ -695,21 +693,23 @@ impl DefaultFunction {
},
DefaultFunction::MapData => match &args[0] {
Value::Con(Constant::ProtoList(_, list)) => {
let data_list: Vec<(PlutusData, PlutusData)> = list
.iter()
.map(|item| match item {
let mut map = BTreeMap::new();
for item in list {
match item {
Constant::ProtoPair(Type::Data, Type::Data, left, right) => {
match (*left.clone(), *right.clone()) {
(Constant::Data(key), Constant::Data(value)) => (key, value),
(Constant::Data(key), Constant::Data(value)) => {
map.insert(key, value);
}
_ => unreachable!(),
}
}
_ => unreachable!(),
})
.collect();
Ok(Value::Con(Constant::Data(PlutusData::Map(
KeyValuePairs::Def(data_list),
))))
}
}
Ok(Value::Con(Constant::Data(PlutusData::Map(map))))
}
_ => unreachable!(),
},
@@ -722,9 +722,8 @@ impl DefaultFunction {
_ => unreachable!(),
})
.collect();
Ok(Value::Con(Constant::Data(PlutusData::ArrayIndef(
MaybeIndefArray::Indef(data_list),
))))
Ok(Value::Con(Constant::Data(PlutusData::Array(data_list))))
}
_ => unreachable!(),
},
@@ -779,8 +778,7 @@ impl DefaultFunction {
_ => unreachable!(),
},
DefaultFunction::UnListData => match &args[0] {
Value::Con(Constant::Data(PlutusData::Array(l)))
| Value::Con(Constant::Data(PlutusData::ArrayIndef(l))) => {
Value::Con(Constant::Data(PlutusData::Array(l))) => {
Ok(Value::Con(Constant::ProtoList(
Type::Data,
l.deref()
@@ -794,7 +792,7 @@ impl DefaultFunction {
DefaultFunction::UnIData => match &args[0] {
Value::Con(Constant::Data(PlutusData::BigInt(b))) => {
if let BigInt::Int(i) = b {
let x: i64 = (*i).try_into().unwrap();
let x: i128 = (*i).try_into().unwrap();
Ok(Value::Con(Constant::Integer(x as isize)))
} else {