diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c8d1466..647334f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,8 +17,11 @@ ### Changed +- **aiken**: update to pallas v0.20.0 @rvcas - **aiken-project**: switch blueprint validator tests now uses insta @MicroProofs +- **aiken-project**: update to pallas v0.20.0 @rvcas - **aiken-lang**: use a better algorithm for inlining single occurrences @MicroProofs +- **uplc**: update to pallas v0.20.0 @rvcas ### Fixed diff --git a/Cargo.lock b/Cargo.lock index 53a3aa9a..d66b71bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -241,7 +241,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.13", + "syn 2.0.39", ] [[package]] @@ -260,6 +260,17 @@ dependencies = [ "serde_json", ] +[[package]] +name = "async-trait" +version = "0.1.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + [[package]] name = "atty" version = "0.2.14" @@ -277,6 +288,51 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[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.67" @@ -315,9 +371,15 @@ checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581" [[package]] name = "base64" -version = "0.21.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64ct" @@ -474,6 +536,15 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chrono" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "num-traits", +] + [[package]] name = "chumsky" version = "0.9.2" @@ -538,7 +609,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.39", ] [[package]] @@ -611,6 +682,21 @@ dependencies = [ "libc", ] +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc32fast" version = "1.3.2" @@ -1015,7 +1101,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.39", ] [[package]] @@ -1265,6 +1351,18 @@ 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" @@ -1462,6 +1560,15 @@ dependencies = [ "signature", ] +[[package]] +name = "keccak" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +dependencies = [ + "cpufeatures", +] + [[package]] name = "kqueue" version = "1.0.8" @@ -1580,6 +1687,12 @@ 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.5.0" @@ -1624,7 +1737,7 @@ checksum = "4901771e1d44ddb37964565c654a3223ba41a594d02b8da471cc4464912b5cfa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.39", ] [[package]] @@ -1691,6 +1804,12 @@ dependencies = [ "windows-sys 0.45.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" @@ -1832,7 +1951,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.39", ] [[package]] @@ -1882,49 +2001,83 @@ dependencies = [ [[package]] name = "pallas" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dbf8964263ee8b776741a0e25d73475e4d1834ec890d686a05e891f11e7701e" +checksum = "e27f9954e72352e78d7f9f5a9d05ea28bc5cd6cb36260ea4c008be7950a16899" dependencies = [ "pallas-addresses", + "pallas-applying", "pallas-codec", + "pallas-configs", "pallas-crypto", - "pallas-miniprotocols", - "pallas-multiplexer", + "pallas-network", "pallas-primitives", "pallas-traverse", + "pallas-utxorpc", ] [[package]] name = "pallas-addresses" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8af9e9683d7adb7c45b58bf8949c16af0556214c14b01cac92761b3c221377b9" +checksum = "8a40f7905ce0a2d029fefefa6a35e062ef1ef4cdfb43659359d98f36f5466e24" dependencies = [ "base58", "bech32", + "crc", "hex", "pallas-codec", "pallas-crypto", + "sha3", "thiserror", ] [[package]] -name = "pallas-codec" -version = "0.18.0" +name = "pallas-applying" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848a3cd192a1afa0e8c7121e40e0c5991715722399c51359dbf9246443a649fb" +checksum = "0fedb637f4e17a314aaf623e038363c9615a825ceeb741991a7adde366528ee8" +dependencies = [ + "pallas-addresses", + "pallas-codec", + "pallas-crypto", + "pallas-primitives", + "pallas-traverse", + "rand", +] + +[[package]] +name = "pallas-codec" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443cc4e8d59a8845282a8d35c4021a434a1911d3bc82914c3a8fcda8247d1ae" dependencies = [ "hex", "minicbor", "serde", + "thiserror", +] + +[[package]] +name = "pallas-configs" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e4c3fa26ed2b1d00174366b7f1d6378059b225652c22b9bd78069917c7aac4e" +dependencies = [ + "base64 0.21.5", + "hex", + "pallas-addresses", + "pallas-codec", + "pallas-crypto", + "serde", + "serde_json", ] [[package]] name = "pallas-crypto" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d7e5248d3c81960fa2a1a430edc54d99601cf963ad7a4da8f9e13808d98c7f" +checksum = "cd1116c3da7bc5ae8aa3a87a3ccc42a46d07994458d084c7d3c1dc732320bfc0" dependencies = [ "cryptoxide", "hex", @@ -1935,39 +2088,26 @@ dependencies = [ ] [[package]] -name = "pallas-miniprotocols" -version = "0.18.0" +name = "pallas-network" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625e7c774664644f252d2ab2632eaed446239f180e1f03c87ffed2b8ff180f43" -dependencies = [ - "hex", - "itertools", - "pallas-codec", - "pallas-multiplexer", - "thiserror", - "tracing", -] - -[[package]] -name = "pallas-multiplexer" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e66af1c76d81a6baf905828d2e527f29c7877e33486e4f955a90d93b357636bf" +checksum = "69d5fb0899c37f74b2b3366d44eef85d44aea2b1cd8e9548263977baa252d9f4" dependencies = [ "byteorder", "hex", - "log", + "itertools", "pallas-codec", - "rand", + "pallas-crypto", "thiserror", + "tokio", "tracing", ] [[package]] name = "pallas-primitives" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "286a2d69437c9b3deaa58b8832edce3b80868ca6afeee8aff7d78f338ada9854" +checksum = "c6f41f2ffbed22cf89cdecb28c3d3694531fcd75c460fe53cb8733d632d302f0" dependencies = [ "base58", "bech32", @@ -1981,18 +2121,31 @@ dependencies = [ [[package]] name = "pallas-traverse" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "519f950d87a031770d302fdd510dc0b744c283b65d99a1a9896f399122a9c182" +checksum = "9c8c440307aafd67c4bff114e93778b3cc84b77f9fc3777c9463c94bb9eb6344" dependencies = [ "hex", "pallas-addresses", "pallas-codec", "pallas-crypto", "pallas-primitives", + "serde", "thiserror", ] +[[package]] +name = "pallas-utxorpc" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "061b212ecd45bd2b5cc8f8a26be7c55295119d03d9a75f3219a13244e13cc032" +dependencies = [ + "pallas-codec", + "pallas-primitives", + "pallas-traverse", + "utxorpc", +] + [[package]] name = "parking_lot" version = "0.12.1" @@ -2027,6 +2180,43 @@ dependencies = [ "subtle", ] +[[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", + "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" @@ -2082,6 +2272,26 @@ dependencies = [ "indexmap", ] +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + [[package]] name = "pin-project-lite" version = "0.2.9" @@ -2141,10 +2351,20 @@ dependencies = [ ] [[package]] -name = "proc-macro2" -version = "1.0.56" +name = "prettyplease" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "proc-macro2" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -2169,6 +2389,60 @@ 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", + "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" @@ -2197,9 +2471,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.26" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -2317,7 +2591,7 @@ version = "0.11.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" dependencies = [ - "base64", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", @@ -2507,7 +2781,7 @@ checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.39", ] [[package]] @@ -2530,7 +2804,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.39", ] [[package]] @@ -2576,6 +2850,16 @@ dependencies = [ "digest", ] +[[package]] +name = "sha3" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +dependencies = [ + "digest", + "keccak", +] + [[package]] name = "signal-hook" version = "0.3.17" @@ -2767,15 +3051,21 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.13" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "tempfile" version = "3.5.0" @@ -2837,7 +3127,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.39", ] [[package]] @@ -2909,6 +3199,16 @@ dependencies = [ "windows-sys 0.45.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.0.0" @@ -2917,7 +3217,7 @@ checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.39", ] [[package]] @@ -2930,6 +3230,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + [[package]] name = "tokio-util" version = "0.7.7" @@ -2978,6 +3289,60 @@ 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.5", + "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", + "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" @@ -3151,6 +3516,44 @@ 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" @@ -3301,6 +3704,17 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "which" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +dependencies = [ + "either", + "libc", + "once_cell", +] + [[package]] name = "winapi" version = "0.3.9" @@ -3529,7 +3943,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.39", ] [[package]] diff --git a/crates/aiken-project/Cargo.toml b/crates/aiken-project/Cargo.toml index fa7e8bc5..32eb7dc5 100644 --- a/crates/aiken-project/Cargo.toml +++ b/crates/aiken-project/Cargo.toml @@ -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" diff --git a/crates/aiken/Cargo.toml b/crates/aiken/Cargo.toml index 6b87830a..19d930ef 100644 --- a/crates/aiken/Cargo.toml +++ b/crates/aiken/Cargo.toml @@ -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" diff --git a/crates/aiken/src/cmd/tx/simulate.rs b/crates/aiken/src/cmd/tx/simulate.rs index 33a961ea..0b11ab4d 100644 --- a/crates/aiken/src/cmd/tx/simulate.rs +++ b/crates/aiken/src/cmd/tx/simulate.rs @@ -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!( "{} {}", diff --git a/crates/uplc/Cargo.toml b/crates/uplc/Cargo.toml index 316a4b4a..74c44d45 100644 --- a/crates/uplc/Cargo.toml +++ b/crates/uplc/Cargo.toml @@ -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" diff --git a/crates/uplc/src/tx.rs b/crates/uplc/src/tx.rs index 23b15aa2..3cd6457c 100644 --- a/crates/uplc/src/tx.rs +++ b/crates/uplc/src/tx.rs @@ -93,8 +93,8 @@ pub fn eval_phase_two_raw( run_phase_one: bool, with_redeemer: fn(&Redeemer) -> (), ) -> Result>, 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)?; diff --git a/crates/uplc/src/tx/tests.rs b/crates/uplc/src/tx/tests.rs index cea36250..3978288b 100644 --- a/crates/uplc/src/tx/tests.rs +++ b/crates/uplc/src/tx/tests.rs @@ -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 { diff --git a/examples/acceptance_tests/036/plutus.json b/examples/acceptance_tests/036/plutus.json index 1388b84c..1423d188 100644 --- a/examples/acceptance_tests/036/plutus.json +++ b/examples/acceptance_tests/036/plutus.json @@ -5,7 +5,7 @@ "plutusVersion": "v2", "compiler": { "name": "Aiken", - "version": "v1.0.20-alpha+1503b52" + "version": "v1.0.20-alpha+7c4caba" } }, "validators": [ diff --git a/examples/acceptance_tests/047/plutus.json b/examples/acceptance_tests/047/plutus.json index 80ad6c23..7c0bd959 100644 --- a/examples/acceptance_tests/047/plutus.json +++ b/examples/acceptance_tests/047/plutus.json @@ -5,7 +5,7 @@ "plutusVersion": "v2", "compiler": { "name": "Aiken", - "version": "v1.0.20-alpha+1503b52" + "version": "v1.0.20-alpha+7c4caba" } }, "validators": [ diff --git a/examples/acceptance_tests/071/plutus.json b/examples/acceptance_tests/071/plutus.json index c06c7b24..96725a93 100644 --- a/examples/acceptance_tests/071/plutus.json +++ b/examples/acceptance_tests/071/plutus.json @@ -5,7 +5,7 @@ "plutusVersion": "v2", "compiler": { "name": "Aiken", - "version": "v1.0.20-alpha+1503b52" + "version": "v1.0.20-alpha+7c4caba" } }, "validators": [ diff --git a/examples/acceptance_tests/077/plutus.json b/examples/acceptance_tests/077/plutus.json index 20156c23..e7eca2a2 100644 --- a/examples/acceptance_tests/077/plutus.json +++ b/examples/acceptance_tests/077/plutus.json @@ -5,7 +5,7 @@ "plutusVersion": "v2", "compiler": { "name": "Aiken", - "version": "v1.0.20-alpha+1503b52" + "version": "v1.0.20-alpha+7c4caba" } }, "validators": [ diff --git a/examples/acceptance_tests/079/plutus.json b/examples/acceptance_tests/079/plutus.json index 1a58226e..a8b5ab2a 100644 --- a/examples/acceptance_tests/079/plutus.json +++ b/examples/acceptance_tests/079/plutus.json @@ -5,7 +5,7 @@ "plutusVersion": "v2", "compiler": { "name": "Aiken", - "version": "v1.0.20-alpha+1503b52" + "version": "v1.0.20-alpha+7c4caba" } }, "validators": [ diff --git a/examples/acceptance_tests/086/plutus.json b/examples/acceptance_tests/086/plutus.json index 1eb452e0..7d522389 100644 --- a/examples/acceptance_tests/086/plutus.json +++ b/examples/acceptance_tests/086/plutus.json @@ -5,7 +5,7 @@ "plutusVersion": "v2", "compiler": { "name": "Aiken", - "version": "v1.0.20-alpha+1503b52" + "version": "v1.0.20-alpha+7c4caba" } }, "validators": [ diff --git a/examples/acceptance_tests/script_context/plutus.json b/examples/acceptance_tests/script_context/plutus.json index 9b3a4239..6f1211c1 100644 --- a/examples/acceptance_tests/script_context/plutus.json +++ b/examples/acceptance_tests/script_context/plutus.json @@ -5,7 +5,7 @@ "plutusVersion": "v2", "compiler": { "name": "Aiken", - "version": "v1.0.20-alpha+1503b52" + "version": "v1.0.20-alpha+7c4caba" } }, "validators": [