RPC types changes/fixes by Boog900 · Pull Request #604 · Cuprate/cuprate

Boog900 · 2026-04-28T22:46:15Z

Will add comments on the main changes.

Boog900 · 2026-04-28T22:52:22Z

        start_height: u64,
    },
    AccessResponseBase {
-        m_blocks_ids: ByteArrayVec<32> = default::<ByteArrayVec<32>>(), "default",


Typo fix The field name in monerod is m_block_ids.

Boog900 · 2026-04-28T22:56:55Z

-#[cfg(feature = "epee")]
-define_request_and_response! {
-    get_o_indexesbin,
-    "cc73fe71162d564ffda8e549b79a350bca53c454" =>
-    core_rpc_server_commands_defs.h => 487..=510,
-    GetOutputIndexes,
-    #[derive(Copy)]
-    Request {
-        txid: [u8; 32],
-    },
-    AccessResponseBase {
-        o_indexes: Vec<u64> as ContainerAsBlob<u64>,
-    }
-}
-


Removed the duplicate of GetOutputIndexes that wrapped o_indexes in ContainerAsBlob<u64>. monerod uses plain KV_SERIALIZE(o_indexes) for both, not KV_SERIALIZE_CONTAINER_POD_AS_BLOB.

Boog900 · 2026-04-28T22:57:32Z

    GetOuts,
    Request {
        outputs: Vec<GetOutputsOut> = default::<Vec<GetOutputsOut>>(), "default",
-        get_txid: bool,


https://github.com/monero-project/monero/blob/cc73fe71162d564ffda8e549b79a350bca53c454/src/rpc/core_rpc_server_commands_defs.h#L533

Boog900 · 2026-04-28T22:59:05Z

+define_request_and_response! {
+    UNDOCUMENTED_METHOD,
+    "cc73fe71162d564ffda8e549b79a350bca53c454" =>
+    core_rpc_server_commands_defs.h => 2522..=2556,
+
+    RpcAccessInfo,
+
+    Request {
+        client: String,
+    },
+
+    AccessResponseBase {
+        hashing_blob: String,
+        seed_height: u64,
+        seed_hash: String,
+        next_seed_hash: String,
+        cookie: u32,
+        diff: u64,
+        credits_per_hash_found: u64,
+        height: u64,
+    }
+}
+
+define_request_and_response! {
+    UNDOCUMENTED_METHOD,
+    "cc73fe71162d564ffda8e549b79a350bca53c454" =>
+    core_rpc_server_commands_defs.h => 2558..=2580,
+
+    RpcAccessSubmitNonce,
+
+    Request {
+        client: String,
+        nonce: u32,
+        cookie: u32,
+    },
+
+    AccessResponseBase {}
+}
+
+define_request_and_response! {
+    UNDOCUMENTED_METHOD,
+    "cc73fe71162d564ffda8e549b79a350bca53c454" =>
+    core_rpc_server_commands_defs.h => 2582..=2604,
+
+    RpcAccessPay,
+
+    Request {
+        client: String,
+        paying_for: String,
+        payment: u64,
+    },
+
+    AccessResponseBase {}
+}
+
+/// An entry in [`RpcAccessTrackingResponse`].
+#[derive(
+    serde::Serialize, serde::Deserialize, Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Hash,
+)]
+pub struct RpcAccessTrackingEntry {
+    rpc: String,
+    count: u64,
+    time: u64,
+    credits: u64,
+}
+
+cuprate_epee_encoding::epee_object!(
+    RpcAccessTrackingEntry,
+    rpc: String,
+    count: u64,
+    time: u64,
+    credits: u64,
+);
+
+define_request_and_response! {
+    UNDOCUMENTED_METHOD,
+    "cc73fe71162d564ffda8e549b79a350bca53c454" =>
+    core_rpc_server_commands_defs.h => 2606..=2644,
+
+    RpcAccessTracking (restricted),
+
+    Request {
+        clear: bool,
+    },
+
+    ResponseBase {
+        data: Vec<RpcAccessTrackingEntry>,
+    }
+}
+
+/// An entry in [`RpcAccessDataResponse`].
+#[derive(
+    serde::Serialize, serde::Deserialize, Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Hash,
+)]
+pub struct RpcAccessDataEntry {
+    client: String,
+    balance: u64,
+    last_update_time: u64,
+    credits_total: u64,
+    credits_used: u64,
+    nonces_good: u64,
+    nonces_stale: u64,
+    nonces_bad: u64,
+    nonces_dupe: u64,
+}
+
+cuprate_epee_encoding::epee_object!(
+    RpcAccessDataEntry,
+    client: String,
+    balance: u64,
+    last_update_time: u64,
+    credits_total: u64,
+    credits_used: u64,
+    nonces_good: u64,
+    nonces_stale: u64,
+    nonces_bad: u64,
+    nonces_dupe: u64,
+);
+
+define_request_and_response! {
+    UNDOCUMENTED_METHOD,
+    "cc73fe71162d564ffda8e549b79a350bca53c454" =>
+    core_rpc_server_commands_defs.h => 2646..=2692,
+
+    RpcAccessData (restricted),
+
+    Request { },
+
+    ResponseBase {
+        entries: Vec<RpcAccessDataEntry>,
+        hashrate: u32,
+    }
+}
+
+define_request_and_response! {
+    UNDOCUMENTED_METHOD,
+    "cc73fe71162d564ffda8e549b79a350bca53c454" =>
+    core_rpc_server_commands_defs.h => 2695..=2720,
+
+    RpcAccessAccount (restricted),
+
+    Request {
+        client: String,
+        delta_balance: i64 = default::<i64>(), "default",
+    },
+
+    ResponseBase {
+        credits: u64,
+    }
+}


