@@ -2,7 +2,7 @@ use anyhow::{bail, Context, Result};
22use bitcoin:: {
33 consensus:: { deserialize, serialize} ,
44 hashes:: hex:: { FromHex , ToHex } ,
5- BlockHash , Txid ,
5+ BlockHash , OutPoint , Txid ,
66} ;
77use crossbeam_channel:: Receiver ;
88use rayon:: prelude:: * ;
@@ -19,7 +19,7 @@ use crate::{
1919 merkle:: Proof ,
2020 metrics:: { self , Histogram , Metrics } ,
2121 signals:: Signal ,
22- status:: ScriptHashStatus ,
22+ status:: { OutPointStatus , ScriptHashStatus } ,
2323 tracker:: Tracker ,
2424 types:: ScriptHash ,
2525} ;
@@ -34,6 +34,7 @@ const UNSUBSCRIBED_QUERY_MESSAGE: &str = "your wallet uses less efficient method
3434pub struct Client {
3535 tip : Option < BlockHash > ,
3636 scripthashes : HashMap < ScriptHash , ScriptHashStatus > ,
37+ outpoints : HashMap < OutPoint , OutPointStatus > ,
3738}
3839
3940#[ derive( Deserialize ) ]
@@ -183,7 +184,25 @@ impl Rpc {
183184 }
184185 } )
185186 . collect :: < Result < Vec < Value > > > ( )
186- . context ( "failed to update status" ) ?;
187+ . context ( "failed to update scripthash status" ) ?;
188+
189+ notifications. extend (
190+ client
191+ . outpoints
192+ . par_iter_mut ( )
193+ . filter_map ( |( outpoint, status) | -> Option < Result < Value > > {
194+ match self . tracker . update_outpoint_status ( status, & self . daemon ) {
195+ Ok ( true ) => Some ( Ok ( notification (
196+ "blockchain.outpoint.subscribe" ,
197+ & [ json ! ( [ outpoint. txid, outpoint. vout] ) , json ! ( status) ] ,
198+ ) ) ) ,
199+ Ok ( false ) => None , // outpoint status is the same
200+ Err ( e) => Some ( Err ( e) ) ,
201+ }
202+ } )
203+ . collect :: < Result < Vec < Value > > > ( )
204+ . context ( "failed to update scripthash status" ) ?,
205+ ) ;
187206
188207 if let Some ( old_tip) = client. tip {
189208 let new_tip = self . tracker . chain ( ) . tip ( ) ;
@@ -342,6 +361,28 @@ impl Rpc {
342361 } )
343362 }
344363
364+ fn outpoint_subscribe ( & self , client : & mut Client , ( txid, vout) : ( Txid , u32 ) ) -> Result < Value > {
365+ let outpoint = OutPoint :: new ( txid, vout) ;
366+ Ok ( match client. outpoints . entry ( outpoint) {
367+ Entry :: Occupied ( e) => json ! ( e. get( ) ) ,
368+ Entry :: Vacant ( e) => {
369+ let outpoint = OutPoint :: new ( txid, vout) ;
370+ let mut status = OutPointStatus :: new ( outpoint) ;
371+ self . tracker
372+ . update_outpoint_status ( & mut status, & self . daemon ) ?;
373+ json ! ( e. insert( status) )
374+ }
375+ } )
376+ }
377+
378+ fn outpoint_unsubscribe (
379+ & self ,
380+ client : & mut Client ,
381+ ( txid, vout) : ( Txid , u32 ) ,
382+ ) -> Result < Value > {
383+ Ok ( json ! ( client. outpoints. remove( & OutPoint :: new( txid, vout) ) ) )
384+ }
385+
345386 fn new_status ( & self , scripthash : ScriptHash ) -> Result < ScriptHashStatus > {
346387 let mut status = ScriptHashStatus :: new ( scripthash) ;
347388 self . tracker
@@ -525,6 +566,8 @@ impl Rpc {
525566 Params :: Features => self . features ( ) ,
526567 Params :: HeadersSubscribe => self . headers_subscribe ( client) ,
527568 Params :: MempoolFeeHistogram => self . get_fee_histogram ( ) ,
569+ Params :: OutPointSubscribe ( args) => self . outpoint_subscribe ( client, * args) ,
570+ Params :: OutPointUnsubscribe ( args) => self . outpoint_unsubscribe ( client, * args) ,
528571 Params :: PeersSubscribe => Ok ( json ! ( [ ] ) ) ,
529572 Params :: Ping => Ok ( Value :: Null ) ,
530573 Params :: RelayFee => self . relayfee ( ) ,
@@ -547,19 +590,21 @@ enum Params {
547590 Banner ,
548591 BlockHeader ( ( usize , ) ) ,
549592 BlockHeaders ( ( usize , usize ) ) ,
550- TransactionBroadcast ( ( String , ) ) ,
551593 Donation ,
552594 EstimateFee ( ( u16 , ) ) ,
553595 Features ,
554596 HeadersSubscribe ,
555597 MempoolFeeHistogram ,
598+ OutPointSubscribe ( ( Txid , u32 ) ) , // TODO: support spk_hint
599+ OutPointUnsubscribe ( ( Txid , u32 ) ) ,
556600 PeersSubscribe ,
557601 Ping ,
558602 RelayFee ,
559603 ScriptHashGetBalance ( ( ScriptHash , ) ) ,
560604 ScriptHashGetHistory ( ( ScriptHash , ) ) ,
561605 ScriptHashListUnspent ( ( ScriptHash , ) ) ,
562606 ScriptHashSubscribe ( ( ScriptHash , ) ) ,
607+ TransactionBroadcast ( ( String , ) ) ,
563608 TransactionGet ( TxGetArgs ) ,
564609 TransactionGetMerkle ( ( Txid , usize ) ) ,
565610 Version ( ( String , Version ) ) ,
@@ -572,6 +617,8 @@ impl Params {
572617 "blockchain.block.headers" => Params :: BlockHeaders ( convert ( params) ?) ,
573618 "blockchain.estimatefee" => Params :: EstimateFee ( convert ( params) ?) ,
574619 "blockchain.headers.subscribe" => Params :: HeadersSubscribe ,
620+ "blockchain.outpoint.subscribe" => Params :: OutPointSubscribe ( convert ( params) ?) ,
621+ "blockchain.outpoint.unsubscribe" => Params :: OutPointUnsubscribe ( convert ( params) ?) ,
575622 "blockchain.relayfee" => Params :: RelayFee ,
576623 "blockchain.scripthash.get_balance" => Params :: ScriptHashGetBalance ( convert ( params) ?) ,
577624 "blockchain.scripthash.get_history" => Params :: ScriptHashGetHistory ( convert ( params) ?) ,
0 commit comments