From d49c636f0fff85b10fef37fd6d8cf86ef9f325b9 Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Mon, 3 Jul 2023 08:09:41 -0400 Subject: [PATCH] Use serai- prefixes on Serai-specific packages Fixes deny.toml, also runs a minor cargo update shrinking the tree. --- Cargo.lock | 576 ++++++++++-------- coordinator/Cargo.toml | 4 +- deny.toml | 14 +- processor/Cargo.toml | 7 +- processor/messages/Cargo.toml | 8 +- substrate/in-instructions/pallet/Cargo.toml | 8 +- .../in-instructions/primitives/Cargo.toml | 4 +- substrate/runtime/Cargo.toml | 8 +- substrate/tokens/pallet/Cargo.toml | 4 +- substrate/tokens/primitives/Cargo.toml | 2 +- substrate/validator-sets/pallet/Cargo.toml | 4 +- .../validator-sets/primitives/Cargo.toml | 2 +- 12 files changed, 347 insertions(+), 294 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ad89271f..7841935d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -407,7 +407,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.21", + "rustix 0.37.22", "slab", "socket2 0.4.9", "waker-fn", @@ -424,13 +424,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "7b2d0f03b3640e3a630367e40c468cb7f309529c708ed1d88597047b0e7c6ef7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -454,7 +454,7 @@ dependencies = [ "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.10", ] [[package]] @@ -603,7 +603,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -1133,7 +1133,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -1252,32 +1252,6 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" -[[package]] -name = "coordinator" -version = "0.1.0" -dependencies = [ - "async-trait", - "blake2", - "ciphersuite", - "flexible-transcript", - "futures", - "hex", - "lazy_static", - "log", - "modular-frost", - "parity-scale-codec", - "processor-messages", - "rand_core 0.6.4", - "schnorr-signatures", - "schnorrkel", - "serai-client", - "serai-db", - "sp-application-crypto", - "tokio", - "tributary-chain", - "zeroize", -] - [[package]] name = "core-foundation" version = "0.9.3" @@ -1630,7 +1604,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -1647,7 +1621,7 @@ checksum = "a26acccf6f445af85ea056362561a24ef56cdc15fcc685f03aec50b9c702cb6d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -1946,7 +1920,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -1999,9 +1973,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65d09067bfacaa79114679b279d7f5885b53295b1e2cfb4e79c8e4bd3d633169" +checksum = "c904bbebf8a5ecde84d81e5d3e5fe085104462a4bec7888608a4b408b117fecf" [[package]] name = "dunce" @@ -2393,7 +2367,7 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.22", + "syn 2.0.23", "toml 0.7.5", "walkdir", ] @@ -2411,7 +2385,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -2437,7 +2411,7 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.22", + "syn 2.0.23", "tempfile", "thiserror", "tiny-keccak", @@ -2966,7 +2940,7 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -2978,7 +2952,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -2988,7 +2962,7 @@ source = "git+https://github.com/serai-dex/substrate#4b81dab20bed5fb232e3daf6290 dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -3055,7 +3029,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7672706608ecb74ab2e055c68327ffc25ae4cac1e12349204fd5fb0f3487cce2" dependencies = [ - "rustix 0.37.21", + "rustix 0.37.22", "windows-sys 0.48.0", ] @@ -3125,7 +3099,7 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.10", "waker-fn", ] @@ -3147,7 +3121,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -3196,7 +3170,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.10", "pin-utils", "slab", ] @@ -3305,6 +3279,26 @@ dependencies = [ "regex", ] +[[package]] +name = "gloo-net" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9902a044653b26b99f7e3693a42f171312d9be8b26b5697bd1e43ad1f8a35e10" +dependencies = [ + "futures-channel", + "futures-core", + "futures-sink", + "gloo-utils", + "js-sys", + "pin-project", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "gloo-timers" version = "0.2.6" @@ -3317,6 +3311,19 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "gloo-utils" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "group" version = "0.12.1" @@ -3557,7 +3564,7 @@ checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.10", ] [[package]] @@ -3600,7 +3607,7 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.10", "socket2 0.4.9", "tokio", "tower-service", @@ -3767,38 +3774,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "in-instructions-pallet" -version = "0.1.0" -dependencies = [ - "frame-support", - "frame-system", - "in-instructions-primitives", - "parity-scale-codec", - "scale-info", - "serai-primitives", - "sp-application-crypto", - "sp-runtime", - "thiserror", - "tokens-pallet", - "validator-sets-pallet", -] - -[[package]] -name = "in-instructions-primitives" -version = "0.1.0" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serai-primitives", - "serde", - "sp-application-crypto", - "sp-runtime", - "sp-std 5.0.0", - "tokens-primitives", - "zeroize", -] - [[package]] name = "indenter" version = "0.3.3" @@ -3914,7 +3889,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" dependencies = [ "hermit-abi", - "rustix 0.38.1", + "rustix 0.38.2", "windows-sys 0.48.0", ] @@ -3929,9 +3904,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "c0aa48fab2893d8a49caa94082ae8488f4e1050d73b367881dcd2198f4199fd8" [[package]] name = "jobserver" @@ -3978,6 +3953,8 @@ dependencies = [ "jsonrpsee-proc-macros", "jsonrpsee-server", "jsonrpsee-types", + "jsonrpsee-wasm-client", + "jsonrpsee-ws-client", "tracing", ] @@ -3987,7 +3964,11 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" dependencies = [ + "anyhow", + "futures-channel", + "futures-timer", "futures-util", + "gloo-net", "http", "jsonrpsee-core", "jsonrpsee-types", @@ -4028,6 +4009,7 @@ dependencies = [ "thiserror", "tokio", "tracing", + "wasm-bindgen-futures", ] [[package]] @@ -4098,6 +4080,29 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-wasm-client" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a77310456f43c6c89bcba1f6b2fc2a28300da7c341f320f5128f8c83cc63232d" +dependencies = [ + "jsonrpsee-client-transport", + "jsonrpsee-core", + "jsonrpsee-types", +] + +[[package]] +name = "jsonrpsee-ws-client" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b83daeecfc6517cfe210df24e570fb06213533dfb990318fae781f4c7119dd9" +dependencies = [ + "http", + "jsonrpsee-client-transport", + "jsonrpsee-core", + "jsonrpsee-types", +] + [[package]] name = "k256" version = "0.13.1" @@ -4899,7 +4904,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" dependencies = [ - "rustix 0.37.21", + "rustix 0.37.22", ] [[package]] @@ -5505,7 +5510,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -5607,7 +5612,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -5892,9 +5897,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.2" +version = "3.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7467bc45fea3d77e829a4df331b9e969e2ec6a4dcd4e126e660f8509b40a475" +checksum = "756d439303e94fae44f288ba881ad29670c65b0c4b0e05674ca81061bb65f2c5" dependencies = [ "arrayvec", "bitvec 1.0.1", @@ -5907,9 +5912,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.2" +version = "3.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9de611934c78014c455793552d0bf7d65a58211179c49996fde925aa667c38" +checksum = "9d884d78fcf214d70b1e239fcd1c6e5e95aa3be1881918da2e488cc946c7a476" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6109,7 +6114,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -6173,7 +6178,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -6196,22 +6201,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e138fdd8263907a2b0e1b4e80b7e58c721126479b6e6eedfb1b402acea7b9bd" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1fef411b303e3e12d534fb6e7852de82da56edd937d895125821fb7c09436c7" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -6222,9 +6227,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -6276,7 +6281,7 @@ dependencies = [ "concurrent-queue", "libc", "log", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.10", "windows-sys 0.48.0", ] @@ -6374,7 +6379,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9825a04601d60621feed79c4e6b56d65db77cdca55cef43b46b0de1096d1c282" dependencies = [ "proc-macro2", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -6442,7 +6447,7 @@ checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -6454,54 +6459,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "processor" -version = "0.1.0" -dependencies = [ - "async-trait", - "bincode", - "bitcoin-serai", - "dalek-ff-group", - "env_logger", - "flexible-transcript", - "frost-schnorrkel", - "futures", - "group 0.13.0", - "hex", - "k256", - "lazy_static", - "log", - "modular-frost", - "monero-serai", - "parity-scale-codec", - "processor-messages", - "rand_chacha 0.3.1", - "rand_core 0.6.4", - "secp256k1", - "serai-client", - "serai-db", - "serde", - "serde_json", - "sp-application-crypto", - "thiserror", - "tokio", - "zeroize", -] - -[[package]] -name = "processor-messages" -version = "0.1.0" -dependencies = [ - "bincode", - "dkg", - "in-instructions-primitives", - "serai-primitives", - "serde", - "tokens-primitives", - "validator-sets-primitives", - "zeroize", -] - [[package]] name = "prometheus" version = "0.13.3" @@ -6869,7 +6826,7 @@ checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -6940,7 +6897,7 @@ dependencies = [ "native-tls", "once_cell", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.10", "rustls 0.21.2", "rustls-pemfile", "serde", @@ -7159,9 +7116,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.21" +version = "0.37.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25693a73057a1b4cb56179dd3c7ea21a7c6c5ee7d85781f5749b46f34b79c" +checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c" dependencies = [ "bitflags 1.3.2", "errno", @@ -7173,9 +7130,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.1" +version = "0.38.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc6396159432b5c8490d4e301d8c705f61860b8b6c863bf79942ce5401968f3" +checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" dependencies = [ "bitflags 2.3.3", "errno", @@ -7407,7 +7364,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -8220,7 +8177,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -8390,11 +8347,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -8646,10 +8603,68 @@ dependencies = [ "zeroize", ] +[[package]] +name = "serai-coordinator" +version = "0.1.0" +dependencies = [ + "async-trait", + "blake2", + "ciphersuite", + "flexible-transcript", + "futures", + "hex", + "lazy_static", + "log", + "modular-frost", + "parity-scale-codec", + "rand_core 0.6.4", + "schnorr-signatures", + "schnorrkel", + "serai-client", + "serai-db", + "serai-processor-messages", + "sp-application-crypto", + "tokio", + "tributary-chain", + "zeroize", +] + [[package]] name = "serai-db" version = "0.1.0" +[[package]] +name = "serai-in-instructions-pallet" +version = "0.1.0" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "serai-in-instructions-primitives", + "serai-primitives", + "serai-tokens-pallet", + "serai-validator-sets-pallet", + "sp-application-crypto", + "sp-runtime", + "thiserror", +] + +[[package]] +name = "serai-in-instructions-primitives" +version = "0.1.0" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serai-primitives", + "serai-tokens-primitives", + "serde", + "sp-application-crypto", + "sp-runtime", + "sp-std 5.0.0", + "zeroize", +] + [[package]] name = "serai-message-queue" version = "0.1.0" @@ -8737,6 +8752,56 @@ dependencies = [ "zeroize", ] +[[package]] +name = "serai-processor" +version = "0.1.0" +dependencies = [ + "async-trait", + "bincode", + "bitcoin-serai", + "dalek-ff-group", + "env_logger", + "flexible-transcript", + "frost-schnorrkel", + "futures", + "group 0.13.0", + "hex", + "jsonrpsee", + "k256", + "lazy_static", + "log", + "modular-frost", + "monero-serai", + "parity-scale-codec", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "secp256k1", + "serai-client", + "serai-db", + "serai-message-queue", + "serai-processor-messages", + "serde", + "serde_json", + "sp-application-crypto", + "thiserror", + "tokio", + "zeroize", +] + +[[package]] +name = "serai-processor-messages" +version = "0.1.0" +dependencies = [ + "bincode", + "dkg", + "serai-in-instructions-primitives", + "serai-primitives", + "serai-tokens-primitives", + "serai-validator-sets-primitives", + "serde", + "zeroize", +] + [[package]] name = "serai-runtime" version = "0.1.0" @@ -8746,7 +8811,6 @@ dependencies = [ "frame-support", "frame-system", "frame-system-rpc-runtime-api", - "in-instructions-pallet", "pallet-assets", "pallet-authority-discovery", "pallet-babe", @@ -8758,7 +8822,10 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "scale-info", + "serai-in-instructions-pallet", "serai-primitives", + "serai-tokens-pallet", + "serai-validator-sets-pallet", "sp-api", "sp-authority-discovery", "sp-block-builder", @@ -8773,15 +8840,69 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "tokens-pallet", - "validator-sets-pallet", +] + +[[package]] +name = "serai-tokens-pallet" +version = "0.1.0" +dependencies = [ + "frame-support", + "frame-system", + "pallet-assets", + "parity-scale-codec", + "scale-info", + "serai-primitives", + "serai-tokens-primitives", +] + +[[package]] +name = "serai-tokens-primitives" +version = "0.1.0" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serai-primitives", + "serde", + "sp-runtime", + "zeroize", +] + +[[package]] +name = "serai-validator-sets-pallet" +version = "0.1.0" +dependencies = [ + "frame-support", + "frame-system", + "hashbrown 0.13.2", + "parity-scale-codec", + "scale-info", + "serai-primitives", + "serai-validator-sets-primitives", + "sp-application-crypto", + "sp-core", + "sp-std 5.0.0", +] + +[[package]] +name = "serai-validator-sets-primitives" +version = "0.1.0" +dependencies = [ + "ciphersuite", + "dkg", + "parity-scale-codec", + "scale-info", + "serai-primitives", + "serde", + "sp-core", + "sp-std 5.0.0", + "zeroize", ] [[package]] name = "serde" -version = "1.0.164" +version = "1.0.165" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "c939f902bb7d0ccc5bce4f03297e161543c2dcb30914faf032c2bd0b7a0d48fc" dependencies = [ "serde_derive", ] @@ -8806,13 +8927,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.165" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "6eaae920e25fffe4019b75ff65e7660e72091e59dd204cb5849bbd6a3fd343d7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -9094,7 +9215,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -9314,7 +9435,7 @@ dependencies = [ "proc-macro2", "quote", "sp-core-hashing 5.0.0", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -9333,7 +9454,7 @@ source = "git+https://github.com/serai-dex/substrate#4b81dab20bed5fb232e3daf6290 dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -9511,7 +9632,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -9703,7 +9824,7 @@ dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -9772,9 +9893,9 @@ dependencies = [ [[package]] name = "ss58-registry" -version = "1.40.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47a8ad42e5fc72d5b1eb104a5546937eaf39843499948bb666d6e93c62423b" +checksum = "bfc443bad666016e012538782d9e3006213a7db43e9fb1dda91657dc06a6fa08" dependencies = [ "Inflector", "num-format", @@ -10093,9 +10214,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.22" +version = "2.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616" +checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" dependencies = [ "proc-macro2", "quote", @@ -10157,7 +10278,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix 0.37.21", + "rustix 0.37.22", "windows-sys 0.48.0", ] @@ -10216,7 +10337,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -10345,31 +10466,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -[[package]] -name = "tokens-pallet" -version = "0.1.0" -dependencies = [ - "frame-support", - "frame-system", - "pallet-assets", - "parity-scale-codec", - "scale-info", - "serai-primitives", - "tokens-primitives", -] - -[[package]] -name = "tokens-primitives" -version = "0.1.0" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serai-primitives", - "serde", - "sp-runtime", - "zeroize", -] - [[package]] name = "tokio" version = "1.29.1" @@ -10383,7 +10479,7 @@ dependencies = [ "mio", "num_cpus", "parking_lot 0.12.1", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.10", "signal-hook-registry", "socket2 0.4.9", "tokio-macros", @@ -10398,7 +10494,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -10451,7 +10547,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.10", "tokio", "tokio-util", ] @@ -10466,7 +10562,7 @@ dependencies = [ "futures-core", "futures-io", "futures-sink", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.10", "tokio", "tracing", ] @@ -10538,7 +10634,7 @@ dependencies = [ "http", "http-body", "http-range-header", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.10", "tower-layer", "tower-service", ] @@ -10563,7 +10659,7 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "log", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.10", "tracing-attributes", "tracing-core", ] @@ -10576,7 +10672,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -10914,37 +11010,6 @@ dependencies = [ "getrandom 0.2.10", ] -[[package]] -name = "validator-sets-pallet" -version = "0.1.0" -dependencies = [ - "frame-support", - "frame-system", - "hashbrown 0.13.2", - "parity-scale-codec", - "scale-info", - "serai-primitives", - "sp-application-crypto", - "sp-core", - "sp-std 5.0.0", - "validator-sets-primitives", -] - -[[package]] -name = "validator-sets-primitives" -version = "0.1.0" -dependencies = [ - "ciphersuite", - "dkg", - "parity-scale-codec", - "scale-info", - "serai-primitives", - "serde", - "sp-core", - "sp-std 5.0.0", - "zeroize", -] - [[package]] name = "valuable" version = "0.1.0" @@ -11042,7 +11107,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", "wasm-bindgen-shared", ] @@ -11076,7 +11141,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -11717,21 +11782,6 @@ dependencies = [ "windows-targets 0.48.1", ] -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-sys" version = "0.45.0" @@ -12068,7 +12118,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] diff --git a/coordinator/Cargo.toml b/coordinator/Cargo.toml index 199d1076..ab0a08da 100644 --- a/coordinator/Cargo.toml +++ b/coordinator/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "coordinator" +name = "serai-coordinator" version = "0.1.0" description = "Serai coordinator to prepare batches and sign transactions" license = "AGPL-3.0-only" @@ -34,7 +34,7 @@ sp-application-crypto = { git = "https://github.com/serai-dex/substrate", defaul serai-db = { path = "../common/db" } -processor-messages = { package = "processor-messages", path = "../processor/messages" } +processor-messages = { package = "serai-processor-messages", path = "../processor/messages" } tributary = { package = "tributary-chain", path = "./tributary" } serai-client = { path = "../substrate/client", features = ["serai"] } diff --git a/deny.toml b/deny.toml index 61d2154f..015970b3 100644 --- a/deny.toml +++ b/deny.toml @@ -45,19 +45,19 @@ default = "deny" exceptions = [ { allow = ["AGPL-3.0"], name = "ethereum-serai" }, - { allow = ["AGPL-3.0"], name = "message-queue" }, + { allow = ["AGPL-3.0"], name = "serai-message-queue" }, - { allow = ["AGPL-3.0"], name = "processor-messages" }, - { allow = ["AGPL-3.0"], name = "processor" }, + { allow = ["AGPL-3.0"], name = "serai-processor-messages" }, + { allow = ["AGPL-3.0"], name = "serai-processor" }, { allow = ["AGPL-3.0"], name = "tributary-chain" }, - { allow = ["AGPL-3.0"], name = "coordinator" }, + { allow = ["AGPL-3.0"], name = "serai-coordinator" }, - { allow = ["AGPL-3.0"], name = "tokens-pallet" }, + { allow = ["AGPL-3.0"], name = "serai-tokens-pallet" }, - { allow = ["AGPL-3.0"], name = "in-instructions-pallet" }, + { allow = ["AGPL-3.0"], name = "serai-in-instructions-pallet" }, - { allow = ["AGPL-3.0"], name = "validator-sets-pallet" }, + { allow = ["AGPL-3.0"], name = "serai-validator-sets-pallet" }, { allow = ["AGPL-3.0"], name = "serai-runtime" }, { allow = ["AGPL-3.0"], name = "serai-node" }, diff --git a/processor/Cargo.toml b/processor/Cargo.toml index aaf00973..19c879f5 100644 --- a/processor/Cargo.toml +++ b/processor/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "processor" +name = "serai-processor" version = "0.1.0" description = "Multichain processor premised on canonicity to reach distributed consensus automatically" license = "AGPL-3.0-only" @@ -57,7 +57,10 @@ tokio = { version = "1", features = ["full"] } serai-db = { path = "../common/db", default-features = false } serai-client = { path = "../substrate/client", default-features = false } -messages = { package = "processor-messages", path = "./messages" } +messages = { package = "serai-processor-messages", path = "./messages" } + +jsonrpsee = { version = "0.16", features = ["client"] } +message-queue = { package = "serai-message-queue", path = "../message-queue" } [dev-dependencies] futures = "0.3" diff --git a/processor/messages/Cargo.toml b/processor/messages/Cargo.toml index 3086a3cd..26699467 100644 --- a/processor/messages/Cargo.toml +++ b/processor/messages/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "processor-messages" +name = "serai-processor-messages" version = "0.1.0" description = "Messages sent and received by the processor" license = "AGPL-3.0-only" @@ -22,6 +22,6 @@ bincode = "1" dkg = { path = "../../crypto/dkg", features = ["serde"] } serai-primitives = { path = "../../substrate/primitives" } -in-instructions-primitives = { path = "../../substrate/in-instructions/primitives" } -tokens-primitives = { path = "../../substrate/tokens/primitives" } -validator-sets-primitives = { path = "../../substrate/validator-sets/primitives" } +serai-in-instructions-primitives = { path = "../../substrate/in-instructions/primitives" } +serai-tokens-primitives = { path = "../../substrate/tokens/primitives" } +serai-validator-sets-primitives = { path = "../../substrate/validator-sets/primitives" } diff --git a/substrate/in-instructions/pallet/Cargo.toml b/substrate/in-instructions/pallet/Cargo.toml index 1dedc2fd..ea9dab34 100644 --- a/substrate/in-instructions/pallet/Cargo.toml +++ b/substrate/in-instructions/pallet/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "in-instructions-pallet" +name = "serai-in-instructions-pallet" version = "0.1.0" description = "Execute calls via In Instructions from unsigned transactions" license = "AGPL-3.0-only" @@ -24,10 +24,10 @@ frame-system = { git = "https://github.com/serai-dex/substrate", default-feature frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false } serai-primitives = { path = "../../primitives", default-features = false } -in-instructions-primitives = { path = "../primitives", default-features = false } +in-instructions-primitives = { package = "serai-in-instructions-primitives", path = "../primitives", default-features = false } -tokens-pallet = { path = "../../tokens/pallet", default-features = false } -validator-sets-pallet = { path = "../../validator-sets/pallet", default-features = false } +tokens-pallet = { package = "serai-tokens-pallet", path = "../../tokens/pallet", default-features = false } +validator-sets-pallet = { package = "serai-validator-sets-pallet", path = "../../validator-sets/pallet", default-features = false } [features] std = [ diff --git a/substrate/in-instructions/primitives/Cargo.toml b/substrate/in-instructions/primitives/Cargo.toml index b97ad5fe..d01fa3d1 100644 --- a/substrate/in-instructions/primitives/Cargo.toml +++ b/substrate/in-instructions/primitives/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "in-instructions-primitives" +name = "serai-in-instructions-primitives" version = "0.1.0" description = "Serai instructions library, enabling encoding and decoding" license = "MIT" @@ -23,7 +23,7 @@ sp-std = { git = "https://github.com/serai-dex/substrate", default-features = fa sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false } serai-primitives = { path = "../../primitives", default-features = false } -tokens-primitives = { path = "../../tokens/primitives", default-features = false } +tokens-primitives = { package = "serai-tokens-primitives", path = "../../tokens/primitives", default-features = false } [features] std = [ diff --git a/substrate/runtime/Cargo.toml b/substrate/runtime/Cargo.toml index 1c21d84d..4bac075d 100644 --- a/substrate/runtime/Cargo.toml +++ b/substrate/runtime/Cargo.toml @@ -39,7 +39,7 @@ frame-support = { git = "https://github.com/serai-dex/substrate", default-featur frame-executive = { git = "https://github.com/serai-dex/substrate", default-features = false } frame-benchmarking = { git = "https://github.com/serai-dex/substrate", default-features = false, optional = true } -serai-primitives = { path = "..//primitives", default-features = false } +serai-primitives = { path = "../primitives", default-features = false } pallet-timestamp = { git = "https://github.com/serai-dex/substrate", default-features = false } @@ -47,10 +47,10 @@ pallet-balances = { git = "https://github.com/serai-dex/substrate", default-feat pallet-assets = { git = "https://github.com/serai-dex/substrate", default-features = false } pallet-transaction-payment = { git = "https://github.com/serai-dex/substrate", default-features = false } -tokens-pallet = { path = "../tokens/pallet", default-features = false } -in-instructions-pallet = { path = "../in-instructions/pallet", default-features = false } +tokens-pallet = { package = "serai-tokens-pallet", path = "../tokens/pallet", default-features = false } +in-instructions-pallet = { package = "serai-in-instructions-pallet", path = "../in-instructions/pallet", default-features = false } -validator-sets-pallet = { path = "../validator-sets/pallet", default-features = false } +validator-sets-pallet = { package = "serai-validator-sets-pallet", path = "../validator-sets/pallet", default-features = false } pallet-session = { git = "https://github.com/serai-dex/substrate", default-features = false } pallet-babe = { git = "https://github.com/serai-dex/substrate", default-features = false } pallet-grandpa = { git = "https://github.com/serai-dex/substrate", default-features = false } diff --git a/substrate/tokens/pallet/Cargo.toml b/substrate/tokens/pallet/Cargo.toml index 9dc2af94..6c0e6595 100644 --- a/substrate/tokens/pallet/Cargo.toml +++ b/substrate/tokens/pallet/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "tokens-pallet" +name = "serai-tokens-pallet" version = "0.1.0" description = "Mint and burn Serai tokens" license = "AGPL-3.0-only" @@ -21,7 +21,7 @@ frame-support = { git = "https://github.com/serai-dex/substrate", default-featur pallet-assets = { git = "https://github.com/serai-dex/substrate", default-features = false } serai-primitives = { path = "../../primitives", default-features = false } -tokens-primitives = { path = "../primitives", default-features = false } +tokens-primitives = { package = "serai-tokens-primitives", path = "../primitives", default-features = false } [features] std = [ diff --git a/substrate/tokens/primitives/Cargo.toml b/substrate/tokens/primitives/Cargo.toml index 60b85c56..0aae37b2 100644 --- a/substrate/tokens/primitives/Cargo.toml +++ b/substrate/tokens/primitives/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "tokens-primitives" +name = "serai-tokens-primitives" version = "0.1.0" description = "Serai tokens primitives" license = "MIT" diff --git a/substrate/validator-sets/pallet/Cargo.toml b/substrate/validator-sets/pallet/Cargo.toml index aaf13fb8..7ecfc0fe 100644 --- a/substrate/validator-sets/pallet/Cargo.toml +++ b/substrate/validator-sets/pallet/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "validator-sets-pallet" +name = "serai-validator-sets-pallet" version = "0.1.0" description = "Validator sets pallet" license = "AGPL-3.0-only" @@ -25,7 +25,7 @@ frame-system = { git = "https://github.com/serai-dex/substrate", default-feature frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false } serai-primitives = { path = "../../primitives", default-features = false } -validator-sets-primitives = { path = "../primitives", default-features = false } +validator-sets-primitives = { package = "serai-validator-sets-primitives", path = "../primitives", default-features = false } [features] std = [ diff --git a/substrate/validator-sets/primitives/Cargo.toml b/substrate/validator-sets/primitives/Cargo.toml index 791fa8c7..cef5df9a 100644 --- a/substrate/validator-sets/primitives/Cargo.toml +++ b/substrate/validator-sets/primitives/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "validator-sets-primitives" +name = "serai-validator-sets-primitives" version = "0.1.0" description = "Primitives for validator sets" license = "MIT"