Merge branch 'main' into user-book

Author: hinto-janai

Cargo.lock

@@ -12,7 +12,6 @@ members = [
 
 	# Net
 	"net/epee-encoding",
-	"net/fixed-bytes",
 	"net/levin",
 	"net/wire",
 
@@ -30,6 +29,11 @@ members = [
 	"storage/txpool",
 	"storage/database",
 
+	# Types
+	"types/types",
+	"types/hex",
+	"types/fixed-bytes",
+
 	# RPC
 	"rpc/json-rpc",
 	"rpc/types",
@@ -44,7 +48,6 @@ members = [
 	"helper",
 	"pruning",
 	"test-utils",
-	"types",
 ]
 
 [profile.release]
@@ -77,22 +80,23 @@ cuprate-consensus-context = { path = "consensus/context",         default-featur
 cuprate-cryptonight       = { path = "cryptonight",               default-features = false }
 cuprate-helper            = { path = "helper",                    default-features = false }
 cuprate-epee-encoding     = { path = "net/epee-encoding",         default-features = false }
-cuprate-fixed-bytes       = { path = "net/fixed-bytes",           default-features = false }
 cuprate-levin             = { path = "net/levin",                 default-features = false }
 cuprate-wire              = { path = "net/wire",                  default-features = false }
+cuprate-async-buffer      = { path = "p2p/async-buffer",          default-features = false }
 cuprate-p2p               = { path = "p2p/p2p",                   default-features = false }
 cuprate-p2p-core          = { path = "p2p/p2p-core",              default-features = false }
 cuprate-p2p-bucket        = { path = "p2p/p2p-bucket",            default-features = false }
 cuprate-dandelion-tower   = { path = "p2p/dandelion-tower",       default-features = false }
-cuprate-async-buffer      = { path = "p2p/async-buffer",          default-features = false }
 cuprate-address-book      = { path = "p2p/address-book",          default-features = false }
 cuprate-blockchain        = { path = "storage/blockchain",        default-features = false }
 cuprate-database          = { path = "storage/database",          default-features = false }
 cuprate-database-service  = { path = "storage/service",           default-features = false }
 cuprate-txpool            = { path = "storage/txpool",            default-features = false }
 cuprate-pruning           = { path = "pruning",                   default-features = false }
 cuprate-test-utils        = { path = "test-utils",                default-features = false }
-cuprate-types             = { path = "types",                     default-features = false }
+cuprate-types             = { path = "types/types",               default-features = false }
+cuprate-hex               = { path = "types/hex",                 default-features = false }
+cuprate-fixed-bytes       = { path = "types/fixed-bytes",         default-features = false }
 cuprate-json-rpc          = { path = "rpc/json-rpc",              default-features = false }
 cuprate-rpc-types         = { path = "rpc/types",                 default-features = false }
 cuprate-rpc-interface     = { path = "rpc/interface",             default-features = false }
@@ -121,6 +125,7 @@ futures               = { version = "0.3", default-features = false }
 hex                   = { version = "0.4", default-features = false }
 hex-literal           = { version = "0.4", default-features = false }
 indexmap              = { version = "2", default-features = false }
+monero-address        = { git = "https://github.com/Cuprate/serai.git", rev = "e6ae8c2", default-features = false }
 monero-serai          = { git = "https://github.com/Cuprate/serai.git", rev = "e6ae8c2", default-features = false }
 nu-ansi-term          = { version = "0.46", default-features = false }
 paste                 = { version = "1", default-features = false }
@@ -211,7 +216,6 @@ missing_transmute_annotations = "deny"
 mut_mut = "deny"
 needless_bitwise_bool = "deny"
 needless_character_iteration = "deny"
-needless_continue = "deny"
 needless_for_each = "deny"
 needless_maybe_sized = "deny"
 needless_raw_string_hashes = "deny"

Cargo.toml

@@ -9,32 +9,34 @@ repository = "https://github.com/Cuprate/cuprate/tree/main/binaries/cuprated"
 
 [dependencies]
 # TODO: after v1.0.0, remove unneeded dependencies.
-cuprate-constants         = { workspace = true, features = ["build"] }
-cuprate-consensus         = { workspace = true }
-cuprate-fast-sync         = { workspace = true }
+cuprate-address-book      = { workspace = true }
+cuprate-async-buffer      = { workspace = true }
+cuprate-blockchain        = { workspace = true }
 cuprate-consensus-context = { workspace = true }
 cuprate-consensus-rules   = { workspace = true }
+cuprate-consensus         = { workspace = true }
+cuprate-constants         = { workspace = true, features = ["build", "rpc"] }
 cuprate-cryptonight       = { workspace = true }
-cuprate-helper            = { workspace = true, features = ["std", "serde", "time"] }
+cuprate-dandelion-tower   = { workspace = true, features = ["txpool"] }
+cuprate-database-service  = { workspace = true, features = ["serde"] }
+cuprate-database          = { workspace = true, features = ["serde"] }
 cuprate-epee-encoding     = { workspace = true }
+cuprate-fast-sync         = { workspace = true }
 cuprate-fixed-bytes       = { workspace = true }
+cuprate-helper            = { workspace = true, features = ["std", "serde", "time"] }
+cuprate-hex               = { workspace = true }
+cuprate-json-rpc          = { workspace = true }
 cuprate-levin             = { workspace = true }
-cuprate-wire              = { workspace = true }
-cuprate-p2p               = { workspace = true }
 cuprate-p2p-core          = { workspace = true }
-cuprate-dandelion-tower   = { workspace = true, features = ["txpool"] }
-cuprate-async-buffer      = { workspace = true }
-cuprate-address-book      = { workspace = true }
-cuprate-blockchain        = { workspace = true }
-cuprate-database-service  = { workspace = true, features = ["serde"] }
-cuprate-txpool            = { workspace = true }
-cuprate-database          = { workspace = true, features = ["serde"] }
+cuprate-p2p               = { workspace = true }
 cuprate-pruning           = { workspace = true }
-cuprate-test-utils        = { workspace = true }
-cuprate-types             = { workspace = true }
-cuprate-json-rpc          = { workspace = true }
 cuprate-rpc-interface     = { workspace = true }
-cuprate-rpc-types         = { workspace = true }
+cuprate-rpc-types         = { workspace = true, features = ["from"] }
+cuprate-test-utils        = { workspace = true }
+cuprate-txpool            = { workspace = true }
+cuprate-types             = { workspace = true, features = ["json"] }
+cuprate-wire              = { workspace = true }
+
 
 # TODO: after v1.0.0, remove unneeded dependencies.
 anyhow                = { workspace = true }
@@ -56,6 +58,7 @@ futures               = { workspace = true }
 hex                   = { workspace = true }
 hex-literal           = { workspace = true }
 indexmap              = { workspace = true }
+monero-address        = { workspace = true }
 monero-serai          = { workspace = true }
 nu-ansi-term          = { workspace = true }
 paste                 = { workspace = true }
@@ -67,6 +70,7 @@ rayon                 = { workspace = true }
 serde_bytes           = { workspace = true }
 serde_json            = { workspace = true }
 serde                 = { workspace = true }
+strum                 = { workspace = true }
 thiserror             = { workspace = true }
 thread_local          = { workspace = true }
 tokio-util            = { workspace = true, features = ["rt"] }

binaries/cuprated/Cargo.toml

@@ -2,11 +2,9 @@
 //!
 //! Will contain the code to initiate the RPC and a request handler.
 
-mod bin;
 mod constants;
-mod handler;
-mod json;
-mod other;
-mod request;
+mod handlers;
+mod rpc_handler;
+mod service;
 
-pub use handler::CupratedRpcHandler;
+pub use rpc_handler::CupratedRpcHandler;

binaries/cuprated/src/blockchain/fast_sync/fast_sync_hashes.bin

@@ -3,3 +3,6 @@
 /// The string message used in RPC response fields for when
 /// `cuprated` does not support a field that `monerod` has.
 pub(super) const FIELD_NOT_SUPPORTED: &str = "`cuprated` does not support this field.";
+
+/// The error message returned when an unsupported RPC call is requested.
+pub(super) const UNSUPPORTED_RPC_CALL: &str = "This RPC call is not supported by Cuprate.";

binaries/cuprated/src/rpc.rs

@@ -0,0 +1,18 @@
+//! RPC handler functions.
+//!
+//! These are the glue (async) functions that connect all the
+//! internal `cuprated` functions and fulfill the request.
+//!
+//! - JSON-RPC handlers are in [`json_rpc`]
+//! - Other JSON endpoint handlers are in [`other_json`]
+//! - Other binary endpoint handlers are in [`bin`]
+//!
+//! - [`helper`] contains helper functions used by many handlers
+//! - [`shared`] contains shared functions used by multiple handlers
+
+pub(super) mod bin;
+pub(super) mod json_rpc;
+pub(super) mod other_json;
+
+mod helper;
+mod shared;