Skip to content

Commit

Permalink
Merge pull request RGB-WG#201 from RGB-WG/develop
Browse files Browse the repository at this point in the history
Results of beta 5 debugging
  • Loading branch information
dr-orlovsky authored May 6, 2024
2 parents 5a91b84 + 47413df commit 8505e62
Show file tree
Hide file tree
Showing 46 changed files with 2,912 additions and 1,625 deletions.
96 changes: 47 additions & 49 deletions Cargo.lock

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

25 changes: 14 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ license = "Apache-2.0"

[workspace.dependencies]
amplify = "4.6.0"
ascii-armor = "0.2.0"
baid58 = "0.4.4"
ascii-armor = "0.6.0"
baid64 = "0.1.0"
strict_encoding = "2.7.0-beta.3"
strict_types = "2.7.0-beta.3"
commit_verify = { version = "0.11.0-beta.5", features = ["stl"] }
Expand Down Expand Up @@ -55,14 +55,14 @@ crate-type = ["cdylib", "rlib"] # We need this for WASM
[dependencies]
amplify = { workspace = true }
ascii-armor = { workspace = true }
baid64 = { workspace = true }
strict_encoding = { workspace = true }
strict_types = { workspace = true }
commit_verify = { workspace = true }
bp-core = { workspace = true }
rgb-core = { workspace = true }
rgb-invoice = { version = "0.11.0-beta.5", path = "invoice" }
aluvm = "0.11.0-beta.5"
baid58 = { workspace = true }
base85 = "=2.0.0"
chrono = "0.4.31"
indexmap = { workspace = true }
Expand All @@ -74,6 +74,7 @@ default = []
all = ["fs", "serde"]
serde = [
"serde_crate",
"chrono/serde",
"amplify/serde",
"strict_encoding/serde",
"strict_types/serde",
Expand All @@ -96,11 +97,13 @@ wasm-bindgen-test = "0.3"
features = ["all"]

[patch.crates-io]
commit_verify = { git = "https://github.com/LNP-BP/client_side_validation", branch = "v0.11" }
single_use_seals = { git = "https://github.com/LNP-BP/client_side_validation", branch = "v0.11" }
bp-consensus = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" }
bp-dbc = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" }
bp-seals = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" }
bp-core = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" }
rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "v0.11" }
aluvm = { git = "https://github.com/AluVM/rust-aluvm", branch = "v0.11" }
strict_encoding = { git = "https://github.com/strict-types/strict-encoding", branch = "develop" }
strict_types = { git = "https://github.com/strict-types/strict-types", branch = "develop" }
commit_verify = { git = "https://github.com/LNP-BP/client_side_validation", branch = "develop" }
single_use_seals = { git = "https://github.com/LNP-BP/client_side_validation", branch = "develop" }
bp-consensus = { git = "https://github.com/BP-WG/bp-core", branch = "develop" }
bp-dbc = { git = "https://github.com/BP-WG/bp-core", branch = "develop" }
bp-seals = { git = "https://github.com/BP-WG/bp-core", branch = "develop" }
bp-core = { git = "https://github.com/BP-WG/bp-core", branch = "develop" }
aluvm = { git = "https://github.com/AluVM/rust-aluvm", branch = "develop" }
rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "develop" }
5 changes: 3 additions & 2 deletions invoice/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ edition = { workspace = true }
license = { workspace = true }

[lib]
name = "invoice"
name = "rgbinvoice"

[dependencies]
amplify = { workspace = true }
baid58 = { workspace = true }
baid64 = { workspace = true }
strict_encoding = { workspace = true }
strict_types = { workspace = true }
bp-core = { workspace = true }
Expand All @@ -27,6 +27,7 @@ indexmap = { workspace = true }
fluent-uri = "0.1.4"
percent-encoding = "2.3.0"
serde_crate = { workspace = true, optional = true }
rand = "0.8.5"

[features]
default = []
Expand Down
1 change: 1 addition & 0 deletions invoice/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
extern crate amplify;
#[macro_use]
extern crate strict_encoding;
extern crate rgbcore as rgb;
#[cfg(feature = "serde")]
extern crate serde_crate as serde;

Expand Down
Loading

0 comments on commit 8505e62

Please sign in to comment.