From 67e7232fbbd01e0efab8da3b07141e3ab2f3948d Mon Sep 17 00:00:00 2001 From: mario4tier Date: Fri, 23 Dec 2022 02:17:13 -0500 Subject: [PATCH] (2) Host/Localhost Sui object creation --- .vscode/launch.json | 27 + .vscode/settings.json | 5 + Cargo.lock | 1527 +++++++++-------- Cargo.toml | 4 + crates/dtp-core/Cargo.toml | 2 + .../dtp-core/src/network/common_internal.rs | 37 + crates/dtp-core/src/network/host_internal.rs | 9 +- .../src/network/localhost_internal.rs | 78 +- crates/dtp-core/src/network/mod.rs | 105 +- crates/dtp-dev-app/src/main.rs | 3 +- crates/dtp-sdk/src/lib.rs | 39 +- crates/dtp-sdk/tests/api_tests.rs | 8 +- crates/dtp-test-helper/src/lib.rs | 4 +- move/sources/host.move | 2 +- 14 files changed, 1069 insertions(+), 781 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 .vscode/settings.json create mode 100644 crates/dtp-core/src/network/common_internal.rs diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..ac192e4 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,27 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "lldb", + "request": "launch", + "name": "Debug integration test 'api_tests'", + "cargo": { + "args": [ + "test", + "--no-run", + "--test=api_tests", + "--package=dtp-sdk" + ], + "filter": { + "name": "api_tests", + "kind": "test" + } + }, + "args": [], + "cwd": "${workspaceFolder}" + }, + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..c8c6a7f --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "editor.formatOnPaste": true, + "editor.formatOnSave": true, + "editor.formatOnType": true +} \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 1d13e31..43e6494 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,7 +14,16 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ - "gimli", + "gimli 0.26.2", +] + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli 0.27.0", ] [[package]] @@ -69,6 +78,18 @@ dependencies = [ "version_check", ] +[[package]] +name = "ahash" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107" +dependencies = [ + "cfg-if", + "getrandom 0.2.8", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "0.7.20" @@ -111,7 +132,7 @@ dependencies = [ [[package]] name = "anemo" version = "0.0.0" -source = "git+https://github.com/mystenlabs/anemo.git?rev=3716a5669c68bd61d6e4958db99674507e0160b4#3716a5669c68bd61d6e4958db99674507e0160b4" +source = "git+https://github.com/mystenlabs/anemo.git?rev=7ebdcf82b5cccce71e9483d5b028329475a41a20#7ebdcf82b5cccce71e9483d5b028329475a41a20" dependencies = [ "anyhow", "async-trait", @@ -119,6 +140,7 @@ dependencies = [ "bytes", "ed25519", "futures", + "hex", "http", "matchit 0.5.0", "pin-project-lite", @@ -128,8 +150,9 @@ dependencies = [ "rcgen 0.9.3", "ring", "rustls", - "serde 1.0.148", + "serde 1.0.151", "serde_json", + "tap", "tokio", "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "tower", @@ -141,18 +164,18 @@ dependencies = [ [[package]] name = "anemo-build" version = "0.0.0" -source = "git+https://github.com/mystenlabs/anemo.git?rev=3716a5669c68bd61d6e4958db99674507e0160b4#3716a5669c68bd61d6e4958db99674507e0160b4" +source = "git+https://github.com/mystenlabs/anemo.git?rev=7ebdcf82b5cccce71e9483d5b028329475a41a20#7ebdcf82b5cccce71e9483d5b028329475a41a20" dependencies = [ "prettyplease", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "anemo-tower" version = "0.0.0" -source = "git+https://github.com/mystenlabs/anemo.git?rev=3716a5669c68bd61d6e4958db99674507e0160b4#3716a5669c68bd61d6e4958db99674507e0160b4" +source = "git+https://github.com/mystenlabs/anemo.git?rev=7ebdcf82b5cccce71e9483d5b028329475a41a20#7ebdcf82b5cccce71e9483d5b028329475a41a20" dependencies = [ "anemo", "bytes", @@ -179,9 +202,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.66" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" dependencies = [ "backtrace", ] @@ -192,7 +215,7 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164" dependencies = [ - "serde 1.0.148", + "serde 1.0.151", ] [[package]] @@ -275,8 +298,8 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" dependencies = [ - "quote 1.0.21", - "syn 1.0.105", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -287,8 +310,8 @@ checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" dependencies = [ "num-bigint", "num-traits 0.2.15", - "quote 1.0.21", - "syn 1.0.105", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -350,9 +373,9 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8dd4e5f0bf8285d5ed538d27fab7411f3e297908fd93c62195de8bee3f199e82" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -417,9 +440,9 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", "synstructure", ] @@ -429,9 +452,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -440,7 +463,7 @@ version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa3d466004a8b4cb1bc34044240a2fd29d17607e2e3bd613eb44fd48e8100da3" dependencies = [ - "bstr 1.0.1", + "bstr 1.1.0", "doc-comment", "predicates", "predicates-core", @@ -478,9 +501,9 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cda8f4bcc10624c4e85bc66b3f452cca98cfa5ca002dc83a16aad2367641bea" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -499,9 +522,9 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -511,13 +534,13 @@ source = "git+https://github.com/mystenmark/async-task?rev=4e45b26e11126b191701b [[package]] name = "async-trait" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" +checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -545,11 +568,17 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] +[[package]] +name = "auto_ops" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7460f7dd8e100147b82a63afca1a20eb6c231ee36b90ba7272e14951cb58af59" + [[package]] name = "autocfg" version = "1.1.0" @@ -585,7 +614,7 @@ dependencies = [ "mime", "percent-encoding", "pin-project-lite", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "serde_urlencoded", "sync_wrapper", @@ -617,7 +646,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustversion", - "serde 1.0.148", + "serde 1.0.151", "sync_wrapper", "tower", "tower-http", @@ -689,16 +718,16 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ - "addr2line", + "addr2line 0.19.0", "cc", "cfg-if", "libc", - "miniz_oxide 0.5.4", - "object", + "miniz_oxide 0.6.2", + "object 0.30.0", "rustc-demangle", ] @@ -732,7 +761,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b06b4c1f053002b70e7084ac944c77d58d5d92b2110dbc5e852735e00ad3ccc" dependencies = [ - "serde 1.0.148", + "serde 1.0.151", "thiserror", ] @@ -742,7 +771,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" dependencies = [ - "serde 1.0.148", + "serde 1.0.151", ] [[package]] @@ -760,9 +789,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3deeecb812ca5300b7d3f66f730cc2ebd3511c3d36c691dd79c165d5b19a26e3" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -777,7 +806,7 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ - "serde 1.0.148", + "serde 1.0.151", ] [[package]] @@ -792,8 +821,8 @@ dependencies = [ "lazy_static 1.4.0", "lazycell", "peeking_take_while", - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "regex", "rustc-hash", "shlex", @@ -890,9 +919,9 @@ dependencies = [ [[package]] name = "blake2" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ "digest 0.10.6", ] @@ -999,14 +1028,14 @@ dependencies = [ [[package]] name = "bstr" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca0852af221f458706eb0725c03e4ed6c46af9ac98e6a689d5e634215d594dd" +checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" dependencies = [ "memchr", "once_cell", "regex-automata", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] @@ -1022,7 +1051,7 @@ dependencies = [ "merlin", "rand 0.8.5", "rand_core 0.6.4", - "serde 1.0.148", + "serde 1.0.151", "serde_derive", "sha3 0.9.1", "subtle-ng", @@ -1044,7 +1073,7 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytecode-interpreter-crypto" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "curve25519-dalek-fiat", @@ -1071,7 +1100,7 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" dependencies = [ - "serde 1.0.148", + "serde 1.0.151", ] [[package]] @@ -1091,7 +1120,7 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e" dependencies = [ - "serde 1.0.148", + "serde 1.0.151", ] [[package]] @@ -1106,7 +1135,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" dependencies = [ - "serde 1.0.148", + "serde 1.0.151", ] [[package]] @@ -1117,8 +1146,8 @@ checksum = "982a0cf6a99c350d7246035613882e376d58cebe571785abc5da4f648d53ac0a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.14", - "serde 1.0.148", + "semver 1.0.16", + "serde 1.0.151", "serde_json", "thiserror", ] @@ -1146,9 +1175,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.77" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" dependencies = [ "jobserver", ] @@ -1188,7 +1217,7 @@ dependencies = [ "js-sys", "num-integer", "num-traits 0.2.15", - "serde 1.0.148", + "serde 1.0.151", "time 0.1.45", "wasm-bindgen", "winapi", @@ -1224,7 +1253,7 @@ checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" dependencies = [ "ciborium-io", "ciborium-ll", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] @@ -1304,9 +1333,9 @@ checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ "heck 0.4.0", "proc-macro-error", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -1347,18 +1376,6 @@ dependencies = [ "cc", ] -[[package]] -name = "coarsetime" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "454038500439e141804c655b4cd1bc6a70bcb95cd2bc9463af5661b6956f0e46" -dependencies = [ - "libc", - "once_cell", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - [[package]] name = "codespan" version = "0.11.1" @@ -1366,7 +1383,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3362992a0d9f1dd7c3d0e89e0ab2bb540b7a95fea8cd798090e758fda2899b5e" dependencies = [ "codespan-reporting", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] @@ -1375,7 +1392,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" dependencies = [ - "serde 1.0.148", + "serde 1.0.151", "termcolor", "unicode-width", ] @@ -1439,7 +1456,7 @@ dependencies = [ "lazy_static 1.4.0", "nom 5.1.2", "rust-ini", - "serde 1.0.148", + "serde 1.0.151", "serde-hjson", "serde_json", "toml", @@ -1466,8 +1483,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e57ff02e8ad8e06ab9731d5dc72dc23bef9200778eae1a89d555d8c42e5d4a86" dependencies = [ - "prost 0.11.3", - "prost-types 0.11.2", + "prost 0.11.5", + "prost-types 0.11.5", "tonic 0.8.3", "tracing-core", ] @@ -1484,8 +1501,8 @@ dependencies = [ "futures", "hdrhistogram", "humantime", - "prost-types 0.11.2", - "serde 1.0.148", + "prost-types 0.11.5", + "serde 1.0.151", "serde_json", "thread_local", "tokio", @@ -1601,7 +1618,7 @@ dependencies = [ "plotters", "rayon", "regex", - "serde 1.0.148", + "serde 1.0.151", "serde_derive", "serde_json", "tinytemplate", @@ -1799,8 +1816,8 @@ version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ - "quote 1.0.21", - "syn 1.0.105", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -1821,7 +1838,7 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "serde 1.0.148", + "serde 1.0.151", "subtle", "zeroize", ] @@ -1849,16 +1866,16 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.6.4", - "serde 1.0.148", + "serde 1.0.151", "subtle-ng", "zeroize", ] [[package]] name = "cxx" -version = "1.0.83" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf" +checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd" dependencies = [ "cc", "cxxbridge-flags", @@ -1868,34 +1885,34 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.83" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39" +checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0" dependencies = [ "cc", "codespan-reporting", "once_cell", - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "scratch", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] name = "cxxbridge-flags" -version = "1.0.83" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12" +checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59" [[package]] name = "cxxbridge-macro" -version = "1.0.83" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" +checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -1916,10 +1933,10 @@ checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "strsim 0.10.0", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] @@ -1929,8 +1946,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" dependencies = [ "darling_core", - "quote 1.0.21", - "syn 1.0.105", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -1946,23 +1963,11 @@ dependencies = [ "parking_lot_core 0.9.5", ] -[[package]] -name = "dashmap" -version = "5.4.0" -source = "git+https://github.com/velvia/dashmap?rev=a6e36242044f86412531c24c437e95beadc67b62#a6e36242044f86412531c24c437e95beadc67b62" -dependencies = [ - "cfg-if", - "hashbrown 0.13.1", - "lock_api", - "once_cell", - "parking_lot_core 0.9.5", -] - [[package]] name = "data-encoding" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" +checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" [[package]] name = "data-encoding-macro" @@ -1981,7 +1986,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" dependencies = [ "data-encoding", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] @@ -2012,9 +2017,9 @@ dependencies = [ [[package]] name = "der" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dd2ae565c0a381dde7fade45fce95984c568bdcb4700a4fdbe3175e0380b2f" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", "zeroize", @@ -2040,9 +2045,9 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -2051,9 +2056,9 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -2072,9 +2077,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" dependencies = [ "darling", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -2084,7 +2089,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" dependencies = [ "derive_builder_core", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] @@ -2094,10 +2099,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "rustc_version 0.4.0", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] @@ -2113,7 +2118,7 @@ dependencies = [ "once_cell", "petgraph 0.6.2", "rayon", - "serde 1.0.148", + "serde 1.0.151", "toml", ] @@ -2135,6 +2140,7 @@ dependencies = [ "diesel_derives", "itoa", "pq-sys", + "r2d2", "serde_json", ] @@ -2145,9 +2151,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "143b758c91dbc3fe1fdcb0dba5bd13276c6a66422f2ef5795b58488248a310aa" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -2262,16 +2268,16 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "dissimilar" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c97b9233581d84b8e1e689cdd3a47b6f69770084fc246e86a7f78b0d9c1d4a5" +checksum = "bd5f0c7e4bd266b8ab2550e6238d2e74977c23c15536ac7be45e9c95e2e3fbbb" [[package]] name = "doc-comment" @@ -2306,7 +2312,9 @@ dependencies = [ "derivative", "serial_test", "sui-json-rpc-types", + "sui-keys", "sui-sdk", + "sui-types", "tokio", ] @@ -2355,15 +2363,15 @@ dependencies = [ "chrono", "nom 6.1.2", "rust_decimal", - "serde 1.0.148", + "serde 1.0.151", "time 0.3.15", ] [[package]] name = "dyn-clone" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" +checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" [[package]] name = "ecdsa" @@ -2384,7 +2392,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" dependencies = [ "pkcs8", - "serde 1.0.148", + "serde 1.0.151", "signature", "zeroize", ] @@ -2398,7 +2406,7 @@ dependencies = [ "curve25519-dalek-ng", "hex", "rand_core 0.6.4", - "serde 1.0.148", + "serde 1.0.151", "sha2 0.9.9", "thiserror", "zeroize", @@ -2413,7 +2421,7 @@ dependencies = [ "curve25519-dalek", "ed25519", "rand 0.7.3", - "serde 1.0.148", + "serde 1.0.151", "sha2 0.9.9", "zeroize", ] @@ -2427,7 +2435,7 @@ dependencies = [ "curve25519-dalek-fiat", "ed25519", "rand 0.8.5", - "serde 1.0.148", + "serde 1.0.151", "serde_bytes", "sha2 0.9.9", "zeroize", @@ -2452,6 +2460,7 @@ dependencies = [ "ff", "generic-array", "group", + "pkcs8", "rand_core 0.6.4", "sec1", "subtle", @@ -2486,9 +2495,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eb359f1476bf611266ac1f5355bc14aeca37b299d0ebccc038ee7058891c9cb" dependencies = [ "once_cell", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -2578,15 +2587,27 @@ dependencies = [ "rand 0.7.3", ] +[[package]] +name = "fail" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe5e43d0f78a42ad591453aedb1d7ae631ce7ee445c7643691055a9ed8d3b01c" +dependencies = [ + "log", + "once_cell", + "rand 0.8.5", +] + [[package]] name = "fastcrypto" version = "0.1.4" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=3ac9fa490f2d7eecd133c87a7c616328a217b66a#3ac9fa490f2d7eecd133c87a7c616328a217b66a" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=6eb758ba78612e5e22a2748dd7a4b2c8b3724377#6eb758ba78612e5e22a2748dd7a4b2c8b3724377" dependencies = [ "aes", "aes-gcm", + "auto_ops", "base64ct", - "blake2 0.10.5", + "blake2 0.10.6", "blake3", "blst", "bs58", @@ -2594,7 +2615,9 @@ dependencies = [ "cbc", "ctr", "curve25519-dalek-ng", + "derive_more", "digest 0.10.6", + "ecdsa", "ed25519-consensus", "eyre", "fastcrypto-derive", @@ -2603,11 +2626,13 @@ dependencies = [ "hkdf", "merlin", "once_cell", + "p256", "rand 0.8.5", "readonly", + "rfc6979", "schemars", "secp256k1", - "serde 1.0.148", + "serde 1.0.151", "serde_bytes", "serde_with", "sha2 0.10.6", @@ -2622,17 +2647,17 @@ dependencies = [ [[package]] name = "fastcrypto-derive" version = "0.1.2" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=3ac9fa490f2d7eecd133c87a7c616328a217b66a#3ac9fa490f2d7eecd133c87a7c616328a217b66a" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=6eb758ba78612e5e22a2748dd7a4b2c8b3724377#6eb758ba78612e5e22a2748dd7a4b2c8b3724377" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "fastcrypto-zkp" version = "0.1.0" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=3ac9fa490f2d7eecd133c87a7c616328a217b66a#3ac9fa490f2d7eecd133c87a7c616328a217b66a" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=6eb758ba78612e5e22a2748dd7a4b2c8b3724377#6eb758ba78612e5e22a2748dd7a4b2c8b3724377" dependencies = [ "ark-bls12-381", "ark-ec", @@ -2797,15 +2822,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fragile" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7464c5c4a3f014d9b2ec4073650e5c06596f385060af740fc45ad5a19f959e8" -dependencies = [ - "fragile 2.0.0", -] - [[package]] name = "fragile" version = "2.0.0" @@ -2904,9 +2920,9 @@ version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -2955,7 +2971,7 @@ version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ - "serde 1.0.148", + "serde 1.0.151", "typenum", "version_check", ] @@ -3008,6 +3024,12 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +[[package]] +name = "gimli" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" + [[package]] name = "glob" version = "0.3.0" @@ -3050,7 +3072,7 @@ dependencies = [ "gloo-utils", "js-sys", "pin-project", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "thiserror", "wasm-bindgen", @@ -3077,7 +3099,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8e8fc851e9c7b9852508bc6e3f690f452f474417e8545ec9857b7f7377036b5" dependencies = [ "js-sys", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "wasm-bindgen", "web-sys", @@ -3096,9 +3118,9 @@ dependencies = [ [[package]] name = "guppy" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8751f3598db532ad3e924c2ccb3f1f067931e4a13ae194f197a4cc19843be082" +checksum = "49acd85aa3980561108f724045040bd916f49c84f289162f88de9f88588fd898" dependencies = [ "camino", "cargo_metadata", @@ -3114,8 +3136,8 @@ dependencies = [ "pathdiff", "petgraph 0.6.2", "rayon", - "semver 1.0.14", - "serde 1.0.148", + "semver 1.0.16", + "serde 1.0.151", "serde_json", "smallvec", "static_assertions", @@ -3133,8 +3155,8 @@ dependencies = [ "cfg-if", "diffus", "guppy-workspace-hack", - "semver 1.0.14", - "serde 1.0.148", + "semver 1.0.16", + "serde 1.0.151", "toml", ] @@ -3165,9 +3187,9 @@ dependencies = [ [[package]] name = "hakari" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641b3bb2a554e883dbbc1ca9571093aa6cdc61414de8f05b396a8ef58f71abc0" +checksum = "6dd93cb6139c6ed69389d0ad541b521a6f2d6cf2cdbf20fe2bb9a46a11ccdd34" dependencies = [ "atomicwrites", "bimap", @@ -3183,7 +3205,7 @@ dependencies = [ "owo-colors", "pathdiff", "rayon", - "serde 1.0.148", + "serde 1.0.151", "tabular", "target-spec", "toml", @@ -3203,7 +3225,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash", + "ahash 0.7.6", ] [[package]] @@ -3212,14 +3234,9 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.6", ] -[[package]] -name = "hashbrown" -version = "0.13.1" -source = "git+https://github.com/velvia/hashbrown?rev=db403dbf63207e22ef388fd6c182e7daa594bce4#db403dbf63207e22ef388fd6c182e7daa594bce4" - [[package]] name = "hashlink" version = "0.8.1" @@ -3270,6 +3287,15 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + [[package]] name = "hex" version = "0.4.3" @@ -3393,9 +3419,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59df7c4e19c950e6e0e868dcc0a300b09a9b88e9ec55bd879ca819087a77355d" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ "http", "hyper", @@ -3525,7 +3551,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c" dependencies = [ - "serde 1.0.148", + "serde 1.0.151", ] [[package]] @@ -3534,9 +3560,9 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -3555,8 +3581,8 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", ] [[package]] @@ -3573,7 +3599,7 @@ checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] @@ -3590,11 +3616,11 @@ dependencies = [ [[package]] name = "inferno" -version = "0.11.12" +version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd2fa5a9ad16dedcfabbc87f048ee6dd40d4944736fe4c5d362fb01df1209de1" +checksum = "d7207d75fcf6c1868f1390fc1c610431fe66328e9ee6813330a041ef6879eca1" dependencies = [ - "ahash", + "ahash 0.8.2", "atty", "indexmap", "itoa", @@ -3618,16 +3644,16 @@ dependencies = [ [[package]] name = "insta" -version = "1.21.2" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261bf85ed492cd1c47c9ba675e48649682a9d2d2e77f515c5386d7726fb0ba76" +checksum = "e48b08a091dfe5b09a6a9688c468fdd5b4396e92ce09e2eb932f0884b02788a4" dependencies = [ "console", "lazy_static 1.4.0", "linked-hash-map", "pest", "pest_derive", - "serde 1.0.148", + "serde 1.0.151", "similar", "yaml-rust", ] @@ -3653,8 +3679,8 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ab388864246d58a276e60e7569a833d9cc4cd75c66e5ca77c177dad38e59996" dependencies = [ - "ahash", - "dashmap 5.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ahash 0.7.6", + "dashmap", "hashbrown 0.12.3", "once_cell", "parking_lot 0.12.1", @@ -3672,9 +3698,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.1" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" +checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" [[package]] name = "iri-string" @@ -3696,9 +3722,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "jemalloc-ctl" @@ -3805,7 +3831,7 @@ dependencies = [ "parking_lot 0.12.1", "rand 0.8.5", "rustc-hash", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "soketto", "thiserror", @@ -3825,7 +3851,7 @@ dependencies = [ "jsonrpsee-core", "jsonrpsee-types", "rustc-hash", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "thiserror", "tokio", @@ -3839,9 +3865,9 @@ source = "git+https://github.com/patrickkuo/jsonrpsee.git?rev=adc19a124ed7045744 dependencies = [ "heck 0.4.0", "proc-macro-crate", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -3855,7 +3881,7 @@ dependencies = [ "hyper", "jsonrpsee-core", "jsonrpsee-types", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "soketto", "tokio", @@ -3872,7 +3898,7 @@ source = "git+https://github.com/patrickkuo/jsonrpsee.git?rev=adc19a124ed7045744 dependencies = [ "anyhow", "beef", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "thiserror", "tracing", @@ -4030,9 +4056,9 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ "cc", ] @@ -4045,9 +4071,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "lock_api" @@ -4066,7 +4092,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] @@ -4214,7 +4240,7 @@ checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326" dependencies = [ "cfg-if", "downcast", - "fragile 2.0.0", + "fragile", "lazy_static 1.4.0", "mockall_derive", "predicates", @@ -4228,15 +4254,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0" dependencies = [ "cfg-if", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "move-abigen" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "bcs", @@ -4247,31 +4273,31 @@ dependencies = [ "move-command-line-common", "move-core-types", "move-model", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] name = "move-binary-format" version = "0.0.3" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "move-core-types", "once_cell", "ref-cast", - "serde 1.0.148", + "serde 1.0.151", "variant_count", ] [[package]] name = "move-borrow-graph" version = "0.0.1" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" [[package]] name = "move-bytecode-source-map" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "bcs", @@ -4280,13 +4306,13 @@ dependencies = [ "move-core-types", "move-ir-types", "move-symbol-pool", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] name = "move-bytecode-utils" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "move-binary-format", @@ -4298,7 +4324,7 @@ dependencies = [ [[package]] name = "move-bytecode-verifier" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "move-binary-format", @@ -4310,7 +4336,7 @@ dependencies = [ [[package]] name = "move-bytecode-viewer" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "clap 3.2.23", @@ -4327,7 +4353,7 @@ dependencies = [ [[package]] name = "move-cli" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "bcs", @@ -4362,7 +4388,7 @@ dependencies = [ "read-write-set", "read-write-set-dynamic", "reqwest", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "serde_yaml", "tempfile", @@ -4373,7 +4399,7 @@ dependencies = [ [[package]] name = "move-command-line-common" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "difference", @@ -4382,7 +4408,7 @@ dependencies = [ "move-core-types", "num-bigint", "once_cell", - "serde 1.0.148", + "serde 1.0.151", "sha2 0.9.9", "walkdir", ] @@ -4390,7 +4416,7 @@ dependencies = [ [[package]] name = "move-compiler" version = "0.0.1" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "bcs", @@ -4419,7 +4445,7 @@ dependencies = [ [[package]] name = "move-core-types" version = "0.0.4" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "bcs", @@ -4430,7 +4456,7 @@ dependencies = [ "primitive-types", "rand 0.8.5", "ref-cast", - "serde 1.0.148", + "serde 1.0.151", "serde_bytes", "uint", ] @@ -4438,7 +4464,7 @@ dependencies = [ [[package]] name = "move-coverage" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "bcs", @@ -4452,13 +4478,13 @@ dependencies = [ "move-ir-types", "once_cell", "petgraph 0.5.1", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] name = "move-disassembler" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "clap 3.2.23", @@ -4476,7 +4502,7 @@ dependencies = [ [[package]] name = "move-docgen" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "codespan", @@ -4488,13 +4514,13 @@ dependencies = [ "num", "once_cell", "regex", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] name = "move-errmapgen" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "bcs", @@ -4502,13 +4528,13 @@ dependencies = [ "move-command-line-common", "move-core-types", "move-model", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] name = "move-ir-compiler" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "bcs", @@ -4527,7 +4553,7 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "codespan-reporting", @@ -4546,7 +4572,7 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode-syntax" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "hex", @@ -4559,7 +4585,7 @@ dependencies = [ [[package]] name = "move-ir-types" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "hex", @@ -4567,13 +4593,13 @@ dependencies = [ "move-core-types", "move-symbol-pool", "once_cell", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] name = "move-model" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "codespan", @@ -4593,13 +4619,13 @@ dependencies = [ "num", "once_cell", "regex", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] name = "move-package" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "bcs", @@ -4623,7 +4649,7 @@ dependencies = [ "ptree", "regex", "reqwest", - "serde 1.0.148", + "serde 1.0.151", "serde_yaml", "sha2 0.9.9", "tempfile", @@ -4635,7 +4661,7 @@ dependencies = [ [[package]] name = "move-prover" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "async-trait", @@ -4662,7 +4688,7 @@ dependencies = [ "once_cell", "pretty", "rand 0.8.5", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "simplelog", "tokio", @@ -4672,7 +4698,7 @@ dependencies = [ [[package]] name = "move-prover-boogie-backend" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "async-trait", @@ -4691,7 +4717,7 @@ dependencies = [ "pretty", "rand 0.8.5", "regex", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "tera", "tokio", @@ -4700,18 +4726,18 @@ dependencies = [ [[package]] name = "move-read-write-set-types" version = "0.0.3" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "move-binary-format", "move-core-types", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] name = "move-resource-viewer" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "bcs", @@ -4720,13 +4746,13 @@ dependencies = [ "move-bytecode-utils", "move-core-types", "once_cell", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] name = "move-stackless-bytecode" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "codespan", "codespan-reporting", @@ -4747,13 +4773,13 @@ dependencies = [ "once_cell", "paste", "petgraph 0.5.1", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] name = "move-stackless-bytecode-interpreter" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "bytecode-interpreter-crypto", @@ -4765,13 +4791,13 @@ dependencies = [ "move-model", "move-stackless-bytecode", "num", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] name = "move-stdlib" version = "0.1.1" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "hex", @@ -4794,16 +4820,16 @@ dependencies = [ [[package]] name = "move-symbol-pool" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "once_cell", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] name = "move-table-extension" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "bcs", @@ -4820,7 +4846,7 @@ dependencies = [ [[package]] name = "move-transactional-test-runner" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "clap 3.2.23", @@ -4852,7 +4878,7 @@ dependencies = [ [[package]] name = "move-unit-test" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "better_any", @@ -4883,10 +4909,10 @@ dependencies = [ [[package]] name = "move-vm-runtime" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "better_any", - "fail", + "fail 0.4.0", "move-binary-format", "move-bytecode-verifier", "move-core-types", @@ -4900,35 +4926,35 @@ dependencies = [ [[package]] name = "move-vm-test-utils" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "move-binary-format", "move-core-types", "move-vm-types", "once_cell", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] name = "move-vm-types" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "bcs", "move-binary-format", "move-core-types", "once_cell", - "serde 1.0.148", + "serde 1.0.151", "smallvec", ] [[package]] name = "msim" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=0667864838a8c1b5b9d19972102086ccf4a525ff#0667864838a8c1b5b9d19972102086ccf4a525ff" +source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=3aeccfeb0f021ad5801c1ab4dcf4004de7780847#3aeccfeb0f021ad5801c1ab4dcf4004de7780847" dependencies = [ - "ahash", + "ahash 0.7.6", "async-task", "bincode", "bytes", @@ -4944,7 +4970,7 @@ dependencies = [ "pin-project-lite", "rand 0.8.5", "real_tokio", - "serde 1.0.148", + "serde 1.0.151", "socket2", "tokio-util 0.7.4 (git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=bb463863b8155543731bdf7850057c083cf1b427)", "toml", @@ -4955,12 +4981,12 @@ dependencies = [ [[package]] name = "msim-macros" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=0667864838a8c1b5b9d19972102086ccf4a525ff#0667864838a8c1b5b9d19972102086ccf4a525ff" +source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=3aeccfeb0f021ad5801c1ab4dcf4004de7780847#3aeccfeb0f021ad5801c1ab4dcf4004de7780847" dependencies = [ "darling", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -4973,9 +4999,9 @@ dependencies = [ "bs58", "byteorder", "data-encoding", - "multihash", + "multihash 0.16.3", "percent-encoding", - "serde 1.0.148", + "serde 1.0.151", "static_assertions", "unsigned-varint", "url", @@ -4983,17 +5009,17 @@ dependencies = [ [[package]] name = "multiaddr" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aebdb21e90f81d13ed01dc84123320838e53963c2ca94b60b305d3fa64f31e" +checksum = "3b53e0cc5907a5c216ba6584bf74be8ab47d6d6289f72793b2dddbf15dc3bf8c" dependencies = [ "arrayref", "byteorder", "data-encoding", "multibase", - "multihash", + "multihash 0.17.0", "percent-encoding", - "serde 1.0.148", + "serde 1.0.151", "static_assertions", "unsigned-varint", "url", @@ -5021,6 +5047,17 @@ dependencies = [ "unsigned-varint", ] +[[package]] +name = "multihash" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" +dependencies = [ + "core2", + "multihash-derive", + "unsigned-varint", +] + [[package]] name = "multihash-derive" version = "0.8.1" @@ -5029,9 +5066,9 @@ checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db" dependencies = [ "proc-macro-crate", "proc-macro-error", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", "synstructure", ] @@ -5044,7 +5081,7 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "mysten-metrics" version = "0.7.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "once_cell", "prometheus", @@ -5067,7 +5104,7 @@ dependencies = [ "futures", "http", "multiaddr 0.14.0", - "serde 1.0.148", + "serde 1.0.151", "tokio", "tokio-stream", "tonic 0.7.2", @@ -5080,19 +5117,19 @@ dependencies = [ [[package]] name = "mysten-network" version = "0.2.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "bincode", "bytes", "eyre", "futures", "http", - "multiaddr 0.16.0", - "serde 1.0.148", + "multiaddr 0.17.0", + "serde 1.0.151", "tokio", "tokio-stream", "tonic 0.8.3", - "tonic-health 0.7.1", + "tonic-health 0.8.0", "tower", "tower-http", "tracing", @@ -5102,7 +5139,7 @@ dependencies = [ [[package]] name = "mysten-util-mem" version = "0.11.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "cfg-if", "ed25519-consensus", @@ -5121,10 +5158,10 @@ dependencies = [ [[package]] name = "mysten-util-mem-derive" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ - "proc-macro2 1.0.47", - "syn 1.0.105", + "proc-macro2 1.0.49", + "syn 1.0.107", "synstructure", "workspace-hack", ] @@ -5152,15 +5189,15 @@ dependencies = [ [[package]] name = "narwhal-config" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "arc-swap", "fastcrypto", "match_opt", - "multiaddr 0.16.0", + "multiaddr 0.17.0", "narwhal-crypto", "rand 0.8.5", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "serde_with", "thiserror", @@ -5171,7 +5208,7 @@ dependencies = [ [[package]] name = "narwhal-consensus" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "arc-swap", "bincode", @@ -5188,7 +5225,7 @@ dependencies = [ "narwhal-types", "prometheus", "rand 0.8.5", - "serde 1.0.148", + "serde 1.0.151", "telemetry-subscribers", "thiserror", "tokio", @@ -5200,7 +5237,7 @@ dependencies = [ [[package]] name = "narwhal-crypto" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "eyre", "fastcrypto", @@ -5208,7 +5245,7 @@ dependencies = [ "once_cell", "rand 0.8.5", "readonly", - "serde 1.0.148", + "serde 1.0.151", "serde_bytes", "serde_with", "tokio", @@ -5219,17 +5256,17 @@ dependencies = [ [[package]] name = "narwhal-dag" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "arc-swap", - "dashmap 5.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dashmap", "either", "fastcrypto", "itertools", "narwhal-crypto", "once_cell", "rayon", - "serde 1.0.148", + "serde 1.0.151", "thiserror", "workspace-hack", ] @@ -5237,8 +5274,10 @@ dependencies = [ [[package]] name = "narwhal-executor" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ + "anemo", + "anemo-tower", "anyhow", "async-trait", "backoff", @@ -5249,7 +5288,7 @@ dependencies = [ "itertools", "match_opt", "mockall", - "multiaddr 0.16.0", + "multiaddr 0.17.0", "mysten-metrics", "narwhal-config", "narwhal-consensus", @@ -5260,7 +5299,7 @@ dependencies = [ "narwhal-types", "prometheus", "rand 0.8.5", - "serde 1.0.148", + "serde 1.0.151", "telemetry-subscribers", "thiserror", "tokio", @@ -5274,7 +5313,7 @@ dependencies = [ [[package]] name = "narwhal-network" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anemo", "anemo-tower", @@ -5285,15 +5324,16 @@ dependencies = [ "backoff", "bytes", "eyre", + "fail 0.5.1", "fastcrypto", "futures", - "multiaddr 0.16.0", + "multiaddr 0.17.0", "mysten-metrics", "narwhal-crypto", "narwhal-types", "prometheus", "rand 0.8.5", - "serde 1.0.148", + "serde 1.0.151", "thiserror", "tokio", "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5306,7 +5346,7 @@ dependencies = [ [[package]] name = "narwhal-node" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anemo", "arc-swap", @@ -5317,10 +5357,11 @@ dependencies = [ "cfg-if", "clap 2.34.0", "eyre", + "fail 0.5.1", "fastcrypto", "futures", "itertools", - "multiaddr 0.16.0", + "multiaddr 0.17.0", "mysten-metrics", "mysten-network 0.2.0", "narwhal-config", @@ -5352,7 +5393,7 @@ dependencies = [ [[package]] name = "narwhal-primary" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anemo", "anemo-tower", @@ -5364,12 +5405,13 @@ dependencies = [ "base64", "bincode", "bytes", - "dashmap 5.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dashmap", "derive_builder", + "fail 0.5.1", "fastcrypto", "futures", "itertools", - "multiaddr 0.16.0", + "multiaddr 0.17.0", "mysten-metrics", "mysten-network 0.2.0", "narwhal-config", @@ -5380,10 +5422,10 @@ dependencies = [ "narwhal-types", "once_cell", "prometheus", - "prost 0.11.3", + "prost 0.11.5", "rand 0.8.5", "roaring", - "serde 1.0.148", + "serde 1.0.151", "tap", "telemetry-subscribers", "thiserror", @@ -5399,9 +5441,10 @@ dependencies = [ [[package]] name = "narwhal-storage" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ - "dashmap 5.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dashmap", + "fail 0.5.1", "fastcrypto", "futures", "narwhal-config", @@ -5420,7 +5463,7 @@ dependencies = [ [[package]] name = "narwhal-types" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anemo", "anemo-build", @@ -5428,7 +5471,7 @@ dependencies = [ "base64", "bincode", "bytes", - "dashmap 5.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dashmap", "derive_builder", "fastcrypto", "futures", @@ -5442,13 +5485,13 @@ dependencies = [ "prometheus", "proptest", "proptest-derive", - "prost 0.11.3", - "prost-build 0.11.3", + "prost 0.11.5", + "prost-build 0.11.5", "protobuf-src", "rand 0.8.5", "roaring", "rustversion", - "serde 1.0.148", + "serde 1.0.151", "serde_with", "signature", "thiserror", @@ -5464,7 +5507,7 @@ dependencies = [ [[package]] name = "narwhal-worker" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anemo", "anemo-tower", @@ -5476,7 +5519,7 @@ dependencies = [ "eyre", "fastcrypto", "futures", - "multiaddr 0.16.0", + "multiaddr 0.17.0", "mysten-metrics", "mysten-network 0.2.0", "narwhal-config", @@ -5487,7 +5530,7 @@ dependencies = [ "narwhal-types", "prometheus", "rand 0.8.5", - "serde 1.0.148", + "serde 1.0.151", "tap", "telemetry-subscribers", "tokio", @@ -5527,7 +5570,7 @@ checksum = "ca2b420f638f07fe83056b55ea190bb815f609ec5a35e7017884a10f78839c9e" [[package]] name = "nexlint" version = "0.1.0" -source = "git+https://github.com/nextest-rs/nexlint.git?rev=8df9c4ea982e2be6b528e7b288a82d79d2d4bf20#8df9c4ea982e2be6b528e7b288a82d79d2d4bf20" +source = "git+https://github.com/nextest-rs/nexlint.git?rev=44615b3f56a7a72ccc4a1b4f4e696b9f44fc7e2e#44615b3f56a7a72ccc4a1b4f4e696b9f44fc7e2e" dependencies = [ "camino", "debug-ignore", @@ -5536,13 +5579,13 @@ dependencies = [ "hakari", "hex", "once_cell", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] name = "nexlint-lints" version = "0.1.0" -source = "git+https://github.com/nextest-rs/nexlint.git?rev=8df9c4ea982e2be6b528e7b288a82d79d2d4bf20#8df9c4ea982e2be6b528e7b288a82d79d2d4bf20" +source = "git+https://github.com/nextest-rs/nexlint.git?rev=44615b3f56a7a72ccc4a1b4f4e696b9f44fc7e2e#44615b3f56a7a72ccc4a1b4f4e696b9f44fc7e2e" dependencies = [ "anyhow", "camino", @@ -5551,7 +5594,7 @@ dependencies = [ "guppy", "nexlint", "regex", - "serde 1.0.148", + "serde 1.0.151", "toml", ] @@ -5566,9 +5609,9 @@ dependencies = [ [[package]] name = "nix" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ "bitflags", "cc", @@ -5683,9 +5726,9 @@ dependencies = [ [[package]] name = "num-format" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b862ff8df690cf089058c98b183676a7ed0f974cc08b426800093227cbff3b" +checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ "arrayvec 0.7.2", "itoa", @@ -5745,11 +5788,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] @@ -5769,9 +5812,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -5798,11 +5841,20 @@ dependencies = [ "memchr", ] +[[package]] +name = "object" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239da7f290cfa979f43f85a8efeee9a8a76d0827c356d37f9d3d7254d6b537fb" +dependencies = [ + "memchr", +] + [[package]] name = "oid-registry" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d4bda43fd1b844cbc6e6e54b5444e2b1bc7838bce59ad205902cccbb26d6761" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" dependencies = [ "asn1-rs", ] @@ -5827,9 +5879,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.43" +version = "0.10.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020433887e44c27ff16365eaa2d380547a94544ad509aff6eb5b6e3e0b27b376" +checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" dependencies = [ "bitflags", "cfg-if", @@ -5846,9 +5898,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -5859,9 +5911,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.78" +version = "0.9.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07d5c8cb6e57b3a3612064d7b18b117912b4ce70955c2504d4b741c9e244b132" +checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" dependencies = [ "autocfg", "cc", @@ -5951,7 +6003,7 @@ checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" dependencies = [ "async-trait", "crossbeam-channel", - "dashmap 5.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dashmap", "fnv", "futures-channel", "futures-executor", @@ -6017,9 +6069,9 @@ checksum = "03f2cb802b5bdfdf52f1ffa0b54ce105e4d346e91990dd571f86c91321ad49e2" dependencies = [ "Inflector", "proc-macro-error", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -6030,9 +6082,9 @@ checksum = "4a0d9d1a6191c4f391f87219d1ea42b23f09ee84d64763cd05ee6ea88d9f384d" dependencies = [ "Inflector", "proc-macro-error", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -6056,6 +6108,17 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" +[[package]] +name = "p256" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2 0.10.6", +] + [[package]] name = "parity-scale-codec" version = "2.3.1" @@ -6067,7 +6130,7 @@ dependencies = [ "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] @@ -6077,9 +6140,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -6096,7 +6159,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", ] [[package]] @@ -6111,9 +6174,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", @@ -6147,9 +6210,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" [[package]] name = "pathdiff" @@ -6218,9 +6281,9 @@ checksum = "28a1af60b1c4148bb269006a750cff8e2ea36aff34d2d96cf7be0b14d1bed23c" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -6308,9 +6371,9 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -6383,9 +6446,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "0.3.15" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" +checksum = "81bdd679d533107e090c2704a35982fc06302e30898e63ffa26a81155c012e92" [[package]] name = "pprof" @@ -6451,7 +6514,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d" dependencies = [ "predicates-core", - "termtree 0.4.0", + "termtree", ] [[package]] @@ -6478,12 +6541,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51" +checksum = "2c8992a85d8e93a28bdf76137db888d3874e3b230dee5ed8bebac4c9f7617773" dependencies = [ - "proc-macro2 1.0.47", - "syn 1.0.105", + "proc-macro2 1.0.49", + "syn 1.0.107", ] [[package]] @@ -6515,9 +6578,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", "version_check", ] @@ -6527,8 +6590,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "version_check", ] @@ -6543,9 +6606,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" dependencies = [ "unicode-ident", ] @@ -6608,12 +6671,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b18e655c21ff5ac2084a5ad0611e827b3f92badf79f4910b5a5c58f4d87ff0" +checksum = "c01db6702aa05baa3f57dec92b8eeeeb4cb19e894e73996b32a4093289e54592" dependencies = [ "bytes", - "prost-derive 0.11.2", + "prost-derive 0.11.5", ] [[package]] @@ -6640,9 +6703,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e330bf1316db56b12c2bcfa399e8edddd4821965ea25ddb2c134b610b1c1c604" +checksum = "cb5320c680de74ba083512704acb90fe00f28f79207286a848e730c45dd73ed6" dependencies = [ "bytes", "heck 0.4.0", @@ -6652,10 +6715,10 @@ dependencies = [ "multimap", "petgraph 0.6.2", "prettyplease", - "prost 0.11.3", - "prost-types 0.11.2", + "prost 0.11.5", + "prost-types 0.11.5", "regex", - "syn 1.0.105", + "syn 1.0.107", "tempfile", "which", ] @@ -6668,22 +6731,22 @@ checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "prost-derive" -version = "0.11.2" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164ae68b6587001ca506d3bf7f1000bfa248d0e1217b618108fba4ec1d0cc306" +checksum = "c8842bad1a5419bca14eac663ba798f6bc19c413c2fdceb5f3ba3b0932d96720" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -6698,12 +6761,12 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.2" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a" +checksum = "017f79637768cde62820bc2d4fe0e45daaa027755c323ad077767c6c5f173091" dependencies = [ "bytes", - "prost 0.11.3", + "prost 0.11.5", ] [[package]] @@ -6732,7 +6795,7 @@ dependencies = [ "config", "directories", "petgraph 0.6.2", - "serde 1.0.148", + "serde 1.0.151", "serde-value", "tint", ] @@ -6751,9 +6814,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" -version = "0.23.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" +checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" dependencies = [ "memchr", ] @@ -6779,9 +6842,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57098b1a3d2159d13dc3a98c0e3a5f8ab91ac3dd2471e52b1d712ea0c1085555" +checksum = "72ef4ced82a24bb281af338b9e8f94429b6eca01b4e66d899f40031f074e74c9" dependencies = [ "bytes", "rand 0.8.5", @@ -6797,9 +6860,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f8c8ab02188aa3eac88cdeb2a0b6b78bddc29cb11b3bfe7044b3268fc7ddd0" +checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" dependencies = [ "libc", "quinn-proto", @@ -6819,11 +6882,22 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ - "proc-macro2 1.0.47", + "proc-macro2 1.0.49", +] + +[[package]] +name = "r2d2" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" +dependencies = [ + "log", + "parking_lot 0.12.1", + "scheduled-thread-pool", ] [[package]] @@ -6949,11 +7023,10 @@ dependencies = [ [[package]] name = "rayon" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" dependencies = [ - "crossbeam-deque", "either", "rayon-core", ] @@ -6998,7 +7071,7 @@ dependencies = [ [[package]] name = "read-write-set" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "move-binary-format", @@ -7013,7 +7086,7 @@ dependencies = [ [[package]] name = "read-write-set-dynamic" version = "0.1.0" -source = "git+https://github.com/move-language/move?rev=5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7#5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" +source = "git+https://github.com/move-language/move?rev=796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a#796ddf22ac4f8cd3d09c0c83bed1cf8faa252d9a" dependencies = [ "anyhow", "move-binary-format", @@ -7024,13 +7097,13 @@ dependencies = [ [[package]] name = "readonly" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c0e08c3b00fcae55ee1dac341e1b9b5bc942e7e1931957436ab00b4a5e8dc18" +checksum = "d78725e4e53781014168628ef49b2dc2fc6ae8d01a08769a5064685d34ee116c" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -7074,22 +7147,22 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b15debb4f9d60d767cd8ca9ef7abb2452922f3214671ff052defc7f3502c44" +checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfa8511e9e94fd3de6585a3d3cd00e01ed556dc9814829280af0e8dc72a8f36" +checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -7151,7 +7224,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "serde_urlencoded", "tokio", @@ -7284,7 +7357,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.14", + "semver 1.0.16", ] [[package]] @@ -7298,9 +7371,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23" +checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" dependencies = [ "bitflags", "errno", @@ -7345,9 +7418,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" [[package]] name = "rusty-fork" @@ -7375,7 +7448,7 @@ dependencies = [ "libc", "log", "memchr", - "nix 0.23.1", + "nix 0.23.2", "radix_trie", "scopeguard", "smallvec", @@ -7391,16 +7464,16 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "107c3d5d7f370ac09efa62a78375f94d94b8a33c61d8c278b96683fb4dbf2d8d" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "same-file" @@ -7421,6 +7494,15 @@ dependencies = [ "windows-sys 0.36.1", ] +[[package]] +name = "scheduled-thread-pool" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf" +dependencies = [ + "parking_lot 0.12.1", +] + [[package]] name = "schemars" version = "0.8.11" @@ -7430,7 +7512,7 @@ dependencies = [ "dyn-clone", "either", "schemars_derive", - "serde 1.0.148", + "serde 1.0.151", "serde_json", ] @@ -7440,10 +7522,10 @@ version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f188d036977451159430f3b8dc82ec76364a42b7e289c2b18a9a18f4470058e9" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "serde_derive_internals", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] @@ -7454,9 +7536,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" [[package]] name = "sct" @@ -7477,15 +7559,16 @@ dependencies = [ "base16ct", "der", "generic-array", + "pkcs8", "subtle", "zeroize", ] [[package]] name = "secp256k1" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff55dc09d460954e9ef2fa8a7ced735a964be9981fd50e870b2b3b0705e14964" +checksum = "d9512ffd81e3a3503ed401f79c33168b9148c75038956039166cd750eaa037c3" dependencies = [ "bitcoin_hashes", "rand 0.8.5", @@ -7535,11 +7618,11 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" dependencies = [ - "serde 1.0.148", + "serde 1.0.151", ] [[package]] @@ -7565,9 +7648,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.148" +version = "1.0.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc" +checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0" dependencies = [ "serde_derive", ] @@ -7590,7 +7673,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b5b14ebbcc4e4f2b3642fa99c388649da58d1dc3308c7d109f39f565d1710f0" dependencies = [ - "serde 1.0.148", + "serde 1.0.151", "thiserror", ] @@ -7601,7 +7684,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f05a5f801ac62a51a49d378fdb3884480041b99aced450b28990673e8ff99895" dependencies = [ "once_cell", - "serde 1.0.148", + "serde 1.0.151", "thiserror", ] @@ -7612,27 +7695,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" dependencies = [ "ordered-float 2.10.0", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] name = "serde_bytes" -version = "0.11.7" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" +checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819" dependencies = [ - "serde 1.0.148", + "serde 1.0.151", ] [[package]] name = "serde_derive" -version = "1.0.148" +version = "1.0.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c" +checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -7641,41 +7724,41 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "serde_json" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ "indexmap", "itoa", "ryu", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] name = "serde_repr" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" +checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "serde_test" -version = "1.0.148" +version = "1.0.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8178223189ca1d189513acd64ed130a3a2e7c76247a19ca11680498b097558" +checksum = "f8f77be7305dac4f250891d2f7444276315f3c288176d35746b6a4ca786dacb3" dependencies = [ - "serde 1.0.148", + "serde 1.0.151", ] [[package]] @@ -7687,7 +7770,7 @@ dependencies = [ "form_urlencoded", "itoa", "ryu", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] @@ -7700,7 +7783,7 @@ dependencies = [ "chrono", "hex", "indexmap", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "serde_with_macros", "time 0.3.15", @@ -7713,9 +7796,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3452b4c0f6c1e357f73fdb87cd1efabaa12acf328c7a528e252893baeb3f4aa" dependencies = [ "darling", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -7726,7 +7809,7 @@ checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ "indexmap", "ryu", - "serde 1.0.148", + "serde 1.0.151", "yaml-rust", ] @@ -7736,7 +7819,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92761393ee4dc3ff8f4af487bd58f4307c9329bbedea02cac0089ad9c411e153" dependencies = [ - "dashmap 5.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dashmap", "futures", "lazy_static 1.4.0", "log", @@ -7751,9 +7834,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b6f5d1c3087fb119617cff2966fe3808a80e5eb59a8c1601d5994d66f4346a5" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -8047,7 +8130,7 @@ name = "sqlx-core" version = "0.6.2" source = "git+https://github.com/huitseeker/sqlx?branch=update_libsqlite3#fa4613e770a82a606b2cbaa4d36e3ca628c67dad" dependencies = [ - "ahash", + "ahash 0.7.6", "atoi", "bitflags", "byteorder", @@ -8096,12 +8179,12 @@ dependencies = [ "either", "heck 0.4.0", "once_cell", - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "sha2 0.10.6", "sqlx-core", "sqlx-rt", - "syn 1.0.105", + "syn 1.0.107", "url", ] @@ -8189,9 +8272,9 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck 0.3.3", "proc-macro-error", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -8210,10 +8293,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck 0.4.0", - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "rustversion", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] @@ -8241,7 +8324,7 @@ checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" [[package]] name = "sui-adapter" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anyhow", "bcs", @@ -8265,7 +8348,7 @@ dependencies = [ [[package]] name = "sui-config" version = "0.0.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anemo", "anyhow", @@ -8278,12 +8361,12 @@ dependencies = [ "move-core-types", "move-package", "move-vm-runtime", - "multiaddr 0.16.0", + "multiaddr 0.17.0", "narwhal-config", "narwhal-crypto", "once_cell", "rand 0.8.5", - "serde 1.0.148", + "serde 1.0.151", "serde_with", "serde_yaml", "sui-adapter", @@ -8296,8 +8379,8 @@ dependencies = [ [[package]] name = "sui-core" -version = "0.18.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +version = "0.19.0" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anyhow", "arc-swap", @@ -8315,7 +8398,7 @@ dependencies = [ "move-bytecode-utils", "move-core-types", "move-vm-runtime", - "multiaddr 0.16.0", + "multiaddr 0.17.0", "mysten-metrics", "mysten-network 0.2.0", "narwhal-config", @@ -8331,7 +8414,7 @@ dependencies = [ "rand 0.8.5", "rocksdb", "scopeguard", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "serde_with", "signature", @@ -8362,11 +8445,11 @@ dependencies = [ [[package]] name = "sui-cost" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anyhow", "bcs", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "strum", "strum_macros", @@ -8381,7 +8464,7 @@ dependencies = [ [[package]] name = "sui-cost-tables" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anyhow", "bcs", @@ -8389,7 +8472,7 @@ dependencies = [ "move-core-types", "move-vm-types", "once_cell", - "serde 1.0.148", + "serde 1.0.151", "sui-protocol-constants", "workspace-hack", ] @@ -8397,7 +8480,7 @@ dependencies = [ [[package]] name = "sui-framework" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anyhow", "bcs", @@ -8420,7 +8503,7 @@ dependencies = [ "move-vm-types", "num_enum", "once_cell", - "serde 1.0.148", + "serde 1.0.151", "smallvec", "sui-framework-build", "sui-types", @@ -8430,7 +8513,7 @@ dependencies = [ [[package]] name = "sui-framework-build" version = "0.0.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anyhow", "fastcrypto", @@ -8450,7 +8533,7 @@ dependencies = [ [[package]] name = "sui-json" version = "0.0.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anyhow", "bcs", @@ -8458,7 +8541,7 @@ dependencies = [ "move-binary-format", "move-core-types", "schemars", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "sui-types", "sui-verifier", @@ -8467,10 +8550,11 @@ dependencies = [ [[package]] name = "sui-json-rpc" version = "0.0.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anyhow", "async-trait", + "bcs", "fastcrypto", "futures", "hyper", @@ -8481,7 +8565,7 @@ dependencies = [ "move-core-types", "mysten-metrics", "prometheus", - "serde 1.0.148", + "serde 1.0.151", "signature", "sui-core", "sui-cost", @@ -8492,6 +8576,7 @@ dependencies = [ "sui-transaction-builder", "sui-types", "tap", + "thiserror", "tokio", "tower", "tower-http", @@ -8502,7 +8587,7 @@ dependencies = [ [[package]] name = "sui-json-rpc-types" version = "0.0.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anyhow", "async-trait", @@ -8515,7 +8600,7 @@ dependencies = [ "move-bytecode-utils", "move-core-types", "schemars", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "serde_with", "sui-json", @@ -8527,13 +8612,13 @@ dependencies = [ [[package]] name = "sui-keys" version = "0.0.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anyhow", "bip32", "fastcrypto", "rand 0.8.5", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "signature", "slip10_ed25519", @@ -8545,30 +8630,30 @@ dependencies = [ [[package]] name = "sui-macros" version = "0.7.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "msim-macros", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", "workspace-hack", ] [[package]] name = "sui-network" version = "0.0.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anemo", "anemo-build", "anyhow", "async-trait", "futures", - "multiaddr 0.16.0", + "multiaddr 0.17.0", "mysten-network 0.2.0", "prometheus", "rand 0.8.5", - "serde 1.0.148", + "serde 1.0.151", "sui-config", "sui-types", "tap", @@ -8582,10 +8667,11 @@ dependencies = [ [[package]] name = "sui-open-rpc" version = "0.0.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ + "bcs", "schemars", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "workspace-hack", ] @@ -8593,13 +8679,13 @@ dependencies = [ [[package]] name = "sui-open-rpc-macros" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "derive-syn-parse", "itertools", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", "unescape", "workspace-hack", ] @@ -8607,15 +8693,15 @@ dependencies = [ [[package]] name = "sui-protocol-constants" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "workspace-hack", ] [[package]] name = "sui-sdk" -version = "0.18.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +version = "0.19.0" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anyhow", "async-trait", @@ -8627,7 +8713,7 @@ dependencies = [ "move-bytecode-utils", "move-core-types", "rand 0.8.5", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "sui-config", "sui-core", @@ -8644,7 +8730,7 @@ dependencies = [ [[package]] name = "sui-simulator" version = "0.7.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anemo", "fastcrypto", @@ -8659,7 +8745,7 @@ dependencies = [ [[package]] name = "sui-storage" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anyhow", "async-trait", @@ -8673,7 +8759,7 @@ dependencies = [ "move-core-types", "mysten-metrics", "rocksdb", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "sqlx", "strum", @@ -8694,7 +8780,7 @@ dependencies = [ [[package]] name = "sui-transaction-builder" version = "0.0.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anyhow", "async-trait", @@ -8711,7 +8797,7 @@ dependencies = [ [[package]] name = "sui-types" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "anyhow", "bcs", @@ -8737,7 +8823,7 @@ dependencies = [ "rand 0.8.5", "roaring", "schemars", - "serde 1.0.148", + "serde 1.0.151", "serde-name", "serde_bytes", "serde_json", @@ -8762,7 +8848,7 @@ dependencies = [ [[package]] name = "sui-verifier" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "move-binary-format", "move-bytecode-verifier", @@ -8773,9 +8859,9 @@ dependencies = [ [[package]] name = "symbolic-common" -version = "10.2.0" +version = "10.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d7c8cd6663e22c348c74cf0b2c77d196fd252c7efe5594ae05edb07d0475da" +checksum = "1b55cdc318ede251d0957f07afe5fed912119b8c1bc5a7804151826db999e737" dependencies = [ "debugid", "memmap2", @@ -8785,9 +8871,9 @@ dependencies = [ [[package]] name = "symbolic-demangle" -version = "10.2.0" +version = "10.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86dc78e43163d342e72c0175113cf0c6ffc6b2540163c8680c4ed91c992af9e2" +checksum = "79be897be8a483a81fff6a3a4e195b4ac838ef73ca42d348b3f722da9902e489" dependencies = [ "cpp_demangle", "rustc-demangle", @@ -8807,12 +8893,12 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "unicode-ident", ] @@ -8828,9 +8914,9 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", "unicode-xid 0.2.4", ] @@ -8864,14 +8950,14 @@ checksum = "6a4b9859e2d5bf61d17ccdf2659396d69b207d956f2cb60e09df319394a8ccd4" dependencies = [ "cfg-expr", "guppy-workspace-hack", - "serde 1.0.148", + "serde 1.0.151", "target-lexicon", ] [[package]] name = "telemetry-subscribers" version = "0.2.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "crossterm 0.25.0", "once_cell", @@ -8918,7 +9004,7 @@ dependencies = [ "pest_derive", "rand 0.8.5", "regex", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "slug", "unic-segment", @@ -8943,12 +9029,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "termtree" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b" - [[package]] name = "termtree" version = "0.4.0" @@ -8961,7 +9041,7 @@ version = "3.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd4a3a7f00909d5a1d1f83b86b65d91e4c94f80b0c2d0ae37e2ef44da7b7a0a0" dependencies = [ - "serde 1.0.148", + "serde 1.0.151", "test-fuzz-internal", "test-fuzz-macro", "test-fuzz-runtime", @@ -8974,9 +9054,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9186daca5c58cb307d09731e0ba06b13fd6c036c90672b9bfc31cecf76cf689" dependencies = [ "cargo_metadata", - "proc-macro2 1.0.47", - "quote 1.0.21", - "serde 1.0.148", + "proc-macro2 1.0.49", + "quote 1.0.23", + "serde 1.0.151", "strum_macros", ] @@ -8989,10 +9069,10 @@ dependencies = [ "darling", "if_chain", "lazy_static 1.4.0", - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "subprocess", - "syn 1.0.105", + "syn 1.0.107", "test-fuzz-internal", "toolchain_find", "unzip-n", @@ -9007,7 +9087,7 @@ dependencies = [ "bincode", "hex", "num-traits 0.2.15", - "serde 1.0.148", + "serde 1.0.151", "sha-1 0.10.1", "test-fuzz-internal", ] @@ -9021,12 +9101,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "textwrap" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d" - [[package]] name = "textwrap" version = "0.16.0" @@ -9040,22 +9114,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -9109,7 +9183,7 @@ dependencies = [ "itoa", "libc", "num_threads", - "serde 1.0.148", + "serde 1.0.151", "time-macros", ] @@ -9153,7 +9227,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" dependencies = [ - "serde 1.0.148", + "serde 1.0.151", "serde_json", ] @@ -9208,9 +9282,9 @@ name = "tokio-macros" version = "1.8.0" source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=bb463863b8155543731bdf7850057c083cf1b427#bb463863b8155543731bdf7850057c083cf1b427" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -9219,9 +9293,9 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -9302,12 +9376,12 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" dependencies = [ "indexmap", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] @@ -9319,7 +9393,7 @@ dependencies = [ "combine", "indexmap", "itertools", - "serde 1.0.148", + "serde 1.0.151", ] [[package]] @@ -9374,8 +9448,8 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.11.3", - "prost-derive 0.11.2", + "prost 0.11.5", + "prost-derive 0.11.5", "rustls-pemfile", "tokio", "tokio-rustls", @@ -9395,10 +9469,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9263bf4c9bfaae7317c1c2faf7f18491d2fe476f70c414b73bf5d445b00ffa1" dependencies = [ "prettyplease", - "proc-macro2 1.0.47", + "proc-macro2 1.0.49", "prost-build 0.10.4", - "quote 1.0.21", - "syn 1.0.105", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -9408,10 +9482,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" dependencies = [ "prettyplease", - "proc-macro2 1.0.47", - "prost-build 0.11.3", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "prost-build 0.11.5", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -9431,13 +9505,13 @@ dependencies = [ [[package]] name = "tonic-health" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632faf60b81a5b5f439d9635102b2b2921ee39171faf14f3e0008d99f98689f1" +checksum = "a88aee666ef3a4d1ee46218bbc8e5f69bcf9cc27bf2e871d6b724d83f56d179f" dependencies = [ "async-stream", "bytes", - "prost 0.11.3", + "prost 0.11.5", "tokio", "tokio-stream", "tonic 0.8.3", @@ -9549,9 +9623,9 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -9562,7 +9636,7 @@ checksum = "a788f2119fde477cd33823330c14004fa8cdac6892fd6f12181bbda9dbf14fc9" dependencies = [ "gethostname", "log", - "serde 1.0.148", + "serde 1.0.151", "serde_json", "time 0.3.15", "tracing", @@ -9675,8 +9749,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "744324b12d69a9fc1edea4b38b7b1311295b662d161ad5deac17bb1358224a08" dependencies = [ "lazy_static 1.4.0", - "quote 1.0.21", - "syn 1.0.105", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -9717,7 +9791,7 @@ checksum = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae" [[package]] name = "typed-store" version = "0.4.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "bincode", "collectable", @@ -9727,7 +9801,7 @@ dependencies = [ "once_cell", "prometheus", "rocksdb", - "serde 1.0.148", + "serde 1.0.151", "tap", "thiserror", "tokio", @@ -9738,19 +9812,19 @@ dependencies = [ [[package]] name = "typed-store-derive" version = "0.3.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", "workspace-hack", ] [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" @@ -9852,9 +9926,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-linebreak" @@ -9939,9 +10013,9 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2e7e85a0596447f0f2ac090e16bc4c516c6fe91771fb0c0ccf7fa3dae896b9c" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -9983,8 +10057,8 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aae2faf80ac463422992abf4de234731279c058aaf33171ca70277c98406b124" dependencies = [ - "quote 1.0.21", - "syn 1.0.105", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -10022,8 +10096,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", ] [[package]] @@ -10087,8 +10161,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" dependencies = [ "cfg-if", - "serde 1.0.148", - "serde_json", "wasm-bindgen-macro", ] @@ -10101,9 +10173,9 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", "wasm-bindgen-shared", ] @@ -10125,7 +10197,7 @@ version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" dependencies = [ - "quote 1.0.21", + "quote 1.0.23", "wasm-bindgen-macro-support", ] @@ -10135,9 +10207,9 @@ version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -10170,9 +10242,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ "webpki", ] @@ -10348,15 +10420,16 @@ dependencies = [ [[package]] name = "workspace-hack" version = "0.1.0" -source = "git+https://github.com/MystenLabs/sui?branch=devnet#21fcff72bef3b12f600da861b7708ca5f30d9512" +source = "git+https://github.com/MystenLabs/sui?branch=devnet#a8af20d94e951ecfb6d0cd47c23cf6393013d8a8" dependencies = [ "Inflector", - "addr2line", + "addr2line 0.17.0", "adler", "aead", "aes", "aes-gcm", - "ahash", + "ahash 0.7.6", + "ahash 0.8.2", "aho-corasick", "aliasable", "alloc-no-stdlib", @@ -10398,10 +10471,13 @@ dependencies = [ "atoi", "atomicwrites", "atty", + "auto_ops", "autocfg", "autotools", "axum 0.5.17", + "axum 0.6.1", "axum-core 0.2.9", + "axum-core 0.3.0", "axum-server", "backoff", "backtrace", @@ -10424,7 +10500,7 @@ dependencies = [ "bitmaps", "bitvec 0.19.6", "bitvec 0.20.4", - "blake2 0.10.5", + "blake2 0.10.6", "blake2 0.9.2", "blake3", "block-buffer 0.10.3", @@ -10436,7 +10512,7 @@ dependencies = [ "brotli-decompressor", "bs58", "bstr 0.2.17", - "bstr 1.0.1", + "bstr 1.1.0", "bulletproofs", "bumpalo", "byte-slice-cast", @@ -10470,7 +10546,6 @@ dependencies = [ "clear_on_drop", "clipboard-win", "cmake", - "coarsetime", "codespan", "codespan-reporting", "collectable", @@ -10518,7 +10593,7 @@ dependencies = [ "darling", "darling_core", "darling_macro", - "dashmap 5.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dashmap", "data-encoding", "data-encoding-macro", "data-encoding-macro-internal", @@ -10572,7 +10647,8 @@ dependencies = [ "ethnum", "event-listener", "eyre", - "fail", + "fail 0.4.0", + "fail 0.5.1", "fastcrypto", "fastcrypto-derive", "fastcrypto-zkp", @@ -10593,7 +10669,7 @@ dependencies = [ "foreign-types", "foreign-types-shared", "form_urlencoded", - "fragile 1.2.2", + "fragile", "fs_extra", "funty", "futures", @@ -10602,6 +10678,7 @@ dependencies = [ "futures-executor", "futures-intrusive", "futures-io", + "futures-lite", "futures-macro", "futures-sink", "futures-task", @@ -10612,7 +10689,7 @@ dependencies = [ "getrandom 0.1.16", "getrandom 0.2.8", "ghash", - "gimli", + "gimli 0.26.2", "glob", "globset", "globwalk", @@ -10709,6 +10786,7 @@ dependencies = [ "match_opt", "matchers", "matchit 0.5.0", + "matchit 0.7.0", "memchr", "memmap2", "memoffset", @@ -10717,6 +10795,7 @@ dependencies = [ "mime_guess", "minimal-lexical", "miniz_oxide 0.5.4", + "miniz_oxide 0.6.2", "mio 0.7.14", "mio 0.8.5", "mockall", @@ -10757,9 +10836,10 @@ dependencies = [ "move-vm-test-utils", "move-vm-types", "multiaddr 0.14.0", - "multiaddr 0.16.0", + "multiaddr 0.17.0", "multibase", - "multihash", + "multihash 0.16.3", + "multihash 0.17.0", "multihash-derive", "multimap", "mysten-network 0.1.0", @@ -10769,7 +10849,7 @@ dependencies = [ "nexlint", "nexlint-lints", "nibble_vec", - "nix 0.23.1", + "nix 0.23.2", "nix 0.24.3", "nom 5.1.2", "nom 6.1.2", @@ -10790,7 +10870,7 @@ dependencies = [ "num_enum_derive", "num_threads", "number_prefix", - "object", + "object 0.29.0", "oid-registry", "once_cell", "oorandom", @@ -10815,11 +10895,13 @@ dependencies = [ "output_vt100", "overload", "owo-colors", + "p256", "parity-scale-codec", "parity-scale-codec-derive", + "parking", "parking_lot 0.11.2", "parking_lot 0.12.1", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", "parking_lot_core 0.9.5", "parse-zoneinfo", "paste", @@ -10863,18 +10945,18 @@ dependencies = [ "proc-macro-error", "proc-macro-error-attr", "proc-macro2 0.4.30", - "proc-macro2 1.0.47", + "proc-macro2 1.0.49", "prometheus", "proptest", "proptest-derive", "prost 0.10.4", - "prost 0.11.3", + "prost 0.11.5", "prost-build 0.10.4", - "prost-build 0.11.3", + "prost-build 0.11.5", "prost-derive 0.10.1", - "prost-derive 0.11.2", + "prost-derive 0.11.5", "prost-types 0.10.1", - "prost-types 0.11.2", + "prost-types 0.11.5", "protobuf", "protobuf-src", "ptree", @@ -10885,7 +10967,8 @@ dependencies = [ "quinn-proto", "quinn-udp", "quote 0.6.13", - "quote 1.0.21", + "quote 1.0.23", + "r2d2", "radium 0.5.3", "radium 0.6.2", "radix_trie", @@ -10937,6 +11020,7 @@ dependencies = [ "ryu", "same-file", "schannel", + "scheduled-thread-pool", "schemars", "schemars_derive", "scopeguard", @@ -10947,11 +11031,11 @@ dependencies = [ "security-framework", "security-framework-sys", "semver 0.11.0", - "semver 1.0.14", + "semver 1.0.16", "semver-parser", "send_wrapper", "serde 0.8.23", - "serde 1.0.148", + "serde 1.0.151", "serde-hjson", "serde-name", "serde-reflection", @@ -11016,7 +11100,7 @@ dependencies = [ "symbolic-common", "symbolic-demangle", "syn 0.15.44", - "syn 1.0.105", + "syn 1.0.107", "sync_wrapper", "synstructure", "tabular", @@ -11027,13 +11111,12 @@ dependencies = [ "tera", "termcolor", "terminal_size", - "termtree 0.2.4", + "termtree", "test-fuzz", "test-fuzz-internal", "test-fuzz-macro", "test-fuzz-runtime", "textwrap 0.11.0", - "textwrap 0.15.2", "textwrap 0.16.0", "thiserror", "thiserror-impl", @@ -11063,7 +11146,7 @@ dependencies = [ "tonic-build 0.7.2", "tonic-build 0.8.4", "tonic-health 0.6.0", - "tonic-health 0.7.1", + "tonic-health 0.8.0", "toolchain_find", "tower", "tower-http", @@ -11122,6 +11205,7 @@ dependencies = [ "vte", "vte_generate_state_changes", "wait-timeout", + "waker-fn", "walkdir", "want", "wasm-bindgen", @@ -11143,27 +11227,16 @@ dependencies = [ "windows_x86_64_msvc 0.36.1", "windows_x86_64_msvc 0.42.0", "winreg", - "wyhash", "wyz", "x509-parser", "yaml-rust", "yansi", "yasna", - "ying-profiler", "zeroize", "zeroize_derive", "zstd-sys", ] -[[package]] -name = "wyhash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf6e163c25e3fac820b4b453185ea2dea3b6a3e0a721d4d23d75bd33734c295" -dependencies = [ - "rand_core 0.6.4", -] - [[package]] name = "wyz" version = "0.2.0" @@ -11206,29 +11279,13 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "yasna" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346d34a236c9d3e5f3b9b74563f238f955bbd05fa0b8b4efa53c130c43982f4c" +checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" dependencies = [ "time 0.3.15", ] -[[package]] -name = "ying-profiler" -version = "0.1.0" -source = "git+https://github.com/velvia/ying-profiler#b3babafa758c3ec7e29d487d5d14483e5350f0ce" -dependencies = [ - "backtrace", - "chrono", - "coarsetime", - "dashmap 5.4.0 (git+https://github.com/velvia/dashmap?rev=a6e36242044f86412531c24c437e95beadc67b62)", - "log", - "once_cell", - "regex", - "tracing", - "wyhash", -] - [[package]] name = "zeroize" version = "1.5.7" @@ -11244,9 +11301,9 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", "synstructure", ] diff --git a/Cargo.toml b/Cargo.toml index df4c561..28aff66 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,10 +27,14 @@ documentation = "https://docs.dtp.dev" #sui-sdk = { path = "../dtp-dev/sui-devnet/crates/sui-sdk/" } #sui-json-rpc-types = { path = "../dtp-dev/sui-devnet/crates/sui-json-rpc-types/" } +#sui-keys = { path = "../dtp-dev/sui-devnet/crates/sui-keys/" } +#sui-types = { path = "../dtp-dev/sui-devnet/crates/sui-types/" } # Comment these sui-XXXXX "git" dependencies if using the above "path" dependencies. sui-sdk = { git = "https://github.com/MystenLabs/sui", branch = "devnet" } sui-json-rpc-types = { git = "https://github.com/MystenLabs/sui", branch = "devnet", package = "sui-json-rpc-types" } +sui-keys = { git = "https://github.com/MystenLabs/sui", branch = "devnet", package = "sui-keys" } +sui-types = { git = "https://github.com/MystenLabs/sui", branch = "devnet", package = "sui-types" } tokio = { version = "1.22.0", features = ["full"] } anyhow = "1.0.64" diff --git a/crates/dtp-core/Cargo.toml b/crates/dtp-core/Cargo.toml index 16f22d7..23e46b7 100644 --- a/crates/dtp-core/Cargo.toml +++ b/crates/dtp-core/Cargo.toml @@ -12,6 +12,8 @@ tokio.workspace = true anyhow.workspace = true sui-sdk.workspace = true sui-json-rpc-types.workspace = true +sui-keys.workspace = true +sui-types.workspace = true derivative = "2.2.0" [dev-dependencies] diff --git a/crates/dtp-core/src/network/common_internal.rs b/crates/dtp-core/src/network/common_internal.rs new file mode 100644 index 0000000..3348f43 --- /dev/null +++ b/crates/dtp-core/src/network/common_internal.rs @@ -0,0 +1,37 @@ +// Structs commonly used between most files in this directory. +// Must remain public because used within the public NetworkManager struct. + +// When a function take this as parameter, you can assume +// there is no gas cost. +use derivative::Derivative; +use sui_keys::keystore::Keystore; +use sui_sdk::types::base_types::{ObjectID, SuiAddress}; +use sui_sdk::SuiClient; + +#[derive(Derivative)] +#[derivative(Debug)] + +// When a function take SuiSDKParamsRPC as parameter, you can +// assume that it will make a RPC call. +pub struct SuiSDKParamsRPC { + pub client_address: SuiAddress, + #[derivative(Debug = "ignore")] + pub sui_client: Option, +} + +// When a function take SuiSDKParamsTxn as parameter, you can +// assume a Sui transaction will be attempted and there +// will be gas cost. +#[derive(Derivative)] +#[derivative(Debug)] +pub struct SuiSDKParamsTxn { + pub package_id: ObjectID, + #[derivative(Debug = "ignore")] + pub keystore: Keystore, +} + +#[derive(Debug)] +pub struct SuiSDKParams { + pub rpc: SuiSDKParamsRPC, + pub txn: SuiSDKParamsTxn, +} diff --git a/crates/dtp-core/src/network/host_internal.rs b/crates/dtp-core/src/network/host_internal.rs index 1e48589..fe12f85 100644 --- a/crates/dtp-core/src/network/host_internal.rs +++ b/crates/dtp-core/src/network/host_internal.rs @@ -1,6 +1,7 @@ +use super::common_internal::*; use anyhow::bail; use sui_sdk::types::base_types::{ObjectID, SuiAddress}; -use sui_sdk::SuiClient; + /* use sui_json_rpc_types::{ EventPage, MoveCallParams, OwnedObjectRef, RPCTransactionRequestParams, @@ -17,11 +18,12 @@ pub struct HostInternal { } pub(crate) async fn get_host_by_address( - sui_client: &SuiClient, + rpc: &SuiSDKParamsRPC, host_address: SuiAddress, ) -> Result { let sui_id = ObjectID::from(host_address); + let sui_client = rpc.sui_client.as_ref().expect("Could not create SuiClient"); let net_resp = sui_client .read_api() .get_parsed_object(sui_id) @@ -43,6 +45,9 @@ pub(crate) async fn get_host_by_address( } impl HostInternal { + pub(crate) fn new(sui_id: ObjectID) -> HostInternal { + HostInternal { sui_id } + } pub fn get_sui_id(&self) -> &ObjectID { &self.sui_id } diff --git a/crates/dtp-core/src/network/localhost_internal.rs b/crates/dtp-core/src/network/localhost_internal.rs index 27eefb5..65be790 100644 --- a/crates/dtp-core/src/network/localhost_internal.rs +++ b/crates/dtp-core/src/network/localhost_internal.rs @@ -1,6 +1,13 @@ +use super::common_internal::*; use super::host_internal::*; +//use std::str::FromStr; +use sui_keys::keystore::AccountKeystore; +//use sui_sdk::json::SuiJsonValue; use sui_sdk::types::base_types::SuiAddress; -use sui_sdk::SuiClient; +use sui_sdk::types::messages::Transaction; +use sui_types::intent::Intent; +use sui_types::messages::ExecuteTransactionRequestType; + /* use sui_json_rpc_types::{ EventPage, MoveCallParams, OwnedObjectRef, RPCTransactionRequestParams, @@ -18,25 +25,81 @@ pub struct LocalhostInternal { } pub(crate) async fn get_localhost_by_address( - sui_client: &SuiClient, - client_address: SuiAddress, + rpc: &SuiSDKParamsRPC, host_address: SuiAddress, ) -> Result<(HostInternal, LocalhostInternal), anyhow::Error> { // Do the equivalent of get_host_by_address, but // create a handle that will allow for administrator // capabilities. #[allow(clippy::needless_borrow)] - let host_internal = - super::host_internal::get_host_by_address(&sui_client, host_address).await?; + let host_internal = super::host_internal::get_host_by_address(rpc, host_address).await?; let localhost_internal = LocalhostInternal { - admin_address: client_address, + admin_address: rpc.client_address, firewall_initialized: false, }; Ok((host_internal, localhost_internal)) } +pub(crate) async fn create_localhost_on_network( + rpc: &SuiSDKParamsRPC, + txn: &SuiSDKParamsTxn, +) -> Result<(HostInternal, LocalhostInternal), anyhow::Error> { + // Do not allow to create a new one if one already exists + // for this user. + + let sui_client = rpc.sui_client.as_ref().expect("Could not create SuiClient"); + + let create_host_call = sui_client + .transaction_builder() + .move_call( + rpc.client_address, + txn.package_id, + "host", + "create", + vec![], + vec![], + None, // The node will pick a gas object belong to the signer if not provided. + 1000, + ) + .await?; + + // Sign transaction. + let signature = + txn.keystore + .sign_secure(&rpc.client_address, &create_host_call, Intent::default())?; + + let response = sui_client + .quorum_driver() + .execute_transaction( + Transaction::from_data(create_host_call, Intent::default(), signature).verify()?, + Some(ExecuteTransactionRequestType::WaitForLocalExecution), + ) + .await?; + + // Get the id from the newly created Sui object. + let sui_id = response + .effects + .unwrap() + .created + .first() + .unwrap() + .reference + .object_id; + + assert!(response.confirmed_local_execution); + + // All good. Build the DTP handles. + Ok(( + HostInternal::new(sui_id), + LocalhostInternal { + admin_address: rpc.client_address, + firewall_initialized: false, + }, + )) +} + impl LocalhostInternal { pub fn get_admin_address(&self) -> &SuiAddress { &self.admin_address @@ -44,7 +107,8 @@ impl LocalhostInternal { pub(crate) async fn init_firewall( &mut self, - _sui_client: &SuiClient, + _rpc: &SuiSDKParamsRPC, + _txn: &SuiSDKParamsTxn, ) -> Result<(), anyhow::Error> { // Dummy mutable for now... just to test the software design "layering" // with a mut. diff --git a/crates/dtp-core/src/network/mod.rs b/crates/dtp-core/src/network/mod.rs index 1038165..cca01f0 100644 --- a/crates/dtp-core/src/network/mod.rs +++ b/crates/dtp-core/src/network/mod.rs @@ -1,22 +1,32 @@ -use derivative::Derivative; +use std::path::PathBuf; +use sui_keys::keystore::{FileBasedKeystore, Keystore}; use sui_sdk::types::base_types::{ObjectID, SuiAddress}; use sui_sdk::SuiClient; +use tokio::time::Duration; // Flatten many sub modules/files under the same dtp_core::network module. // // Allows to do: // use dtp_core::network::{NetworkManager, HostInternal, LocalhostInternal} // -// Instead of: +// Instead of verbose: // use dtp_core::network::NetworkManager; // use dtp_core::network::host_internal::HostInternal; // use dtp_core::network::localhost_internal::LocalhostInternal; +pub use self::common_internal::*; pub use self::host_internal::*; pub use self::localhost_internal::*; +mod common_internal; mod host_internal; mod localhost_internal; +// The default location for localnet is relative to +// this module Cargo.toml location. +// +// TODO Handle default for devnet/testnet ... mainnet. +const DEFAULT_LOCALNET_KEYSTORE_PATHNAME: &str = "../../../dtp-dev/localnet/sui.keystore"; + // NetworkManager // // Perform network objects management associated to a single client address. @@ -36,43 +46,77 @@ mod localhost_internal; // An API dtp-sdk::Host --- owns a ----> dtp-core::HostInternal // An API dtp-sdk::Locahost --- owns a ----> dtp-core::LocalhostInternal // -#[derive(Derivative)] -#[derivative(Debug)] + +#[allow(dead_code)] pub struct NetworkManager { - package_id: ObjectID, - client_address: SuiAddress, - #[derivative(Debug = "ignore")] - sui_client: SuiClient, + sui_sdk_params: SuiSDKParams, + localhost_id: Option, + volunteers_id: Vec, } impl NetworkManager { pub async fn new( client_address: SuiAddress, - http_url: &str, - ws_url: Option<&str>, + keystore_pathname: Option<&str>, ) -> Result { - let sui_client = SuiClient::new(http_url, ws_url, None).await?; + // TODO Rewrite the building of the PathBuf for devnet/testnet... mainnet. + let pathbuf = if let Some(x) = keystore_pathname { + PathBuf::from(x) + } else { + let path = env!("CARGO_MANIFEST_DIR"); + let pathname = format!("{}/{}", path, DEFAULT_LOCALNET_KEYSTORE_PATHNAME); + PathBuf::from(pathname) + }; + + let keystore = Keystore::File(FileBasedKeystore::new(&pathbuf)?); Ok(NetworkManager { - package_id: ObjectID::ZERO, // TODO Revisit this when mainnet. - client_address, - sui_client, + sui_sdk_params: SuiSDKParams { + rpc: SuiSDKParamsRPC { + client_address, + sui_client: None, + }, + txn: SuiSDKParamsTxn { + package_id: ObjectID::ZERO, // TODO Revisit this when mainnet. + keystore, + }, + }, + localhost_id: None, + volunteers_id: Vec::new(), }) } + // Add RPC details. For now, allow only one to be added. + pub async fn add_rpc( + &mut self, + http_url: &str, + ws_url: Option<&str>, + request_timeout: Option, + ) -> Result<(), anyhow::Error> { + let sui_client = SuiClient::new(http_url, ws_url, request_timeout).await?; + self.sui_sdk_params.rpc.sui_client = Some(sui_client); + Ok(()) + } + // Accessors pub fn get_client_address(&self) -> &SuiAddress { - &self.client_address + &self.sui_sdk_params.rpc.client_address } pub fn get_package_id(&self) -> &ObjectID { - &self.package_id + &self.sui_sdk_params.txn.package_id } - pub fn get_sui_client(&self) -> &SuiClient { - &self.sui_client + + pub fn get_sui_client(&self) -> Result<&SuiClient, anyhow::Error> { + Ok(self + .sui_sdk_params + .rpc + .sui_client + .as_ref() + .expect("Cannot get SuiClient")) } // Needed? // Mutators pub fn set_package_id(&mut self, package_id: ObjectID) { - self.package_id = package_id; + self.sui_sdk_params.txn.package_id = package_id; } // Accessors that do a JSON-RPC call. @@ -80,14 +124,14 @@ impl NetworkManager { &self, host_address: SuiAddress, ) -> Result { - get_host_by_address(&self.sui_client, host_address).await + get_host_by_address(&self.sui_sdk_params.rpc, host_address).await } pub async fn get_localhost_by_address( &self, host_address: SuiAddress, ) -> Result<(HostInternal, LocalhostInternal), anyhow::Error> { - get_localhost_by_address(&self.sui_client, self.client_address, host_address).await + get_localhost_by_address(&self.sui_sdk_params.rpc, host_address).await } // Mutators that do a JSON-RPC call and transaction. @@ -97,7 +141,24 @@ impl NetworkManager { ) -> Result<(), anyhow::Error> { // TODO Verify here client_address == localhost.admin_address // Detect user error. - localhost.init_firewall(&self.sui_client).await + localhost + .init_firewall(&self.sui_sdk_params.rpc, &self.sui_sdk_params.txn) + .await + } + + pub async fn create_localhost_on_network( + &self, + ) -> Result<(HostInternal, LocalhostInternal), anyhow::Error> { + let (host, localhost) = + create_localhost_on_network(&self.sui_sdk_params.rpc, &self.sui_sdk_params.txn).await?; + + // To minimise caller having to deal with "race condition", do a RPC to the fullnode + // to verify if it reflects the creation. Keep trying for up to 5 seconds. + // + // Do not fail this call if the fullnode is somehow too slow. The creation has already + // succeeded from the point of view of the transaction effects. + // + Ok((host, localhost)) } } diff --git a/crates/dtp-dev-app/src/main.rs b/crates/dtp-dev-app/src/main.rs index 85cfba2..63de8c8 100644 --- a/crates/dtp-dev-app/src/main.rs +++ b/crates/dtp-dev-app/src/main.rs @@ -14,7 +14,8 @@ async fn main() -> Result<(), anyhow::Error> { let own_address = SuiAddress::from_str("0xcfed50a652b8fce7a7917a8a736a7c2b1d646ba2")?; - let dtp: DTP = DTP::new(own_address, "http://0.0.0.0:9000", None).await?; + let mut dtp: DTP = DTP::new(own_address, None).await?; + dtp.add_rpc("http://0.0.0.0:9000", None, None).await?; let peer_address = SuiAddress::from_str("0xcfed50a652b8fce7a7917a8a736a7c2b1d646ba2")?; diff --git a/crates/dtp-sdk/src/lib.rs b/crates/dtp-sdk/src/lib.rs index bed58a1..03e5b11 100644 --- a/crates/dtp-sdk/src/lib.rs +++ b/crates/dtp-sdk/src/lib.rs @@ -28,6 +28,7 @@ use anyhow::bail; use dtp_core::network::{HostInternal, LocalhostInternal, NetworkManager}; use sui_sdk::types::base_types::{ObjectID, SuiAddress}; +use tokio::time::Duration; #[allow(dead_code)] #[derive(Debug)] @@ -54,12 +55,11 @@ pub struct DTP { impl DTP { pub async fn new( client_address: SuiAddress, - http_url: &str, - ws_url: Option<&str>, + keystore_pathname: Option<&str>, ) -> Result { Ok(DTP { #[allow(clippy::needless_borrow)] - netmgr: NetworkManager::new(client_address, &http_url, ws_url).await?, + netmgr: NetworkManager::new(client_address, keystore_pathname).await?, }) } @@ -80,6 +80,15 @@ impl DTP { self.netmgr.get_client_address() } + pub async fn add_rpc( + &mut self, + http_url: &str, + ws_url: Option<&str>, + request_timeout: Option, + ) -> Result<(), anyhow::Error> { + self.netmgr.add_rpc(http_url, ws_url, request_timeout).await + } + // get_host_by_address // JSON-RPC: Yes // Gas Cost: No @@ -127,6 +136,11 @@ impl DTP { }) } + // create_localhost_on_network + // + // JSON-RPC: Yes + // Gas Cost: Yes + // // Create a new DTP Host on the Sui network. // // The shared object created on the network will be retreiveable @@ -135,10 +149,21 @@ impl DTP { // For the administrator the same object can also be retreiveable // as a read/write DTP::Localhost handle (see get_localhost_xxxx). // - /* - pub async fn create_host_on_network(&self) -> Result { - Ok(()) - }*/ + pub async fn create_localhost_on_network(&self) -> Result { + let (host_internal, localhost_internal) = self.netmgr.create_localhost_on_network().await?; + + // TODO Do a RPC to confirm existence? May be not, have to look into sui_sdk. + + let host = Host { + sui_id: *host_internal.get_sui_id(), + host_internal, + }; + + Ok(Localhost { + host, + localhost_internal, + }) + } // Ping Service // JSON-RPC: Yes diff --git a/crates/dtp-sdk/tests/api_tests.rs b/crates/dtp-sdk/tests/api_tests.rs index 578e582..c589762 100644 --- a/crates/dtp-sdk/tests/api_tests.rs +++ b/crates/dtp-sdk/tests/api_tests.rs @@ -12,15 +12,15 @@ async fn localhost_instantiation_localnet() -> Result<(), anyhow::Error> { let network: SuiNetworkForTest = common::setup_localnet()?; let owner = network.get_client_address(Client::Test1).clone(); - let mut dtp: DTP = DTP::new(owner, "http://0.0.0.0:9000", None).await?; - + let mut dtp: DTP = DTP::new(owner, None).await?; + dtp.add_rpc("http://0.0.0.0:9000", None, None).await?; dtp.set_package_id(network.dtp_package_id); // This won't be needed for mainnet. // Test API to create a Localhost. // - // Localhost is an handle on a Host shared object that can be + // Localhost is an handle on a Sui shared object that can be // administrated only by this sender. - //let localhost = dtp.create_host_on_network().await?; + let _localhost = dtp.create_localhost_on_network().await?; //assert!(network.object_exists(&localhost.get_object_id()).await?); diff --git a/crates/dtp-test-helper/src/lib.rs b/crates/dtp-test-helper/src/lib.rs index dcc8d3a..daed37a 100644 --- a/crates/dtp-test-helper/src/lib.rs +++ b/crates/dtp-test-helper/src/lib.rs @@ -89,8 +89,8 @@ impl SuiNetworkForTest { .push(SuiAddress::from_str(line.as_str())?); } } - dbg!(ret.client_addresses.len()); - assert!(ret.client_addresses.len() == 5); + + assert_eq!(ret.client_addresses.len(), 5); Ok(ret) } diff --git a/move/sources/host.move b/move/sources/host.move index 1b1c335..cadf277 100644 --- a/move/sources/host.move +++ b/move/sources/host.move @@ -175,4 +175,4 @@ module dtp::test_host { test_scenario::end(scenario_val); } -} \ No newline at end of file +}