Update outpoint mapping for ptrs

Author: buffrr

client/src/client.rs

@@ -15,7 +15,7 @@ use spaces_protocol::{
     validate::{TxChangeSet, UpdateKind, Validator},
     Bytes, Covenant, FullSpaceOut, RevokeReason, SpaceOut,
 };
-use spaces_ptr::{CommitmentKey, RegistryKey, RegistrySptrKey};
+use spaces_ptr::{CommitmentKey, RegistryKey, RegistrySptrKey, PtrOutpointKey};
 use spaces_wallet::bitcoin::{Network, Transaction};
 
 use crate::{
@@ -348,7 +348,7 @@ impl Client {
             }
 
             // Outpoint => PtrOut
-            let outpoint_key = OutpointKey::from_outpoint::<Sha256>(outpoint);
+            let outpoint_key = PtrOutpointKey::from_outpoint::<Sha256>(outpoint);
             state.insert_ptrout(outpoint_key, create);
         }
     }

client/src/rpc.rs

@@ -48,7 +48,7 @@ use tokio::{
     task::JoinSet,
 };
 use spaces_protocol::hasher::Hash;
-use spaces_ptr::{PtrSource, FullPtrOut, PtrOut, Commitment, RegistryKey, CommitmentKey, RegistrySptrKey};
+use spaces_ptr::{PtrSource, FullPtrOut, PtrOut, Commitment, RegistryKey, CommitmentKey, RegistrySptrKey, PtrOutpointKey};
 use spaces_ptr::sptr::Sptr;
 use spaces_wallet::bitcoin::hashes::sha256;
 use crate::auth::BasicAuthLayer;
@@ -1853,7 +1853,7 @@ impl AsyncChainState {
         outpoint: OutPoint,
         prefer_recent: bool,
     ) -> anyhow::Result<ProofResult> {
-        let key = OutpointKey::from_outpoint::<Sha256>(outpoint);
+        let key = PtrOutpointKey::from_outpoint::<Sha256>(outpoint);
 
         let proof = if !prefer_recent {
             let ptrout = match state.get_ptrout(&outpoint)? {

client/src/store/chain.rs

@@ -10,7 +10,7 @@ use spaces_protocol::hasher::{BaseHash, BidKey, OutpointKey, SpaceKey};
 use spaces_protocol::prepare::SpacesSource;
 use spaces_protocol::{FullSpaceOut, SpaceOut};
 use spaces_protocol::slabel::SLabel;
-use spaces_ptr::{Commitment, CommitmentKey, FullPtrOut, PtrOut, PtrSource, RegistryKey, RegistrySptrKey};
+use spaces_ptr::{Commitment, CommitmentKey, FullPtrOut, PtrOut, PtrSource, RegistryKey, RegistrySptrKey, PtrOutpointKey};
 use spaces_ptr::sptr::Sptr;
 use spaces_wallet::bitcoin::Network;
 use crate::client::{BlockMeta, PtrBlockMeta};
@@ -276,7 +276,7 @@ impl Chain {
         tip.hash = block_hash;
     }
 
-    pub(crate) fn insert_ptrout(&self, key: OutpointKey, ptrout: PtrOut) {
+    pub(crate) fn insert_ptrout(&self, key: PtrOutpointKey, ptrout: PtrOut) {
         self.db.pt.state.insert(key, ptrout)
     }
 

client/src/store/ptrs.rs

@@ -20,10 +20,10 @@ use spacedb::{
 use spaces_protocol::{
     bitcoin::{BlockHash, OutPoint},
     constants::{ChainAnchor},
-    hasher::{KeyHash, OutpointKey},
+    hasher::{KeyHash},
 };
 use spaces_protocol::slabel::SLabel;
-use spaces_ptr::{Commitment, CommitmentKey, FullPtrOut, PtrOut, PtrSource, RegistryKey, RegistrySptrKey};
+use spaces_ptr::{Commitment, CommitmentKey, FullPtrOut, PtrOut, PtrSource, RegistryKey, RegistrySptrKey, PtrOutpointKey};
 use spaces_ptr::sptr::Sptr;
 use crate::store::{EncodableOutpoint, Sha256};
 
@@ -110,7 +110,7 @@ impl PtrStore {
 }
 
 pub trait PtrChainState {
-    fn insert_ptrout(&self, key: OutpointKey, ptrout: PtrOut);
+    fn insert_ptrout(&self, key: PtrOutpointKey, ptrout: PtrOut);
     fn insert_commitment(&self, key: CommitmentKey, commitment: Commitment);
     fn insert_registry(&self, key: RegistryKey, state_root: Hash);
     fn insert_registry_delegation(&self, key: RegistrySptrKey, space: SLabel);
@@ -124,7 +124,7 @@ pub trait PtrChainState {
 }
 
 impl PtrChainState for PtrLiveSnapshot {
-    fn insert_ptrout(&self, key: OutpointKey, ptrout: PtrOut) {
+    fn insert_ptrout(&self, key: PtrOutpointKey, ptrout: PtrOut) {
         self.insert(key, ptrout)
     }
 
@@ -351,7 +351,7 @@ impl PtrSource for PtrLiveSnapshot {
         &mut self,
         outpoint: &OutPoint,
     ) -> spaces_protocol::errors::Result<Option<PtrOut>> {
-        let h = OutpointKey::from_outpoint::<Sha256>(*outpoint);
+        let h = PtrOutpointKey::from_outpoint::<Sha256>(*outpoint);
         let result = self.get(h).map_err(|err| {
             spaces_protocol::errors::Error::IO(format!("getptrout: {}", err.to_string()))
         })?;

ptr/src/lib.rs

@@ -143,6 +143,7 @@ pub enum KeyKind {
     Sptr = 0x02,
     Registry = 0x03,
     RegistrySptr = 0x04,
+    PtrOutpoint = 0x05,
 }
 
 impl KeyKind {
@@ -175,9 +176,15 @@ pub struct RegistrySptrKey([u8; 32]);
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 pub struct CommitmentKey([u8; 32]);
 
+#[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
+pub struct PtrOutpointKey([u8; 32]);
+
 impl KeyHash for RegistryKey {}
 impl KeyHash for RegistrySptrKey {}
 impl KeyHash for CommitmentKey {}
+impl KeyHash for PtrOutpointKey {}
 
 impl Commitment {
     pub fn is_finalized(&self, height: u32) -> bool {
@@ -205,6 +212,21 @@ impl From<CommitmentKey> for Hash {
     }
 }
 
+impl From<PtrOutpointKey> for Hash {
+    fn from(value: PtrOutpointKey) -> Self {
+        value.0
+    }
+}
+
+impl PtrOutpointKey {
+    pub fn from_outpoint<H: KeyHasher>(outpoint: OutPoint) -> Self {
+        let mut buffer = [0u8; 36];
+        buffer[0..32].copy_from_slice(outpoint.txid.as_ref());
+        buffer[32..36].copy_from_slice(&outpoint.vout.to_le_bytes());
+        Self(ns_hash::<H>(KeyKind::PtrOutpoint, H::hash(&buffer)))
+    }
+}
+
 impl CommitmentKey {
     pub fn new<H: KeyHasher>(space: &SLabel, root: [u8; 32]) -> Self {
         let mut data = [0u8; 64];