From bcc48600c71eeb14e146e0169f6ab8b27083b26a Mon Sep 17 00:00:00 2001 From: Michael Dougherty Date: Tue, 7 May 2024 09:30:02 -0700 Subject: [PATCH 1/7] New dna crate version --- Cargo.lock | 2 +- crates/holochain_deepkey_dna/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 08b378c..9b06e19 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -973,7 +973,7 @@ dependencies = [ [[package]] name = "holochain_deepkey_dna" -version = "0.0.5" +version = "0.0.6-dev.2" dependencies = [ "hc_deepkey_sdk", ] diff --git a/crates/holochain_deepkey_dna/Cargo.toml b/crates/holochain_deepkey_dna/Cargo.toml index 59fa076..0738e3a 100644 --- a/crates/holochain_deepkey_dna/Cargo.toml +++ b/crates/holochain_deepkey_dna/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "holochain_deepkey_dna" -version = "0.0.5" +version = "0.0.6-dev.2" edition = "2021" authors = ["Michael dougherty "] license = "CAL-1.0" From 5ed38734cb14271a2b2e0492930fb4ec002c6a4e Mon Sep 17 00:00:00 2001 From: Michael Dougherty Date: Tue, 7 May 2024 15:34:10 -0700 Subject: [PATCH 2/7] Bump, with actual correct DNA --- Cargo.lock | 2 +- crates/holochain_deepkey_dna/Cargo.toml | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9b06e19..e585e43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -973,7 +973,7 @@ dependencies = [ [[package]] name = "holochain_deepkey_dna" -version = "0.0.6-dev.2" +version = "0.0.6-dev.3" dependencies = [ "hc_deepkey_sdk", ] diff --git a/crates/holochain_deepkey_dna/Cargo.toml b/crates/holochain_deepkey_dna/Cargo.toml index 0738e3a..fca650c 100644 --- a/crates/holochain_deepkey_dna/Cargo.toml +++ b/crates/holochain_deepkey_dna/Cargo.toml @@ -1,16 +1,13 @@ [package] name = "holochain_deepkey_dna" -version = "0.0.6-dev.2" +version = "0.0.6-dev.3" edition = "2021" authors = ["Michael dougherty "] license = "CAL-1.0" repository = "https://github.com/holochain/deepkey" description = "A compilation of the Deepkey DNA for use in Holochain" -include = [ - "*", - "src/deepkey.dna", -] +include = ["*", "src/deepkey.dna"] [lib] name = "holochain_deepkey_dna" @@ -20,6 +17,4 @@ path = "src/lib.rs" hc_deepkey_sdk = { version = "0.6.0", path = "../../dnas/deepkey/sdk" } [features] -fuzzing = [ - "hc_deepkey_sdk/fuzzing", -] \ No newline at end of file +fuzzing = ["hc_deepkey_sdk/fuzzing"] From db3f4521c86518f7bfcaa41789ada72fdd34397d Mon Sep 17 00:00:00 2001 From: Michael Dougherty Date: Tue, 7 May 2024 16:13:11 -0700 Subject: [PATCH 3/7] dev.4 --- Cargo.lock | 237 +++++++++++++----------- crates/holochain_deepkey_dna/Cargo.toml | 2 +- zomes/deepkey/Cargo.toml | 2 +- 3 files changed, 126 insertions(+), 115 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e585e43..1303e57 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -75,9 +75,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" @@ -96,9 +96,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bincode" @@ -191,7 +191,7 @@ version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", "syn 1.0.109", ] @@ -234,7 +234,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.22", + "semver 1.0.23", "serde", "serde_json", "thiserror", @@ -242,9 +242,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.92" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" [[package]] name = "cfg-if" @@ -254,9 +254,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -470,7 +470,7 @@ checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", "strsim", "syn 1.0.109", @@ -484,9 +484,9 @@ checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", - "syn 2.0.58", + "syn 2.0.61", ] [[package]] @@ -508,7 +508,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", "quote 1.0.36", - "syn 2.0.58", + "syn 2.0.61", ] [[package]] @@ -518,7 +518,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -558,7 +558,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", "syn 1.0.109", ] @@ -569,9 +569,9 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", - "syn 2.0.58", + "syn 2.0.61", ] [[package]] @@ -581,7 +581,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", "rustc_version", "syn 1.0.109", @@ -605,9 +605,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "enum-iterator" @@ -624,7 +624,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", "syn 1.0.109", ] @@ -645,9 +645,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" dependencies = [ "darling 0.20.8", - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", - "syn 2.0.58", + "syn 2.0.61", ] [[package]] @@ -674,9 +674,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fnv" @@ -744,9 +744,9 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", - "syn 2.0.58", + "syn 2.0.61", ] [[package]] @@ -812,9 +812,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -849,9 +849,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc_deepkey_sdk" @@ -925,7 +925,7 @@ dependencies = [ "holochain_integrity_types", "paste", "proc-macro-error", - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", "syn 1.0.109", ] @@ -965,7 +965,7 @@ dependencies = [ "kitsune_p2p_dht_arc", "must_future", "proptest", - "proptest-derive", + "proptest-derive 0.4.0", "serde", "serde_bytes", "thiserror", @@ -973,7 +973,7 @@ dependencies = [ [[package]] name = "holochain_deepkey_dna" -version = "0.0.6-dev.3" +version = "0.0.6-dev.4" dependencies = [ "hc_deepkey_sdk", ] @@ -991,7 +991,7 @@ dependencies = [ "holochain_util", "kitsune_p2p_timestamp", "proptest", - "proptest-derive", + "proptest-derive 0.4.0", "serde", "serde_bytes", "subtle", @@ -1029,7 +1029,7 @@ dependencies = [ "arbitrary", "holochain_serialized_bytes_derive", "proptest", - "proptest-derive", + "proptest-derive 0.3.0", "rmp-serde", "serde", "serde-transcode", @@ -1172,7 +1172,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -1262,7 +1262,7 @@ dependencies = [ "chrono", "once_cell", "proptest", - "proptest-derive", + "proptest-derive 0.4.0", "rand", "serde", ] @@ -1281,9 +1281,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libm" @@ -1299,9 +1299,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1400,9 +1400,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -1425,9 +1425,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -1435,28 +1435,28 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[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 = "pest" -version = "2.7.9" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -1488,7 +1488,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", "syn 1.0.109", "version_check", @@ -1500,7 +1500,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", "version_check", ] @@ -1516,9 +1516,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] @@ -1554,6 +1554,17 @@ dependencies = [ "syn 0.15.44", ] +[[package]] +name = "proptest-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e" +dependencies = [ + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 1.0.109", +] + [[package]] name = "ptr_meta" version = "0.1.4" @@ -1569,7 +1580,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", "syn 1.0.109", ] @@ -1595,7 +1606,7 @@ version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", ] [[package]] @@ -1665,11 +1676,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] @@ -1759,16 +1770,16 @@ version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", "syn 1.0.109", ] [[package]] name = "rmp" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -1788,9 +1799,9 @@ dependencies = [ [[package]] name = "rmpv" -version = "1.0.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e0e0214a4a2b444ecce41a4025792fc31f77c7bb89c46d253953ea8c65701ec" +checksum = "58450723cd9ee93273ce44a20b6ec4efe17f8ed2e3631474387bfdecf18bb2a9" dependencies = [ "num-traits", "rmp", @@ -1800,9 +1811,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" @@ -1810,14 +1821,14 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.22", + "semver 1.0.23", ] [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -1828,9 +1839,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" [[package]] name = "rusty-fork" @@ -1846,9 +1857,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -1873,9 +1884,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "self_cell" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "semver" @@ -1888,9 +1899,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] @@ -1948,16 +1959,16 @@ version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", - "syn 2.0.58", + "syn 2.0.61", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "indexmap 2.2.6", "itoa", @@ -1994,7 +2005,7 @@ checksum = "e63e6744142336dfb606fe2b068afa2e1cca1ee6a5d8377277a92945d81fa331" dependencies = [ "bitflags 1.3.2", "itertools", - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", "syn 1.0.109", ] @@ -2045,7 +2056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", "rustversion", "syn 1.0.109", @@ -2084,18 +2095,18 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.58" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", "unicode-ident", ] @@ -2143,7 +2154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58071dc2471840e9f374eeb0f6e405a31bccb3cc5d59bb4598f02cafc274b5c4" dependencies = [ "cargo_metadata", - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", "serde", "strum_macros", @@ -2158,7 +2169,7 @@ dependencies = [ "darling 0.14.4", "if_chain", "lazy_static", - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", "subprocess", "syn 1.0.109", @@ -2183,22 +2194,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", - "syn 2.0.58", + "syn 2.0.61", ] [[package]] @@ -2246,9 +2257,9 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", - "syn 2.0.58", + "syn 2.0.61", ] [[package]] @@ -2293,9 +2304,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unicode-xid" @@ -2309,7 +2320,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2e7e85a0596447f0f2ac090e16bc4c516c6fe91771fb0c0ccf7fa3dae896b9c" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", "syn 1.0.109", ] @@ -2376,9 +2387,9 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", - "syn 2.0.58", + "syn 2.0.61", "wasm-bindgen-shared", ] @@ -2398,9 +2409,9 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", - "syn 2.0.58", + "syn 2.0.61", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2502,7 +2513,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9352877c4f07fc59146d21b56ae6dc469caf342587f49c81b4fbeafead31972" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quote 1.0.36", "syn 1.0.109", ] @@ -2559,7 +2570,7 @@ checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ "bitflags 2.5.0", "indexmap 2.2.6", - "semver 1.0.22", + "semver 1.0.23", ] [[package]] @@ -2624,11 +2635,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] diff --git a/crates/holochain_deepkey_dna/Cargo.toml b/crates/holochain_deepkey_dna/Cargo.toml index fca650c..2c8ae3e 100644 --- a/crates/holochain_deepkey_dna/Cargo.toml +++ b/crates/holochain_deepkey_dna/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "holochain_deepkey_dna" -version = "0.0.6-dev.3" +version = "0.0.6-dev.4" edition = "2021" authors = ["Michael dougherty "] license = "CAL-1.0" diff --git a/zomes/deepkey/Cargo.toml b/zomes/deepkey/Cargo.toml index dcec083..194ba76 100644 --- a/zomes/deepkey/Cargo.toml +++ b/zomes/deepkey/Cargo.toml @@ -16,5 +16,5 @@ holo_hash = { workspace = true } rmp-serde = { workspace = true } serde = { workspace = true } serde_bytes = { workspace = true } -thiserror = "1.0.38" +thiserror = "1.0" whi_hdi_extensions = { workspace = true } From f1bb1ee06d88e78084d05e073ff9fa23d4714553 Mon Sep 17 00:00:00 2001 From: Michael Dougherty Date: Tue, 7 May 2024 16:14:51 -0700 Subject: [PATCH 4/7] dev.5 --- Cargo.lock | 2 +- crates/holochain_deepkey_dna/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1303e57..787fed0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -973,7 +973,7 @@ dependencies = [ [[package]] name = "holochain_deepkey_dna" -version = "0.0.6-dev.4" +version = "0.0.6-dev.5" dependencies = [ "hc_deepkey_sdk", ] diff --git a/crates/holochain_deepkey_dna/Cargo.toml b/crates/holochain_deepkey_dna/Cargo.toml index 2c8ae3e..7dc7b5a 100644 --- a/crates/holochain_deepkey_dna/Cargo.toml +++ b/crates/holochain_deepkey_dna/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "holochain_deepkey_dna" -version = "0.0.6-dev.4" +version = "0.0.6-dev.5" edition = "2021" authors = ["Michael dougherty "] license = "CAL-1.0" From 1c8bb3792da97367f31fcf3f983915b37ef353d4 Mon Sep 17 00:00:00 2001 From: Michael Dougherty Date: Mon, 10 Jun 2024 12:52:27 -0700 Subject: [PATCH 5/7] Bump deps --- Cargo.lock | 54 ++++++++++++------------- crates/holochain_deepkey_dna/Cargo.toml | 2 +- dnas/deepkey/sdk/Cargo.toml | 7 +--- dnas/deepkey/types/Cargo.toml | 12 +++--- 4 files changed, 36 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 787fed0..b0c036f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -878,9 +878,9 @@ dependencies = [ [[package]] name = "hdi" -version = "0.5.0-dev.1" +version = "0.5.0-dev.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "367fb15bb6f1bf07c73dd3da85830a2fe2a37de5eceac5a0450e241222b0d9be" +checksum = "ff15f519955feed397b6c1b79ce0b2062dab2f67b626d8e46c76a7f9de694e63" dependencies = [ "getrandom", "hdk_derive", @@ -896,9 +896,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.4.0-dev.1" +version = "0.4.0-dev.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08966c37dccd8a205b22799f6143b25455378a7ac8b8af0a8826c6f2dc5c0070" +checksum = "d3e4a4ac76aadc261e2a513f8ffb345504a7d667d3a02f65f349b801c4aaa33e" dependencies = [ "getrandom", "hdi", @@ -916,9 +916,9 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.4.0-dev.1" +version = "0.4.0-dev.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d73ba220510d0b83c0fe717d20b763f343229d0e59b248796f7a8ae94bb0b69" +checksum = "f6adaaddb9883624c159cd89049f545f065b9c5eaf46172a1f42f35fa88f6a98" dependencies = [ "darling 0.14.4", "heck 0.5.0", @@ -950,9 +950,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.4.0-dev.1" +version = "0.4.0-dev.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439389b876b16eeddb280e4daf68002c8792103e40ed332bb9bef6a898f7a367" +checksum = "80b84303db38ecc1c5a3b5334b3da34201cf04dc231b37e7fda01e418e160089" dependencies = [ "arbitrary", "base64", @@ -973,16 +973,16 @@ dependencies = [ [[package]] name = "holochain_deepkey_dna" -version = "0.0.6-dev.5" +version = "0.0.6-dev.6" dependencies = [ "hc_deepkey_sdk", ] [[package]] name = "holochain_integrity_types" -version = "0.4.0-dev.1" +version = "0.4.0-dev.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c204c0e9f64f0c04e4980df7049e99dac459311d81298f352e1e2e38946ecf8" +checksum = "c41780c1d157026b8730e45877960238a976f72bef3d832d14d2d6dc24716187" dependencies = [ "arbitrary", "holo_hash", @@ -1000,9 +1000,9 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.4.0-dev.1" +version = "0.4.0-dev.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf025d865d391e4388e24382f8da70e13a4395348e5a250fa82051ae44b70c8" +checksum = "d1896bece8eb429f4c4c50de93afb15939117c516b827325bb9b5644a8fb2d1f" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -1064,9 +1064,9 @@ dependencies = [ [[package]] name = "holochain_wasmer_common" -version = "0.0.93" +version = "0.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e77c4d54b5bf86dfa0266588d43fc913b0442799f34c8fc04b0e8eda0260bd4" +checksum = "c9f7d17668e4a4997b5e121c7a951ea9606331ef206b991f1e81420c84d98485" dependencies = [ "holochain_serialized_bytes", "serde", @@ -1078,9 +1078,9 @@ dependencies = [ [[package]] name = "holochain_wasmer_guest" -version = "0.0.93" +version = "0.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10fcb10d7d455c5222a13b2343e2a438bcbbf3f97ef79f16c9e01203f6616dd0" +checksum = "e292e12fda0716ce36b566c7cf3dad8443fdc7c56950e42c5a3ba81988e792d0" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", @@ -1092,9 +1092,9 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.4.0-dev.1" +version = "0.4.0-dev.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab039f61375d1aa5b33de73971ae176775040e8aad8f65ec72cf274ce50b178" +checksum = "2afa8b7ee86e8f1c6c91e74a462cefc0cba5ef12cb84d39ed24ed9dfa27743cb" dependencies = [ "derive_more", "holo_hash", @@ -1214,9 +1214,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.4.0-dev.1" +version = "0.4.0-dev.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d7fbce2d113aaf0eb99076d5a77f3acb659350aef8dc76235de8a134f4ddbbf" +checksum = "f0a6a1f169c55972780aecd280a2a4548a6fb1b55ff8c3039a8dfef50c4e2985" dependencies = [ "base64", "derive_more", @@ -1229,9 +1229,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.4.0-dev.1" +version = "0.4.0-dev.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5600ee3a3b4d282f87dddc24262640d9ee267621ae9f6f7eda8483f4e46b360" +checksum = "88d374982ce2b07d4253ef7ecb9e2ec89d1e10e8e92c8aaba71d679684bc3abe" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1240,9 +1240,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.4.0-dev.1" +version = "0.4.0-dev.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a1c38460330340f036390bfe0aba67a4f0608635079439061b87c4a528bd8e" +checksum = "894bc48429be17d4d2d57d71e5d117086f81e529f7d733d98882335f8e5bd2df" dependencies = [ "derive_more", "gcollections", @@ -1254,9 +1254,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.4.0-dev.0" +version = "0.4.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504c201124264754c22e577db2184db79767cf47a63817f902a6a461e82d8cb8" +checksum = "7edfdb7b15c5e5e3b706b986ec52faabdacab1bbbac7db32246734ef4d8d56ac" dependencies = [ "arbitrary", "chrono", diff --git a/crates/holochain_deepkey_dna/Cargo.toml b/crates/holochain_deepkey_dna/Cargo.toml index 7dc7b5a..83a4589 100644 --- a/crates/holochain_deepkey_dna/Cargo.toml +++ b/crates/holochain_deepkey_dna/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "holochain_deepkey_dna" -version = "0.0.6-dev.5" +version = "0.0.6-dev.6" edition = "2021" authors = ["Michael dougherty "] license = "CAL-1.0" diff --git a/dnas/deepkey/sdk/Cargo.toml b/dnas/deepkey/sdk/Cargo.toml index ded3cc4..fecaafc 100644 --- a/dnas/deepkey/sdk/Cargo.toml +++ b/dnas/deepkey/sdk/Cargo.toml @@ -14,14 +14,11 @@ crate-type = ["cdylib", "rlib"] [dependencies] hc_deepkey_types = { version = "0.7", path = "../types" } -hdk = "0.4.0-dev.1" +hdk = "0.4.0-dev.6" serde = "1" serde_bytes = "0.11" arbitrary = { version = "1.0", features = ["derive"], optional = true } [features] -fuzzing = [ - "arbitrary", - "hc_deepkey_types/fuzzing", -] \ No newline at end of file +fuzzing = ["arbitrary", "hc_deepkey_types/fuzzing"] diff --git a/dnas/deepkey/types/Cargo.toml b/dnas/deepkey/types/Cargo.toml index 123a6cb..89b998b 100644 --- a/dnas/deepkey/types/Cargo.toml +++ b/dnas/deepkey/types/Cargo.toml @@ -13,7 +13,7 @@ name = "deepkey_types" crate-type = ["cdylib", "rlib"] [dependencies] -hdi = "0.5.0-dev.1" +hdi = "0.5.0-dev.5" holo_hash = { version = "0.4.0-dev.1", features = ["hashing", "encoding"] } holochain_integrity_types = "0.4.0-dev.1" rmpv = { version = "1", features = ["with-serde"] } @@ -24,8 +24,8 @@ arbitrary = { version = "1.0", features = ["derive"], optional = true } [features] fuzzing = [ - "arbitrary", - # "hdi/fuzzing", - "holochain_integrity_types/fuzzing", - "holo_hash/fuzzing", -] \ No newline at end of file + "arbitrary", + # "hdi/fuzzing", + "holochain_integrity_types/fuzzing", + "holo_hash/fuzzing", +] From c54eb3497fd19250a787342c9b8affc2913d3eaa Mon Sep 17 00:00:00 2001 From: Michael Dougherty Date: Wed, 21 Aug 2024 11:31:59 -0700 Subject: [PATCH 6/7] Remove sdk and types crates (to be moved into holochain monorepo) --- Cargo.lock | 4 + Cargo.toml | 12 +- crates/holochain_deepkey_dna/Cargo.toml | 2 +- dnas/deepkey/sdk/Cargo.toml | 24 ---- dnas/deepkey/sdk/README.md | 11 -- dnas/deepkey/sdk/src/lib.rs | 127 ------------------ dnas/deepkey/types/Cargo.toml | 31 ----- dnas/deepkey/types/README.md | 11 -- dnas/deepkey/types/src/app_binding.rs | 22 --- dnas/deepkey/types/src/authority_spec.rs | 28 ---- .../types/src/authorized_spec_change.rs | 32 ----- dnas/deepkey/types/src/change_rule.rs | 29 ---- dnas/deepkey/types/src/key_anchor.rs | 43 ------ dnas/deepkey/types/src/key_meta.rs | 26 ---- dnas/deepkey/types/src/key_registration.rs | 105 --------------- dnas/deepkey/types/src/keyset_root.rs | 32 ----- dnas/deepkey/types/src/lib.rs | 24 ---- 17 files changed, 8 insertions(+), 555 deletions(-) delete mode 100644 dnas/deepkey/sdk/Cargo.toml delete mode 100644 dnas/deepkey/sdk/README.md delete mode 100644 dnas/deepkey/sdk/src/lib.rs delete mode 100644 dnas/deepkey/types/Cargo.toml delete mode 100644 dnas/deepkey/types/README.md delete mode 100644 dnas/deepkey/types/src/app_binding.rs delete mode 100644 dnas/deepkey/types/src/authority_spec.rs delete mode 100644 dnas/deepkey/types/src/authorized_spec_change.rs delete mode 100644 dnas/deepkey/types/src/change_rule.rs delete mode 100644 dnas/deepkey/types/src/key_anchor.rs delete mode 100644 dnas/deepkey/types/src/key_meta.rs delete mode 100644 dnas/deepkey/types/src/key_registration.rs delete mode 100644 dnas/deepkey/types/src/keyset_root.rs delete mode 100644 dnas/deepkey/types/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index b0c036f..c693b24 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -856,6 +856,8 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc_deepkey_sdk" version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6194335c3238219fa7fe1d8d76f06153b69a96451ae90e8e4fcecff6373f282f" dependencies = [ "arbitrary", "hc_deepkey_types", @@ -867,6 +869,8 @@ dependencies = [ [[package]] name = "hc_deepkey_types" version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffd8d1cb0720a907a08f53dfcb531dbaa4d1fe0f268657076c3799f81e0e234" dependencies = [ "arbitrary", "hdi", diff --git a/Cargo.toml b/Cargo.toml index 6fa5297..84ca030 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,19 +6,14 @@ opt-level = "z" [workspace] resolver = "2" -members = [ - "crates/holochain_deepkey_dna", - "dnas/deepkey/sdk", - "dnas/deepkey/types", - "zomes/*", -] +members = ["crates/holochain_deepkey_dna", "zomes/*"] [workspace.dependencies] serde = "1" rmp-serde = "1" serde_bytes = "0.11" -hc_deepkey_types = { version = "0.7.0", path = "dnas/deepkey/types" } -hc_deepkey_sdk = { version = "0.6.0", path = "dnas/deepkey/sdk" } +hc_deepkey_types = { version = "0.7.0" } +hc_deepkey_sdk = { version = "0.6.0" } holo_hash = { version = "0.4.0-dev.1", features = ["hashing", "encoding"] } holochain_integrity_types = { version = "0.4.0-dev.1" } hdi = { version = "0.5.0-dev.1" } @@ -31,4 +26,3 @@ path = "zomes/deepkey" [workspace.dependencies.deepkey_csr] path = "zomes/deepkey_csr" - diff --git a/crates/holochain_deepkey_dna/Cargo.toml b/crates/holochain_deepkey_dna/Cargo.toml index 83a4589..5dfa5da 100644 --- a/crates/holochain_deepkey_dna/Cargo.toml +++ b/crates/holochain_deepkey_dna/Cargo.toml @@ -14,7 +14,7 @@ name = "holochain_deepkey_dna" path = "src/lib.rs" [dependencies] -hc_deepkey_sdk = { version = "0.6.0", path = "../../dnas/deepkey/sdk" } +hc_deepkey_sdk = { version = "0.6.0" } [features] fuzzing = ["hc_deepkey_sdk/fuzzing"] diff --git a/dnas/deepkey/sdk/Cargo.toml b/dnas/deepkey/sdk/Cargo.toml deleted file mode 100644 index fecaafc..0000000 --- a/dnas/deepkey/sdk/Cargo.toml +++ /dev/null @@ -1,24 +0,0 @@ -[package] -name = "hc_deepkey_sdk" -version = "0.6.0" -authors = ["Matthew Brisebois "] -edition = "2018" -license = "CAL-1.0" -repository = "https://github.com/holochain/deepkey" -description = "SDK for the Deepkey DNA Zomes" -readme = "README.md" - -[lib] -name = "deepkey_sdk" -crate-type = ["cdylib", "rlib"] - -[dependencies] -hc_deepkey_types = { version = "0.7", path = "../types" } -hdk = "0.4.0-dev.6" -serde = "1" -serde_bytes = "0.11" - -arbitrary = { version = "1.0", features = ["derive"], optional = true } - -[features] -fuzzing = ["arbitrary", "hc_deepkey_types/fuzzing"] diff --git a/dnas/deepkey/sdk/README.md b/dnas/deepkey/sdk/README.md deleted file mode 100644 index 3403ab1..0000000 --- a/dnas/deepkey/sdk/README.md +++ /dev/null @@ -1,11 +0,0 @@ -[![](https://img.shields.io/crates/v/hc_deepkey_sdk?style=flat-square)](https://crates.io/crates/hc_deepkey_sdk) - -See source code [github.com/holochain/deepkey](https://github.com/holochain/deepkey) - -# Deepkey SDK -A package containing macros and other helpers for integration with the Deepkey DNA Zomes. - - -## Crate Documentation - -See [docs.rs/hc_deepkey_sdk](https://docs.rs/hc_deepkey_sdk/) diff --git a/dnas/deepkey/sdk/src/lib.rs b/dnas/deepkey/sdk/src/lib.rs deleted file mode 100644 index 2de53b9..0000000 --- a/dnas/deepkey/sdk/src/lib.rs +++ /dev/null @@ -1,127 +0,0 @@ -pub use deepkey_types; -pub use deepkey_types::*; - -pub use hdk; - -use hdk::prelude::{holo_hash::DnaHash, *}; -use serde_bytes::ByteArray; - -#[hdk_entry_helper] -#[derive(Clone)] -pub enum KeyState { - NotFound, - Invalid(Option), - Valid(SignedActionHashed), -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct KeyRevocationInput { - pub prior_key_registration: ActionHash, - pub revocation_authorization: Vec<(u8, ByteArray<64>)>, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct DerivationDetails { - pub app_index: u32, - pub key_index: u32, -} - -impl DerivationDetails { - pub fn to_derivation_path(&self) -> Vec { - vec![self.app_index, self.key_index] - } -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct AppBindingInput { - pub app_name: String, - pub installed_app_id: String, - pub dna_hashes: Vec, - #[serde(default)] - pub metadata: deepkey_types::MetaData, -} - -#[cfg(feature = "fuzzing")] -impl<'a> arbitrary::Arbitrary<'a> for AppBindingInput { - fn arbitrary(u: &mut arbitrary::Unstructured<'a>) -> arbitrary::Result { - Ok(Self { - app_name: arbitrary::Arbitrary::arbitrary(u)?, - installed_app_id: arbitrary::Arbitrary::arbitrary(u)?, - dna_hashes: arbitrary::Arbitrary::arbitrary(u)?, - metadata: deepkey_types::MetaData::new(), - }) - } -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))] -pub struct DerivationDetailsInput { - pub app_index: u32, - pub key_index: u32, - #[serde(with = "serde_bytes")] - pub derivation_seed: Vec, - #[serde(with = "serde_bytes")] - pub derivation_bytes: Vec, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))] -pub struct CreateKeyInput { - pub key_generation: KeyGeneration, - pub app_binding: AppBindingInput, - pub derivation_details: Option, - #[serde(default)] - pub create_only: bool, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct UpdateKeyInput { - pub key_revocation: KeyRevocation, - pub key_generation: KeyGeneration, - pub derivation_details: Option, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct RevokeKeyInput { - pub key_revocation: KeyRevocation, -} - -impl TryFrom for KeyRevocation { - type Error = WasmError; - - fn try_from(input: KeyRevocationInput) -> ExternResult { - Ok(Self { - prior_key_registration: input.prior_key_registration, - revocation_authorization: input - .revocation_authorization - .into_iter() - .map(|(index, signature)| (index, Signature::from(signature.into_array()))) - .collect(), - }) - } -} - -#[derive(Serialize, Deserialize, Clone, Debug)] -pub struct AuthoritySpecInput { - pub sigs_required: u8, - pub authorized_signers: Vec>, -} - -impl From for AuthoritySpec { - fn from(input: AuthoritySpecInput) -> Self { - Self { - sigs_required: input.sigs_required, - authorized_signers: input - .authorized_signers - .iter() - .map(|key| key.into_array()) - .collect(), - } - } -} - -#[derive(Serialize, Deserialize, Clone, Debug)] -pub struct UpdateChangeRuleInput { - pub authority_spec: AuthoritySpecInput, - pub authorizations: Option>, -} diff --git a/dnas/deepkey/types/Cargo.toml b/dnas/deepkey/types/Cargo.toml deleted file mode 100644 index 89b998b..0000000 --- a/dnas/deepkey/types/Cargo.toml +++ /dev/null @@ -1,31 +0,0 @@ -[package] -name = "hc_deepkey_types" -version = "0.7.0" -authors = ["Matthew Brisebois "] -edition = "2018" -license = "CAL-1.0" -repository = "https://github.com/holochain/deepkey" -description = "Definitions used by the Deepkey DNA Zomes" -readme = "README.md" - -[lib] -name = "deepkey_types" -crate-type = ["cdylib", "rlib"] - -[dependencies] -hdi = "0.5.0-dev.5" -holo_hash = { version = "0.4.0-dev.1", features = ["hashing", "encoding"] } -holochain_integrity_types = "0.4.0-dev.1" -rmpv = { version = "1", features = ["with-serde"] } -serde = "1" - -arbitrary = { version = "1.0", features = ["derive"], optional = true } - - -[features] -fuzzing = [ - "arbitrary", - # "hdi/fuzzing", - "holochain_integrity_types/fuzzing", - "holo_hash/fuzzing", -] diff --git a/dnas/deepkey/types/README.md b/dnas/deepkey/types/README.md deleted file mode 100644 index 589774f..0000000 --- a/dnas/deepkey/types/README.md +++ /dev/null @@ -1,11 +0,0 @@ -[![](https://img.shields.io/crates/v/hc_deepkey_types?style=flat-square)](https://crates.io/crates/hc_deepkey_types) - -See source code [github.com/holochain/deepkey](https://github.com/holochain/deepkey) - -# Deepkey Types -Definitions used by the Deepkey DNA Zomes. - - -## Crate Documentation - -See [docs.rs/hc_deepkey_types](https://docs.rs/hc_deepkey_types/) diff --git a/dnas/deepkey/types/src/app_binding.rs b/dnas/deepkey/types/src/app_binding.rs deleted file mode 100644 index f4a2236..0000000 --- a/dnas/deepkey/types/src/app_binding.rs +++ /dev/null @@ -1,22 +0,0 @@ -use crate::{ - MetaData, -}; -use hdi::prelude::{ - *, - holo_hash::DnaHash -}; - - -#[hdk_entry_helper] -#[derive(Clone, PartialEq)] -pub struct AppBinding { - // TODO: if an app binding will not change for the series of registration updates, it doesn't - // make sense to point to 1 key meta when there could be many in the series. - pub app_index: u32, - pub app_name: String, - pub installed_app_id: String, - pub dna_hashes: Vec, - pub key_anchor_addr: ActionHash, - #[serde(default)] - pub metadata: MetaData, -} diff --git a/dnas/deepkey/types/src/authority_spec.rs b/dnas/deepkey/types/src/authority_spec.rs deleted file mode 100644 index 3e3da4f..0000000 --- a/dnas/deepkey/types/src/authority_spec.rs +++ /dev/null @@ -1,28 +0,0 @@ -use crate::KeyBytes; -use hdi::prelude::*; - - -// Represents an M:N multisignature spec. -// The trivial case 1:1 represents a single agent to sign. -// We need an entry to define the rules of authority -// (for authorizing or revoking) keys in the space under a KeysetRoot. -// This is only committed by the first Deepkey agent. -#[hdk_entry_helper] -#[derive(Clone)] -pub struct AuthoritySpec { - // set to 1 for a single signer scenario - pub sigs_required: u8, - // These signers may not exist on the DHT. - // E.g. a revocation key used to create the first change rule. - pub authorized_signers: Vec, -} - - -impl AuthoritySpec { - pub fn new(sigs_required: u8, authorized_signers: Vec) -> Self { - Self { - sigs_required, - authorized_signers, - } - } -} diff --git a/dnas/deepkey/types/src/authorized_spec_change.rs b/dnas/deepkey/types/src/authorized_spec_change.rs deleted file mode 100644 index cde64af..0000000 --- a/dnas/deepkey/types/src/authorized_spec_change.rs +++ /dev/null @@ -1,32 +0,0 @@ -use crate::AuthoritySpec; -use hdi::prelude::*; - - -pub type Authorization = (u8, Signature); - - -#[hdk_entry_helper] -#[derive(Clone)] -pub struct AuthorizedSpecChange { - pub new_spec: AuthoritySpec, - // Signature of the content of the authority_spec field, - // signed by throwaway RootKey on Create, - // or according to previous AuthSpec upon Update. - pub authorization_of_new_spec: Vec, -} - - -impl AuthorizedSpecChange { - pub fn new(new_spec: AuthoritySpec, authorization_of_new_spec: Vec) -> Self { - Self { - new_spec, - authorization_of_new_spec, - } - } - pub fn as_new_spec_ref(&self) -> &AuthoritySpec { - &self.new_spec - } - pub fn as_authorization_of_new_spec_ref(&self) -> &Vec { - &self.authorization_of_new_spec - } -} diff --git a/dnas/deepkey/types/src/change_rule.rs b/dnas/deepkey/types/src/change_rule.rs deleted file mode 100644 index 41358f0..0000000 --- a/dnas/deepkey/types/src/change_rule.rs +++ /dev/null @@ -1,29 +0,0 @@ -use hdi::prelude::*; - -use crate::{ - AuthorizedSpecChange, -}; - - -// The author needs to be linked from the KeysetRoot -#[hdk_entry_helper] -#[derive(Clone)] -pub struct ChangeRule { - pub keyset_root: ActionHash, - pub keyset_leaf: ActionHash, - pub spec_change: AuthorizedSpecChange, -} - -impl ChangeRule { - pub fn new( - keyset_root: ActionHash, - keyset_leaf: ActionHash, - spec_change: AuthorizedSpecChange, - ) -> Self { - Self { - keyset_root, - keyset_leaf, - spec_change, - } - } -} diff --git a/dnas/deepkey/types/src/key_anchor.rs b/dnas/deepkey/types/src/key_anchor.rs deleted file mode 100644 index 331b646..0000000 --- a/dnas/deepkey/types/src/key_anchor.rs +++ /dev/null @@ -1,43 +0,0 @@ -use hdi::prelude::*; - - -pub type KeyBytes = [u8; 32]; - - -#[hdk_entry_helper] -#[derive(Clone, PartialEq)] -pub struct KeyAnchor { - pub bytes: KeyBytes, -} - -impl KeyAnchor { - pub fn new(bytes: KeyBytes) -> Self { - KeyAnchor { - bytes, - } - } -} - - -impl TryFrom for KeyAnchor { - type Error = WasmError; - - fn try_from(input: AgentPubKey) -> Result { - Ok( - Self { - bytes: input.get_raw_32().try_into() - .map_err( |e| wasm_error!(WasmErrorInner::Guest(format!( - "Failed AgentPubKey to [u8;32] conversion: {:?}", e - ))) )?, - } - ) - } -} - -impl TryFrom<&AgentPubKey> for KeyAnchor { - type Error = WasmError; - - fn try_from(input: &AgentPubKey) -> Result { - input.to_owned().try_into() - } -} diff --git a/dnas/deepkey/types/src/key_meta.rs b/dnas/deepkey/types/src/key_meta.rs deleted file mode 100644 index a464277..0000000 --- a/dnas/deepkey/types/src/key_meta.rs +++ /dev/null @@ -1,26 +0,0 @@ -use hdi::prelude::*; - - -// #[derive(Debug, Clone, Serialize, Deserialize)] -// pub enum KeyType { -// AppUI, -// AppSig, -// AppEncryption, -// TLS, -// } - - -#[hdk_entry_helper] -#[derive(Clone)] -#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))] -pub struct KeyMeta { - // TODO: make sure we can ensure there is only 1 key anchor creation action - pub app_binding_addr: ActionHash, - pub key_index: u32, - pub key_registration_addr: ActionHash, - pub key_anchor_addr: ActionHash, - pub derivation_seed: Option>, - pub derivation_bytes: Option>, - - // pub key_type: KeyType, -} diff --git a/dnas/deepkey/types/src/key_registration.rs b/dnas/deepkey/types/src/key_registration.rs deleted file mode 100644 index edf1184..0000000 --- a/dnas/deepkey/types/src/key_registration.rs +++ /dev/null @@ -1,105 +0,0 @@ -use hdi::prelude::*; - -use crate::{ - KeyAnchor, - Authorization, -}; - - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))] -pub struct KeyGeneration { - pub new_key: AgentPubKey, - - // The private key has signed the deepkey agent key to prove ownership - pub new_key_signing_of_author: Signature, - - // TODO - // generator: ActionHash, // This is the key authorized to generate new keys on this chain - // generator_signature: Signature, // The generator key signing the new key -} - -impl KeyGeneration { - pub fn new(key: AgentPubKey, signature: Signature) -> Self { - Self { - new_key: key, - new_key_signing_of_author: signature, - } - } -} - -impl From<(AgentPubKey, Signature)> for KeyGeneration { - fn from((key, signature): (AgentPubKey, Signature)) -> Self { - Self::new( key, signature ) - } -} - -impl From<(&AgentPubKey, &Signature)> for KeyGeneration { - fn from((key, signature): (&AgentPubKey, &Signature)) -> Self { - ( key.to_owned(), signature.to_owned() ).into() - } -} - - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))] -pub struct KeyRevocation { - pub prior_key_registration: ActionHash, - pub revocation_authorization: Vec, -} - -impl KeyRevocation { - pub fn new(prior_key: ActionHash, authorizations: Vec) -> Self { - Self { - prior_key_registration: prior_key, - revocation_authorization: authorizations, - } - } -} - -impl From<(ActionHash, Vec)> for KeyRevocation { - fn from((prior_key, authorizations): (ActionHash, Vec)) -> Self { - Self::new( prior_key, authorizations ) - } -} - -impl From<(&ActionHash, &Vec)> for KeyRevocation { - fn from((prior_key, authorizations): (&ActionHash, &Vec)) -> Self { - ( prior_key.to_owned(), authorizations.to_owned() ).into() - } -} - - -#[hdk_entry_helper] -#[derive(Clone)] -#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))] -pub enum KeyRegistration { - // Creates a key under management of current KSR on this chain - Create(KeyGeneration), - - // Unmanaged key. Keys for hosted web users may be of this type, cannot replace/revoke - CreateOnly(KeyGeneration), - - // Revokes a key and replaces it with a newly generated one - Update(KeyRevocation, KeyGeneration), - - // Permanently revokes a key (Note: still uses an update action.) - Delete(KeyRevocation) -} - -impl KeyRegistration { - pub fn key_anchor(&self) -> ExternResult { - match self { - KeyRegistration::Create(key_gen) => key_gen.new_key.to_owned(), - KeyRegistration::CreateOnly(key_gen) => key_gen.new_key.to_owned(), - KeyRegistration::Update(_, key_gen) => key_gen.new_key.to_owned(), - KeyRegistration::Delete(_) => Err(wasm_error!(WasmErrorInner::Guest( - "Cannot derive KeyAnchor from a KeyRegistration::Delete".to_string() - )))?, - }.try_into() - } - - pub fn key_anchor_hash(&self) -> ExternResult { - hash_entry( self.key_anchor()? ) - } -} diff --git a/dnas/deepkey/types/src/keyset_root.rs b/dnas/deepkey/types/src/keyset_root.rs deleted file mode 100644 index bb9f1c9..0000000 --- a/dnas/deepkey/types/src/keyset_root.rs +++ /dev/null @@ -1,32 +0,0 @@ -use crate::KeyBytes; -use hdi::prelude::*; - -pub const KEYSET_ROOT_INDEX: u32 = POST_GENESIS_SEQ_THRESHOLD + 1; - - -#[hdk_entry_helper] -#[derive(Clone)] -pub struct KeysetRoot { - pub first_deepkey_agent: AgentPubKey, - /// The private key is thrown away. - pub root_pub_key: KeyBytes, - pub signed_fda: Signature, -} - -impl KeysetRoot { - pub fn new( - first_deepkey_agent: AgentPubKey, - root_pub_key: KeyBytes, - signed_fda: Signature, - ) -> Self { - Self { - first_deepkey_agent, - root_pub_key, - signed_fda, - } - } - - pub fn root_pub_key_as_agent(&self) -> AgentPubKey { - holo_hash::AgentPubKey::from_raw_32( self.root_pub_key.to_vec() ) - } -} diff --git a/dnas/deepkey/types/src/lib.rs b/dnas/deepkey/types/src/lib.rs deleted file mode 100644 index 68bcc07..0000000 --- a/dnas/deepkey/types/src/lib.rs +++ /dev/null @@ -1,24 +0,0 @@ -pub mod authority_spec; -pub mod authorized_spec_change; -pub mod change_rule; -pub mod app_binding; -pub mod key_anchor; -pub mod key_meta; -pub mod key_registration; -pub mod keyset_root; - -pub use authorized_spec_change::*; -pub use authority_spec::*; -pub use change_rule::*; -pub use app_binding::*; -pub use keyset_root::*; -pub use key_anchor::*; -pub use key_meta::*; -pub use key_registration::*; - -use std::collections::BTreeMap; - - -pub type MetaData = BTreeMap; - -pub use hdi; \ No newline at end of file From 059980f4f9bcd635775980a9a821f14dc07e9664 Mon Sep 17 00:00:00 2001 From: Michael Dougherty Date: Wed, 21 Aug 2024 11:51:29 -0700 Subject: [PATCH 7/7] Remove types re-export from deepkey crate --- Cargo.lock | 364 ++++-------------------- crates/holochain_deepkey_dna/Cargo.toml | 4 +- crates/holochain_deepkey_dna/src/lib.rs | 6 - 3 files changed, 59 insertions(+), 315 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c693b24..8eba5e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,15 +52,6 @@ dependencies = [ "libc", ] -[[package]] -name = "arbitrary" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" -dependencies = [ - "derive_arbitrary", -] - [[package]] name = "arrayref" version = "0.3.7" @@ -191,8 +182,8 @@ version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -470,8 +461,8 @@ checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "strsim", "syn 1.0.109", ] @@ -484,8 +475,8 @@ checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "syn 2.0.61", ] @@ -496,7 +487,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core 0.14.4", - "quote 1.0.36", + "quote", "syn 1.0.109", ] @@ -507,7 +498,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", - "quote 1.0.36", + "quote", "syn 2.0.61", ] @@ -558,22 +549,11 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "syn 1.0.109", ] -[[package]] -name = "derive_arbitrary" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" -dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.36", - "syn 2.0.61", -] - [[package]] name = "derive_more" version = "0.99.17" @@ -581,8 +561,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "rustc_version", "syn 1.0.109", ] @@ -624,8 +604,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -645,8 +625,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" dependencies = [ "darling 0.20.8", - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "syn 2.0.61", ] @@ -656,28 +636,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "fallible-iterator" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - [[package]] name = "fnv" version = "1.0.7" @@ -744,8 +708,8 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "syn 2.0.61", ] @@ -859,7 +823,6 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6194335c3238219fa7fe1d8d76f06153b69a96451ae90e8e4fcecff6373f282f" dependencies = [ - "arbitrary", "hc_deepkey_types", "hdk", "serde", @@ -872,7 +835,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bffd8d1cb0720a907a08f53dfcb531dbaa4d1fe0f268657076c3799f81e0e234" dependencies = [ - "arbitrary", "hdi", "holo_hash", "holochain_integrity_types", @@ -929,8 +891,8 @@ dependencies = [ "holochain_integrity_types", "paste", "proc-macro-error", - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -958,7 +920,6 @@ version = "0.4.0-dev.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80b84303db38ecc1c5a3b5334b3da34201cf04dc231b37e7fda01e418e160089" dependencies = [ - "arbitrary", "base64", "blake2b_simd", "derive_more", @@ -968,8 +929,6 @@ dependencies = [ "holochain_wasmer_common", "kitsune_p2p_dht_arc", "must_future", - "proptest", - "proptest-derive 0.4.0", "serde", "serde_bytes", "thiserror", @@ -977,10 +936,7 @@ dependencies = [ [[package]] name = "holochain_deepkey_dna" -version = "0.0.6-dev.6" -dependencies = [ - "hc_deepkey_sdk", -] +version = "0.0.8-dev.1" [[package]] name = "holochain_integrity_types" @@ -988,14 +944,11 @@ version = "0.4.0-dev.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c41780c1d157026b8730e45877960238a976f72bef3d832d14d2d6dc24716187" dependencies = [ - "arbitrary", "holo_hash", "holochain_secure_primitive", "holochain_serialized_bytes", "holochain_util", "kitsune_p2p_timestamp", - "proptest", - "proptest-derive 0.4.0", "serde", "serde_bytes", "subtle", @@ -1030,10 +983,7 @@ version = "0.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fad1068180811f3a23c340894cb98b0710244ffac76427664239545f162619c5" dependencies = [ - "arbitrary", "holochain_serialized_bytes_derive", - "proptest", - "proptest-derive 0.3.0", "rmp-serde", "serde", "serde-transcode", @@ -1048,7 +998,7 @@ version = "0.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71cc7f19017233d644abc4a23cbe19220effc05aea057f93db1be00348b89464" dependencies = [ - "quote 1.0.36", + "quote", "syn 1.0.109", ] @@ -1262,12 +1212,7 @@ version = "0.4.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edfdb7b15c5e5e3b706b986ec52faabdacab1bbbac7db32246734ef4d8d56ac" dependencies = [ - "arbitrary", "chrono", - "once_cell", - "proptest", - "proptest-derive 0.4.0", - "rand", "serde", ] @@ -1289,18 +1234,6 @@ version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - [[package]] name = "lock_api" version = "0.4.12" @@ -1409,7 +1342,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -1479,12 +1411,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - [[package]] name = "proc-macro-error" version = "1.0.4" @@ -1492,8 +1418,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "syn 1.0.109", "version_check", ] @@ -1504,20 +1430,11 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "version_check", ] -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid", -] - [[package]] name = "proc-macro2" version = "1.0.82" @@ -1527,48 +1444,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "proptest" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" -dependencies = [ - "bit-set", - "bit-vec", - "bitflags 2.5.0", - "lazy_static", - "num-traits", - "rand", - "rand_chacha", - "rand_xorshift", - "regex-syntax", - "rusty-fork", - "tempfile", - "unarray", -] - -[[package]] -name = "proptest-derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b46295382dc76166cb7cf2bb4a97952464e4b7ed5a43e6cd34e1fec3349ddc" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "proptest-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e" -dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.36", - "syn 1.0.109", -] - [[package]] name = "ptr_meta" version = "0.1.4" @@ -1584,33 +1459,18 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "syn 1.0.109", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - [[package]] name = "quote" version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ - "proc-macro2 1.0.82", + "proc-macro2", ] [[package]] @@ -1619,45 +1479,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_xorshift" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" -dependencies = [ - "rand_core", -] - [[package]] name = "rayon" version = "1.10.0" @@ -1774,8 +1595,8 @@ version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -1828,37 +1649,12 @@ dependencies = [ "semver 1.0.23", ] -[[package]] -name = "rustix" -version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - [[package]] name = "rustversion" version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" -[[package]] -name = "rusty-fork" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" -dependencies = [ - "fnv", - "quick-error", - "tempfile", - "wait-timeout", -] - [[package]] name = "ryu" version = "1.0.18" @@ -1963,8 +1759,8 @@ version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "syn 2.0.61", ] @@ -2009,8 +1805,8 @@ checksum = "e63e6744142336dfb606fe2b068afa2e1cca1ee6a5d8377277a92945d81fa331" dependencies = [ "bitflags 1.3.2", "itertools", - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -2060,8 +1856,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "rustversion", "syn 1.0.109", ] @@ -2082,25 +1878,14 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid", -] - [[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "unicode-ident", ] @@ -2110,8 +1895,8 @@ version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "unicode-ident", ] @@ -2127,18 +1912,6 @@ version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys 0.52.0", -] - [[package]] name = "test-fuzz" version = "3.0.4" @@ -2158,8 +1931,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58071dc2471840e9f374eeb0f6e405a31bccb3cc5d59bb4598f02cafc274b5c4" dependencies = [ "cargo_metadata", - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "serde", "strum_macros", ] @@ -2173,8 +1946,8 @@ dependencies = [ "darling 0.14.4", "if_chain", "lazy_static", - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "subprocess", "syn 1.0.109", "test-fuzz-internal", @@ -2211,8 +1984,8 @@ version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "syn 2.0.61", ] @@ -2261,8 +2034,8 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "syn 2.0.61", ] @@ -2294,12 +2067,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" -[[package]] -name = "unarray" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" - [[package]] name = "unicode-ident" version = "1.0.12" @@ -2312,20 +2079,14 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - [[package]] name = "unzip-n" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2e7e85a0596447f0f2ac090e16bc4c516c6fe91771fb0c0ccf7fa3dae896b9c" dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -2347,15 +2108,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - [[package]] name = "walkdir" version = "2.5.0" @@ -2391,8 +2143,8 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "syn 2.0.61", "wasm-bindgen-shared", ] @@ -2403,7 +2155,7 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ - "quote 1.0.36", + "quote", "wasm-bindgen-macro-support", ] @@ -2413,8 +2165,8 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "syn 2.0.61", "wasm-bindgen-backend", "wasm-bindgen-shared", @@ -2517,8 +2269,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9352877c4f07fc59146d21b56ae6dc469caf342587f49c81b4fbeafead31972" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.82", - "quote 1.0.36", + "proc-macro2", + "quote", "syn 1.0.109", ] diff --git a/crates/holochain_deepkey_dna/Cargo.toml b/crates/holochain_deepkey_dna/Cargo.toml index 5dfa5da..d013eb1 100644 --- a/crates/holochain_deepkey_dna/Cargo.toml +++ b/crates/holochain_deepkey_dna/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "holochain_deepkey_dna" -version = "0.0.6-dev.6" +version = "0.0.8-dev.1" edition = "2021" authors = ["Michael dougherty "] license = "CAL-1.0" @@ -14,7 +14,5 @@ name = "holochain_deepkey_dna" path = "src/lib.rs" [dependencies] -hc_deepkey_sdk = { version = "0.6.0" } [features] -fuzzing = ["hc_deepkey_sdk/fuzzing"] diff --git a/crates/holochain_deepkey_dna/src/lib.rs b/crates/holochain_deepkey_dna/src/lib.rs index dd49855..3bdfdf5 100644 --- a/crates/holochain_deepkey_dna/src/lib.rs +++ b/crates/holochain_deepkey_dna/src/lib.rs @@ -3,9 +3,3 @@ /// Get the hard-coded Deepkey DNA provided by this crate. /// This can be decoded with `holochain_types::DnaBundle::decode()` pub const DEEPKEY_DNA_BUNDLE_BYTES: &[u8] = include_bytes!("deepkey.dna"); - -pub mod types { - pub use deepkey_sdk::*; -} - -pub use deepkey_sdk::hdk;