fix(rpc): verify and adjust common node API parameter names 2/4 (#5284)

ChainSafe · Feb 13, 2025 · c019d5f · c019d5f
1 parent 4c12c3e
commit c019d5f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 26 deletions.
diff --git a/src/rpc/methods/gas.rs b/src/rpc/methods/gas.rs
@@ -29,7 +29,7 @@ const MIN_GAS_PREMIUM: f64 = 100000.0;
 pub enum GasEstimateFeeCap {}
 impl RpcMethod<3> for GasEstimateFeeCap {
     const NAME: &'static str = "Filecoin.GasEstimateFeeCap";
-    const PARAM_NAMES: [&'static str; 3] = ["message", "max_queue_blocks", "tipset_key"];
+    const PARAM_NAMES: [&'static str; 3] = ["message", "maxQueueBlocks", "tipsetKey"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Read;
 
@@ -68,7 +68,12 @@ fn estimate_fee_cap<DB: Blockstore>(
 pub enum GasEstimateGasPremium {}
 impl RpcMethod<4> for GasEstimateGasPremium {
     const NAME: &'static str = "Filecoin.GasEstimateGasPremium";
-    const PARAM_NAMES: [&'static str; 4] = ["nblocksincl", "sender", "gas_limit", "tipset_key"];
+    const PARAM_NAMES: [&'static str; 4] = [
+        "numberOfBlocksToInclude",
+        "senderAddress",
+        "gasLimit",
+        "tipsetKey",
+    ];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Read;
 
@@ -166,7 +171,7 @@ pub async fn estimate_gas_premium<DB: Blockstore>(
 pub enum GasEstimateGasLimit {}
 impl RpcMethod<2> for GasEstimateGasLimit {
     const NAME: &'static str = "Filecoin.GasEstimateGasLimit";
-    const PARAM_NAMES: [&'static str; 2] = ["msg", "tsk"];
+    const PARAM_NAMES: [&'static str; 2] = ["message", "tipsetKey"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Read;
 
@@ -261,7 +266,7 @@ impl GasEstimateGasLimit {
 pub enum GasEstimateMessageGas {}
 impl RpcMethod<3> for GasEstimateMessageGas {
     const NAME: &'static str = "Filecoin.GasEstimateMessageGas";
-    const PARAM_NAMES: [&'static str; 3] = ["msg", "spec", "tsk"];
+    const PARAM_NAMES: [&'static str; 3] = ["message", "messageSendSpec", "tipsetKey"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Read;
 

diff --git a/src/rpc/methods/net.rs b/src/rpc/methods/net.rs
@@ -133,7 +133,7 @@ impl RpcMethod<0> for NetInfo {
 pub enum NetConnect {}
 impl RpcMethod<1> for NetConnect {
     const NAME: &'static str = "Filecoin.NetConnect";
-    const PARAM_NAMES: [&'static str; 1] = ["info"];
+    const PARAM_NAMES: [&'static str; 1] = ["peerAddressInfo"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Write;
 
@@ -166,7 +166,7 @@ impl RpcMethod<1> for NetConnect {
 pub enum NetDisconnect {}
 impl RpcMethod<1> for NetDisconnect {
     const NAME: &'static str = "Filecoin.NetDisconnect";
-    const PARAM_NAMES: [&'static str; 1] = ["id"];
+    const PARAM_NAMES: [&'static str; 1] = ["peerId"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Write;
 
@@ -175,9 +175,9 @@ impl RpcMethod<1> for NetDisconnect {
 
     async fn handle(
         ctx: Ctx<impl Blockstore>,
-        (id,): Self::Params,
+        (peer_id,): Self::Params,
     ) -> Result<Self::Ok, ServerError> {
-        let peer_id = PeerId::from_str(&id)?;
+        let peer_id = PeerId::from_str(&peer_id)?;
 
         let (tx, rx) = flume::bounded(1);
         let req = NetworkMessage::JSONRPCRequest {
@@ -194,7 +194,7 @@ impl RpcMethod<1> for NetDisconnect {
 pub enum NetAgentVersion {}
 impl RpcMethod<1> for NetAgentVersion {
     const NAME: &'static str = "Filecoin.NetAgentVersion";
-    const PARAM_NAMES: [&'static str; 1] = ["id"];
+    const PARAM_NAMES: [&'static str; 1] = ["peerId"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Read;
 
@@ -203,9 +203,9 @@ impl RpcMethod<1> for NetAgentVersion {
 
     async fn handle(
         ctx: Ctx<impl Blockstore>,
-        (id,): Self::Params,
+        (peer_id,): Self::Params,
     ) -> Result<Self::Ok, ServerError> {
-        let peer_id = PeerId::from_str(&id)?;
+        let peer_id = PeerId::from_str(&peer_id)?;
         let (tx, rx) = flume::bounded(1);
         ctx.network_send()
             .send_async(NetworkMessage::JSONRPCRequest {
@@ -255,7 +255,7 @@ impl RpcMethod<0> for NetVersion {
 pub enum NetProtectAdd {}
 impl RpcMethod<1> for NetProtectAdd {
     const NAME: &'static str = "Filecoin.NetProtectAdd";
-    const PARAM_NAMES: [&'static str; 1] = ["peer_ids"];
+    const PARAM_NAMES: [&'static str; 1] = ["peerIdList"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Admin;
 
@@ -309,7 +309,7 @@ impl RpcMethod<0> for NetProtectList {
 pub enum NetProtectRemove {}
 impl RpcMethod<1> for NetProtectRemove {
     const NAME: &'static str = "Filecoin.NetProtectRemove";
-    const PARAM_NAMES: [&'static str; 1] = ["peer_ids"];
+    const PARAM_NAMES: [&'static str; 1] = ["peerIdList"];
     const API_PATHS: ApiPaths = ApiPaths::Both;
     const PERMISSION: Permission = Permission::Admin;
 

diff --git a/src/rpc/methods/state.rs b/src/rpc/methods/state.rs
@@ -79,7 +79,7 @@ const INITIAL_PLEDGE_DEN: u64 = 100;
 pub enum StateCall {}
 impl RpcMethod<2> for StateCall {
     const NAME: &'static str = "Filecoin.StateCall";
-    const PARAM_NAMES: [&'static str; 2] = ["message", "tsk"];
+    const PARAM_NAMES: [&'static str; 2] = ["message", "tipsetKey"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Read;
 
@@ -161,7 +161,7 @@ pub enum StateAccountKey {}
 
 impl RpcMethod<2> for StateAccountKey {
     const NAME: &'static str = "Filecoin.StateAccountKey";
-    const PARAM_NAMES: [&'static str; 2] = ["address", "tipset_key"];
+    const PARAM_NAMES: [&'static str; 2] = ["address", "tipsetKey"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Read;
 
@@ -256,7 +256,7 @@ pub enum StateGetActor {}
 
 impl RpcMethod<2> for StateGetActor {
     const NAME: &'static str = "Filecoin.StateGetActor";
-    const PARAM_NAMES: [&'static str; 2] = ["address", "tipset_key"];
+    const PARAM_NAMES: [&'static str; 2] = ["address", "tipsetKey"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Read;
 
@@ -1528,7 +1528,7 @@ pub enum StateCirculatingSupply {}
 
 impl RpcMethod<1> for StateCirculatingSupply {
     const NAME: &'static str = "Filecoin.StateCirculatingSupply";
-    const PARAM_NAMES: [&'static str; 1] = ["tipset_key"];
+    const PARAM_NAMES: [&'static str; 1] = ["tipsetKey"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Read;
 
@@ -1714,7 +1714,7 @@ pub enum StateDealProviderCollateralBounds {}
 
 impl RpcMethod<3> for StateDealProviderCollateralBounds {
     const NAME: &'static str = "Filecoin.StateDealProviderCollateralBounds";
-    const PARAM_NAMES: [&'static str; 3] = ["size", "verified", "tipset_key"];
+    const PARAM_NAMES: [&'static str; 3] = ["size", "verified", "tipsetKey"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Read;
 
@@ -2305,7 +2305,7 @@ pub enum StateGetClaim {}
 
 impl RpcMethod<3> for StateGetClaim {
     const NAME: &'static str = "Filecoin.StateGetClaim";
-    const PARAM_NAMES: [&'static str; 3] = ["address", "claim_id", "tipset_key"];
+    const PARAM_NAMES: [&'static str; 3] = ["address", "claimId", "tipsetKey"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Read;
 
@@ -2325,7 +2325,7 @@ pub enum StateGetClaims {}
 
 impl RpcMethod<2> for StateGetClaims {
     const NAME: &'static str = "Filecoin.StateGetClaims";
-    const PARAM_NAMES: [&'static str; 2] = ["address", "tipset_key"];
+    const PARAM_NAMES: [&'static str; 2] = ["address", "tipsetKey"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Read;
 
@@ -2359,7 +2359,7 @@ pub enum StateGetAllClaims {}
 
 impl RpcMethod<1> for StateGetAllClaims {
     const NAME: &'static str = "Filecoin.StateGetAllClaims";
-    const PARAM_NAMES: [&'static str; 1] = ["tipset_key"];
+    const PARAM_NAMES: [&'static str; 1] = ["tipsetKey"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Read;
 
@@ -2379,7 +2379,7 @@ pub enum StateGetAllocation {}
 
 impl RpcMethod<3> for StateGetAllocation {
     const NAME: &'static str = "Filecoin.StateGetAllocation";
-    const PARAM_NAMES: [&'static str; 3] = ["address", "allocation_id", "tipset_key"];
+    const PARAM_NAMES: [&'static str; 3] = ["address", "allocationId", "tipsetKey"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Read;
 
@@ -2401,7 +2401,7 @@ pub enum StateGetAllocations {}
 
 impl RpcMethod<2> for StateGetAllocations {
     const NAME: &'static str = "Filecoin.StateGetAllocations";
-    const PARAM_NAMES: [&'static str; 2] = ["address", "tipset_key"];
+    const PARAM_NAMES: [&'static str; 2] = ["address", "tipsetKey"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Read;
 
@@ -2568,7 +2568,7 @@ pub enum StateGetAllAllocations {}
 
 impl RpcMethod<1> for crate::rpc::prelude::StateGetAllAllocations {
     const NAME: &'static str = "Filecoin.StateGetAllAllocations";
-    const PARAM_NAMES: [&'static str; 1] = ["tipset_key"];
+    const PARAM_NAMES: [&'static str; 1] = ["tipsetKey"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Read;
 
@@ -2588,7 +2588,7 @@ pub enum StateGetAllocationIdForPendingDeal {}
 
 impl RpcMethod<2> for StateGetAllocationIdForPendingDeal {
     const NAME: &'static str = "Filecoin.StateGetAllocationIdForPendingDeal";
-    const PARAM_NAMES: [&'static str; 2] = ["deal_id", "tipset_key"];
+    const PARAM_NAMES: [&'static str; 2] = ["dealId", "tipsetKey"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Read;
 
@@ -2621,7 +2621,7 @@ pub enum StateGetAllocationForPendingDeal {}
 
 impl RpcMethod<2> for StateGetAllocationForPendingDeal {
     const NAME: &'static str = "Filecoin.StateGetAllocationForPendingDeal";
-    const PARAM_NAMES: [&'static str; 2] = ["deal_id", "tipset_key"];
+    const PARAM_NAMES: [&'static str; 2] = ["dealId", "tipsetKey"];
     const API_PATHS: ApiPaths = ApiPaths::V1;
     const PERMISSION: Permission = Permission::Read;