Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Complete transfers with PSBT construction and tapret commitments #39

Merged
merged 28 commits into from
Dec 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
90df45a
wip on transfers
dr-orlovsky Nov 19, 2023
2d58939
wip on pay method refactoring
dr-orlovsky Dec 1, 2023
333057a
wip on payment workflow
dr-orlovsky Dec 2, 2023
88ef5cb
wip on moving out invoice library
dr-orlovsky Dec 2, 2023
5bf1ca3
wip on moving transfers to std lib
dr-orlovsky Dec 10, 2023
8522c62
wallet: payment workflow draft
dr-orlovsky Dec 13, 2023
db31a8e
descriptor: support for SpkClass
dr-orlovsky Dec 15, 2023
e03adc6
psbt: implement everything
dr-orlovsky Dec 17, 2023
7ad91e6
runtime, cli: payment workflow
dr-orlovsky Dec 18, 2023
62b5009
chore: fix clippy warnings
dr-orlovsky Dec 18, 2023
721b55c
fix: select correct assignment name
crisdut Dec 23, 2023
79ba1b6
Merge pull request #68 from crisdut/fix/select-assignment
dr-orlovsky Dec 23, 2023
8d2280c
cli: remove unneeded set-host command
dr-orlovsky Dec 25, 2023
3961b4d
pay: fix payments
dr-orlovsky Dec 25, 2023
d47871f
cli: implement resolver
dr-orlovsky Dec 25, 2023
639d402
cli: remove outdated PanickingResolver
dr-orlovsky Dec 25, 2023
330cfd2
wallet: make resolver to use terminal transactions from consignment
dr-orlovsky Dec 25, 2023
5e80961
store and apply tapret tweaks
dr-orlovsky Dec 25, 2023
44826ac
pay: add unsigned transaction to consignment terminals
dr-orlovsky Dec 25, 2023
fa31165
cli: add addicional Prepare and Consign commands
dr-orlovsky Dec 25, 2023
acf9369
cli: add armor command
dr-orlovsky Dec 25, 2023
f0b5490
chore: update deps with fix on tapret validation
dr-orlovsky Dec 25, 2023
773dea0
chore: update dependencies with fixes
dr-orlovsky Dec 25, 2023
b1a9c07
cli: report successful validation
dr-orlovsky Dec 25, 2023
7e24f78
chore: fix clippy lints
dr-orlovsky Dec 25, 2023
af58684
cli: filter wallet/all state with a flag
dr-orlovsky Dec 25, 2023
065fb5e
ci: fix default feature build
dr-orlovsky Dec 25, 2023
69377f1
release v0.11.0-beta.1
dr-orlovsky Dec 25, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
592 changes: 373 additions & 219 deletions Cargo.lock

Large diffs are not rendered by default.

32 changes: 20 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[workspace]
members = [
"invoice",
"psbt",
"cli",
"fs",
"."
]
default-members = [
"invoice",
"psbt",
"cli",
"fs",
"."
]

[workspace.package]
version = "0.11.0-alpha.2"
version = "0.11.0-beta.1"
keywords = ["bitcoin", "lightning", "rgb", "smart-contracts", "lnp-bp"]
categories = ["cryptography::cryptocurrencies"]
authors = ["Dr Maxim Orlovsky <[email protected]>"]
Expand All @@ -26,16 +26,21 @@ license = "Apache-2.0"
[workspace.dependencies]
amplify = "4.5.0"
baid58 = "0.4.4"
commit_verify = "0.11.0-beta.2"
strict_encoding = "2.6.1"
strict_types = "1.6.3"
bp-core = "0.11.0-beta.1"
bp-seals = "0.11.0-beta.1"
bp-std = "0.11.0-beta.2"
bp-wallet = "0.11.0-beta.2"
bp-utils = "0.11.0-beta.2"
bp-esplora = "0.11.0-beta.1"
rgb-std = { version = "0.11.0-beta.2", features = ["fs"] }
bp-core = "0.11.0-beta.2"
bp-seals = "0.11.0-beta.2"
bp-std = "0.11.0-beta.3"
bp-wallet = "0.11.0-beta.3"
bp-util = "0.11.0-beta.3"
bp-esplora = "0.11.0-beta.2"
descriptors = "0.11.0-beta.2"
psbt = { version = "0.11.0-beta.2", features = ["client-side-validation"] }
rgb-std = { version = "0.11.0-beta.3", features = ["fs"] }
rgb-psbt = { version = "0.11.0-beta.1", path = "psbt" }
indexmap = "2.0.2"
chrono = "0.4.31"
serde_crate = { package = "serde", version = "1", features = ["derive"] }
serde_yaml = "0.9.19"
log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug"] }
Expand All @@ -60,21 +65,24 @@ name = "rgb_rt"
[dependencies]
amplify = { workspace = true }
baid58 = { workspace = true }
commit_verify = { workspace = true }
strict_types = { workspace = true }
bp-core = { workspace = true }
bp-std = { workspace = true }
bp-wallet = { workspace = true, features = ["fs"] }
bp-esplora = { workspace = true, optional = true }
descriptors = "0.11.0-beta.2"
descriptors = { workspace = true }
rgb-std = { workspace = true }
rgb-psbt = { workspace = true }
rgb-persist-fs = { version = "0.11.0-alpha", path = "fs" }
indexmap = { workspace = true }
chrono = { workspace = true }
serde_crate = { workspace = true, optional = true }
serde_yaml = { workspace = true, optional = true }
log = { workspace = true, optional = true }

[features]
default = []
default = ["esplora"]
all = ["esplora", "serde", "log"]
esplora = ["bp-esplora", "bp-wallet/esplora"]
serde = ["serde_crate", "serde_yaml", "bp-std/serde", "bp-wallet/serde",]
Expand Down
9 changes: 4 additions & 5 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,14 @@ path = "src/main.rs"
amplify = { workspace = true }
baid58 = { workspace = true }
strict_types = { workspace = true, features = ["serde"] }
commit_verify = "0.11.0-beta.1"
commit_verify = { workspace = true }
bp-seals = { workspace = true }
bp-std = { workspace = true, features = ["serde"] }
bp-wallet = { workspace = true }
bp-esplora = { workspace = true }
bp-util = "0.11.0-beta.2"
bp-util = { workspace = true }
psbt = { workspace = true }
rgb-std = { workspace = true, features = ["serde"] }
rgb-invoice = { version = "0.11.0-alpha.2", path = "../invoice" }
rgb-runtime = { version = "0.11.0-alpha.2", path = "..", features = ["log", "serde"] }
rgb-runtime = { version = "0.11.0-beta.1", path = "..", features = ["esplora", "log", "serde"] }
log = { workspace = true }
env_logger = "0.10.1"
clap = { version = "4.4.8", features = ["derive", "env"] }
Expand Down
7 changes: 6 additions & 1 deletion cli/src/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

use bp_util::{Config, DescriptorOpts};
use bpstd::XpubDerivable;
use rgb_rt::{RgbDescr, Runtime, RuntimeError, TapretKey};
use rgb_rt::{Resolver, ResolverError, RgbDescr, Runtime, RuntimeError, TapretKey};

use crate::Command;

Expand Down Expand Up @@ -75,4 +75,9 @@ impl RgbArgs {

Ok(runtime)
}

#[allow(clippy::result_large_err)]
pub fn resolver(&self) -> Result<Resolver, ResolverError> {
Resolver::new(&self.resolver.esplora)
}
}
Loading
Loading