From 354e2f7ec7f3db64848fc529a3bc23d704dea172 Mon Sep 17 00:00:00 2001
From: Nathan Fretz <nmfretz@gmail.com>
Date: Fri, 5 Apr 2024 21:06:04 -0700
Subject: [PATCH] Update Ordinals to  v0.17.1 (#1034)

---
 ordinals/docker-compose.yml | 19 +++++++++++++++----
 ordinals/hooks/pre-start    |  9 +++++++++
 ordinals/umbrel-app.yml     | 19 +++++++++++++------
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/ordinals/docker-compose.yml b/ordinals/docker-compose.yml
index d8dfc74..c64c7d5 100644
--- a/ordinals/docker-compose.yml
+++ b/ordinals/docker-compose.yml
@@ -8,12 +8,23 @@ services:
       PROXY_AUTH_ADD: "false"
 
   ord:
-    image: nmfretz/ord:v0.15.0@sha256:526066ae7e2a69a639142cb07d0f45ceff94dd57b2a9f7fcd2062705e5b62b50
+    image: nmfretz/ord:v0.17.1@sha256:ee391d9152c0ac6f0f6909c19fc14e747af72abf9813d6a79b22d6f4a55ef29c
     # This needs to run as root
     # user: "1000:1000"
     restart: on-failure
-    # First-inscription-height may not be needed in the future
-    command: "--first-inscription-height 767430 --data-dir /var/lib/ord --bitcoin-data-dir /var/lib/bitcoind --rpc-url ${APP_BITCOIN_NODE_IP}:${APP_BITCOIN_RPC_PORT} --chain ${APP_BITCOIN_NETWORK} server --http"
+    command: "ord server --http"
     volumes:
       - ${APP_DATA_DIR}/data/ord:/var/lib/ord
-      - ${APP_BITCOIN_DATA_DIR}:/var/lib/bitcoind:ro
\ No newline at end of file
+      - ${APP_BITCOIN_DATA_DIR}:/var/lib/bitcoind:ro
+    environment:
+      ORD_DATA_DIR: "/var/lib/ord"
+      ORD_BITCOIN_DATA_DIR: "/var/lib/bitcoind"
+      ORD_COOKIE_FILE: "/var/lib/bitcoind/.cookie"
+      ORD_BITCOIN_RPC_USERNAME: "${APP_BITCOIN_RPC_USER}"
+      ORD_BITCOIN_RPC_PASSWORD: "${APP_BITCOIN_RPC_PASS}"
+      ORD_BITCOIN_RPC_URL: "${APP_BITCOIN_NODE_IP}:${APP_BITCOIN_RPC_PORT}"
+      ORD_CHAIN: "${APP_BITCOIN_NETWORK}"
+      # First-inscription-height may not be needed in the future. It would be nice to remove it so that other chains like testnet are not impacted.
+      ORD_FIRST_INSCRIPTION_HEIGHT: "767430"
+      ORD_INDEX_RUNES: "true"
+      # TODO: consider index-sats
diff --git a/ordinals/hooks/pre-start b/ordinals/hooks/pre-start
index f45be00..83448c1 100755
--- a/ordinals/hooks/pre-start
+++ b/ordinals/hooks/pre-start
@@ -17,6 +17,7 @@ set_correct_permissions() {
 	fi
 }
 
+# handle generating the correct ord data dir for pre-0.15.0 versions
 if [[ -f "${APP_DATA_DIR}/index.redb" ]]; then
   rm -f "${APP_DATA_DIR}/index.redb"
   mkdir -p "${ORDINALS_DATA_DIR}"
@@ -24,6 +25,14 @@ if [[ -f "${APP_DATA_DIR}/index.redb" ]]; then
   set_correct_permissions "${APP_DATA_DIR}"
 fi
 
+# re-index the ordinals data for runes
+# for installs post 0.17.1 this file will be harmlessly created 
+if [[ ! -f "${APP_DATA_DIR}/AT_LEAST_0-17-1" ]]; then
+    if [[ -f "${ORDINALS_DATA_DIR}/index.redb" ]]; then
+        rm -f "${ORDINALS_DATA_DIR}/index.redb"
+    fi
+    touch "${APP_DATA_DIR}/AT_LEAST_0-17-1"
+fi
 
 
 
diff --git a/ordinals/umbrel-app.yml b/ordinals/umbrel-app.yml
index 98a4f09..ca1fa8f 100644
--- a/ordinals/umbrel-app.yml
+++ b/ordinals/umbrel-app.yml
@@ -2,22 +2,29 @@ manifestVersion: 1
 id: ordinals
 category: bitcoin
 name: Ordinals
-version: "0.15.0"
-tagline: Trustlessly view Ordinal inscriptions using your Bitcoin node.
+version: "0.17.1"
+tagline: Run your own index, block explorer, and command-line wallet for Ordinals
 description: >
-  A block explorer to trustlessly view Ordinal inscriptions. Search blocks, transactions, outputs, and individual satoshis.
+  Run your own index, block explorer, and command-line wallet for Ordinals. The app automatically connects to your Bitcoin node on umbrelOS for trustless operation. Simply install the app and wait for Ordinals to index inscriptions and runes.
+  
 
+  Use the block explorer to view Ordinal inscriptions. Search blocks, transactions, outputs, and individual satoshis.
 
-  Simply install the app and wait for Ordinals to connect to your Bitcoin node and index inscriptions.
+
+  Advanced users can use the command-line to create wallets, create and manage inscriptions, and more. A future umbrelOS update will allow you to run commands from a Terminal directly within the umbrelOS interface!
 
 
   Disclaimer: The Ordinals app does not control, filter, or moderate the content hosted on the Bitcoin blockchain. Consequently, you may come across NSFW (Not Safe For Work), objectionable, or unlawful material while using the app.
 releaseNotes: >-
-  🚨 This update requires a full re-indexing of the ord database due to a significant new release of ord that alters the database schema.
+  🚨 This update requires a full re-indexing of the ord database to prepare for upcoming runes!
   This is handled for you automatically by Umbrel when you update the app. 
 
 
-  This release updates Ord from version 0.5.1 to 0.15.0. Full release notes for Ord can be found at: https://github.com/ordinals/ord/releases
+  Advanced users: running ord commands via the Terminal has now been simplified. From inside the ord container, simply type the command you want to run as listed in the ord help menu. For example, to create a wallet, run `ord wallet create`.
+  An upcoming umbrelOS update will allow you to run commands from a Terminal right from the umbrelOS interface.
+
+
+  Full release notes for Ord can be found at: https://github.com/ordinals/ord/releases
 developer: Casey Rodarmor
 website: https://ordinals.com/
 dependencies: