Skip to content

Commit

Permalink
Update rust-bitcoin in ord
Browse files Browse the repository at this point in the history
  • Loading branch information
raphjaph committed Sep 21, 2024
1 parent 4b109f9 commit 23a8ec9
Show file tree
Hide file tree
Showing 5 changed files with 140 additions and 71 deletions.
96 changes: 81 additions & 15 deletions Cargo.lock

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

7 changes: 5 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ axum = { version = "0.6.1", features = ["http2"] }
axum-server = "0.5.0"
base64 = "0.22.0"
bip39 = "2.0.0"
bitcoin = { version = "0.30.1", features = ["rand"] }
bitcoin = { version = "0.31.2", features = ["rand"] }
boilerplate = { version = "1.0.0", features = ["axum"] }
brotli = "6.0.0"
chrono = { version = "0.4.19", features = ["serde"] }
Expand All @@ -47,7 +47,7 @@ mime = "0.3.16"
mime_guess = "2.0.4"
miniscript = "10.0.0"
mp4 = "0.14.0"
bitcoincore-rpc = "0.17.0"
bitcoincore-rpc = "0.18.0"
ordinals = { version = "0.0.10", path = "crates/ordinals" }
redb = "2.1.1"
ref-cast = "1.0.23"
Expand Down Expand Up @@ -92,3 +92,6 @@ path = "src/lib.rs"
[[test]]
name = "integration"
path = "tests/lib.rs"

[patch.crates-io]
ordinals = { path = "./crates/ordinals"}
2 changes: 1 addition & 1 deletion crates/ordinals/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ license = "CC0-1.0"
rust-version = "1.74.0"

[dependencies]
bitcoin = { version = "0.30.1", features = ["rand"] }
bitcoin = { version = "0.31.2", features = ["rand"] }
derive_more = { version = "1.0.0", features = ["display", "from_str"] }
serde = { version = "1.0.137", features = ["derive"] }
serde_with = "3.7.0"
Expand Down
5 changes: 2 additions & 3 deletions crates/ordinals/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
use {
bitcoin::{
consensus::{Decodable, Encodable},
constants::{
COIN_VALUE, DIFFCHANGE_INTERVAL, MAX_SCRIPT_ELEMENT_SIZE, SUBSIDY_HALVING_INTERVAL,
},
constants::{DIFFCHANGE_INTERVAL, MAX_SCRIPT_ELEMENT_SIZE, SUBSIDY_HALVING_INTERVAL},
opcodes,
script::{self, Instruction},
Network, OutPoint, ScriptBuf, Transaction,
Expand All @@ -33,6 +31,7 @@ pub use {
};

pub const CYCLE_EPOCHS: u32 = 6;
pub const COIN_VALUE: u64 = 100_000_000;

fn default<T: Default>() -> T {
Default::default()
Expand Down
Loading

0 comments on commit 23a8ec9

Please sign in to comment.