Restore and update listaccounts

client/src/client.rs

@@ -28,7 +28,7 @@ use json::bitcoin::Txid;
 use jsonrpc_async;
 use log::Level::{Debug, Trace, Warn};
 use serde::{self, Serialize};
-use serde_json::{self, json, Map};
+use serde_json::{self, Map};
 
 use crate::error::*;
 use crate::json;
@@ -892,7 +892,7 @@ pub trait RpcApi: Sized {
     ) -> Result<Vec<json::TestMempoolAcceptResult>> {
         let hexes: Vec<serde_json::Value> =
             rawtxs.to_vec().into_iter().map(|r| r.raw_hex().into()).collect();
-        let mut args = [into_json(hexes)?, opt_into_json(max_fee_rate)?];
+        let args = [into_json(hexes)?, opt_into_json(max_fee_rate)?];
         self.call("testmempoolaccept", &args).await
     }
 
@@ -1121,7 +1121,7 @@ pub trait RpcApi: Sized {
         tx: R,
         max_fee_rate: Option<u64>,
     ) -> Result<bitcoin::Txid> {
-        let mut args = [into_json(tx.raw_hex())?, opt_into_json(max_fee_rate)?];
+        let args = [into_json(tx.raw_hex())?, opt_into_json(max_fee_rate)?];
         self.call("sendrawtransaction", &args).await
     }
 

client/src/lib.rs

@@ -31,7 +31,7 @@ use json::bitcoin::consensus::{Decodable, ReadExt};
 use json::bitcoin::hex::HexToBytesIter;
 
 mod client;
-mod error;
+pub mod error;
 mod queryable;
 mod traits;
 

client/src/traits/account.rs

@@ -48,13 +48,13 @@ pub trait AccountRPC: RpcApi {
         owner: Option<String>,
         options: AccountHistoryOptions,
     ) -> Result<Vec<AccountHistory>>;
-    // TODO handle AccountResult enum type
-    // async fn list_accounts(
-    //     &self,
-    //     pagination: Option<ListAccountPagination>,
-    //     verbose: Option<bool>,
-    //     options: Option<ListAccountOptions>,
-    // ) -> Result<Vec<AccountResult<String, String>>>;
+    async fn list_accounts(
+        &self,
+        pagination: Option<ListAccountsPagination>,
+        verbose: Option<bool>,
+        indexed_amounts: Option<bool>,
+        is_mine_only: Option<bool>,
+    ) -> Result<Vec<AccountsResult<AccountsResultOwner, String>>>;
     async fn list_burn_history(&self, options: BurnHistoryOptions) -> Result<Vec<BurnHistory>>;
     async fn list_community_balances(&self) -> Result<CommunityBalanceData>;
     async fn list_pending_dusd_swaps(&self) -> Result<Vec<DusdSwapsInfo>>;
@@ -157,17 +157,24 @@ impl AccountRPC for Client {
     ) -> Result<Vec<AccountHistory>> {
         self.call("listaccounthistory", &[into_json(owner)?, into_json(options)?]).await
     }
-    // async fn list_accounts(
-    //     &self,
-    //     pagination: Option<ListAccountPagination>,
-    //     verbose: Option<bool>,
-    //     options: Option<ListAccountOptions>,
-    // ) -> Result<Vec<AccountResult<String, String>>> {
-    //     self.call(
-    //         "listaccounts",
-    //         &[into_json(pagination)?, into_json(verbose)?, into_json(options)?],
-    //     )
-    // }
+    async fn list_accounts(
+        &self,
+        pagination: Option<ListAccountsPagination>,
+        verbose: Option<bool>,
+        indexed_amounts: Option<bool>,
+        is_mine_only: Option<bool>,
+    ) -> Result<Vec<AccountsResult<AccountsResultOwner, String>>> {
+        self.call(
+            "listaccounts",
+            &[
+                into_json(pagination)?,
+                into_json(verbose)?,
+                into_json(indexed_amounts)?,
+                into_json(is_mine_only)?,
+            ],
+        )
+        .await
+    }
     async fn list_burn_history(&self, options: BurnHistoryOptions) -> Result<Vec<BurnHistory>> {
         self.call("listburnhistory", &[into_json(options)?]).await
     }

json/src/account.rs

@@ -9,7 +9,7 @@ pub enum OwnerType {
     All,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum Format {
     Id,
@@ -30,48 +30,50 @@ pub enum TransferDomainType {
     Evm = 3,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ListAccountPagination {
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ListAccountsPagination {
     start: Option<String>,
     including_start: Option<bool>,
     limit: Option<u64>,
 }
 
+impl ListAccountsPagination {
+    pub fn new(start: Option<String>, including_start: Option<bool>, limit: Option<u64>) -> Self {
+        Self {
+            start,
+            including_start,
+            limit,
+        }
+    }
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 pub struct GetAccountPagination {
     start: Option<u32>,
     including_start: Option<bool>,
     limit: Option<u64>,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct AccountResult<T, U> {
+#[derive(Debug, Serialize, Deserialize, Eq, PartialEq)]
+pub struct AccountsResult<T, U> {
     key: String,
     owner: T,
     amount: U,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, Eq, PartialEq)]
 #[serde(rename_all = "camelCase")]
-pub struct AccountOwner {
+pub struct AccountsResultOwner {
     asm: String,
     hex: String,
-    req_sigs: i64,
+    req_sigs: Option<u64>,
     r#type: String,
-    addresses: Vec<String>,
+    addresses: Option<Vec<String>>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct AccountAmount(pub HashMap<String, f64>);
 
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ListAccountOptions {
-    indexed_amounts: Option<bool>,
-    is_mine_only: Option<bool>,
-}
-
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct GetAccountOptions {
@@ -107,7 +109,7 @@ pub struct AccountHistory {
     pub amounts: Vec<String>,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct AccountHistoryOptions {
     max_block_height: Option<u64>,