pow-migration: Switch back to upstream nimiq_rpc

- Switch back to upstream `nimiq_rpc` now that the upstream
  repository supports the required RPC methods.
- Update `jsonrpsee` dependency from version 0.20.3 to 0.22.1.
- Remove `jsonrpsee` as a direct dependency from the `pow-migration`
  subcrate.

pow-migration/Cargo.toml

@@ -25,7 +25,6 @@ convert_case = "0.6"
 hex = "0.4"
 humantime = "2.1"
 indicatif = "0.17"
-jsonrpsee = { version = "0.20", features = ["client-core"] }
 log = { package = "tracing", version = "0.1", features = ["log"] }
 nimiq-blockchain = { workspace = true }
 nimiq-bls = { workspace = true }
@@ -52,7 +51,7 @@ nimiq-primitives = { workspace = true, features = ["policy"]}
 nimiq-serde = { workspace = true }
 nimiq-transaction = { workspace = true }
 nimiq-vrf = { workspace = true }
-nimiq_rpc = { git = "https://github.com/jsdanielh/rust-client.git" }
+nimiq_rpc = "0.3"
 percentage = "0.1"
 rand = "0.8"
 serde = "1.0"

pow-migration/src/genesis/types.rs

@@ -8,7 +8,7 @@ use crate::state::types::GenesisValidator;
 pub enum Error {
     /// RPC error
     #[error("RPC error: {0}")]
-    Rpc(#[from] jsonrpsee::core::Error),
+    Rpc(#[from] nimiq_rpc::jsonrpsee::core::ClientError),
     /// Unknown PoW block
     #[error("Unknown PoW block")]
     UnknownBlock,

pow-migration/src/history/mod.rs

@@ -15,7 +15,7 @@ use nimiq_primitives::{
 };
 use nimiq_rpc::{
     primitives::{
-        TransactionDetails as PoWTransaction, TransactionSequence as PoWTransactionSequence,
+        TransactionDetails2 as PoWTransaction, TransactionSequence as PoWTransactionSequence,
     },
     Client,
 };
@@ -29,7 +29,7 @@ use thiserror::Error;
 pub enum Error {
     /// RPC error
     #[error("RPC error: {0}")]
-    Rpc(#[from] jsonrpsee::core::Error),
+    Rpc(#[from] nimiq_rpc::jsonrpsee::core::ClientError),
     /// Unknown PoW block
     #[error("Unknown PoW block")]
     UnknownBlock,
@@ -159,7 +159,7 @@ pub async fn get_history_root(
                 }
                 for hash in hashes {
                     log::trace!(hash, "Processing transaction");
-                    let pow_transaction = client.get_transaction_by_hash(&hash).await?;
+                    let pow_transaction = client.get_transaction_by_hash_2(&hash).await?;
                     let pos_transaction = from_pow_transaction(&pow_transaction)?;
                     network_id = pos_transaction.network_id;
 

pow-migration/src/monitor/types.rs

@@ -16,5 +16,5 @@ pub enum ValidatorsReadiness {
 pub enum Error {
     /// RPC error
     #[error("RPC error: {0}")]
-    Rpc(#[from] jsonrpsee::core::Error),
+    Rpc(#[from] nimiq_rpc::jsonrpsee::core::ClientError),
 }

pow-migration/src/state/types.rs

@@ -9,7 +9,7 @@ use thiserror::Error;
 pub enum Error {
     /// RPC error
     #[error("RPC error: {0}")]
-    Rpc(#[from] jsonrpsee::core::Error),
+    Rpc(#[from] nimiq_rpc::jsonrpsee::core::ClientError),
     /// Address parsing error
     #[error("Failed to parse Nimiq address: {0}")]
     Address(#[from] AddressParseError),