diff --git a/Cargo.lock b/Cargo.lock index 83a339af1..71e23692e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -141,9 +141,9 @@ dependencies = [ [[package]] name = "axum" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16705af05732b7d3258ec0f7b73c03a658a28925e050d8852d5b568ee8bcf4e" +checksum = "6b9496f0c1d1afb7a2af4338bbe1d969cddfead41d87a9fb3aaa6d0bbc7af648" dependencies = [ "async-trait", "axum-core 0.2.7", @@ -217,10 +217,22 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5738be7561b0eeb501ef1d5c5db3f24e01ceb55fededd9b00039aada34966ad" +[[package]] +name = "bee-api-types" +version = "1.0.0-alpha.1" +source = "git+https://github.com/iotaledger/bee.git?branch=shimmer-develop#ff52b003a2c3845e2987d23487a696af106c053c" +dependencies = [ + "axum 0.5.13", + "bee-block", + "bee-ledger-types", + "serde", + "thiserror", +] + [[package]] name = "bee-block" version = "0.1.0" -source = "git+https://github.com/iotaledger/bee.git?branch=shimmer-develop#4933f301e80c0e13f83d7940d9ab7c387f11d220" +source = "git+https://github.com/iotaledger/bee.git?branch=shimmer-develop#ff52b003a2c3845e2987d23487a696af106c053c" dependencies = [ "bech32", "bee-pow", @@ -244,12 +256,39 @@ dependencies = [ [[package]] name = "bee-ledger" version = "0.7.0" -source = "git+https://github.com/iotaledger/bee.git?branch=shimmer-develop#c6a10bce2fb5eed8778de397d3360a9e8455e039" +source = "git+https://github.com/iotaledger/bee.git?branch=shimmer-develop#ff52b003a2c3845e2987d23487a696af106c053c" dependencies = [ + "async-trait", "bee-block", + "bee-ledger-types", + "bee-runtime", + "bee-storage", + "bee-tangle", + "bytes", + "futures", + "hashbrown", + "iota-crypto", + "log", "packable", + "prefix-hex", + "ref-cast", + "reqwest", + "serde", "thiserror", "time-helper", + "tokio", + "tokio-stream", + "url", +] + +[[package]] +name = "bee-ledger-types" +version = "1.0.0-alpha.1" +source = "git+https://github.com/iotaledger/bee.git?branch=shimmer-develop#ff52b003a2c3845e2987d23487a696af106c053c" +dependencies = [ + "bee-block", + "packable", + "thiserror", ] [[package]] @@ -268,30 +307,19 @@ dependencies = [ [[package]] name = "bee-pow" -version = "0.2.0" -source = "git+https://github.com/iotaledger/bee.git?branch=shimmer-develop#4933f301e80c0e13f83d7940d9ab7c387f11d220" +version = "1.0.0-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8e36e724dc98f8671c4f674b8419785def4ea81ad7af4fba061ff11724210c1" dependencies = [ "bee-ternary", "iota-crypto", "thiserror", ] -[[package]] -name = "bee-rest-api" -version = "0.2.2" -source = "git+https://github.com/iotaledger/bee.git?branch=shimmer-develop#c6a10bce2fb5eed8778de397d3360a9e8455e039" -dependencies = [ - "axum 0.5.12", - "bee-block", - "bee-ledger", - "serde", - "thiserror", -] - [[package]] name = "bee-runtime" version = "0.1.1-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=shimmer-develop#c6a10bce2fb5eed8778de397d3360a9e8455e039" +source = "git+https://github.com/iotaledger/bee.git?branch=shimmer-develop#ff52b003a2c3845e2987d23487a696af106c053c" dependencies = [ "async-trait", "bee-storage", @@ -303,7 +331,7 @@ dependencies = [ [[package]] name = "bee-storage" version = "0.12.0" -source = "git+https://github.com/iotaledger/bee.git?branch=shimmer-develop#c6a10bce2fb5eed8778de397d3360a9e8455e039" +source = "git+https://github.com/iotaledger/bee.git?branch=shimmer-develop#ff52b003a2c3845e2987d23487a696af106c053c" dependencies = [ "packable", "serde", @@ -313,7 +341,7 @@ dependencies = [ [[package]] name = "bee-tangle" version = "0.3.0" -source = "git+https://github.com/iotaledger/bee.git?branch=shimmer-develop#c6a10bce2fb5eed8778de397d3360a9e8455e039" +source = "git+https://github.com/iotaledger/bee.git?branch=shimmer-develop#ff52b003a2c3845e2987d23487a696af106c053c" dependencies = [ "async-trait", "bee-block", @@ -334,9 +362,9 @@ dependencies = [ [[package]] name = "bee-ternary" -version = "0.6.0" +version = "1.0.0-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0b9489a68e42231e9f4f1443c765d3f80433a52101510ab413e6a9cd2240d21" +checksum = "a9252b65ddd9a863b0efc06ddab6c26334ecbe00fb8fa47bbde10babda2981b2" dependencies = [ "autocfg", "num-traits", @@ -346,7 +374,7 @@ dependencies = [ [[package]] name = "bee-test" version = "0.1.0" -source = "git+https://github.com/iotaledger/bee.git?branch=shimmer-develop#c6a10bce2fb5eed8778de397d3360a9e8455e039" +source = "git+https://github.com/iotaledger/bee.git?branch=shimmer-develop#ff52b003a2c3845e2987d23487a696af106c053c" dependencies = [ "bee-block", "bee-ledger", @@ -481,10 +509,10 @@ dependencies = [ "async-recursion", "async-trait", "auth-helper", - "axum 0.5.12", + "axum 0.5.13", + "bee-api-types", "bee-block", "bee-metrics", - "bee-rest-api", "bee-test", "clap", "console-subscriber", @@ -539,9 +567,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.8" +version = "3.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190814073e85d238f31ff738fcb0bf6910cedeb73376c87cd69291028966fd83" +checksum = "ab8b79fe3946ceb4a0b1c080b4018992b8d27e9ff363644c1c9b6387c854614d" dependencies = [ "bitflags", "clap_derive", @@ -630,6 +658,22 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + [[package]] name = "cpufeatures" version = "0.2.2" @@ -676,9 +720,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-common" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ccfd8c0ee4cce11e45b3fd6f9d5e69e0cc62912aa6a0cb1bf4617b0eba5a12f" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", "typenum", @@ -817,9 +861,9 @@ checksum = "5caaa75cbd2b960ff1e5392d2cfb1f44717fffe12fc1f32b7b5d1267f99732a6" [[package]] name = "dyn-clone" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140206b78fb2bc3edbcfc9b5ccbd0b30699cfe8d348b8b31b330e47df5291a5a" +checksum = "9d07a982d1fb29db01e5a59b1918e03da4df7297eaeee7686ac45542fd4e59c8" [[package]] name = "ed25519" @@ -863,6 +907,15 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" +[[package]] +name = "encoding_rs" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +dependencies = [ + "cfg-if", +] + [[package]] name = "enum-as-inner" version = "0.4.0" @@ -930,6 +983,21 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.0.1" @@ -1087,9 +1155,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "607c8a29735385251a339424dd462993c0fed8fa09d378f259377df08c126022" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ "ahash", ] @@ -1265,6 +1333,19 @@ dependencies = [ "tokio-io-timeout", ] +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -1332,8 +1413,8 @@ dependencies = [ [[package]] name = "inx" -version = "0.4.0" -source = "git+https://github.com/iotaledger/inx#87419e742c270e227028f97141b03cbc02c54aa2" +version = "1.0.0-beta.1" +source = "git+https://github.com/iotaledger/inx#c6cdb616252cb5da728f124155758500fcb7e9e8" dependencies = [ "bee-block", "packable", @@ -1345,9 +1426,9 @@ dependencies = [ [[package]] name = "iota-crypto" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03717e934972fad6f1c9b4cd25f662e1753b58a7f76e3dceadeb646e034b252" +checksum = "538b238fbd6fa732f526f6401656fa6a366598b9fe1ca35185e47f3978369707" dependencies = [ "bee-ternary", "blake2", @@ -1364,7 +1445,7 @@ dependencies = [ "socket2", "widestring", "winapi", - "winreg", + "winreg 0.7.0", ] [[package]] @@ -1586,6 +1667,24 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +[[package]] +name = "native-tls" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + [[package]] name = "nom" version = "7.1.1" @@ -1646,6 +1745,51 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +[[package]] +name = "openssl" +version = "0.10.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" +dependencies = [ + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "os_info" version = "3.4.0" @@ -1658,9 +1802,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.1.0" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa" +checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" [[package]] name = "owning_ref" @@ -1673,9 +1817,9 @@ dependencies = [ [[package]] name = "packable" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332ecf21e38a8f3afce70f005b638c67759686a5e3e12d1859c56d0687f164d3" +checksum = "ffe491a88c5c4c77f5e02c92901c011ec4368e4ea1b4aff5c1a4bdaf3a087354" dependencies = [ "autocfg", "packable-derive", @@ -1685,9 +1829,9 @@ dependencies = [ [[package]] name = "packable-derive" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cfe1637c03253dfa99917b97dcb646a540cad292b18fdc72e9a0d0dd29f165e" +checksum = "715f215a9cb02dd40282e4544148d0b3cb21010561e4588f0790ae9f1f61c041" dependencies = [ "proc-macro-crate", "proc-macro-error", @@ -1821,6 +1965,12 @@ dependencies = [ "spki", ] +[[package]] +name = "pkg-config" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" + [[package]] name = "ppv-lite86" version = "0.2.16" @@ -1840,9 +1990,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1516508b396cefe095485fdce673007422f5e48e82934b7b423dc26aa5e6a4" +checksum = "da6ffbe862780245013cb1c0a48c4e44b7d665548088f91f6b90876d0625e4c2" dependencies = [ "proc-macro2", "syn", @@ -2052,18 +2202,18 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685d58625b6c2b83e4cc88a27c4bf65adb7b6b16dbdc413e515c9405b47432ab" +checksum = "776c8940430cf563f66a93f9111d1cd39306dc6c68149ecc6b934742a44a828a" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a043824e29c94169374ac5183ac0ed43f5724dc4556b19568007486bd840fa1f" +checksum = "5f26c4704460286103bff62ea1fb78d137febc86aaf76952e6c5a2249af01f54" dependencies = [ "proc-macro2", "quote", @@ -2094,6 +2244,44 @@ dependencies = [ "winapi", ] +[[package]] +name = "reqwest" +version = "0.11.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "lazy_static", + "log", + "mime", + "native-tls", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.10.1", +] + [[package]] name = "resolv-conf" version = "0.7.0" @@ -2182,6 +2370,16 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" +[[package]] +name = "schannel" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +dependencies = [ + "lazy_static", + "windows-sys", +] + [[package]] name = "scopeguard" version = "1.1.0" @@ -2198,6 +2396,29 @@ dependencies = [ "untrusted", ] +[[package]] +name = "security-framework" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "semver" version = "0.9.0" @@ -2582,10 +2803,11 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.19.2" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" +checksum = "57aec3cfa4c296db7255446efb4928a6be304b431a806216105542a67b6ca82e" dependencies = [ + "autocfg", "bytes", "libc", "memchr", @@ -2621,6 +2843,16 @@ dependencies = [ "syn", ] +[[package]] +name = "tokio-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +dependencies = [ + "native-tls", + "tokio", +] + [[package]] name = "tokio-rustls" version = "0.23.4" @@ -2674,7 +2906,7 @@ checksum = "5be9d60db39854b30b835107500cf0aca0b0d14d6e1c3de124217c23a29c2ddb" dependencies = [ "async-stream", "async-trait", - "axum 0.5.12", + "axum 0.5.13", "base64", "bytes", "futures-core", @@ -2925,9 +3157,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" [[package]] name = "unicode-normalization" @@ -2960,6 +3192,7 @@ dependencies = [ "idna", "matches", "percent-encoding", + "serde", ] [[package]] @@ -2987,6 +3220,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "version_check" version = "0.9.4" @@ -3046,6 +3285,18 @@ dependencies = [ "wasm-bindgen-shared", ] +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de9a9cec1733468a8c657e57fa2413d2ae2c0129b95e87c5b72b8ace4d13f31f" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "wasm-bindgen-macro" version = "0.2.81" @@ -3204,6 +3455,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + [[package]] name = "wyz" version = "0.5.0" diff --git a/Cargo.toml b/Cargo.toml index 454a6ef57..8d4ecd77d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,7 +55,7 @@ ed25519-dalek = { version = "1.0", default-features = false, features = ["u64_ba hex = { version = "0.4", default-features = false, optional = true } hyper = { version = "0.14", default-features = false, features = ["server", "tcp", "stream"], optional = true } lazy_static = { version = "1.4", default-features = false, optional = true } -packable = { version = "0.4", default-features = false, optional = true } +packable = { version = "0.5", default-features = false, optional = true } rand = { version = "0.8", default-features = false, features = ["std"], optional = true } regex = { version = "1.5", default-features = false, features = ["std"], optional = true } serde_urlencoded = { version = "0.7", default-features = false, optional = true } @@ -64,21 +64,21 @@ tower-http = { version = "0.3", default-features = false, features = ["cors", "c zeroize = { version = "1.5", default-features = false, features = ["std"], optional = true } # INX -inx = { git = "https://github.com/iotaledger/inx", version = "0.4", default-features = false, features = ["types"], optional = true } +inx = { git = "https://github.com/iotaledger/inx", version = "1.0.0-beta.1", default-features = false, features = ["types"], optional = true } # Metrics bee-metrics = { git = "https://github.com/iotaledger/bee", branch = "mainnet-develop-0.4", default-features = false, features = ["sync"], optional = true } # Stardust types +bee-api-types-stardust = { package = "bee-api-types", git = "https://github.com/iotaledger/bee.git", branch = "shimmer-develop", default-features = false, optional = true } bee-block-stardust = { package = "bee-block", git = "https://github.com/iotaledger/bee.git", branch = "shimmer-develop", default-features = false, features = ["std", "serde", "dto"], optional = true } -bee-rest-api-stardust = { package = "bee-rest-api", git = "https://github.com/iotaledger/bee.git", branch = "shimmer-develop", default-features = false, optional = true } # Tokio Console console-subscriber = { version = "0.1", default-features = false, optional = true } [dev-dependencies] bee-test = { package = "bee-test", git = "https://github.com/iotaledger/bee.git", branch = "shimmer-develop", default-features = false } -packable = { version = "0.4", default-features = false } +packable = { version = "0.5", default-features = false } [features] default = [ @@ -117,11 +117,11 @@ metrics = [ ] # The following feature enables metrics that can be used to debug the runtime. metrics-debug = [ - "metrics" + "metrics", ] stardust = [ "dep:bee-block-stardust", - "dep:bee-rest-api-stardust", + "dep:bee-api-types-stardust", ] [profile.production] diff --git a/bin/inx-chronicle/src/api/stardust/core/routes.rs b/bin/inx-chronicle/src/api/stardust/core/routes.rs index 8cb645b30..56cc8bf81 100644 --- a/bin/inx-chronicle/src/api/stardust/core/routes.rs +++ b/bin/inx-chronicle/src/api/stardust/core/routes.rs @@ -10,18 +10,18 @@ use axum::{ routing::*, Router, }; -use bee_block_stardust::{ - output::dto::OutputDto, - payload::{dto::MilestonePayloadDto, milestone::option::dto::MilestoneOptionDto}, - BlockDto, -}; -use bee_rest_api_stardust::types::{ +use bee_api_types_stardust::{ dtos::ReceiptDto, responses::{ BlockMetadataResponse, BlockResponse, MilestoneResponse, OutputMetadataResponse, OutputResponse, ReceiptsResponse, TreasuryResponse, UtxoChangesResponse, }, }; +use bee_block_stardust::{ + output::dto::OutputDto, + payload::{dto::MilestonePayloadDto, milestone::option::dto::MilestoneOptionDto}, + BlockDto, +}; use chronicle::{ db::{ collections::{OutputMetadataResult, OutputWithMetadataResult}, diff --git a/src/types/ledger/inclusion_state.rs b/src/types/ledger/inclusion_state.rs index c5c87b6d4..4d67f6677 100644 --- a/src/types/ledger/inclusion_state.rs +++ b/src/types/ledger/inclusion_state.rs @@ -1,7 +1,7 @@ // Copyright 2022 IOTA Stiftung // SPDX-License-Identifier: Apache-2.0 -use bee_rest_api_stardust::types::dtos as bee; +use bee_api_types_stardust::dtos as bee; use mongodb::bson::Bson; use serde::{Deserialize, Serialize};