Skip to content
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.

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

Minimal pallas dependencies #949

Merged
merged 2 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion crates/uplc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@ miette = "5.5.0"
num-bigint = "0.4.3"
num-integer = "0.1.45"
num-traits = "0.2.15"
pallas.workspace = true
pallas-crypto = "0.22.0"
pallas-primitives = "0.22.0"
pallas-addresses = "0.22.0"
pallas-codec = { version = "0.22.0", features = ["num-bigint"] }
pallas-traverse = "0.22.0"
peg = "0.8.1"
pretty = "0.11.3"
serde = { version = "1.0.152", features = ["derive"] }
Expand Down
14 changes: 6 additions & 8 deletions crates/uplc/src/ast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,12 @@ use crate::{
};
use num_bigint::BigInt;
use num_traits::ToPrimitive;
use pallas::ledger::{
addresses::{Network, ShelleyAddress, ShelleyDelegationPart, ShelleyPaymentPart},
primitives::{
alonzo::{self, Constr, PlutusData},
conway::{self, Language},
},
traverse::ComputeHash,
use pallas_addresses::{Network, ShelleyAddress, ShelleyDelegationPart, ShelleyPaymentPart};
use pallas_primitives::{
alonzo::{self, Constr, PlutusData},
conway::{self, Language},
};
use pallas_traverse::ComputeHash;
use serde::{
self,
de::{self, Deserialize, Deserializer, MapAccess, Visitor},
Expand Down Expand Up @@ -304,7 +302,7 @@ pub struct Data;
impl Data {
pub fn to_hex(data: PlutusData) -> String {
let mut bytes = Vec::new();
pallas::codec::minicbor::Encoder::new(&mut bytes)
pallas_codec::minicbor::Encoder::new(&mut bytes)
.encode(data)
.expect("failed to encode Plutus Data as cbor?");
hex::encode(bytes)
Expand Down
2 changes: 1 addition & 1 deletion crates/uplc/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::{
ast::{Constant, Name, Term, Type},
builtins::DefaultFunction,
};
use pallas::ledger::primitives::alonzo::PlutusData;
use pallas_primitives::alonzo::PlutusData;

pub const CONSTR_FIELDS_EXPOSER: &str = "__constr_fields_exposer";
pub const CONSTR_INDEX_EXPOSER: &str = "__constr_index_exposer";
Expand Down
2 changes: 1 addition & 1 deletion crates/uplc/src/builtins.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::{fmt::Display, rc::Rc, str::FromStr};

use pallas::codec::flat::de;
use pallas_codec::flat::de;
use strum_macros::EnumIter;

use crate::ast::Term;
Expand Down
18 changes: 8 additions & 10 deletions crates/uplc/src/flat.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
use num_bigint::BigInt;
use pallas::{
codec::flat::{
de::{self, Decode, Decoder},
en::{self, Encode, Encoder},
Flat,
},
ledger::primitives::{babbage::PlutusData, Fragment},
use pallas_codec::flat::{
de::{self, Decode, Decoder},
en::{self, Encode, Encoder},
Flat,
};
use pallas_primitives::{babbage::PlutusData, Fragment};

use std::{collections::VecDeque, fmt::Debug, rc::Rc};

Expand Down Expand Up @@ -35,7 +33,7 @@ where
T: Binder<'b> + Debug,
{
pub fn from_cbor(bytes: &'b [u8], buffer: &'b mut Vec<u8>) -> Result<Self, de::Error> {
let mut cbor_decoder = pallas::codec::minicbor::Decoder::new(bytes);
let mut cbor_decoder = pallas_codec::minicbor::Decoder::new(bytes);

let flat_bytes = cbor_decoder
.bytes()
Expand Down Expand Up @@ -88,7 +86,7 @@ where

let mut bytes = Vec::new();

let mut cbor_encoder = pallas::codec::minicbor::Encoder::new(&mut bytes);
let mut cbor_encoder = pallas_codec::minicbor::Encoder::new(&mut bytes);

cbor_encoder
.bytes(&flat_bytes)
Expand Down Expand Up @@ -1006,7 +1004,7 @@ mod tests {
parser,
};
use indoc::indoc;
use pallas::codec::flat::Flat;
use pallas_codec::flat::Flat;

#[test]
fn flat_encode_integer() {
Expand Down
6 changes: 3 additions & 3 deletions crates/uplc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ pub mod parser;
mod pretty;
pub mod tx;

pub use pallas::codec::utils::KeyValuePairs;
pub use pallas::crypto::hash::Hash;
pub use pallas::ledger::primitives::{
pub use pallas_codec::utils::KeyValuePairs;
pub use pallas_crypto::hash::Hash;
pub use pallas_primitives::{
alonzo::{BigInt, Constr, PlutusData},
babbage::{PostAlonzoTransactionOutput, TransactionInput, TransactionOutput, Value},
Error, Fragment,
Expand Down
2 changes: 1 addition & 1 deletion crates/uplc/src/machine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pub mod value;

use cost_model::{ExBudget, StepKind};
pub use error::Error;
use pallas::ledger::primitives::conway::Language;
use pallas_primitives::conway::Language;

use self::{
cost_model::CostModel,
Expand Down
2 changes: 1 addition & 1 deletion crates/uplc/src/machine/cost_model.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::collections::HashMap;

use pallas::ledger::primitives::conway::Language;
use pallas_primitives::conway::Language;

use crate::builtins::DefaultFunction;

Expand Down
2 changes: 1 addition & 1 deletion crates/uplc/src/machine/runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use num_bigint::BigInt;
use num_integer::Integer;
use num_traits::{Signed, Zero};
use once_cell::sync::Lazy;
use pallas::ledger::primitives::conway::{Language, PlutusData};
use pallas_primitives::conway::{Language, PlutusData};

use crate::{
ast::{Constant, Data, Type},
Expand Down
4 changes: 2 additions & 2 deletions crates/uplc/src/machine/value.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::{
};
use num_bigint::BigInt;
use num_traits::{Signed, ToPrimitive, Zero};
use pallas::ledger::primitives::babbage::{self, PlutusData};
use pallas_primitives::babbage::{self, PlutusData};

use super::{runtime::BuiltinRuntime, Error};

Expand Down Expand Up @@ -411,7 +411,7 @@ pub fn from_pallas_bigint(n: &babbage::BigInt) -> BigInt {
pub fn to_pallas_bigint(n: &BigInt) -> babbage::BigInt {
if let Some(i) = n.to_i128() {
if let Ok(i) = i.try_into() {
let pallas_int: pallas::codec::utils::Int = i;
let pallas_int: pallas_codec::utils::Int = i;
return babbage::BigInt::Int(pallas_int);
}
}
Expand Down
4 changes: 2 additions & 2 deletions crates/uplc/src/optimize/shrinker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::{cmp::Ordering, iter, ops::Neg, rc::Rc, vec};
use indexmap::IndexMap;
use itertools::Itertools;

use pallas::ledger::primitives::babbage::{BigInt, PlutusData};
use pallas_primitives::babbage::{BigInt, PlutusData};

use crate::{
ast::{Constant, Data, Name, NamedDeBruijn, Program, Term, Type},
Expand Down Expand Up @@ -1907,7 +1907,7 @@ fn pop_lambdas_and_get_names(term: &Term<Name>) -> (Vec<Rc<Name>>, &Term<Name>)
#[cfg(test)]
mod tests {

use pallas::ledger::primitives::babbage::{BigInt, PlutusData};
use pallas_primitives::babbage::{BigInt, PlutusData};
use pretty_assertions::assert_eq;

use crate::{
Expand Down
4 changes: 2 additions & 2 deletions crates/uplc/src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::{

use interner::Interner;
use num_bigint::BigInt;
use pallas::ledger::primitives::alonzo::PlutusData;
use pallas_primitives::alonzo::PlutusData;
use peg::{error::ParseError, str::LineCol};

pub mod interner;
Expand Down Expand Up @@ -248,7 +248,7 @@ peg::parser! {
))
}
/ _* "Map" _+ kvps:plutus_key_value_pairs() {
PlutusData::Map(pallas::codec::utils::KeyValuePairs::Def(kvps))
PlutusData::Map(pallas_codec::utils::KeyValuePairs::Def(kvps))
}
/ _* "List" _+ ls:plutus_list() { PlutusData::Array(ls) }
/ _* "I" _+ n:big_number() { PlutusData::BigInt(to_pallas_bigint(&n)) }
Expand Down
2 changes: 1 addition & 1 deletion crates/uplc/src/pretty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::{
machine::runtime::{convert_tag_to_constr, Compressable},
machine::value::from_pallas_bigint,
};
use pallas::ledger::primitives::babbage::{Constr, PlutusData};
use pallas_primitives::babbage::{Constr, PlutusData};
use pretty::RcDoc;
use std::ascii::escape_default;

Expand Down
4 changes: 2 additions & 2 deletions crates/uplc/src/tx.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use pallas::ledger::primitives::{
use pallas_primitives::{
babbage::{CostMdls, MintedTx, Redeemer, TransactionInput, TransactionOutput},
Fragment,
};
use pallas::ledger::traverse::{Era, MultiEraTx};
use pallas_traverse::{Era, MultiEraTx};

use error::Error;
pub use phase_one::eval_phase_one;
Expand Down
8 changes: 4 additions & 4 deletions crates/uplc/src/tx/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ use crate::machine::{self, cost_model::ExBudget};
#[derive(thiserror::Error, Debug, miette::Diagnostic)]
pub enum Error {
#[error("{0}")]
Address(#[from] pallas::ledger::addresses::Error),
Address(#[from] pallas_addresses::Error),
#[error("Only shelley reward addresses can be a part of withdrawals")]
BadWithdrawalAddress,
#[error("{0}")]
FlatDecode(#[from] pallas::codec::flat::de::Error),
FlatDecode(#[from] pallas_codec::flat::de::Error),
#[error("{0}")]
FragmentDecode(#[from] pallas::ledger::primitives::Error),
FragmentDecode(#[from] pallas_primitives::Error),
#[error("{}\n\n{:#?}\n\n{}", .0, .1, .2.join("\n"))]
Machine(machine::Error, ExBudget, Vec<String>),
#[error("Native script can't be executed in phase-two")]
Expand All @@ -32,7 +32,7 @@ pub enum Error {
#[error("PlutusV2 cost model not found.")]
V2CostModelNotFound,
#[error("Wrong era, Please use Babbage or Alonzo: {0}")]
WrongEra(#[from] pallas::codec::minicbor::decode::Error),
WrongEra(#[from] pallas_codec::minicbor::decode::Error),
#[error("Byron address not allowed in Plutus.")]
ByronAddressNotAllowed,
#[error("Inline datum not allowed in PlutusV1.")]
Expand Down
23 changes: 9 additions & 14 deletions crates/uplc/src/tx/eval.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,17 @@ use crate::{
machine::cost_model::ExBudget,
PlutusData,
};
use pallas::{
codec::utils::{KeyValuePairs, MaybeIndefArray},
crypto::hash::Hash,
ledger::{
addresses::{Address, ScriptHash, StakePayload},
primitives::babbage::{
Certificate, CostMdls, DatumHash, DatumOption, ExUnits, Mint, MintedTx, NativeScript,
PlutusV1Script, PlutusV2Script, PolicyId, PseudoScript, Redeemer, RedeemerTag,
RewardAccount, StakeCredential, TransactionInput, TransactionOutput, Value,
Withdrawals,
},
traverse::{ComputeHash, OriginalHash},
},
use pallas_addresses::{Address, ScriptHash, StakePayload};
use pallas_codec::utils::{KeyValuePairs, MaybeIndefArray};
use pallas_crypto::hash::Hash;
use pallas_primitives::babbage::{
Certificate, CostMdls, DatumHash, DatumOption, ExUnits, Mint, MintedTx, NativeScript,
PlutusV1Script, PlutusV2Script, PolicyId, PseudoScript, Redeemer, RedeemerTag, RewardAccount,
StakeCredential, TransactionInput, TransactionOutput, Value, Withdrawals,
};
use pallas_traverse::{ComputeHash, OriginalHash};

use pallas::ledger::primitives::conway::Language;
use pallas_primitives::conway::Language;

use std::{cmp::Ordering, collections::HashMap, convert::TryInto, ops::Deref, vec};

Expand Down
13 changes: 4 additions & 9 deletions crates/uplc/src/tx/phase_one.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
use std::collections::HashMap;

use pallas::{
codec::utils::{KeyValuePairs, MaybeIndefArray},
ledger::{
addresses::{Address, ScriptHash, ShelleyPaymentPart, StakePayload},
primitives::babbage::{
Certificate, MintedTx, PolicyId, RedeemerTag, RewardAccount, StakeCredential,
TransactionOutput,
},
},
use pallas_addresses::{Address, ScriptHash, ShelleyPaymentPart, StakePayload};
use pallas_codec::utils::{KeyValuePairs, MaybeIndefArray};
use pallas_primitives::babbage::{
Certificate, MintedTx, PolicyId, RedeemerTag, RewardAccount, StakeCredential, TransactionOutput,
};

use super::{
Expand Down
16 changes: 6 additions & 10 deletions crates/uplc/src/tx/script_context.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
use pallas::{
codec::utils::KeyValuePairs,
crypto::hash::Hash,
ledger::{
addresses::Address,
primitives::babbage::{
AddrKeyhash, Certificate, Coin, DatumHash, PlutusData, PolicyId, Redeemer,
StakeCredential, TransactionInput, TransactionOutput, Value,
},
},
use pallas_addresses::Address;
use pallas_codec::utils::KeyValuePairs;
use pallas_crypto::hash::Hash;
use pallas_primitives::babbage::{
AddrKeyhash, Certificate, Coin, DatumHash, PlutusData, PolicyId, Redeemer, StakeCredential,
TransactionInput, TransactionOutput, Value,
};

use super::to_plutus_data::MintValue;
Expand Down
6 changes: 3 additions & 3 deletions crates/uplc/src/tx/tests.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use pallas::codec::utils::MaybeIndefArray;
use pallas::ledger::primitives::{
use pallas_codec::utils::MaybeIndefArray;
use pallas_primitives::{
babbage::{CostMdls, TransactionInput, TransactionOutput},
Fragment,
};
use pallas::ledger::traverse::{Era, MultiEraTx};
use pallas_traverse::{Era, MultiEraTx};

use crate::machine::cost_model::ExBudget;

Expand Down
12 changes: 6 additions & 6 deletions crates/uplc/src/tx/to_plutus_data.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
use pallas::codec::utils::{AnyUInt, Bytes, Int, KeyValuePairs};
use pallas::crypto::hash::Hash;
use pallas::ledger::addresses::{Address, ShelleyDelegationPart, ShelleyPaymentPart, StakePayload};
use pallas::ledger::primitives::babbage::{AssetName, BigInt, Constr, Mint, PlutusData, ScriptRef};
use pallas::ledger::primitives::babbage::{
use pallas_addresses::{Address, ShelleyDelegationPart, ShelleyPaymentPart, StakePayload};
use pallas_codec::utils::{AnyUInt, Bytes, Int, KeyValuePairs};
use pallas_crypto::hash::Hash;
use pallas_primitives::babbage::{AssetName, BigInt, Constr, Mint, PlutusData, ScriptRef};
use pallas_primitives::babbage::{
Certificate, DatumOption, PseudoScript, Redeemer, StakeCredential, TransactionInput,
TransactionOutput, Value,
};
use pallas::ledger::traverse::ComputeHash;
use pallas_traverse::ComputeHash;

use crate::machine::runtime::{convert_constr_to_tag, ANY_TAG};

Expand Down
Loading
Loading