Merge branch 'master' into rune-unlock-time

crates/mockcore/src/lib.rs

@@ -96,7 +96,7 @@ pub fn builder() -> Builder {
   Builder {
     fail_lock_unspent: false,
     network: Network::Bitcoin,
-    version: 250000,
+    version: 280000,
   }
 }
 

deploy/setup

@@ -79,7 +79,7 @@ echo '[Service]' > $OVERRIDE
 echo "Environment=CHAIN=$CHAIN" >> $OVERRIDE
 echo "Environment=CSP_ORIGIN=$CSP_ORIGIN" >> $OVERRIDE
 
-if [[ $CHAIN == main ]]; then
+if [[ $CHAIN == main && $DOMAIN != charlie.ordinals.net ]]; then
   echo Environment=ORD_SERVER_DISABLE_JSON_API=true >> $OVERRIDE
 fi
 

docs/src/guides/wallet.md

@@ -43,7 +43,7 @@ Installing Bitcoin Core
 Bitcoin Core is available from [bitcoincore.org](https://bitcoincore.org/) on
 the [download page](https://bitcoincore.org/en/download/).
 
-Making inscriptions requires Bitcoin Core 24 or newer.
+Making inscriptions requires Bitcoin Core 28 or newer.
 
 This guide does not cover installing Bitcoin Core in detail. Once Bitcoin Core
 is installed, you should be able to run `bitcoind -version` successfully from

src/inscriptions/media.rs

@@ -75,6 +75,7 @@ impl Media {
     ("application/pdf",             GENERIC, Pdf,              &["pdf"]),
     ("application/pgp-signature",   TEXT,    Text,             &["asc"]),
     ("application/protobuf",        GENERIC, Unknown,          &["binpb"]),
+    ("application/x-bittorrent",    GENERIC, Unknown,          &["torrent"]),
     ("application/x-javascript",    TEXT,    Code(JavaScript), &[]),
     ("application/yaml",            TEXT,    Code(Yaml),       &["yaml", "yml"]),
     ("audio/flac",                  GENERIC, Audio,            &["flac"]),

src/subcommand/env.rs

@@ -241,10 +241,14 @@ bitcoin-cli -datadir={datadir} getblockchaininfo
 
     loop {
       if SHUTTING_DOWN.load(atomic::Ordering::Relaxed) {
-        break Ok(None);
+        break;
       }
 
       thread::sleep(Duration::from_millis(100));
     }
+
+    thread::sleep(Duration::from_secs(5));
+
+    Ok(None)
   }
 }

src/wallet.rs

@@ -606,7 +606,7 @@ impl Wallet {
   }
 
   pub(crate) fn check_version(client: Client) -> Result<Client> {
-    const MIN_VERSION: usize = 250000;
+    const MIN_VERSION: usize = 280000;
 
     let bitcoin_version = client.version()?;
     if bitcoin_version < MIN_VERSION {

tests/wallet/inscribe.rs

@@ -80,7 +80,7 @@ fn inscribe_fails_if_bitcoin_core_is_too_old() {
   CommandBuilder::new("wallet inscribe --file hello.txt --fee-rate 1")
     .write("hello.txt", "HELLOWORLD")
     .expected_exit_code(1)
-    .expected_stderr("error: Bitcoin Core 25.0.0 or newer required, current version is 24.0.0\n")
+    .expected_stderr("error: Bitcoin Core 28.0.0 or newer required, current version is 24.0.0\n")
     .core(&core)
     .ord(&ord)
     .run_and_extract_stdout();