Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ordinals/ord into add-multi-paren…
Browse files Browse the repository at this point in the history
…t-to-wallet
  • Loading branch information
raphjaph committed Sep 3, 2024
2 parents a3ca35a + 839322b commit bd21999
Show file tree
Hide file tree
Showing 28 changed files with 7,413 additions and 777 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ defaults:

env:
RUSTFLAGS: --deny warnings
LANGUAGES: de fr es pt ru zh ja ko fil ar hi it
LANGUAGES: de fr es pt ru zh ja ko fil ar hi it nl

jobs:
docs:
Expand Down
23 changes: 22 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "ord"
description = "◉ Ordinal wallet and block explorer"
version = "0.19.1"
version = "0.20.0-dev"
license = "CC0-1.0"
edition = "2021"
autotests = false
Expand Down Expand Up @@ -49,7 +49,8 @@ miniscript = "10.0.0"
mp4 = "0.14.0"
ord-bitcoincore-rpc = "0.17.2"
ordinals = { version = "0.0.9", path = "crates/ordinals" }
redb = "2.0.0"
redb = "2.1.1"
ref-cast = "1.0.23"
regex = "1.6.0"
reqwest = { version = "0.11.27", features = ["blocking", "json"] }
rss = "2.0.1"
Expand Down
2 changes: 1 addition & 1 deletion bin/install-bitcoin-core-linux
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -euxo pipefail

version=24.0.1
version=27.1

wget \
-O bitcoin.tar.gz \
Expand Down
2 changes: 2 additions & 0 deletions deploy/setup
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ fi

bitcoind --version

chown bitcoin:bitcoin /var/lib/bitcoind/settings.json

if [[ ! -e ~/.cargo/env ]]; then
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
fi
Expand Down
Loading

0 comments on commit bd21999

Please sign in to comment.