Skip to content

Commit fb1f7d3

Browse files
committed
Merge pull request #39 from RGB-WG/v0.11
Complete transfers with PSBT construction and tapret commitments
2 parents f2f2b22 + 69377f1 commit fb1f7d3

22 files changed

+1524
-1905
lines changed

Cargo.lock

+373-219
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+21-13
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
[workspace]
22
members = [
3-
"invoice",
3+
"psbt",
44
"cli",
55
"fs",
66
"."
77
]
88
default-members = [
9-
"invoice",
9+
"psbt",
1010
"cli",
1111
"fs",
1212
"."
1313
]
1414

1515
[workspace.package]
16-
version = "0.11.0-alpha.2"
16+
version = "0.11.0-beta.2"
1717
keywords = ["bitcoin", "lightning", "rgb", "smart-contracts", "lnp-bp"]
1818
categories = ["cryptography::cryptocurrencies"]
1919
authors = ["Dr Maxim Orlovsky <[email protected]>"]
@@ -26,16 +26,21 @@ license = "Apache-2.0"
2626
[workspace.dependencies]
2727
amplify = "4.5.0"
2828
baid58 = "0.4.4"
29+
commit_verify = "0.11.0-beta.2"
2930
strict_encoding = "2.6.1"
3031
strict_types = "1.6.3"
31-
bp-core = "0.11.0-beta.1"
32-
bp-seals = "0.11.0-beta.1"
33-
bp-std = "0.11.0-beta.2"
34-
bp-wallet = "0.11.0-beta.2"
35-
bp-utils = "0.11.0-beta.2"
36-
bp-esplora = "0.11.0-beta.1"
37-
rgb-std = { version = "0.11.0-beta.2", features = ["fs"] }
32+
bp-core = "0.11.0-beta.2"
33+
bp-seals = "0.11.0-beta.2"
34+
bp-std = "0.11.0-beta.3"
35+
bp-wallet = "0.11.0-beta.3"
36+
bp-util = "0.11.0-beta.3"
37+
bp-esplora = "0.11.0-beta.2"
38+
descriptors = "0.11.0-beta.2"
39+
psbt = { version = "0.11.0-beta.2", features = ["client-side-validation"] }
40+
rgb-std = { version = "0.11.0-beta.3", features = ["fs"] }
41+
rgb-psbt = { version = "0.11.0-beta.2", path = "psbt" }
3842
indexmap = "2.0.2"
43+
chrono = "0.4.31"
3944
serde_crate = { package = "serde", version = "1", features = ["derive"] }
4045
serde_yaml = "0.9.19"
4146
log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug"] }
@@ -60,24 +65,27 @@ name = "rgb_rt"
6065
[dependencies]
6166
amplify = { workspace = true }
6267
baid58 = { workspace = true }
68+
commit_verify = { workspace = true }
6369
strict_types = { workspace = true }
6470
bp-core = { workspace = true }
6571
bp-std = { workspace = true }
6672
bp-wallet = { workspace = true, features = ["fs"] }
6773
bp-esplora = { workspace = true, optional = true }
68-
descriptors = "0.11.0-beta.2"
74+
descriptors = { workspace = true }
6975
rgb-std = { workspace = true }
76+
rgb-psbt = { workspace = true }
7077
rgb-persist-fs = { version = "0.11.0-alpha", path = "fs" }
7178
indexmap = { workspace = true }
79+
chrono = { workspace = true }
7280
serde_crate = { workspace = true, optional = true }
7381
serde_yaml = { workspace = true, optional = true }
7482
log = { workspace = true, optional = true }
7583

7684
[features]
77-
default = []
85+
default = ["esplora"]
7886
all = ["esplora", "serde", "log"]
7987
esplora = ["bp-esplora", "bp-wallet/esplora"]
80-
serde = ["serde_crate", "serde_yaml", "bp-std/serde", "bp-wallet/serde",]
88+
serde = ["serde_crate", "serde_yaml", "bp-std/serde", "bp-wallet/serde", "descriptors/serde", "rgb-psbt/serde"]
8189

8290
[package.metadata.docs.rs]
8391
features = [ "all" ]

cli/Cargo.toml

+4-5
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@ path = "src/main.rs"
2020
amplify = { workspace = true }
2121
baid58 = { workspace = true }
2222
strict_types = { workspace = true, features = ["serde"] }
23-
commit_verify = "0.11.0-beta.1"
23+
commit_verify = { workspace = true }
2424
bp-seals = { workspace = true }
2525
bp-std = { workspace = true, features = ["serde"] }
2626
bp-wallet = { workspace = true }
27-
bp-esplora = { workspace = true }
28-
bp-util = "0.11.0-beta.2"
27+
bp-util = { workspace = true }
28+
psbt = { workspace = true }
2929
rgb-std = { workspace = true, features = ["serde"] }
30-
rgb-invoice = { version = "0.11.0-alpha.2", path = "../invoice" }
31-
rgb-runtime = { version = "0.11.0-alpha.2", path = "..", features = ["log", "serde"] }
30+
rgb-runtime = { version = "0.11.0-beta.1", path = "..", features = ["esplora", "log", "serde"] }
3231
log = { workspace = true }
3332
env_logger = "0.10.1"
3433
clap = { version = "4.4.8", features = ["derive", "env"] }

cli/src/args.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
use bp_util::{Config, DescriptorOpts};
2525
use bpstd::XpubDerivable;
26-
use rgb_rt::{RgbDescr, Runtime, RuntimeError, TapretKey};
26+
use rgb_rt::{Resolver, ResolverError, RgbDescr, Runtime, RuntimeError, TapretKey};
2727

2828
use crate::Command;
2929

@@ -75,4 +75,9 @@ impl RgbArgs {
7575

7676
Ok(runtime)
7777
}
78+
79+
#[allow(clippy::result_large_err)]
80+
pub fn resolver(&self) -> Result<Resolver, ResolverError> {
81+
Resolver::new(&self.resolver.esplora)
82+
}
7883
}

0 commit comments

Comments
 (0)