Merge branch 'master' of github.com:ordinals/ord into tweak-outputs-return

raphjaph · raphjaph · commit e34554064213 · 2024-12-19T19:33:59.000-05:00
diff --git a/deploy/setup b/deploy/setup
@@ -53,7 +53,7 @@ case $CHAIN in
     CSP_ORIGIN=signet.ordinals.com
     ufw allow 38333
     ;;
-  testnet3)
+  test)
     COOKIE_FILE_DIR=/var/lib/bitcoind/testnet3
     CSP_ORIGIN=testnet.ordinals.com
     ufw allow 18333
diff --git a/justfile b/justfile
@@ -50,7 +50,7 @@ deploy-signet branch='master' remote='ordinals/ord': \
   (deploy branch remote 'signet' 'signet.ordinals.net')
 
 deploy-testnet branch='master' remote='ordinals/ord': \
-  (deploy branch remote 'testnet3' 'testnet.ordinals.net')
+  (deploy branch remote 'test' 'testnet.ordinals.net')
 
 deploy-testnet4 branch='master' remote='ordinals/ord': \
   (deploy branch remote 'testnet4' 'testnet4.ordinals.net')
diff --git a/src/index.rs b/src/index.rs
@@ -91,6 +91,7 @@ pub(crate) enum Statistic {
   Runes = 13,
   SatRanges = 14,
   UnboundInscriptions = 16,
+  LastSavepointHeight = 17,
 }
 
 impl Statistic {
diff --git a/src/index/reorg.rs b/src/index/reorg.rs
@@ -83,17 +83,21 @@ impl Reorg {
       return Ok(());
     }
 
-    if (height < SAVEPOINT_INTERVAL || height % SAVEPOINT_INTERVAL == 0)
-      && u32::try_from(
-        index
-          .settings
-          .bitcoin_rpc_client(None)?
-          .get_blockchain_info()?
-          .headers,
-      )
-      .unwrap()
-      .saturating_sub(height)
-        <= CHAIN_TIP_DISTANCE
+    let height = u64::from(height);
+
+    let last_savepoint_height = index
+      .begin_read()?
+      .0
+      .open_table(STATISTIC_TO_COUNT)?
+      .get(&Statistic::LastSavepointHeight.key())?
+      .map(|last_savepoint_height| last_savepoint_height.value())
+      .unwrap_or(0);
+
+    let blocks = index.client.get_blockchain_info()?.headers;
+
+    if (height < SAVEPOINT_INTERVAL.into()
+      || height.saturating_sub(last_savepoint_height) >= SAVEPOINT_INTERVAL.into())
+      && blocks.saturating_sub(height) <= CHAIN_TIP_DISTANCE.into()
     {
       let wtx = index.begin_write()?;
 
@@ -111,6 +115,10 @@ impl Reorg {
       log::debug!("creating savepoint at height {}", height);
       wtx.persistent_savepoint()?;
 
+      wtx
+        .open_table(STATISTIC_TO_COUNT)?
+        .insert(&Statistic::LastSavepointHeight.key(), &height)?;
+
       Index::increment_statistic(&wtx, Statistic::Commits, 1)?;
       wtx.commit()?;
     }
diff --git a/static/preview-video.js b/static/preview-video.js
@@ -0,0 +1,3 @@
+document.getElementsByTagName('video')[0].addEventListener('click', (event) => {
+  event.target.controls = true;
+});
diff --git a/templates/preview-video.html b/templates/preview-video.html
@@ -3,9 +3,10 @@
   <head>
     <meta charset=utf-8>
     <link rel=stylesheet href=/static/preview-video.css>
+    <script src=/static/preview-video.js type=module defer></script>
   </head>
   <body>
-    <video controls loop muted autoplay>
+    <video loop muted autoplay>
       <source src=/content/{{self.inscription_id}}>
     </video>
   </body>

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ pub(crate) enum Statistic {`
`91`	`91`	`Runes = 13,`
`92`	`92`	`SatRanges = 14,`
`93`	`93`	`UnboundInscriptions = 16,`
	`94`	`+ LastSavepointHeight = 17,`
`94`	`95`	`}`
`95`	`96`
`96`	`97`	`impl Statistic {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+document.getElementsByTagName('video')[0].addEventListener('click', (event) => {`
	`2`	`+ event.target.controls = true;`
	`3`	`+});`