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

chore: update to pallas v0.20.0

Browse Source
This commit is contained in:
rvcas
2023-12-04 21:44:19 -05:00
parent 7c4cabada9
commit b17b7f287c
15 changed files with 519 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/aiken-project/Cargo.toml
View File

@@ -28,8 +28,8 @@ miette = { version = "5.9.0", features = ["fancy"] }
minicbor = "0.19.1"
notify = "6.1.1"
owo-colors = { version = "3.5.0", features = ["supports-colors"] }
pallas = "0.18.0"
pallas-traverse = "0.18.0"
pallas = "0.20.0"
pallas-traverse = "0.20.0"
petgraph = "0.6.3"
pulldown-cmark = { version = "0.9.2", default-features = false }
rayon = "1.7.0"

10
crates/aiken/Cargo.toml
View File

@@ -26,11 +26,11 @@ ignore = "0.4.20"
indoc = "2.0"
miette = { version = "5.5.0", features = ["fancy"] }
owo-colors = { version = "3.5.0", features = ["supports-colors"] }
pallas-addresses = "0.18.0"
pallas-codec = "0.18.0"
pallas-crypto = "0.18.0"
pallas-primitives = "0.18.0"
pallas-traverse = "0.18.0"
pallas-addresses = "0.20.0"
pallas-codec = "0.20.0"
pallas-crypto = "0.20.0"
pallas-primitives = "0.20.0"
pallas-traverse = "0.20.0"
regex = "1.7.1"
serde_json = "1.0.94"
thiserror = "1.0.39"

4
crates/aiken/src/cmd/tx/simulate.rs
View File

