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

chore: change how we depend on pallas

Browse Source
This commit is contained in:
rvcas
2024-01-24 21:26:48 -05:00
parent 9d563612f3
commit 589bb9a4b3
30 changed files with 163 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/uplc/src/tx/error.rs
View File

@@ -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_addresses::Error),
Address(#[from] pallas::ledger::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_primitives::Error),
FragmentDecode(#[from] pallas::ledger::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")]
@@ -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.")]

22
crates/uplc/src/tx/eval.rs
View File

@@ -3,15 +3,21 @@ use crate::{
machine::cost_model::ExBudget,
PlutusData,
};
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, Language, Mint, MintedTx, NativeScript,
PlutusV1Script, PlutusV2Script, PolicyId, PseudoScript, Redeemer, RedeemerTag, RewardAccount,
StakeCredential, TransactionInput, TransactionOutput, Value, Withdrawals,
use pallas::{
codec::utils::{KeyValuePairs, MaybeIndefArray},
crypto::hash::Hash,
ledger::{
addresses::{Address, ScriptHash, StakePayload},
primitives::babbage::{
Certificate, CostMdls, DatumHash, DatumOption, ExUnits, Language, Mint, MintedTx,
NativeScript, PlutusV1Script, PlutusV2Script, PolicyId, PseudoScript, Redeemer,
RedeemerTag, RewardAccount, StakeCredential, TransactionInput, TransactionOutput,
Value, Withdrawals,
},
traverse::{ComputeHash, OriginalHash},
},
};
use pallas_traverse::{ComputeHash, OriginalHash};
use std::{cmp::Ordering, collections::HashMap, convert::TryInto, ops::Deref, vec};
use super::{

13
crates/uplc/src/tx/phase_one.rs
View File

@@ -1,9 +1,14 @@
use std::collections::HashMap;
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 pallas::{
codec::utils::{KeyValuePairs, MaybeIndefArray},
ledger::{
addresses::{Address, ScriptHash, ShelleyPaymentPart, StakePayload},
primitives::babbage::{
Certificate, MintedTx, PolicyId, RedeemerTag, RewardAccount, StakeCredential,
TransactionOutput,
},
},
};
use super::{

16
crates/uplc/src/tx/script_context.rs
View File

@@ -1,9 +1,13 @@
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 pallas::{
codec::utils::KeyValuePairs,
crypto::hash::Hash,
ledger::{
addresses::Address,
primitives::babbage::{
AddrKeyhash, Certificate, Coin, DatumHash, PlutusData, PolicyId, Redeemer,
StakeCredential, TransactionInput, TransactionOutput, Value,
},
},
};
use super::to_plutus_data::MintValue;

6
crates/uplc/src/tx/tests.rs
View File

@@ -1,9 +1,9 @@
use pallas_codec::utils::MaybeIndefArray;
use pallas_primitives::{
use pallas::codec::utils::MaybeIndefArray;
use pallas::ledger::primitives::{
babbage::{CostMdls, TransactionInput, TransactionOutput},
Fragment,
};
use pallas_traverse::{Era, MultiEraTx};
use pallas::ledger::traverse::{Era, MultiEraTx};
use crate::machine::cost_model::ExBudget;

12
crates/uplc/src/tx/to_plutus_data.rs
View File

@@ -1,12 +1,12 @@
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::{
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::{
Certificate, DatumOption, PseudoScript, Redeemer, StakeCredential, TransactionInput,
TransactionOutput, Value,
};
use pallas_traverse::ComputeHash;
use pallas::ledger::traverse::ComputeHash;
use crate::machine::runtime::{convert_constr_to_tag, ANY_TAG};