Sulkta-OSS/pallas
3
0
Fork 0
Code Issues 1 Pull requests 4 Projects Releases Packages Wiki Activity Actions

Back-merge v0.13 hotfix

Browse source
This commit is contained in:
Santiago Carmuega 2022-10-13 16:14:20 -03:00
commit 62f7c84df0
9 changed files with 21 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pallas-addresses/Cargo.toml
View file

@ -8,9 +8,7 @@ homepage = "https://github.com/txpipe/pallas"
documentation = "https://docs.rs/pallas-byron" documentation = "https://docs.rs/pallas-byron"
license = "Apache-2.0" license = "Apache-2.0"
readme = "README.md" readme = "README.md"
authors = [ authors = ["Santiago Carmuega <santiago@carmuega.me>"]
"Santiago Carmuega <santiago@carmuega.me>",
]
[dependencies] [dependencies]
hex = "0.4.3" hex = "0.4.3"

5
pallas-codec/Cargo.toml
View file

@ -8,12 +8,9 @@ homepage = "https://github.com/txpipe/pallas"
documentation = "https://docs.rs/pallas-codec" documentation = "https://docs.rs/pallas-codec"
license = "Apache-2.0" license = "Apache-2.0"
readme = "README.md" readme = "README.md"
authors = [ authors = ["Santiago Carmuega <santiago@carmuega.me>"]
"Santiago Carmuega <santiago@carmuega.me>"
]
[dependencies] [dependencies]
hex = "0.4.3" hex = "0.4.3"
minicbor = { version = "0.18", features = ["std", "half", "derive"] } minicbor = { version = "0.18", features = ["std", "half", "derive"] }
serde = { version = "1.0.143", features = ["derive"] } serde = { version = "1.0.143", features = ["derive"] }

4
pallas-crypto/Cargo.toml
View file

@ -8,9 +8,7 @@ homepage = "https://github.com/txpipe/pallas"
documentation = "https://docs.rs/pallas-crypto" documentation = "https://docs.rs/pallas-crypto"
license = "Apache-2.0" license = "Apache-2.0"
readme = "README.md" readme = "README.md"
authors = [ authors = ["Nicolas Di Prima <nicolas@primetype.co.uk>"]
"Nicolas Di Prima <nicolas@primetype.co.uk>"
]
[dependencies] [dependencies]
hex = "0.4" hex = "0.4"

8
pallas-miniprotocols/Cargo.toml
View file

@ -8,13 +8,11 @@ homepage = "https://github.com/txpipe/pallas"
documentation = "https://docs.rs/pallas-machines" documentation = "https://docs.rs/pallas-machines"
license = "Apache-2.0" license = "Apache-2.0"
readme = "README.md" readme = "README.md"
authors = [ authors = ["Santiago Carmuega <santiago@carmuega.me>"]
"Santiago Carmuega <santiago@carmuega.me>"
]
[dependencies] [dependencies]
pallas-codec = { version = "0.14.0-alpha.0", path = "../pallas-codec/" } pallas-codec = { version = "0.14.0-alpha.0", path = "../pallas-codec/" }
pallas-multiplexer = { version = "0.14.0-alpha.0", path = "../pallas-multiplexer/" } pallas-multiplexer = { version = "0.14.0-alpha.0", path = "../pallas-multiplexer/" }
log = "0.4.14" log = "0.4.14"
hex = "0.4.3" hex = "0.4.3"
itertools = "0.10.3" itertools = "0.10.3"

6
pallas-multiplexer/Cargo.toml
View file

@ -8,12 +8,10 @@ homepage = "https://github.com/txpipe/pallas"
documentation = "https://docs.rs/pallas-multiplexer" documentation = "https://docs.rs/pallas-multiplexer"
license = "Apache-2.0" license = "Apache-2.0"
readme = "README.md" readme = "README.md"
authors = [ authors = ["Santiago Carmuega <santiago@carmuega.me>"]
"Santiago Carmuega <santiago@carmuega.me>"
]
[dependencies] [dependencies]
pallas-codec = { version = "0.14.0-alpha.0", path = "../pallas-codec/" } pallas-codec = { version = "0.14.0-alpha.0", path = "../pallas-codec/" }
log = "0.4.14" log = "0.4.14"
byteorder = "1.4.3" byteorder = "1.4.3"
hex = "0.4.3" hex = "0.4.3"

