diff --git a/native/Cargo.lock b/native/Cargo.lock index 96000db..fff4e85 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -17,6 +17,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08abcc3b4e9339e33a3d0a5ed15d84a687350c05689d825e0f6655eef9e76a94" +[[package]] +name = "arrayref" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" + [[package]] name = "arrayvec" version = "0.4.11" @@ -26,6 +32,12 @@ dependencies = [ "nodrop", ] +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + [[package]] name = "autocfg" version = "0.1.6" @@ -39,7 +51,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5180c5a20655b14a819b652fd2378fa5f1697b6c9ddad3e695c2f9cedf6df4e2" dependencies = [ "backtrace-sys", - "cfg-if 0.1.9", + "cfg-if 0.1.10", "libc", "rustc-demangle", ] @@ -80,13 +92,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" [[package]] -name = "blake2-rfc" -version = "0.2.18" +name = "blake3" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" +checksum = "b64485778c4f16a6a5a9d335e80d449ac6c70cdd6a06d2af18a6f6f775a125b3" dependencies = [ - "arrayvec", + "arrayref", + "arrayvec 0.5.2", + "cc", + "cfg-if 0.1.10", "constant_time_eq", + "crypto-mac", + "digest", ] [[package]] @@ -115,9 +132,9 @@ dependencies = [ [[package]] name = "cfg-if" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "cfg-if" @@ -159,9 +176,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "crossbeam-deque" @@ -179,8 +196,8 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" dependencies = [ - "arrayvec", - "cfg-if 0.1.9", + "arrayvec 0.4.11", + "cfg-if 0.1.10", "crossbeam-utils", "lazy_static", "memoffset", @@ -202,15 +219,28 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" dependencies = [ - "cfg-if 0.1.9", + "cfg-if 0.1.10", "lazy_static", ] [[package]] -name = "cslice" -version = "0.2.0" +name = "crypto-mac" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697c714f50560202b1f4e2e09cd50a421881c83e9025db75d15f276616f04f40" +checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] [[package]] name = "ed" @@ -274,6 +304,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +[[package]] +name = "generic-array" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "getrandom" version = "0.2.2" @@ -349,7 +389,7 @@ dependencies = [ [[package]] name = "librocksdb-sys" version = "6.17.3" -source = "git+https://github.com/rust-rocksdb/rust-rocksdb#bc59596da15867510133d60822e615ef6e3a1ca4" +source = "git+https://github.com/rust-rocksdb/rust-rocksdb?rev=v0.16.0#5329272444193c68394fa02428158ebccee09e45" dependencies = [ "bindgen", "cc", @@ -375,9 +415,9 @@ dependencies = [ [[package]] name = "merk" version = "1.0.0" -source = "git+https://github.com/nomic-io/merk?branch=chunk_proofs#2f5b0d0421e34e30365afe4029f2beb5d16e926f" +source = "git+https://github.com/nomic-io/merk?rev=a613a054001f28b9f23d7576ae92ec8a2922168c#a613a054001f28b9f23d7576ae92ec8a2922168c" dependencies = [ - "blake2-rfc", + "blake3", "byteorder", "colored", "ed", @@ -392,12 +432,11 @@ dependencies = [ [[package]] name = "neon" -version = "0.8.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcdbfbcfbb5ae2ffc7281dfe0b118374bd696369096afc252f26c0b8e7a02e91" +checksum = "28e15415261d880aed48122e917a45e87bb82cf0260bb6db48bbab44b7464373" dependencies = [ - "cslice", - "neon-build", + "neon-build 0.10.1", "neon-runtime", "semver", "smallvec", @@ -408,15 +447,21 @@ name = "neon-build" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a529aacddb4b04e9c0a0d5e67478d9aad331c748cbbf6d1657f6d167b3fac37a" + +[[package]] +name = "neon-build" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bac98a702e71804af3dacfde41edde4a16076a7bbe889ae61e56e18c5b1c811" dependencies = [ "neon-sys", ] [[package]] name = "neon-runtime" -version = "0.8.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dbec080794ea0939cbd4fa262e749068fd36b18bbb65b6b810e72ae98fea789" +checksum = "4676720fa8bb32c64c3d9f49c47a47289239ec46b4bdb66d0913cc512cb0daca" dependencies = [ "cfg-if 1.0.0", "neon-sys", @@ -425,9 +470,9 @@ dependencies = [ [[package]] name = "neon-sys" -version = "0.8.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed97a0dce4e4666c57b15e4cd94c7d3cf1405f58383a302b989e6e9e0f5cac5d" +checksum = "a5ebc923308ac557184455b4aaa749470554cbac70eb4daa8b18cdc16bef7df6" dependencies = [ "cc", "regex", @@ -440,7 +485,7 @@ dependencies = [ "failure", "merk", "neon", - "neon-build", + "neon-build 0.8.0", ] [[package]] @@ -649,8 +694,8 @@ checksum = "2089e4031214d129e201f8c3c8c2fe97cd7322478a0d1cdf78e7029b0042efdb" [[package]] name = "rocksdb" -version = "0.15.0" -source = "git+https://github.com/rust-rocksdb/rust-rocksdb#bc59596da15867510133d60822e615ef6e3a1ca4" +version = "0.16.0" +source = "git+https://github.com/rust-rocksdb/rust-rocksdb?rev=v0.16.0#5329272444193c68394fa02428158ebccee09e45" dependencies = [ "libc", "librocksdb-sys", @@ -716,6 +761,12 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252" +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + [[package]] name = "syn" version = "1.0.48" @@ -759,6 +810,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "typenum" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" + [[package]] name = "unicode-xid" version = "0.2.1" diff --git a/native/Cargo.toml b/native/Cargo.toml index 7e6822a..6009373 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -14,7 +14,7 @@ crate-type = ["cdylib"] neon-build = "0.8.0" [dependencies] -neon = "0.8.0" +neon = "0.10.1" merk = { git = "https://github.com/nomic-io/merk", rev = "a613a054001f28b9f23d7576ae92ec8a2922168c"} # merk = { path = "../../merk" } failure = "0.1.6"