Skip to content

Commit

Permalink
Merge pull request #279 from RGB-WG/payments
Browse files Browse the repository at this point in the history
Improve v0.12 payments workflows
  • Loading branch information
dr-orlovsky authored Jan 25, 2025
2 parents 9d6af65 + 5a05fcc commit 2f51bcd
Show file tree
Hide file tree
Showing 13 changed files with 300 additions and 103 deletions.
7 changes: 1 addition & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ jobs:
matrix:
feature:
- fs
- cli
- log
- esplora_blocking
- electrum_blocking
- mempool_blocking
- serde
steps:
- uses: actions/checkout@v4
Expand All @@ -65,7 +60,7 @@ jobs:
strategy:
fail-fast: false
matrix:
toolchain: [ nightly, beta, stable, 1.77.0 ]
toolchain: [ nightly, beta, stable, 1.82.0 ]
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: jetli/[email protected]
with:
version: 'latest'
- name: Add wasm32 target
run: rustup target add wasm32-unknown-unknown
- name: Test in headless Chrome
Expand Down
74 changes: 38 additions & 36 deletions Cargo.lock

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

10 changes: 7 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@ categories = ["cryptography::cryptocurrencies"]
authors = ["Dr Maxim Orlovsky <[email protected]>"]
homepage = "https://rgb.tech"
repository = "https://github.com/RGB-WG/rgb"
rust-version = "1.77.0"
rust-version = "1.82.0"
edition = "2021"
license = "Apache-2.0"

[workspace.dependencies]
amplify = "4.8.0"
nonasync = "0.1.2"
strict_encoding = "2.8.1"
strict_types = "2.8.1"
commit_verify = "=0.12.0-beta.4"
bp-core = "=0.12.0-beta.4"
bp-std = { version = "=0.12.0-beta.4", features = ["client-side-validation"] }
bp-electrum = "=0.12.0-beta.4"
bp-esplora = { version = "=0.12.0-beta.4", default-features = false }
Expand Down Expand Up @@ -51,10 +53,12 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
amplify = { workspace = true }
commit_verify = { workspace = true }
strict_types = { workspace = true }
nonasync = { workspace = true }
bp-std = { workspace = true }
bp-wallet = { workspace = true }
rgb-std = { workspace = true, features = ["bitcoin"] }
rgb-psbt = { workspace = true, features = ["bp"] }
indexmap = { workspace = true }
serde = { workspace = true, optional = true }
serde_yaml = { workspace = true, optional = true }
Expand Down Expand Up @@ -105,5 +109,5 @@ psbt = { git = "https://github.com/BP-WG/bp-std", branch = "v0.12" }
bp-std = { git = "https://github.com/BP-WG/bp-std", branch = "v0.12" }
bp-wallet = { git = "https://github.com/BP-WG/bp-wallet", branch = "v0.12" }
rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "v0.12" }
rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "v0.12" }
rgb-invoice = { git = "https://github.com/RGB-WG/rgb-std", branch = "v0.12" }
rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "payments" }
rgb-invoice = { git = "https://github.com/RGB-WG/rgb-std", branch = "payments" }
Loading

0 comments on commit 2f51bcd

Please sign in to comment.