12
pallas-primitives/src/alonzo/model.rs
View file

@ -947,7 +947,9 @@ impl<'b, C> minicbor::decode::Decode<'b, C> for PlutusData {
| minicbor::data::Type::I16 | minicbor::data::Type::I16
| minicbor::data::Type::I32 | minicbor::data::Type::I32
| minicbor::data::Type::I64 => Ok(Self::BigInt(d.decode_with(ctx)?)), | minicbor::data::Type::I64 => Ok(Self::BigInt(d.decode_with(ctx)?)),
minicbor::data::Type::Map => Ok(Self::Map(d.decode_with(ctx)?)), minicbor::data::Type::Map | minicbor::data::Type::MapIndef => {
Ok(Self::Map(d.decode_with(ctx)?))
}
minicbor::data::Type::Bytes => Ok(Self::BoundedBytes(d.decode_with(ctx)?)), minicbor::data::Type::Bytes => Ok(Self::BoundedBytes(d.decode_with(ctx)?)),
minicbor::data::Type::BytesIndef => { minicbor::data::Type::BytesIndef => {
let mut full = Vec::new(); let mut full = Vec::new();
@ -1253,8 +1255,12 @@ impl<'b, C> minicbor::Decode<'b, C> for Metadatum {
} }
minicbor::data::Type::Bytes => Ok(Metadatum::Bytes(d.decode_with(ctx)?)), minicbor::data::Type::Bytes => Ok(Metadatum::Bytes(d.decode_with(ctx)?)),
minicbor::data::Type::String => Ok(Metadatum::Text(d.decode_with(ctx)?)), minicbor::data::Type::String => Ok(Metadatum::Text(d.decode_with(ctx)?)),
minicbor::data::Type::Array => Ok(Metadatum::Array(d.decode_with(ctx)?)), minicbor::data::Type::Array | minicbor::data::Type::ArrayIndef => {
minicbor::data::Type::Map => Ok(Metadatum::Map(d.decode_with(ctx)?)), Ok(Metadatum::Array(d.decode_with(ctx)?))
}
minicbor::data::Type::Map | minicbor::data::Type::MapIndef => {
Ok(Metadatum::Map(d.decode_with(ctx)?))
}
_ => Err(minicbor::decode::Error::message( _ => Err(minicbor::decode::Error::message(
"Can't turn data type into metadatum", "Can't turn data type into metadatum",
)), )),

2
pallas-primitives/src/babbage/model.rs
View file

@ -680,6 +680,8 @@ mod tests {
include_str!("../../../test_data/babbage4.block"), include_str!("../../../test_data/babbage4.block"),
// peculiar block with i32 overlfow // peculiar block with i32 overlfow
include_str!("../../../test_data/babbage5.block"), include_str!("../../../test_data/babbage5.block"),
// peculiar block with map undef in plutus data
include_str!("../../../test_data/babbage6.block"),
]; ];
for (idx, block_str) in test_blocks.iter().enumerate() { for (idx, block_str) in test_blocks.iter().enumerate() {

4
pallas/Cargo.toml
View file

@ -8,9 +8,7 @@ homepage = "https://github.com/txpipe/pallas"
documentation = "https://docs.rs/pallas" documentation = "https://docs.rs/pallas"
license = "Apache-2.0" license = "Apache-2.0"
readme = "../README.md" readme = "../README.md"
authors = [ authors = ["Santiago Carmuega <santiago@carmuega.me>"]
"Santiago Carmuega <santiago@carmuega.me>"
]
[dependencies] [dependencies]
pallas-multiplexer = { version = "0.14.0-alpha.0", path = "../pallas-multiplexer/" } pallas-multiplexer = { version = "0.14.0-alpha.0", path = "../pallas-multiplexer/" }

1
test_data/babbage6.block Normal file
View file

File diff suppressed because one or more lines are too long