update to rgb-lib 0.3.0-alpha.2

bitlightlabs · May 28, 2024 · deb9485 · deb9485
1 parent f0484f7
commit deb9485
Show file tree

Hide file tree

Showing 7 changed files with 238 additions and 173 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,8 +37,3 @@ lto = "off"
 opt-level = 3
 lto = true
 panic = "abort"
-
-[patch.crates-io]
-commit_verify = { path = "../client_side_validation/commit_verify" }
-rgb-std = { path = "../rgb-wallet/std" }
-rgb-wallet = { path = "../rgb-wallet" }
diff --git a/lightning-invoice/Cargo.toml b/lightning-invoice/Cargo.toml
@@ -29,7 +29,7 @@ hashbrown = { version = "0.8", optional = true }
 bitcoin = { version = "0.29.0", default-features = false }
 
 # RGB and related
-rgb-std = "=0.10.9"
+rgb-std = { version = "=0.11.0-beta.5", default-features = false }
 
 [dev-dependencies]
 lightning = { version = "0.0.118", path = "../lightning", default-features = false, features = ["_test_utils"] }

diff --git a/lightning/Cargo.toml b/lightning/Cargo.toml
@@ -50,21 +50,30 @@ backtrace = { version = "0.3", optional = true }
 core2 = { version = "0.3.0", optional = true, default-features = false }
 
 # RGB and related
-amplify = "=4.5.0"
+amplify = { version = "=4.6.0", default-features = false }
 base64 = "0.13.0"
-bp-core = "=0.10.11"
-commit_verify = "=0.10.6"
+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-contracts = { version = "=0.10.2", features = ["electrum"] }
-rgb_core = { package = "rgb-core", version = "=0.10.8" }
-rgb-lib = { git = "https://github.com/RGB-Tools/rgb-lib", branch = "rln_v0.10" }
-rgb-std = "=0.10.9"
-rgb-wallet = "=0.10.9"
+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 = [
+    "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_json = "^1.0"
-strict_encoding = "=2.6.1"
+strict_encoding = { version = "=2.7.0-beta.1", default-features = false }
 tokio = { version = "1.14.1", features = ["macros", "rt-multi-thread"] }
 
 [dev-dependencies]

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 rgbwallet::RgbTransport;
+use invoice::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 rgbwallet::RgbTransport;
+use invoice::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,7 +31,7 @@ use bitcoin::{secp256k1, Witness};
 use bitcoin::blockdata::script::Script;
 use bitcoin::hash_types::Txid;
 
-use rgbwallet::RgbTransport;
+use invoice::RgbTransport;
 
 use rgbstd::contract::ContractId;
 
@@ -2415,7 +2415,7 @@ impl Writeable for UnsignedChannelAnnouncement {
 impl Readable for ContractId {
 	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
 		let buf: [u8; 32] = Readable::read(r)?;
-		let contract_id = ContractId::from_slice(buf).unwrap();
+		let contract_id = ContractId::copy_from_slice(buf).unwrap();
 		Ok(contract_id)
 	}
 }