Merge branch 'master' into add-remote-rpc

ordinals · Feb 25, 2023 · 45b3715 · 45b3715
2 parents e21e75d + acb8791
commit 45b3715
Show file tree

Hide file tree

Showing 25 changed files with 541 additions and 94 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,31 @@
 Changelog
 =========
 
+[0.5.1](https://github.com/casey/ord/releases/tag/0.5.1) - 2023-02-21
+---------------------------------------------------------------------
+
+### Performance
+- Batch tx requests and re-enable skipping transactions (#1759)
+
+### Added
+- Add option to set inscription destination address (#1536)
+- Allow supplying passphrase for `ord wallet create` and `ord wallet restore` (#1669)
+- Add `--config-dir` option (#1697)
+
+### Changed
+- Require users manually specify a `--fee-rate` for `wallet send` (#1755)
+
+### Documentation
+- Add Sparrow Wallet Guide to Handbook (#1742)
+
+### Misc
+- Handle block count RPC error gracefully (#1637)
+- Fix typos in overview.md (#1715)
+- Typo fix (#1682)
+- README typo fix (#1716)
+- Fix changelog dates: 2022 → 2023 (#1700)
+- Bump version number (#1695)
+
 [0.5.0](https://github.com/casey/ord/releases/tag/0.5.0) - 2023-02-11
 ---------------------------------------------------------------------
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ord"
 description = "◉ Ordinal wallet and block explorer"
-version = "0.5.0"
+version = "0.5.1"
 license = "CC0-1.0"
 edition = "2021"
 autotests = false
@@ -17,6 +17,7 @@ members = [".", "test-bitcoincore-rpc"]
 anyhow = { version = "1.0.56", features = ["backtrace"] }
 axum = { version = "0.6.1", features = ["headers"] }
 axum-server = "0.4.0"
+base64 = "0.13.1"
 bech32 = "0.9.1"
 bip39 = "1.0.1"
 bitcoin = { version = "0.29.1", features = ["rand"] }
@@ -31,6 +32,7 @@ futures = "0.3.21"
 hex = "0.4.3"
 html-escaper = "0.2.0"
 http = "0.2.6"
+hyper = { version = "0.14.24", features = ["http1", "client"] }
 indicatif = "0.17.1"
 lazy_static = "1.4.0"
 log = "0.4.14"

diff --git a/README.md b/README.md
@@ -24,6 +24,8 @@ where the project is and where it's going.
 Join [the Discord server](https://discord.gg/87cjuz4FYg) to chat with fellow
 ordinal degenerates.
 
+Tune in to the [Twitch stream](https://www.twitch.tv/ordinalsofficial) to watch us work on this project!
+
 Wallet
 ------
 
@@ -89,8 +91,11 @@ cd ord
 cargo build --release
 ```
 
+The default location for the `ord` binary once built is `./target/release/ord`.
+
 `ord` requires `rustc` version 1.67.0 or later. Run `rustc --version` to ensure you have this version. Run `rustup update` to get the latest stable release.
 
+
 Syncing
 -------
 

diff --git a/deploy/ord.service b/deploy/ord.service
@@ -11,7 +11,7 @@ Environment=RUST_LOG=info
 ExecStart=/usr/local/bin/ord \
   --bitcoin-data-dir /var/lib/bitcoind \
   --data-dir /var/lib/ord \
-  --config /var/lib/ord/ord.yaml \
+  --config-dir /var/lib/ord \
   --chain ${CHAIN} \
   --index-sats \
   server \

diff --git a/docs/src/digital-artifacts.md b/docs/src/digital-artifacts.md
@@ -25,7 +25,7 @@ yours:
   because nobody can own it.
 
 - Digital artifacts are complete. An NFT that points to off-chain content
-  on IPFS or Arweave is incomplete, and thus not a digital artifacts.
+  on IPFS or Arweave is incomplete, and thus is not a digital artifact.
 
 - Digital artifacts are permissionless. An NFT which cannot be sold without
   paying a royalty is not permissionless, and thus not a digital artifact.