diff --git a/flake.nix b/flake.nix index 3ea8aedc..733718ca 100644 --- a/flake.nix +++ b/flake.nix @@ -63,5 +63,11 @@ }; defaultPackage = yatima-rs; + + devShell = pkgs.mkShell { + buildInputs = [ + pkgs.protobuf + ]; + }; }); } diff --git a/yatima-rs/Cargo.lock b/yatima-rs/Cargo.lock index 42102ba0..9219e9ae 100644 --- a/yatima-rs/Cargo.lock +++ b/yatima-rs/Cargo.lock @@ -292,12 +292,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "itoa" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" - [[package]] name = "keccak" version = "0.1.0" @@ -311,59 +305,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" [[package]] -name = "lock_api" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" +name = "libipld" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "lurk-ipld" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6675e4a614577a2e677b7ddabbe23824c980b5373a7553768554fa4d3c83ec9f" +checksum = "dfb2f6a99d838dcb1cc18361c79e827b76e91987227406e705d07cbef51ab7be" dependencies = [ "async-trait", "cached", "fnv", + "libipld-cbor", + "libipld-cbor-derive", + "libipld-core", + "libipld-macro", "log", - "lurk-ipld-cbor", - "lurk-ipld-core", - "lurk-ipld-json", - "lurk-ipld-macro", "multihash", "parking_lot", "thiserror", ] [[package]] -name = "lurk-ipld-cbor" -version = "0.1.0" +name = "libipld-cbor" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f04538a7157c1782ddf2806355046adc01d2371a99502b66ac26df9149b62f3" +checksum = "46b3bbc4f35b8f25eb140d183f33d4610a1eb6531b312f01161fa06693f8c28a" dependencies = [ "byteorder", - "lurk-ipld-core", + "libipld-core", "thiserror", ] [[package]] -name = "lurk-ipld-core" -version = "0.1.0" +name = "libipld-cbor-derive" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6ec17d094f4f62e33e201ded63d911fd0bff3b12121ddc50d611e967f7e6824" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "libipld-core" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd43b843c3cdc52d0df1ccdfdc75c65e412c25ff696cbc29be069d6d5e8261e" +checksum = "fbdd758764f9680a818af33c31db733eb7c45224715d8816b9dcf0548c75f7c5" dependencies = [ "anyhow", "cid", @@ -375,24 +363,31 @@ dependencies = [ ] [[package]] -name = "lurk-ipld-json" -version = "0.1.0" +name = "libipld-macro" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db548002b1710ab2eaab21404087d0114f9069f18705c0ab6f9b26d46c614614" +checksum = "c6c4cb1056262ef4056ad9e5fb41f252c45f55009888e21b7837ac051f38814a" dependencies = [ - "lurk-ipld-core", - "multihash", - "serde", - "serde_json", + "libipld-core", ] [[package]] -name = "lurk-ipld-macro" -version = "0.1.0" +name = "lock_api" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797538f4712f28003260eba722e4732668b9738fb88fa0d5202707a48c0272" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ - "lurk-ipld-core", + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", ] [[package]] @@ -677,12 +672,6 @@ version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" -[[package]] -name = "ryu" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" - [[package]] name = "scopeguard" version = "1.1.0" @@ -727,17 +716,6 @@ dependencies = [ "syn", ] -[[package]] -name = "serde_json" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" -dependencies = [ - "itoa", - "ryu", - "serde", -] - [[package]] name = "serde_repr" version = "0.1.8" @@ -948,7 +926,7 @@ dependencies = [ "base-x", "cid", "im", - "lurk-ipld", + "libipld", "multibase", "multihash", "nom", diff --git a/yatima-rs/Cargo.toml b/yatima-rs/Cargo.toml index 52982017..de642f47 100644 --- a/yatima-rs/Cargo.toml +++ b/yatima-rs/Cargo.toml @@ -17,7 +17,7 @@ base-x = { version = "0.2.8", default-features = false } multibase = { version = "0.9.1", default-features = false } multihash = { version = "0.16.2", default-features = false, features = ["alloc", "secure-hashes"] } cid = { version = "0.8.4", default-features = false, features = ["alloc", "serde-codec"] } -libipld = { package = "lurk-ipld", version = "0.1.0", default-features = false, features = ["dag-cbor", "dag-json", "serde-codec"] } +libipld = { version = "0.13.1", default-features = false, features = ["dag-cbor", "derive", "serde-codec"] } serde = { version = "1.0.137", default-features = false, features = ["alloc", "serde_derive"] } serde_tuple = "0.5.0" serde_repr = "0.1.8"