Update ptrs testnet4 height

Author: buffrr

client/src/client.rs

@@ -161,7 +161,7 @@ impl Client {
             }
         }
         // Ptrs tip must connect to block
-        {
+        if chain.can_scan_ptrs(height) {
             let tip = chain.ptrs_tip();
             if tip.hash != block.header.prev_blockhash || tip.height + 1 != height {
                 return Err(SyncError {
@@ -254,8 +254,14 @@ impl Client {
                 self.apply_space_tx(chain, &tx, validated_tx);
             }
 
-            let ptrs_ctx =
-                { spaces_ptr::TxContext::from_tx::<Chain, Sha256>(chain, tx, spaceouts.is_some() || spaceouts_input_ctx.is_some())? };
+            let ptrs_ctx = if chain.can_scan_ptrs(height) {
+                spaces_ptr::TxContext::from_tx::<Chain, Sha256>(
+                    chain,
+                    tx,
+                    spaceouts.is_some() || spaceouts_input_ctx.is_some())?
+            } else {
+                None
+            };
 
             if let Some(ptrs_ctx) = ptrs_ctx {
                 let spent_spaceouts = spaceouts_input_ctx.unwrap_or_default().into_iter()
@@ -286,7 +292,9 @@ impl Client {
         }
 
         chain.update_spaces_tip(height, block_hash);
-        chain.update_ptrs_tip(height, block_hash);
+        if chain.can_scan_ptrs(height) {
+            chain.update_ptrs_tip(height, block_hash);
+        }
 
         Ok((spaces_meta, ptr_meta))
     }

client/src/config.rs

@@ -195,10 +195,12 @@ impl Args {
         );
 
         let genesis = Spaced::genesis(args.chain);
+        let ptr_genesis = Spaced::ptr_genesis(args.chain);
 
         let chain = Chain::load(
             args.chain.fallback_network(),
             genesis,
+            ptr_genesis,
             &data_dir,
             args.block_index || args.block_index_full,
             args.block_index || args.block_index_full, // TODO: option to index ptrs

client/src/spaces.rs

@@ -172,4 +172,12 @@ impl Spaced {
             _ => panic!("unsupported network"),
         }
     }
+
+    pub fn ptr_genesis(network: ExtendedNetwork) -> ChainAnchor {
+        match network {
+            ExtendedNetwork::Testnet4 => ChainAnchor::PTR_TESTNET4(),
+            ExtendedNetwork::Regtest => ChainAnchor::PTR_TESTNET4(),
+            _ => panic!("unsupported network"),
+        }
+    }
 }

client/src/store/chain.rs

@@ -39,6 +39,7 @@ const_assert!(
 pub struct Chain {
     db: LiveStore,
     idx: LiveIndex,
+    ptrs_genesis: ChainAnchor,
 }
 
 #[derive(Clone)]
@@ -94,8 +95,7 @@ impl Chain {
         self.db.pt.state.get_ptr_info(key)
     }
 
-    pub fn load(network: Network, genesis: ChainAnchor, dir: &Path, index_spaces: bool, index_ptrs: bool) -> anyhow::Result<Self> {
-        let ptrs_genesis = spaces_ptr::constants::ptrs_start_height(&network);
+    pub fn load(_network: Network, genesis: ChainAnchor, ptrs_genesis: ChainAnchor, dir: &Path, index_spaces: bool, index_ptrs: bool) -> anyhow::Result<Self> {
         let proto_db_path = dir.join("protocol.sdb");
         let ptrs_db_path = dir.join("ptrs.sdb");
         let initial_sp_sync = !proto_db_path.exists();
@@ -109,7 +109,7 @@ impl Chain {
 
         let pt_store = PtrStore::open(ptrs_db_path)?;
         let pt = PtrLiveStore {
-            state: pt_store.begin(&genesis)?,
+            state: pt_store.begin(&ptrs_genesis)?,
             store: pt_store,
         };
 
@@ -130,27 +130,23 @@ impl Chain {
         let chain = Chain {
             db: LiveStore { sp, pt },
             idx: LiveIndex { sp: sp_idx, pt: pt_idx },
+            ptrs_genesis
         };
 
         // If spaces synced past the ptrs point, reset the tip
         if initial_pt_sync {
             let sp_tip = chain.db.sp.state.tip.read().expect("tip").clone();
-            if sp_tip.height > ptrs_genesis {
+            if sp_tip.height > ptrs_genesis.height {
                 info!("spaces tip = {} > ptrs genesis = {} - rescanning to index ptrs",
-                    sp_tip.height, ptrs_genesis
+                    sp_tip.height, ptrs_genesis.height
                 );
                 assert_eq!(
-                    ptrs_genesis % COMMIT_BLOCK_INTERVAL, 0,
+                    ptrs_genesis.height % COMMIT_BLOCK_INTERVAL, 0,
                     "ptrs genesis must align with commit interval"
                 );
-                chain.restore_spaces(|height| {
-                    if height != ptrs_genesis {
-                        // return a dummy hash until we have a checkpoint matching ptrs genesis
-                        return Ok(BlockHash::from_slice(&[0u8; 32]).expect("hash"));
-                    }
-
-                    Ok(sp_tip.hash)
-                })?;
+                chain.restore_spaces(|_| {
+                    return Ok(BlockHash::from_slice(&[0u8; 32]).expect("hash"));
+                }, Some(ptrs_genesis.height))?;
             }
         }
 
@@ -263,6 +259,10 @@ impl Chain {
         *self.db.pt.state.tip.read().expect("ptrs tip")
     }
 
+    pub fn can_scan_ptrs(&self, height: u32) -> bool {
+        height > self.ptrs_genesis.height
+    }
+
     pub fn update_ptrs_tip(&self, height: u32, block_hash: BlockHash) {
         let mut tip = self.db.pt.state.tip.write().expect("write tip");
         tip.height = height;
@@ -349,7 +349,7 @@ impl Chain {
     where
         F: Fn(u32) -> anyhow::Result<BlockHash>,
     {
-        let point = self.restore_spaces(get_block_hash)?;
+        let point = self.restore_spaces(get_block_hash, None)?;
         self.restore_ptrs(point)
     }
 
@@ -405,22 +405,27 @@ impl Chain {
         Ok(())
     }
 
-    pub fn restore_spaces<F>(&self, get_block_hash: F) -> anyhow::Result<ChainAnchor>
+    pub fn restore_spaces<F>(&self, get_block_hash: F, restore_to_height: Option<u32>) -> anyhow::Result<ChainAnchor>
     where
         F: Fn(u32) -> anyhow::Result<BlockHash>,
     {
         let chain_iter = self.db.sp.store.iter();
         for (snapshot_index, snapshot) in chain_iter.enumerate() {
             let chain_snapshot = snapshot?;
             let chain_checkpoint: ChainAnchor = chain_snapshot.metadata().try_into()?;
-            let required_hash = get_block_hash(chain_checkpoint.height)?;
-
-            if required_hash != chain_checkpoint.hash {
-                info!(
-                    "Could not restore to block={} height={}",
-                    chain_checkpoint.hash, chain_checkpoint.height
-                );
-                continue;
+            if let Some(restore_to_height) = restore_to_height {
+                if restore_to_height != chain_checkpoint.height {
+                    continue;
+                }
+            } else {
+                let required_hash = get_block_hash(chain_checkpoint.height)?;
+                if required_hash != chain_checkpoint.hash {
+                    info!(
+                        "Could not restore to block={} height={}",
+                        chain_checkpoint.hash, chain_checkpoint.height
+                    );
+                    continue;
+                }
             }
 
             info!(

protocol/src/constants.rs

@@ -84,6 +84,18 @@ impl ChainAnchor {
         )
     };
 
+    pub const PTR_TESTNET4: fn() -> Self = || {
+        Self::new(
+            [
+                0x94, 0x94, 0xe5, 0x15, 0x75, 0xaa, 0xcf, 0x09,
+                0x45, 0xc1, 0x7a, 0x30, 0xf3, 0x53, 0x20, 0xe8,
+                0x1d, 0x2b, 0xd0, 0xed, 0x6a, 0xaa, 0xb3, 0xc3,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            ],
+            100_008,
+        )
+    };
+
     // Testnet activation block
     pub const TESTNET: fn() -> Self = || {
         Self::new(
@@ -109,6 +121,18 @@ impl ChainAnchor {
             0,
         )
     };
+
+    pub const PTR_REGTEST: fn() -> Self = || {
+        Self::new(
+            [
+                0x06, 0x22, 0x6e, 0x46, 0x11, 0x1a, 0x0b, 0x59,
+                0xca, 0xaf, 0x12, 0x60, 0x43, 0xeb, 0x5b, 0xbf,
+                0x28, 0xc3, 0x4f, 0x3a, 0x5e, 0x33, 0x2a, 0x1f,
+                0xc7, 0xb2, 0xb7, 0x3c, 0xf1, 0x88, 0x91, 0x0f,
+            ],
+            0,
+        )
+    };
 }
 
 #[cfg(feature = "bincode")]

ptr/src/constants.rs

@@ -1,7 +1,7 @@
 use bitcoin::Network;
 
 pub const PTR_MAINNET_HEIGHT : u32 = 922_777;
-pub const PTR_TESTNET4_HEIGHT : u32 = 100_000;
+pub const PTR_TESTNET4_HEIGHT : u32 = 100_008;
 pub const PTR_REGTEST_HEIGHT : u32 = 0;
 
 pub fn ptrs_start_height(network: &Network) -> u32 {