diff --git a/Cargo.lock b/Cargo.lock index 4713b402..17bc2973 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -66,7 +66,9 @@ dependencies = [ "num-bigint", "ordinal", "owo-colors", - "pallas", + "pallas-codec", + "pallas-primitives", + "pallas-traverse", "rand", "regex", "serde_json", @@ -90,7 +92,7 @@ dependencies = [ "num-bigint", "ordinal", "owo-colors", - "pallas", + "pallas-primitives", "petgraph", "pretty_assertions", "serde", @@ -144,7 +146,11 @@ dependencies = [ "notify", "num-bigint", "owo-colors", - "pallas", + "pallas-addresses", + "pallas-codec", + "pallas-crypto", + "pallas-primitives", + "pallas-traverse", "patricia_tree", "petgraph", "pretty_assertions", @@ -220,12 +226,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "anyhow" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" - [[package]] name = "arrayvec" version = "0.5.2" @@ -276,17 +276,6 @@ dependencies = [ "nom", ] -[[package]] -name = "async-trait" -version = "0.1.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.60", -] - [[package]] name = "atty" version = "0.2.14" @@ -304,51 +293,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http", - "http-body", - "hyper", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - [[package]] name = "backtrace" version = "0.3.71" @@ -385,12 +329,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581" -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.7" @@ -541,15 +479,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "num-traits", -] - [[package]] name = "chumsky" version = "0.9.3" @@ -1300,15 +1229,6 @@ dependencies = [ "digest", ] -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "http" version = "0.2.12" @@ -1376,18 +1296,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - [[package]] name = "hyper-tls" version = "0.5.0" @@ -1715,12 +1623,6 @@ dependencies = [ "url", ] -[[package]] -name = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - [[package]] name = "memchr" version = "2.7.2" @@ -1823,12 +1725,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - [[package]] name = "native-tls" version = "0.2.11" @@ -2008,23 +1904,6 @@ dependencies = [ "supports-color 1.3.1", ] -[[package]] -name = "pallas" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d414da3cb1cdddd5a11ae11ddbdbd0be42917619e18ea8ddfc942ce564177207" -dependencies = [ - "pallas-addresses", - "pallas-applying", - "pallas-codec", - "pallas-configs", - "pallas-crypto", - "pallas-network", - "pallas-primitives", - "pallas-traverse", - "pallas-utxorpc", -] - [[package]] name = "pallas-addresses" version = "0.22.0" @@ -2041,21 +1920,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "pallas-applying" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0bda8d2f978d1482470484d3efcd1a029d9a1f560bb75e32a7a67539e68c58" -dependencies = [ - "hex", - "pallas-addresses", - "pallas-codec", - "pallas-crypto", - "pallas-primitives", - "pallas-traverse", - "rand", -] - [[package]] name = "pallas-codec" version = "0.22.0" @@ -2069,21 +1933,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "pallas-configs" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6aa7902aefb3fd30f04a345be664df3a36af8a5be38efc55027ef8e2536e69" -dependencies = [ - "base64 0.21.7", - "hex", - "pallas-addresses", - "pallas-codec", - "pallas-crypto", - "serde", - "serde_json", -] - [[package]] name = "pallas-crypto" version = "0.22.0" @@ -2098,24 +1947,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "pallas-network" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc07ddecbb424ebf1e23ad5202442a7ae7c3cb909eb375c65a57f9acc521665a" -dependencies = [ - "byteorder", - "hex", - "itertools", - "pallas-codec", - "pallas-crypto", - "rand", - "socket2", - "thiserror", - "tokio", - "tracing", -] - [[package]] name = "pallas-primitives" version = "0.22.0" @@ -2148,18 +1979,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "pallas-utxorpc" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9547f8ada5e3d89894e89a1a372e75b61c526b7081ca1962f39ea264180d2778" -dependencies = [ - "pallas-codec", - "pallas-primitives", - "pallas-traverse", - "utxorpc", -] - [[package]] name = "parking_lot" version = "0.12.2" @@ -2196,9 +2015,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "patricia_tree" @@ -2209,43 +2028,6 @@ dependencies = [ "bitflags 2.5.0", ] -[[package]] -name = "pbjson" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048f9ac93c1eab514f9470c4bc8d97ca2a0a236b84f45cc19d69a59fc11467f6" -dependencies = [ - "base64 0.13.1", - "serde", -] - -[[package]] -name = "pbjson-build" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbb7b706f2afc610f3853550cdbbf6372fd324824a087806bd4480ea4996e24" -dependencies = [ - "heck 0.4.1", - "itertools", - "prost", - "prost-types", -] - -[[package]] -name = "pbjson-types" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a88c8d87f99a4ac14325e7a4c24af190fca261956e3b82dd7ed67e77e6c7043" -dependencies = [ - "bytes", - "chrono", - "pbjson", - "pbjson-build", - "prost", - "prost-build", - "serde", -] - [[package]] name = "pbkdf2" version = "0.11.0" @@ -2301,26 +2083,6 @@ dependencies = [ "indexmap 2.2.6", ] -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.60", -] - [[package]] name = "pin-project-lite" version = "0.2.14" @@ -2383,16 +2145,6 @@ dependencies = [ "yansi", ] -[[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] - [[package]] name = "proc-macro2" version = "1.0.81" @@ -2422,60 +2174,6 @@ dependencies = [ "unarray", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" -dependencies = [ - "bytes", - "heck 0.4.1", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn 1.0.109", - "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost", -] - [[package]] name = "psm" version = "0.1.21" @@ -2634,7 +2332,7 @@ version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "base64 0.21.7", + "base64", "bytes", "encoding_rs", "futures-core", @@ -2703,7 +2401,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.7", + "base64", ] [[package]] @@ -3266,16 +2964,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.2.0" @@ -3297,17 +2985,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-stream" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-util" version = "0.7.10" @@ -3356,60 +3033,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tonic" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" -dependencies = [ - "async-trait", - "axum", - "base64 0.21.7", - "bytes", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "indexmap 1.9.3", - "pin-project", - "pin-project-lite", - "rand", - "slab", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - [[package]] name = "tower-service" version = "0.3.2" @@ -3576,44 +3199,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" -[[package]] -name = "utxorpc" -version = "1.0.0-alpha.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1841467f5ca405d4e878be56e1a8c8ae1f6f62b50984988027f6b4859d36c0" -dependencies = [ - "utxorpc-spec-cardano", - "utxorpc-spec-sync", -] - -[[package]] -name = "utxorpc-spec-cardano" -version = "1.0.0-alpha.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb1a8c03aef60aa154ae04fe871c9a6fab18c99f468f0ddc096e45c21c5b6814" -dependencies = [ - "bytes", - "pbjson", - "pbjson-types", - "prost", - "serde", -] - -[[package]] -name = "utxorpc-spec-sync" -version = "1.0.0-alpha.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f7ab73d37f96892e16a5c89f9aa430b9efdcaa5f2a0259a87f99a2eb732ea0" -dependencies = [ - "bytes", - "pbjson", - "pbjson-types", - "prost", - "serde", - "tonic", - "utxorpc-spec-cardano", -] - [[package]] name = "vcpkg" version = "0.2.15" @@ -3763,18 +3348,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - [[package]] name = "winapi" version = "0.3.9" diff --git a/Cargo.toml b/Cargo.toml index 3fc64f0f..a0397c13 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,8 +47,12 @@ x86_64-unknown-linux-gnu = "ubuntu-22.04" [workspace.dependencies] walkdir = "2.3.2" -pallas = "0.22.0" insta = { version = "1.30.0", features = ["yaml", "json"] } +pallas-addresses = "0.22.0" +pallas-codec = { version = "0.22.0", features = ["num-bigint"] } +pallas-crypto = "0.22.0" +pallas-primitives = "0.22.0" +pallas-traverse = "0.22.0" [profile.dev.package.insta] opt-level = 3 diff --git a/crates/aiken-lang/Cargo.toml b/crates/aiken-lang/Cargo.toml index c8dab228..6d75c769 100644 --- a/crates/aiken-lang/Cargo.toml +++ b/crates/aiken-lang/Cargo.toml @@ -14,22 +14,22 @@ authors = [ rust-version = "1.66.1" [dependencies] +blst = "0.3.11" hex = "0.4.3" indexmap = "1.9.2" indoc = "2.0.1" itertools = "0.10.5" miette = "5.9.0" +num-bigint = "0.4.3" ordinal = "0.3.2" owo-colors = { version = "3.5.0", features = ["supports-colors"] } -pallas.workspace = true +pallas-primitives.workspace = true +petgraph = "0.6.3" +serde = { version = "1.0.197", features = ["derive", "rc"] } strum = "0.24.1" thiserror = "1.0.39" -vec1 = "1.10.1" uplc = { path = '../uplc', version = "1.0.31-alpha" } -num-bigint = "0.4.3" -petgraph = "0.6.3" -blst = "0.3.11" -serde = { version = "1.0.197", features = ["derive", "rc"] } +vec1 = "1.10.1" [target.'cfg(not(target_family="wasm"))'.dependencies] chumsky = "0.9.2" diff --git a/crates/aiken-lang/src/expr.rs b/crates/aiken-lang/src/expr.rs index bc1505c4..222f7054 100644 --- a/crates/aiken-lang/src/expr.rs +++ b/crates/aiken-lang/src/expr.rs @@ -15,7 +15,7 @@ use crate::{ }, }; use indexmap::IndexMap; -use pallas::ledger::primitives::alonzo::{Constr, PlutusData}; +use pallas_primitives::alonzo::{Constr, PlutusData}; use std::{fmt::Debug, rc::Rc}; use uplc::{ ast::Data, diff --git a/crates/aiken-lang/src/plutus_version.rs b/crates/aiken-lang/src/plutus_version.rs index 1980499f..66a1d306 100644 --- a/crates/aiken-lang/src/plutus_version.rs +++ b/crates/aiken-lang/src/plutus_version.rs @@ -1,4 +1,4 @@ -use pallas::ledger::primitives::conway::Language; +use pallas_primitives::conway::Language; use serde::{Deserialize, Serialize}; #[derive(Debug, Default, Deserialize, Serialize, Clone, Copy, PartialEq)] diff --git a/crates/aiken-project/Cargo.toml b/crates/aiken-project/Cargo.toml index b377f823..0fd6c645 100644 --- a/crates/aiken-project/Cargo.toml +++ b/crates/aiken-project/Cargo.toml @@ -15,7 +15,10 @@ rust-version = "1.66.1" build = "build.rs" [dependencies] +aiken-lang = { path = "../aiken-lang", version = "1.0.31-alpha" } askama = "0.12.0" +ciborium = "0.2.2" +cryptoxide = "0.4.4" dirs = "4.0.0" fslock = "0.2.1" futures = "0.3.26" @@ -25,31 +28,31 @@ indexmap = "1.9.2" itertools = "0.10.5" miette = { version = "5.9.0", features = ["fancy"] } notify = "6.1.1" +num-bigint = "0.4.4" owo-colors = { version = "3.5.0", features = ["supports-colors"] } -pallas.workspace = true +pallas-addresses.workspace = true +pallas-codec.workspace = true +pallas-crypto.workspace = true +pallas-primitives.workspace = true +pallas-traverse.workspace = true +patricia_tree = "0.8.0" petgraph = "0.6.3" pulldown-cmark = { version = "0.9.2", default-features = false } rayon = "1.7.0" regex = "1.7.1" reqwest = { version = "0.11.14", features = ["blocking", "json"] } +semver = { version = "1.0.23", features = ["serde"] } serde = { version = "1.0.152", features = ["derive"] } serde_json = { version = "1.0.94", features = ["preserve_order"] } strip-ansi-escapes = "0.1.1" thiserror = "1.0.39" tokio = { version = "1.26.0", features = ["full"] } toml = "0.7.2" +uplc = { path = '../uplc', version = "1.0.31-alpha" } +vec1 = "1.10.1" walkdir.workspace = true zip = "0.6.4" -aiken-lang = { path = "../aiken-lang", version = "1.0.31-alpha" } -uplc = { path = '../uplc', version = "1.0.31-alpha" } -num-bigint = "0.4.4" -cryptoxide = "0.4.4" -vec1 = "1.10.1" -patricia_tree = "0.8.0" -ciborium = "0.2.2" -semver = { version = "1.0.23", features = ["serde"] } - [dev-dependencies] blst = "0.3.11" indoc = "2.0.1" diff --git a/crates/aiken-project/src/blueprint/error.rs b/crates/aiken-project/src/blueprint/error.rs index 330276ef..4ca1bb6f 100644 --- a/crates/aiken-project/src/blueprint/error.rs +++ b/crates/aiken-project/src/blueprint/error.rs @@ -5,7 +5,7 @@ use super::{ use aiken_lang::ast::Span; use miette::{Diagnostic, NamedSource}; use owo_colors::{OwoColorize, Stream::Stdout}; -use pallas::codec::minicbor as cbor; +use pallas_codec::minicbor as cbor; use std::fmt::Debug; use uplc::ast::Constant; @@ -50,7 +50,7 @@ pub enum Error { ParameterizedValidator { n: usize }, #[error( - "I couldn't compute the address of the given validator because it's actually a minting policy!", + "I couldn't compute the address of the given validator because it's actually a minting policy!" )] #[diagnostic(code("aiken::blueprint::address::minting_validator"))] #[diagnostic(help( @@ -60,7 +60,7 @@ pub enum Error { UnexpectedMintingValidator, #[error( - "I couldn't compute the policyId of the given validator because it's actually a spending policy!", + "I couldn't compute the policyId of the given validator because it's actually a spending policy!" )] #[diagnostic(code("aiken::blueprint::address::spending_validator"))] #[diagnostic(help( diff --git a/crates/aiken-project/src/error.rs b/crates/aiken-project/src/error.rs index b5398018..e6f890c7 100644 --- a/crates/aiken-project/src/error.rs +++ b/crates/aiken-project/src/error.rs @@ -116,7 +116,7 @@ pub enum Error { #[error("I couldn't parse the provided stake address.")] MalformedStakeAddress { - error: Option, + error: Option, }, #[error("I didn't find any validator matching your criteria.")] diff --git a/crates/aiken-project/src/lib.rs b/crates/aiken-project/src/lib.rs index 6efab615..f9200e6c 100644 --- a/crates/aiken-project/src/lib.rs +++ b/crates/aiken-project/src/lib.rs @@ -48,11 +48,9 @@ use indexmap::IndexMap; use miette::NamedSource; use options::{CodeGenMode, Options}; use package_name::PackageName; -use pallas::ledger::{ - addresses::{Address, Network, ShelleyAddress, ShelleyDelegationPart, StakePayload}, - primitives::conway::{self as cardano, PolicyId}, - traverse::ComputeHash, -}; +use pallas_addresses::{Address, Network, ShelleyAddress, ShelleyDelegationPart, StakePayload}; +use pallas_primitives::conway::{self as cardano, PolicyId}; +use pallas_traverse::ComputeHash; use std::{ collections::{BTreeSet, HashMap}, fs::{self, File}, diff --git a/crates/aiken-project/src/test_framework.rs b/crates/aiken-project/src/test_framework.rs index 15d1f57d..2ca9e5ba 100644 --- a/crates/aiken-project/src/test_framework.rs +++ b/crates/aiken-project/src/test_framework.rs @@ -12,7 +12,7 @@ use cryptoxide::{blake2b::Blake2b, digest::Digest}; use indexmap::IndexMap; use itertools::Itertools; use owo_colors::{OwoColorize, Stream}; -use pallas::ledger::primitives::alonzo::{Constr, PlutusData}; +use pallas_primitives::alonzo::{Constr, PlutusData}; use patricia_tree::PatriciaMap; use std::{ borrow::Borrow, collections::BTreeMap, convert::TryFrom, ops::Deref, path::PathBuf, rc::Rc, diff --git a/crates/aiken/Cargo.toml b/crates/aiken/Cargo.toml index 845b02b6..f93858f9 100644 --- a/crates/aiken/Cargo.toml +++ b/crates/aiken/Cargo.toml @@ -20,31 +20,32 @@ license = false eula = false [dependencies] +aiken-lang = { path = "../aiken-lang", version = "1.0.31-alpha" } +aiken-lsp = { path = "../aiken-lsp", version = "1.0.31-alpha" } +aiken-project = { path = '../aiken-project', version = "1.0.31-alpha" } clap = { version = "4.1.8", features = [ "derive", "wrap_help", "unicode", "string", ] } +clap_complete = "4.3.2" hex = "0.4.3" ignore = "0.4.20" indoc = "2.0" +inquire = "0.6.2" miette = { version = "5.5.0", features = ["fancy"] } +num-bigint = "0.4.3" +ordinal = "0.3.2" owo-colors = { version = "3.5.0", features = ["supports-colors"] } -pallas.workspace = true +pallas-codec.workspace = true +pallas-primitives.workspace = true +pallas-traverse.workspace = true +rand = "0.8.5" regex = "1.7.1" serde_json = "1.0.94" thiserror = "1.0.39" - -aiken-lang = { path = "../aiken-lang", version = "1.0.31-alpha" } -aiken-lsp = { path = "../aiken-lsp", version = "1.0.31-alpha" } -aiken-project = { path = '../aiken-project', version = "1.0.31-alpha" } uplc = { path = '../uplc', version = "1.0.31-alpha" } -clap_complete = "4.3.2" -inquire = "0.6.2" -num-bigint = "0.4.3" -ordinal = "0.3.2" -rand = "0.8.5" [target.'cfg(not(windows))'.dependencies] xdg = "2.5.2" diff --git a/crates/aiken/src/cmd/blueprint/apply.rs b/crates/aiken/src/cmd/blueprint/apply.rs index a25c3073..247eb857 100644 --- a/crates/aiken/src/cmd/blueprint/apply.rs +++ b/crates/aiken/src/cmd/blueprint/apply.rs @@ -12,7 +12,7 @@ use inquire; use num_bigint::BigInt; use ordinal::Ordinal; use owo_colors::{OwoColorize, Stream::Stderr}; -use pallas::ledger::primitives::alonzo::PlutusData; +use pallas_primitives::alonzo::PlutusData; use std::{fs, path::PathBuf, process, str::FromStr}; use uplc::ast::Data as UplcData; diff --git a/crates/aiken/src/cmd/blueprint/convert.rs b/crates/aiken/src/cmd/blueprint/convert.rs index a63544e2..60e70f80 100644 --- a/crates/aiken/src/cmd/blueprint/convert.rs +++ b/crates/aiken/src/cmd/blueprint/convert.rs @@ -1,13 +1,12 @@ -use clap::ValueEnum; -use miette::IntoDiagnostic; -use serde_json::json; -use std::{env, fs::File, io::BufReader, path::PathBuf, process}; - use aiken_project::{ blueprint::{error::Error as BlueprintError, Blueprint}, config::Config, error::Error as ProjectError, }; +use clap::ValueEnum; +use miette::IntoDiagnostic; +use serde_json::json; +use std::{env, fs::File, io::BufReader, path::PathBuf, process}; /// Convert a blueprint into other formats. #[derive(clap::Args)] @@ -88,8 +87,7 @@ pub fn exec( let mut double_cbor_bytes = Vec::new(); - let mut cbor_encoder = - pallas::codec::minicbor::Encoder::new(&mut double_cbor_bytes); + let mut cbor_encoder = pallas_codec::minicbor::Encoder::new(&mut double_cbor_bytes); cbor_encoder.bytes(&cbor_bytes).unwrap(); diff --git a/crates/aiken/src/cmd/tx/simulate.rs b/crates/aiken/src/cmd/tx/simulate.rs index fb15240e..0b11ab4d 100644 --- a/crates/aiken/src/cmd/tx/simulate.rs +++ b/crates/aiken/src/cmd/tx/simulate.rs @@ -1,13 +1,10 @@ use miette::IntoDiagnostic; use owo_colors::{OwoColorize, Stream::Stderr}; -use pallas::ledger::{ - primitives::{ - babbage::{Redeemer, TransactionInput, TransactionOutput}, - Fragment, - }, - traverse::{Era, MultiEraTx}, +use pallas_primitives::{ + babbage::{Redeemer, TransactionInput, TransactionOutput}, + Fragment, }; - +use pallas_traverse::{Era, MultiEraTx}; use std::{fmt, fs, path::PathBuf, process}; use uplc::{ machine::cost_model::ExBudget, diff --git a/crates/uplc/Cargo.toml b/crates/uplc/Cargo.toml index 802143dd..fac61ae4 100644 --- a/crates/uplc/Cargo.toml +++ b/crates/uplc/Cargo.toml @@ -19,11 +19,11 @@ miette = "5.5.0" num-bigint = "0.4.3" num-integer = "0.1.45" num-traits = "0.2.15" -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" +pallas-addresses.workspace = true +pallas-codec.workspace = true +pallas-crypto.workspace = true +pallas-primitives.workspace = true +pallas-traverse.workspace = true peg = "0.8.1" pretty = "0.11.3" serde = { version = "1.0.152", features = ["derive"] }