@@ -79,9 +79,7 @@ pub fn exec(
)
};
let tx = MultiEraTx::decode(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode(Era::Alonzo, &tx_bytes))
.into_diagnostic()?;
let tx = MultiEraTx::decode_for_era(Era::Babbage, &tx_bytes).into_diagnostic()?;
eprintln!(
"{} {}",

10
crates/uplc/Cargo.toml
View File

@@ -20,11 +20,11 @@ miette = "5.5.0"
num-bigint = "0.4.3"
num-integer = "0.1.45"
num-traits = "0.2.15"
pallas-addresses = "0.18.0"
pallas-codec = "0.18.0"
pallas-crypto = "0.18.0"
pallas-primitives = "0.18.0"
pallas-traverse = "0.18.0"
pallas-addresses = "0.20.0"
pallas-codec = "0.20.0"
pallas-crypto = "0.20.0"
pallas-primitives = "0.20.0"
pallas-traverse = "0.20.0"
peg = "0.8.1"
pretty = "0.11.3"
pretty_assertions = "1.3.0"

4
crates/uplc/src/tx.rs
View File

@@ -93,8 +93,8 @@ pub fn eval_phase_two_raw(
run_phase_one: bool,
with_redeemer: fn(&Redeemer) -> (),
) -> Result<Vec<Vec<u8>>, Error> {
let multi_era_tx = MultiEraTx::decode(Era::Babbage, tx_bytes)
.or_else(|_| MultiEraTx::decode(Era::Alonzo, tx_bytes))?;
let multi_era_tx = MultiEraTx::decode_for_era(Era::Babbage, tx_bytes)
.or_else(|_| MultiEraTx::decode_for_era(Era::Alonzo, tx_bytes))?;
let cost_mdls = CostMdls::decode_fragment(cost_mdls_bytes)?;

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

@@ -234,8 +234,8 @@ fn test_eval_0() {
mem: 14000000,
};
let multi_era_tx = MultiEraTx::decode(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode(Era::Alonzo, &tx_bytes))
let multi_era_tx = MultiEraTx::decode_for_era(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode_for_era(Era::Alonzo, &tx_bytes))
.unwrap();
match multi_era_tx {
MultiEraTx::Babbage(tx) => {
@@ -504,8 +504,8 @@ fn test_eval_1() {
mem: 14000000,
};
let multi_era_tx = MultiEraTx::decode(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode(Era::Alonzo, &tx_bytes))
let multi_era_tx = MultiEraTx::decode_for_era(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode_for_era(Era::Alonzo, &tx_bytes))
.unwrap();
match multi_era_tx {
MultiEraTx::Babbage(tx) => {
@@ -613,8 +613,8 @@ fn test_eval_2() {
mem: 14000000,
};
let multi_era_tx = MultiEraTx::decode(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode(Era::Alonzo, &tx_bytes))
let multi_era_tx = MultiEraTx::decode_for_era(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode_for_era(Era::Alonzo, &tx_bytes))
.unwrap();
match multi_era_tx {
MultiEraTx::Babbage(tx) => {
@@ -881,8 +881,8 @@ fn test_eval_3() {
mem: 14000000,
};
let multi_era_tx = MultiEraTx::decode(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode(Era::Alonzo, &tx_bytes))
let multi_era_tx = MultiEraTx::decode_for_era(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode_for_era(Era::Alonzo, &tx_bytes))
.unwrap();
match multi_era_tx {
MultiEraTx::Babbage(tx) => {
@@ -987,8 +987,8 @@ fn test_eval_4() {
mem: 14000000,
};
let multi_era_tx = MultiEraTx::decode(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode(Era::Alonzo, &tx_bytes))
let multi_era_tx = MultiEraTx::decode_for_era(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode_for_era(Era::Alonzo, &tx_bytes))
.unwrap();
match multi_era_tx {
MultiEraTx::Babbage(tx) => {
@@ -1070,8 +1070,8 @@ fn test_eval_5() {
mem: 14000000,
};
let multi_era_tx = MultiEraTx::decode(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode(Era::Alonzo, &tx_bytes))
let multi_era_tx = MultiEraTx::decode_for_era(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode_for_era(Era::Alonzo, &tx_bytes))
.unwrap();
match multi_era_tx {
MultiEraTx::Babbage(tx) => {
@@ -1178,8 +1178,8 @@ fn test_eval_6() {
mem: 14000000,
};
let multi_era_tx = MultiEraTx::decode(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode(Era::Alonzo, &tx_bytes))
let multi_era_tx = MultiEraTx::decode_for_era(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode_for_era(Era::Alonzo, &tx_bytes))
.unwrap();
match multi_era_tx {
MultiEraTx::Babbage(tx) => {
@@ -1286,8 +1286,8 @@ fn test_eval_7() {
mem: 14000000,
};
let multi_era_tx = MultiEraTx::decode(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode(Era::Alonzo, &tx_bytes))
let multi_era_tx = MultiEraTx::decode_for_era(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode_for_era(Era::Alonzo, &tx_bytes))
.unwrap();
match multi_era_tx {
MultiEraTx::Babbage(tx) => {
@@ -1545,8 +1545,8 @@ fn test_eval_8() {
mem: 14000000,
};
let multi_era_tx = MultiEraTx::decode(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode(Era::Alonzo, &tx_bytes))
let multi_era_tx = MultiEraTx::decode_for_era(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode_for_era(Era::Alonzo, &tx_bytes))
.unwrap();
match multi_era_tx {
MultiEraTx::Babbage(tx) => {
@@ -1593,8 +1593,8 @@ fn test_eval_8() {
fn eval_missing_redeemer() {
let tx_bytes = hex::decode("84a30082825820275b5da338c8b899035081eb34bfa950b634911a5dd3271b3ad6cf4c2bba0c5000825820275b5da338c8b899035081eb34bfa950b634911a5dd3271b3ad6cf4c2bba0c50010181825839000af00cc47500bb64cfffb783e8c42f746b4e8b8a70ede9c08c7113acf3bde34d1041f5a2076ef9aa6cf4539ab1a96ed462a0300acbdb65d51a02cf47c8021a00028d89a1068149480100002221200101f5f6").unwrap();
let multi_era_tx = MultiEraTx::decode(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode(Era::Alonzo, &tx_bytes))
let multi_era_tx = MultiEraTx::decode_for_era(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode_for_era(Era::Alonzo, &tx_bytes))
.unwrap();
let inputs = multi_era_tx
@@ -1648,8 +1648,8 @@ fn eval_missing_redeemer() {
mem: 14000000,
};
let multi_era_tx = MultiEraTx::decode(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode(Era::Alonzo, &tx_bytes))
let multi_era_tx = MultiEraTx::decode_for_era(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode_for_era(Era::Alonzo, &tx_bytes))
.unwrap();
match multi_era_tx {
@@ -1673,8 +1673,8 @@ fn eval_missing_redeemer() {
fn eval_extraneous_redeemer() {
let tx_bytes = hex::decode("84a70082825820275b5da338c8b899035081eb34bfa950b634911a5dd3271b3ad6cf4c2bba0c5000825820275b5da338c8b899035081eb34bfa950b634911a5dd3271b3ad6cf4c2bba0c50010181825839000af00cc47500bb64cfffb783e8c42f746b4e8b8a70ede9c08c7113acf3bde34d1041f5a2076ef9aa6cf4539ab1a96ed462a0300acbdb65d51a02cf2b47021a0002aa0a0b5820fc54f302cff3a8a1cb374f5e4979e18a1d3627dcf4539637b03f5959eb8565bf0d81825820275b5da338c8b899035081eb34bfa950b634911a5dd3271b3ad6cf4c2bba0c500110825839000af00cc47500bb64cfffb783e8c42f746b4e8b8a70ede9c08c7113acf3bde34d1041f5a2076ef9aa6cf4539ab1a96ed462a0300acbdb65d51a02af51c2111a0003ff0fa40081825820065dd553fbe4e240a8f819bb9e333a7483de4a22b65c7fb6a95ce9450f84dff758402c26125a057a696079d08f2c8c9d2b8ccda9fe7cf7360c1a86712b85a91db82a3b80996b30ba6f4b2f969c93eb50694e0f6ea0bcf129080dcc07ecd9e605f00a049fd87980ff0582840000d879808219044c1a000382d48401001864821903e81903e8068149480100002221200101f5f6").unwrap();
let multi_era_tx = MultiEraTx::decode(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode(Era::Alonzo, &tx_bytes))
let multi_era_tx = MultiEraTx::decode_for_era(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode_for_era(Era::Alonzo, &tx_bytes))
.unwrap();
let inputs = multi_era_tx
@@ -1728,8 +1728,8 @@ fn eval_extraneous_redeemer() {
mem: 14000000,
};
let multi_era_tx = MultiEraTx::decode(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode(Era::Alonzo, &tx_bytes))
let multi_era_tx = MultiEraTx::decode_for_era(Era::Babbage, &tx_bytes)
.or_else(|_| MultiEraTx::decode_for_era(Era::Alonzo, &tx_bytes))
.unwrap();
match multi_era_tx {