update rgb-lib to 0.3.0-alpha.3

bitlightlabs · Jun 5, 2024 · c36fd74 · c36fd74
1 parent deb9485
commit c36fd74
Show file tree

Hide file tree

Showing 12 changed files with 632 additions and 805 deletions.
diff --git a/lightning-invoice/Cargo.toml b/lightning-invoice/Cargo.toml
@@ -29,7 +29,10 @@ hashbrown = { version = "0.8", optional = true }
 bitcoin = { version = "0.29.0", default-features = false }
 
 # RGB and related
-rgb-std = { version = "=0.11.0-beta.5", default-features = false }
+rgb-lib = { version = "0.3.0-alpha.3", features = [
+    "electrum",
+    "esplora",
+] }
 
 [dev-dependencies]
 lightning = { version = "0.0.118", path = "../lightning", default-features = false, features = ["_test_utils"] }

diff --git a/lightning-invoice/src/de.rs b/lightning-invoice/src/de.rs
@@ -13,7 +13,7 @@ use bitcoin::{PubkeyHash, ScriptHash};
 use bitcoin::util::address::WitnessVersion;
 use bitcoin_hashes::Hash;
 use bitcoin_hashes::sha256;
-use rgbstd::contract::ContractId;
+use rgb_lib::ContractId;
 use crate::prelude::*;
 use lightning::ln::PaymentSecret;
 use lightning::routing::gossip::RoutingFees;

diff --git a/lightning-invoice/src/lib.rs b/lightning-invoice/src/lib.rs
@@ -51,7 +51,7 @@ use bitcoin_hashes::{Hash, sha256};
 use lightning::ln::features::Bolt11InvoiceFeatures;
 use lightning::util::invoice::construct_invoice_preimage;
 
-use rgbstd::contract::ContractId;
+use rgb_lib::ContractId;
 use secp256k1::PublicKey;
 use secp256k1::{Message, Secp256k1};
 use secp256k1::ecdsa::RecoverableSignature;

diff --git a/lightning-invoice/src/utils.rs b/lightning-invoice/src/utils.rs
@@ -15,7 +15,7 @@ use lightning::ln::inbound_payment::{create, create_from_hash, ExpandedKey};
 use lightning::routing::gossip::RoutingFees;
 use lightning::routing::router::{RouteHint, RouteHintHop, Router};
 use lightning::util::logger::Logger;
-use rgbstd::contract::ContractId;
+use rgb_lib::ContractId;
 use secp256k1::PublicKey;
 use core::ops::Deref;
 use core::time::Duration;

diff --git a/lightning/Cargo.toml b/lightning/Cargo.toml
@@ -40,8 +40,11 @@ grind_signatures = []
 default = ["std", "grind_signatures"]
 
 [dependencies]
-bitcoin_30 = { package = "bitcoin", version = "0.30.0", default-features = false, features = ["secp-recovery", "base64"] }
-bitcoin = { package = "bitcoin", version = "0.29.0", default-features = false, features = ["base64", "secp-recovery", "serde"] }
+bitcoin = { package = "bitcoin", version = "0.29.0", default-features = false, features = [
+    "base64",
+    "secp-recovery",
+    "serde",
+] }
 
 hashbrown = { version = "0.8", optional = true }
 regex = { version = "1.5.6", optional = true }
@@ -50,31 +53,20 @@ backtrace = { version = "0.3", optional = true }
 core2 = { version = "0.3.0", optional = true, default-features = false }
 
 # RGB and related
-amplify = { version = "=4.6.0", default-features = false }
-base64 = "0.13.0"
-bp-core = { version = "=0.11.0-beta.5", default-features = false }
-commit_verify = { version = "=0.11.0-beta.5", default-features = false }
 futures = "0.3"
 hex = "0.4"
-reqwest = { version = "0.11", default-features = false, features = ["json", "blocking"] }
-rgb-core = { version = "=0.11.0-beta.5", default-features = false, features = [
-    "stl",
-] }
-rgb-invoice = { version = "=0.11.0-beta.5", default-features = false }
-rgb-lib = { version = "0.3.0-alpha.2", features = [
+rgb-lib = { version = "0.3.0-alpha.3", features = [
     "electrum",
     "esplora",
 ] }
-rgb-psbt = { version = "=0.11.0-beta.5", default-features = false }
-rgb-std = { version = "=0.11.0-beta.5", default-features = false }
-rgb-runtime = { version = "=0.11.0-beta.5", default-features = false, features = [
-    "electrum",
-    "serde",
+serde = { version = "^1.0", features = [
+    "derive",
 ] }
-serde = { version = "^1.0", features = ["derive"] }
 serde_json = "^1.0"
-strict_encoding = { version = "=2.7.0-beta.1", default-features = false }
-tokio = { version = "1.14.1", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.14.1", features = [
+    "macros",
+    "rt-multi-thread",
+] }
 
 [dev-dependencies]
 hex = "0.4"

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
@@ -23,7 +23,7 @@ use bitcoin::secp256k1::{PublicKey,SecretKey};
 use bitcoin::secp256k1::{Secp256k1,ecdsa::Signature};
 use bitcoin::secp256k1;
 
-use invoice::RgbTransport;
+use rgb_lib::RgbTransport;
 
 use crate::ln::{ChannelId, PaymentPreimage, PaymentHash};
 use crate::ln::features::{ChannelTypeFeatures, InitFeatures};

diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
@@ -30,7 +30,7 @@ use bitcoin::secp256k1::{SecretKey,PublicKey};
 use bitcoin::secp256k1::Secp256k1;
 use bitcoin::{LockTime, secp256k1, Sequence};
 
-use invoice::RgbTransport;
+use rgb_lib::RgbTransport;
 
 use crate::blinded_path::BlindedPath;
 use crate::blinded_path::payment::{PaymentConstraints, ReceiveTlvs};

diff --git a/lightning/src/ln/msgs.rs b/lightning/src/ln/msgs.rs
@@ -31,9 +31,7 @@ use bitcoin::{secp256k1, Witness};
 use bitcoin::blockdata::script::Script;
 use bitcoin::hash_types::Txid;
 
-use invoice::RgbTransport;
-
-use rgbstd::contract::ContractId;
+use rgb_lib::{ContractId, RgbTransport};
 
 use crate::blinded_path::payment::ReceiveTlvs;
 use crate::ln::{ChannelId, PaymentPreimage, PaymentHash, PaymentSecret};