Merge pull request #34 from buffrr/more-wallet-stuff

Clean up bid replacements and output selection

Author: buffrr

node/src/bin/space-cli.rs

@@ -9,7 +9,7 @@ use jsonrpsee::{
 };
 use protocol::{
     bitcoin::{Amount, FeeRate, OutPoint, Txid},
-    hasher::{KeyHasher},
+    hasher::KeyHasher,
     slabel::SLabel,
 };
 use serde::{Deserialize, Serialize};
@@ -224,9 +224,7 @@ enum Commands {
     },
     /// DNS encodes the space and calculates the SHA-256 hash
     #[command(name = "hashspace")]
-    HashSpace {
-        space: String,
-    },
+    HashSpace { space: String },
 }
 
 struct SpaceCli {
@@ -262,7 +260,7 @@ impl SpaceCli {
     async fn send_request(
         &self,
         req: Option<RpcWalletRequest>,
-        auction_outputs: Option<u8>,
+        bidouts: Option<u8>,
         fee_rate: Option<u64>,
     ) -> Result<(), ClientError> {
         let fee_rate = fee_rate.map(|fee| FeeRate::from_sat_per_vb(fee).unwrap());
@@ -271,7 +269,7 @@ impl SpaceCli {
             .wallet_send_request(
                 &self.wallet,
                 RpcWalletTxBuilder {
-                    auction_outputs,
+                    bidouts,
                     requests: match req {
                         None => vec![],
                         Some(req) => vec![req],
@@ -395,7 +393,7 @@ async fn handle_commands(
             let response = cli.client.get_spaceout(outpoint).await?;
             println!("{}", serde_json::to_string_pretty(&response)?);
         }
-        Commands::CreateWallet  => {
+        Commands::CreateWallet => {
             cli.client.wallet_create(&cli.wallet).await?;
         }
         Commands::LoadWallet => {
@@ -410,10 +408,11 @@ async fn handle_commands(
         Commands::ExportWallet { path } => {
             let result = cli.client.wallet_export(&cli.wallet).await?;
             let content = serde_json::to_string_pretty(&result).expect("result");
-            fs::write(path, content).map_err(|e|
-                ClientError::Custom(format!("Could not save to path: {}", e.to_string())))?;
+            fs::write(path, content).map_err(|e| {
+                ClientError::Custom(format!("Could not save to path: {}", e.to_string()))
+            })?;
         }
-        Commands::GetWalletInfo  => {
+        Commands::GetWalletInfo => {
             let result = cli.client.wallet_get_info(&cli.wallet).await?;
             println!("{}", serde_json::to_string_pretty(&result).expect("result"));
         }
@@ -533,7 +532,7 @@ async fn handle_commands(
             println!("{}", serde_json::to_string_pretty(&spaces)?);
         }
         Commands::ListBidOuts => {
-            let spaces = cli.client.wallet_list_auction_outputs(&cli.wallet).await?;
+            let spaces = cli.client.wallet_list_bidouts(&cli.wallet).await?;
             println!("{}", serde_json::to_string_pretty(&spaces)?);
         }
         Commands::ListSpaces => {

node/src/rpc.rs

@@ -1,4 +1,3 @@
-use crate::store::RolloutEntry;
 use std::{
     collections::BTreeMap, fs, io::Write, net::SocketAddr, path::PathBuf, str::FromStr, sync::Arc,
 };
@@ -23,8 +22,9 @@ use protocol::{
         OutPoint,
     },
     constants::ChainAnchor,
-    hasher::{BaseHash, SpaceKey},
+    hasher::{BaseHash, KeyHasher, SpaceKey},
     prepare::DataSource,
+    slabel::SLabel,
     FullSpaceOut, SpaceOut,
 };
 use serde::{Deserialize, Serialize};
@@ -33,8 +33,6 @@ use tokio::{
     sync::{broadcast, mpsc, oneshot, RwLock},
     task::JoinSet,
 };
-use protocol::hasher::KeyHasher;
-use protocol::slabel::SLabel;
 use wallet::{
     bdk_wallet as bdk, bdk_wallet::template::Bip86, bitcoin::hashes::Hash, export::WalletExport,
     DoubleUtxo, SpacesWallet, WalletConfig, WalletDescriptors, WalletInfo,
@@ -44,12 +42,11 @@ use crate::{
     config::ExtendedNetwork,
     node::{BlockMeta, TxEntry},
     source::BitcoinRpc,
-    store::{ChainState, LiveSnapshot},
+    store::{ChainState, LiveSnapshot, RolloutEntry, Sha256},
     wallets::{
         AddressKind, Balance, RpcWallet, TxResponse, WalletCommand, WalletOutput, WalletResponse,
     },
 };
-use crate::store::Sha256;
 
 pub(crate) type Responder<T> = oneshot::Sender<T>;
 
@@ -59,8 +56,6 @@ pub struct ServerInfo {
     pub tip: ChainAnchor,
 }
 
-
-
 pub enum ChainStateCommand {
     GetTip {
         resp: Responder<anyhow::Result<ChainAnchor>>,
@@ -107,11 +102,16 @@ pub trait Rpc {
     async fn get_server_info(&self) -> Result<ServerInfo, ErrorObjectOwned>;
 
     #[method(name = "getspace")]
-    async fn get_space(&self, space_or_hash: &str) -> Result<Option<FullSpaceOut>, ErrorObjectOwned>;
+    async fn get_space(
+        &self,
+        space_or_hash: &str,
+    ) -> Result<Option<FullSpaceOut>, ErrorObjectOwned>;
 
     #[method(name = "getspaceowner")]
-    async fn get_space_owner(&self, space_or_hash: &str)
-                             -> Result<Option<OutPoint>, ErrorObjectOwned>;
+    async fn get_space_owner(
+        &self,
+        space_or_hash: &str,
+    ) -> Result<Option<OutPoint>, ErrorObjectOwned>;
 
     #[method(name = "getspaceout")]
     async fn get_spaceout(&self, outpoint: OutPoint) -> Result<Option<SpaceOut>, ErrorObjectOwned>;
@@ -178,19 +178,16 @@ pub trait Rpc {
 
     #[method(name = "walletlistspaces")]
     async fn wallet_list_spaces(&self, wallet: &str)
-                                -> Result<Vec<WalletOutput>, ErrorObjectOwned>;
+        -> Result<Vec<WalletOutput>, ErrorObjectOwned>;
 
     #[method(name = "walletlistunspent")]
     async fn wallet_list_unspent(
         &self,
         wallet: &str,
     ) -> Result<Vec<WalletOutput>, ErrorObjectOwned>;
 
-    #[method(name = "walletlistauctionoutputs")]
-    async fn wallet_list_auction_outputs(
-        &self,
-        wallet: &str,
-    ) -> Result<Vec<DoubleUtxo>, ErrorObjectOwned>;
+    #[method(name = "walletlistbidouts")]
+    async fn wallet_list_bidouts(&self, wallet: &str) -> Result<Vec<DoubleUtxo>, ErrorObjectOwned>;
 
     #[method(name = "walletgetbalance")]
     async fn wallet_get_balance(&self, wallet: &str) -> Result<Balance, ErrorObjectOwned>;
@@ -199,7 +196,7 @@ pub trait Rpc {
 #[derive(Clone, Serialize, Deserialize)]
 pub struct RpcWalletTxBuilder {
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub auction_outputs: Option<u8>,
+    pub bidouts: Option<u8>,
     pub requests: Vec<RpcWalletRequest>,
     pub fee_rate: Option<FeeRate>,
     pub dust: Option<Amount>,
@@ -573,7 +570,10 @@ impl RpcServer for RpcServerImpl {
         Ok(ServerInfo { chain, tip })
     }
 
-    async fn get_space(&self, space_or_hash: &str) -> Result<Option<FullSpaceOut>, ErrorObjectOwned> {
+    async fn get_space(
+        &self,
+        space_or_hash: &str,
+    ) -> Result<Option<FullSpaceOut>, ErrorObjectOwned> {
         let space_hash = get_space_key(space_or_hash)?;
 
         let info = self
@@ -764,13 +764,10 @@ impl RpcServer for RpcServerImpl {
             .map_err(|error| ErrorObjectOwned::owned(-1, error.to_string(), None::<String>))
     }
 
-    async fn wallet_list_auction_outputs(
-        &self,
-        wallet: &str,
-    ) -> Result<Vec<DoubleUtxo>, ErrorObjectOwned> {
+    async fn wallet_list_bidouts(&self, wallet: &str) -> Result<Vec<DoubleUtxo>, ErrorObjectOwned> {
         self.wallet(&wallet)
             .await?
-            .send_list_auction_outputs()
+            .send_list_bidouts()
             .await
             .map_err(|error| ErrorObjectOwned::owned(-1, error.to_string(), None::<String>))
     }
@@ -992,17 +989,17 @@ impl AsyncChainState {
 
 fn get_space_key(space_or_hash: &str) -> Result<SpaceKey, ErrorObjectOwned> {
     if space_or_hash.len() != 64 {
-        return Ok(
-            SpaceKey::from(
-                Sha256::hash(SLabel::try_from(space_or_hash).map_err(|_| {
+        return Ok(SpaceKey::from(Sha256::hash(
+            SLabel::try_from(space_or_hash)
+                .map_err(|_| {
                     ErrorObjectOwned::owned(
                         -1,
                         "expected a space name prefixed with @ or a hex encoded space hash",
                         None::<String>,
                     )
-                })?.as_ref())
-            )
-        );
+                })?
+                .as_ref(),
+        )));
     }
 
     let mut hash = [0u8; 32];

node/src/store.rs

@@ -11,8 +11,14 @@ use std::{
 use anyhow::Result;
 use bincode::{config, Decode, Encode};
 use jsonrpsee::core::Serialize;
+use protocol::{
+    bitcoin::OutPoint,
+    constants::{ChainAnchor, ROLLOUT_BATCH_SIZE},
+    hasher::{BidKey, KeyHash, OutpointKey, SpaceKey},
+    prepare::DataSource,
+    Covenant, FullSpaceOut, SpaceOut,
+};
 use serde::Deserialize;
-use protocol::{bitcoin::OutPoint, constants::{ChainAnchor, ROLLOUT_BATCH_SIZE}, hasher::{BidKey, KeyHash, OutpointKey, SpaceKey}, prepare::DataSource, Covenant, FullSpaceOut, SpaceOut};
 use spacedb::{
     db::{Database, SnapshotIterator},
     fs::FileBackend,
@@ -23,7 +29,7 @@ use spacedb::{
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct RolloutEntry {
     pub space: String,
-    pub value: u32
+    pub value: u32,
 }
 
 type SpaceDb = Database<Sha256Hasher>;
@@ -334,7 +340,13 @@ impl LiveSnapshot {
             let outpoint = self.get_space_outpoint(&spacehash)?;
             if let Some(outpoint) = outpoint {
                 if let Some(spaceout) = self.get_spaceout(&outpoint)? {
-                    spaceouts.push((priority, FullSpaceOut { txid: outpoint.txid, spaceout }));
+                    spaceouts.push((
+                        priority,
+                        FullSpaceOut {
+                            txid: outpoint.txid,
+                            spaceout,
+                        },
+                    ));
                 }
             }
         }