These types were all not included with the initial RPC stuff, added them now, although they wont be used.

Boog900 · 2026-04-28T22:59:56Z

+        current_height: u64 = default::<u64>(), "default",
+        #[cfg_attr(feature = "serde", serde(skip_serializing_if = "crate::free::is_zero"))]
+        target_height: u64 = default::<u64>(), "default",


https://github.com/monero-project/monero/blob/cc73fe71162d564ffda8e549b79a350bca53c454/src/rpc/core_rpc_server_commands_defs.h#L2206

Boog900 · 2026-04-28T23:02:42Z

+impl<'de> Deserialize<'de> for JsonRpcRequest {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {


I wanted to avoid this, but I don't think we can. I added 2 step deserialisation as it's the only way to handle the different ways the empty params field can be accepted.

Boog900 · 2026-04-28T23:04:09Z

    SetBans(SetBansRequest),
    GetBans(GetBansRequest),
    Banned(BannedRequest),
-    FlushTransactionPool(FlushTransactionPoolRequest),


This was named wrong: https://github.com/monero-project/monero/blob/367cf79fbc80e7897f3942e5393b61726ae0bd65/src/rpc/core_rpc_server.h#L172

Boog900 · 2026-04-28T23:06:10Z

 #[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
 #[cfg_attr(feature = "serde", serde(untagged))]
 pub enum OtherRequest {
+    GetInfo(GetInfoRequest),


https://github.com/monero-project/monero/blob/367cf79fbc80e7897f3942e5393b61726ae0bd65/src/rpc/core_rpc_server.h#L132

Boog900 · 2026-04-28T23:07:27Z

+fn compress_integer_array(v: &[u64]) -> Vec<u8> {
+    let mut out = Vec::with_capacity(v.len() * 2);
+    for val in v {
+        VarInt::write(val, &mut out).expect("Writing to vec should not fail");
+    }
+    out


https://github.com/monero-project/monero/blob/cc73fe71162d564ffda8e549b79a350bca53c454/src/rpc/core_rpc_server_commands_defs.h#L46

Boog900 · 2026-04-28T23:21:02Z

+        match name {
+            "start_height" => self.start_height = Some(read_epee_value(r)?),
+            "base" => self.base = Some(read_epee_value(r)?),
+            "amount" => self.amount = Some(read_epee_value(r)?),
+            "binary" => self.binary = Some(read_epee_value(r)?),
+            "compress" => self.compress = Some(read_epee_value(r)?),
+            "compressed_data" => self.compressed_data = Some(read_epee_value(r)?),
+            // `distribution` arrives as a raw LE-u64 blob when `binary=true`
+            // (monerod uses `KV_SERIALIZE_CONTAINER_POD_AS_BLOB_N`) or as a
+            // typed EPEE u64 array when `binary=false`. Detect via marker.
+            "distribution" => {
+                let marker = read_marker(r)?;
+                self.distribution = Some(if marker == ContainerAsBlob::<u64>::MARKER {
+                    ContainerAsBlob::<u64>::read(r, &marker)?.into()
+                } else {
+                    Vec::<u64>::read(r, &marker)?
+                });
+            }
+            _ => return Ok(false),
        }


this should match: https://github.com/monero-project/monero/blob/cc73fe71162d564ffda8e549b79a350bca53c454/src/rpc/core_rpc_server_commands_defs.h#L2481

redsh4de · 2026-05-01T20:45:11Z

 #[doc = monero_definition_link!("cc73fe71162d564ffda8e549b79a350bca53c454", "/rpc/core_rpc_server_commands_defs.h", 91)]
 /// RPC miror version.
-pub const CORE_RPC_VERSION_MINOR: u32 = 14;
+pub const CORE_RPC_VERSION_MINOR: u32 = 15;


MINOR bump to 15: the still relevant addition in monerod is monero-project/monero#9383, which adds top_block_hash to /getblocks.bin's response

Should be added with the bump or new issue? theres already a TODO for it fwiw

Ah yeah, this PR is split from my wider RPC changes, where this is already done. I'll leave this for now as it'll be ok once the rest is merged.

SyntheticBird45 · 2026-05-02T23:50:05Z

+            "rpc_access_submit_nonce" => {
+                Self::RpcAccessSubmitNonce(de!(RpcAccessSubmitNonceRequest))
+            }


nits: maybe inhibit rustfmt here to have unified formatting ?

would rather just leave this

SyntheticBird45

first pass. Will approve tomorrow

Boog900 · 2026-05-05T09:41:49Z

fuzz CI error is not due to this PR

RPC types changes/fixes

bb67f1e

github-actions Bot added A-dependency Area: Related to dependencies, or changes to a Cargo.{toml,lock} file. A-workspace Area: Changes to a root workspace file or general repo file. A-rpc Area: Related to RPC. A-binaries Area: Related to binaries. labels Apr 28, 2026

Boog900 commented Apr 28, 2026

View reviewed changes

fmt + fix default

aa678af

github-actions Bot added the A-docs Area: Related to documentation. label Apr 30, 2026

fix hack

58eaed1

Boog900 marked this pull request as ready for review May 1, 2026 17:27

redsh4de reviewed May 1, 2026

View reviewed changes

redsh4de approved these changes May 2, 2026

View reviewed changes

SyntheticBird45 reviewed May 2, 2026

View reviewed changes

move entry types to types.rs

ab51c46

github-actions Bot added the A-types Area: Related to types. label May 5, 2026

update cargo-fuzz

be898d9

github-actions Bot added the A-ci Area: Related to CI. label May 5, 2026

Boog900 requested a review from SyntheticBird45 May 5, 2026 09:41

SyntheticBird45 approved these changes May 5, 2026

View reviewed changes

Boog900 merged commit 704a665 into main May 5, 2026
13 of 19 checks passed

Boog900 deleted the rpc-types-fixes branch May 5, 2026 11:54

		impl<'de> Deserialize<'de> for JsonRpcRequest {
		fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {

Conversation

Boog900 commented Apr 28, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

SyntheticBird45 left a comment

Choose a reason for hiding this comment

Uh oh!

Boog900 commented May 5, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants