diff --git a/node/src/bin/space-cli.rs b/node/src/bin/space-cli.rs index 2f4e99a..66b58f3 100644 --- a/node/src/bin/space-cli.rs +++ b/node/src/bin/space-cli.rs @@ -133,6 +133,16 @@ enum Commands { #[arg(long, short)] fee_rate: Option, }, + /// Renew ownership of a space + #[command(name = "renew", )] + Renew { + /// Spaces to renew + #[arg(display_order = 0)] + spaces: Vec, + /// Fee rate to use in sat/vB + #[arg(long, short)] + fee_rate: Option, + }, /// Estimates the minimum bid needed for a rollout within the given target blocks #[command(name = "estimatebid")] EstimateBid { @@ -554,6 +564,19 @@ async fn handle_commands( ) .await? } + Commands::Renew { spaces, fee_rate } => { + let spaces: Vec<_> = spaces.into_iter().map(|s| normalize_space(&s)).collect(); + cli.send_request( + Some(RpcWalletRequest::Transfer(TransferSpacesParams { + spaces, + to: None, + })), + None, + fee_rate, + false, + ) + .await? + } Commands::Transfer { spaces, to, @@ -563,7 +586,7 @@ async fn handle_commands( cli.send_request( Some(RpcWalletRequest::Transfer(TransferSpacesParams { spaces, - to, + to: Some(to), })), None, fee_rate, @@ -741,6 +764,7 @@ async fn handle_commands( }).await?; println!("{}", serde_json::to_string_pretty(&result).expect("result")); } + } Ok(()) diff --git a/node/src/rpc.rs b/node/src/rpc.rs index 78d76ee..af94ed9 100644 --- a/node/src/rpc.rs +++ b/node/src/rpc.rs @@ -273,16 +273,18 @@ pub enum RpcWalletRequest { Register(RegisterParams), #[serde(rename = "execute")] Execute(ExecuteParams), - #[serde(rename = "sendspaces")] + #[serde(rename = "transfer")] Transfer(TransferSpacesParams), - #[serde(rename = "sendcoins")] + #[serde(rename = "send")] SendCoins(SendCoinsParams), } #[derive(Clone, Serialize, Deserialize)] pub struct TransferSpacesParams { pub spaces: Vec, - pub to: String, + + #[serde(skip_serializing_if = "Option::is_none")] + pub to: Option, } #[derive(Clone, Serialize, Deserialize)] diff --git a/node/src/wallets.rs b/node/src/wallets.rs index 67a9839..53e4f07 100644 --- a/node/src/wallets.rs +++ b/node/src/wallets.rs @@ -116,7 +116,7 @@ pub enum WalletCommand { space: String, msg: protocol::Bytes, resp: crate::rpc::Responder>, - } + }, } #[derive(Debug, Clone, Copy, Serialize, Deserialize, ValueEnum)] @@ -184,7 +184,7 @@ impl RpcWallet { let space = fullspaceout.spaceout.space.as_ref().expect("space").name.to_string(); let foreign_input = fullspaceout.outpoint(); let tx = wallet.buy::(state, &listing, fee_rate)?; - + if !skip_tx_check { let tip = wallet.local_chain().tip().height(); let mut checker = TxChecker::new(state); @@ -205,7 +205,7 @@ impl RpcWallet { // Incrementing last_seen by 1 ensures eviction of older tx // in cases with same-second/last seen replacement. - wallet.apply_unconfirmed_tx_record(tx_record, last_seen+1)?; + wallet.apply_unconfirmed_tx_record(tx_record, last_seen + 1)?; wallet.commit()?; Ok(TxResponse { @@ -248,7 +248,7 @@ impl RpcWallet { // Incrementing last_seen by 1 ensures eviction of older tx // in cases with same-second/last seen replacement. - wallet.apply_unconfirmed_tx_record(tx_record, last_seen+1)?; + wallet.apply_unconfirmed_tx_record(tx_record, last_seen + 1)?; wallet.commit()?; Ok(vec![TxResponse { @@ -573,7 +573,7 @@ impl RpcWallet { fn list_spaces( wallet: &mut SpacesWallet, - state: &mut LiveSnapshot + state: &mut LiveSnapshot, ) -> anyhow::Result { let unspent = wallet.list_unspent_with_details(state)?; let recent_events = wallet.list_recent_events()?; @@ -788,14 +788,20 @@ impl RpcWallet { .filter_map(|space| SLabel::from_str(space).ok()) .collect(); if spaces.len() != params.spaces.len() { - return Err(anyhow!("sendspaces: some names were malformed")); + return Err(anyhow!("transfer: some names were malformed")); } - let recipient = match Self::resolve(network, store, ¶ms.to, true)? { - None => { - return Err(anyhow!("sendspaces: could not resolve '{}'", params.to)) + + let recipient = if let Some(to) = params.to { + match Self::resolve(network, store, &to, true)? { + None => { + return Err(anyhow!("transfer: could not resolve '{}'", to)) + } + Some(r) => Some(r), } - Some(r) => r, + } else { + None }; + for space in spaces { let spacehash = SpaceKey::from(Sha256::hash(space.as_ref())); match store.get_space_info(&spacehash)? { @@ -817,6 +823,18 @@ impl RpcWallet { } Some(full) => { + let recipient = match recipient.clone() { + None => { + SpaceAddress( + Address::from_script( + full.spaceout.script_pubkey.as_script(), + wallet.config.network, + ).expect("valid script") + ) + } + Some(addr) => SpaceAddress(addr) + }; + builder = builder.add_transfer(SpaceTransfer { space: full, recipient: recipient.clone(), @@ -938,7 +956,7 @@ impl RpcWallet { let address = wallet.next_unused_space_address(); spaces.push(SpaceTransfer { space: spaceout, - recipient: address.0, + recipient: address, }); } @@ -1195,7 +1213,7 @@ impl RpcWallet { pub async fn send_sign_message( &self, space: &str, - msg: protocol::Bytes + msg: protocol::Bytes, ) -> anyhow::Result { let (resp, resp_rx) = oneshot::channel(); self.sender @@ -1221,7 +1239,6 @@ impl RpcWallet { } - pub async fn send_force_spend( &self, outpoint: OutPoint, diff --git a/node/tests/integration_tests.rs b/node/tests/integration_tests.rs index 2918e7f..b92d87a 100644 --- a/node/tests/integration_tests.rs +++ b/node/tests/integration_tests.rs @@ -364,7 +364,7 @@ async fn it_should_allow_batch_transfers_refreshing_expire_height( ALICE, vec![RpcWalletRequest::Transfer(TransferSpacesParams { spaces: registered_spaces.clone(), - to: space_address, + to: Some(space_address), })], false, ) @@ -781,7 +781,7 @@ async fn it_should_not_allow_register_or_transfer_to_same_space_multiple_times(r ALICE, vec![RpcWalletRequest::Transfer(TransferSpacesParams { spaces: vec![transfer.clone()], - to: bob_address.clone(), + to: Some(bob_address.clone()), })], false, ).await.expect("send request"); @@ -792,7 +792,7 @@ async fn it_should_not_allow_register_or_transfer_to_same_space_multiple_times(r ALICE, vec![RpcWalletRequest::Transfer(TransferSpacesParams { spaces: vec![transfer], - to: bob_address, + to: Some(bob_address), })], false, ).await.expect_err("there's already a transfer submitted"); @@ -849,7 +849,7 @@ async fn it_can_batch_txs(rig: &TestRig) -> anyhow::Result<()> { vec![ RpcWalletRequest::Transfer(TransferSpacesParams { spaces: vec!["@test9996".to_string()], - to: bob_address, + to: Some(bob_address), }), RpcWalletRequest::Bid(BidParams { name: "@test100".to_string(), diff --git a/wallet/src/builder.rs b/wallet/src/builder.rs index 81a39bc..bd862b9 100644 --- a/wallet/src/builder.rs +++ b/wallet/src/builder.rs @@ -119,7 +119,7 @@ pub struct RegisterRequest { #[derive(Debug, Clone)] pub struct SpaceTransfer { pub space: FullSpaceOut, - pub recipient: Address, + pub recipient: SpaceAddress, } #[derive(Debug, Clone)] @@ -555,17 +555,31 @@ impl Iterator for BuilderIterator<'_> { if !params.transfers.is_empty() { // TODO: resolved address recipient for transfer in ¶ms.transfers { - detailed_tx.add_transfer( - transfer - .space - .spaceout - .space - .as_ref() - .expect("space") - .name - .to_string(), - transfer.recipient.script_pubkey(), - ); + if self.wallet.is_mine(transfer.recipient.script_pubkey()) { + detailed_tx.add_renew( + transfer + .space + .spaceout + .space + .as_ref() + .expect("space") + .name + .to_string(), + transfer.recipient.script_pubkey(), + ); + } else { + detailed_tx.add_transfer( + transfer + .space + .spaceout + .space + .as_ref() + .expect("space") + .name + .to_string(), + transfer.recipient.script_pubkey(), + ); + } } } if !params.sends.is_empty() { @@ -783,7 +797,7 @@ impl Builder { }; transfers.push(SpaceTransfer { space: params.space, - recipient: to.0, + recipient: to, }) } StackRequest::Send(send) => sends.push(send), diff --git a/wallet/src/tx_event.rs b/wallet/src/tx_event.rs index 3a977e1..72667b7 100644 --- a/wallet/src/tx_event.rs +++ b/wallet/src/tx_event.rs @@ -83,6 +83,7 @@ pub enum TxEventKind { Bid, Register, Transfer, + Renew, Send, FeeBump, Buy, @@ -322,6 +323,15 @@ impl TxRecord { }); } + pub fn add_renew(&mut self, space: String, to: ScriptBuf) { + self.events.push(TxEvent { + kind: TxEventKind::Renew, + space: Some(space), + foreign_input: None, + details: Some(serde_json::to_value(TransferEventDetails { to }).expect("json value")), + }); + } + pub fn add_bidout(&mut self, count: usize) { self.events.push(TxEvent { kind: TxEventKind::Bidout, @@ -507,7 +517,8 @@ impl Display for TxEventKind { TxEventKind::Send => "send", TxEventKind::Script => "script", TxEventKind::FeeBump => "fee-bump", - TxEventKind::Buy => "buy" + TxEventKind::Buy => "buy", + TxEventKind::Renew => "renew", }) } } @@ -527,6 +538,7 @@ impl FromStr for TxEventKind { "script" => Ok(TxEventKind::Script), "fee-bump" => Ok(TxEventKind::FeeBump), "buy" => Ok(TxEventKind::Buy), + "renew" => Ok(TxEventKind::Renew), _ => Err("invalid event kind"), } }