Skip to content

Commit c36fd74

Browse files
committed
update rgb-lib to 0.3.0-alpha.3
1 parent deb9485 commit c36fd74

File tree

12 files changed

+632
-805
lines changed

12 files changed

+632
-805
lines changed

lightning-invoice/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ hashbrown = { version = "0.8", optional = true }
2929
bitcoin = { version = "0.29.0", default-features = false }
3030

3131
# RGB and related
32-
rgb-std = { version = "=0.11.0-beta.5", default-features = false }
32+
rgb-lib = { version = "0.3.0-alpha.3", features = [
33+
"electrum",
34+
"esplora",
35+
] }
3336

3437
[dev-dependencies]
3538
lightning = { version = "0.0.118", path = "../lightning", default-features = false, features = ["_test_utils"] }

lightning-invoice/src/de.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use bitcoin::{PubkeyHash, ScriptHash};
1313
use bitcoin::util::address::WitnessVersion;
1414
use bitcoin_hashes::Hash;
1515
use bitcoin_hashes::sha256;
16-
use rgbstd::contract::ContractId;
16+
use rgb_lib::ContractId;
1717
use crate::prelude::*;
1818
use lightning::ln::PaymentSecret;
1919
use lightning::routing::gossip::RoutingFees;

lightning-invoice/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ use bitcoin_hashes::{Hash, sha256};
5151
use lightning::ln::features::Bolt11InvoiceFeatures;
5252
use lightning::util::invoice::construct_invoice_preimage;
5353

54-
use rgbstd::contract::ContractId;
54+
use rgb_lib::ContractId;
5555
use secp256k1::PublicKey;
5656
use secp256k1::{Message, Secp256k1};
5757
use secp256k1::ecdsa::RecoverableSignature;

lightning-invoice/src/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use lightning::ln::inbound_payment::{create, create_from_hash, ExpandedKey};
1515
use lightning::routing::gossip::RoutingFees;
1616
use lightning::routing::router::{RouteHint, RouteHintHop, Router};
1717
use lightning::util::logger::Logger;
18-
use rgbstd::contract::ContractId;
18+
use rgb_lib::ContractId;
1919
use secp256k1::PublicKey;
2020
use core::ops::Deref;
2121
use core::time::Duration;

lightning/Cargo.toml

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@ grind_signatures = []
4040
default = ["std", "grind_signatures"]
4141

4242
[dependencies]
43-
bitcoin_30 = { package = "bitcoin", version = "0.30.0", default-features = false, features = ["secp-recovery", "base64"] }
44-
bitcoin = { package = "bitcoin", version = "0.29.0", default-features = false, features = ["base64", "secp-recovery", "serde"] }
43+
bitcoin = { package = "bitcoin", version = "0.29.0", default-features = false, features = [
44+
"base64",
45+
"secp-recovery",
46+
"serde",
47+
] }
4548

4649
hashbrown = { version = "0.8", optional = true }
4750
regex = { version = "1.5.6", optional = true }
@@ -50,31 +53,20 @@ backtrace = { version = "0.3", optional = true }
5053
core2 = { version = "0.3.0", optional = true, default-features = false }
5154

5255
# RGB and related
53-
amplify = { version = "=4.6.0", default-features = false }
54-
base64 = "0.13.0"
55-
bp-core = { version = "=0.11.0-beta.5", default-features = false }
56-
commit_verify = { version = "=0.11.0-beta.5", default-features = false }
5756
futures = "0.3"
5857
hex = "0.4"
59-
reqwest = { version = "0.11", default-features = false, features = ["json", "blocking"] }
60-
rgb-core = { version = "=0.11.0-beta.5", default-features = false, features = [
61-
"stl",
62-
] }
63-
rgb-invoice = { version = "=0.11.0-beta.5", default-features = false }
64-
rgb-lib = { version = "0.3.0-alpha.2", features = [
58+
rgb-lib = { version = "0.3.0-alpha.3", features = [
6559
"electrum",
6660
"esplora",
6761
] }
68-
rgb-psbt = { version = "=0.11.0-beta.5", default-features = false }
69-
rgb-std = { version = "=0.11.0-beta.5", default-features = false }
70-
rgb-runtime = { version = "=0.11.0-beta.5", default-features = false, features = [
71-
"electrum",
72-
"serde",
62+
serde = { version = "^1.0", features = [
63+
"derive",
7364
] }
74-
serde = { version = "^1.0", features = ["derive"] }
7565
serde_json = "^1.0"
76-
strict_encoding = { version = "=2.7.0-beta.1", default-features = false }
77-
tokio = { version = "1.14.1", features = ["macros", "rt-multi-thread"] }
66+
tokio = { version = "1.14.1", features = [
67+
"macros",
68+
"rt-multi-thread",
69+
] }
7870

7971
[dev-dependencies]
8072
hex = "0.4"

lightning/src/ln/channel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use bitcoin::secp256k1::{PublicKey,SecretKey};
2323
use bitcoin::secp256k1::{Secp256k1,ecdsa::Signature};
2424
use bitcoin::secp256k1;
2525

26-
use invoice::RgbTransport;
26+
use rgb_lib::RgbTransport;
2727

2828
use crate::ln::{ChannelId, PaymentPreimage, PaymentHash};
2929
use crate::ln::features::{ChannelTypeFeatures, InitFeatures};

lightning/src/ln/channelmanager.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use bitcoin::secp256k1::{SecretKey,PublicKey};
3030
use bitcoin::secp256k1::Secp256k1;
3131
use bitcoin::{LockTime, secp256k1, Sequence};
3232

33-
use invoice::RgbTransport;
33+
use rgb_lib::RgbTransport;
3434

3535
use crate::blinded_path::BlindedPath;
3636
use crate::blinded_path::payment::{PaymentConstraints, ReceiveTlvs};

lightning/src/ln/msgs.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ use bitcoin::{secp256k1, Witness};
3131
use bitcoin::blockdata::script::Script;
3232
use bitcoin::hash_types::Txid;
3333

34-
use invoice::RgbTransport;
35-
36-
use rgbstd::contract::ContractId;
34+
use rgb_lib::{ContractId, RgbTransport};
3735

3836
use crate::blinded_path::payment::ReceiveTlvs;
3937
use crate::ln::{ChannelId, PaymentPreimage, PaymentHash, PaymentSecret};

0 commit comments

Comments
 (0)