diff --git a/Cargo.lock b/Cargo.lock index 75f1ec9..ef1d783 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1581,7 +1581,7 @@ dependencies = [ [[package]] name = "rgb-core" version = "0.11.0-beta.4" -source = "git+https://github.com/RGB-WG/rgb-core?branch=master#6fc1a557dce94add483dbca59ce2b7ccec007464" +source = "git+https://github.com/RGB-WG/rgb-core?branch=canary#f6a262826225e223ae7af33f408fed5f75536d80" dependencies = [ "aluvm", "amplify", @@ -1602,7 +1602,7 @@ dependencies = [ [[package]] name = "rgb-invoice" version = "0.11.0-beta.4" -source = "git+https://github.com/RGB-WG/rgb-std?branch=master#6801aa52abadc978cbdb3a0351aec5f91a076bb2" +source = "git+https://github.com/RGB-WG/rgb-std?branch=master#5dfb7aecb8e0d3d80ac5101a661f92545cbf45c0" dependencies = [ "amplify", "baid58", @@ -1673,7 +1673,7 @@ dependencies = [ [[package]] name = "rgb-std" version = "0.11.0-beta.4" -source = "git+https://github.com/RGB-WG/rgb-std?branch=master#6801aa52abadc978cbdb3a0351aec5f91a076bb2" +source = "git+https://github.com/RGB-WG/rgb-std?branch=master#5dfb7aecb8e0d3d80ac5101a661f92545cbf45c0" dependencies = [ "amplify", "baid58", diff --git a/Cargo.toml b/Cargo.toml index ee0ea4a..13644ba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -95,10 +95,10 @@ electrum = ["electrum-client", "bitcoin"] serde = ["serde_crate", "serde_with", "serde_yaml", "bp-std/serde", "bp-wallet/serde", "descriptors/serde", "rgb-psbt/serde"] [package.metadata.docs.rs] -features = [ "all" ] +features = ["all"] [patch.crates-io] bp-util = { git = "https://github.com/BP-WG/bp-wallet", branch = "master" } bp-wallet = { git = "https://github.com/BP-WG/bp-wallet", branch = "master" } -rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "master" } +rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "canary" } rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "master" } diff --git a/examples/transfer.psbt b/examples/transfer.psbt deleted file mode 100644 index 0053932..0000000 Binary files a/examples/transfer.psbt and /dev/null differ diff --git a/examples/transfer.rgb b/examples/transfer.rgb deleted file mode 100644 index 034960d..0000000 Binary files a/examples/transfer.rgb and /dev/null differ diff --git a/psbt/src/lib.rs b/psbt/src/lib.rs index 6f96f44..fb16c45 100644 --- a/psbt/src/lib.rs +++ b/psbt/src/lib.rs @@ -78,7 +78,7 @@ impl RgbPsbt for Psbt { let mut inputs = info.inputs.into_inner(); for input in self.inputs_mut() { let outpoint = input.prevout().outpoint(); - if let Some(pos) = inputs.iter().position(|i| i == &XChain::Bitcoin(outpoint)) { + if let Some(pos) = inputs.iter().position(|i| **i == XChain::Bitcoin(outpoint)) { inputs.remove(pos); input .set_rgb_consumer(contract_id, info.id) diff --git a/src/runtime.rs b/src/runtime.rs index 639ae61..84947cd 100644 --- a/src/runtime.rs +++ b/src/runtime.rs @@ -144,7 +144,7 @@ impl, K> OutpointFilter for Runtime { let output = output.into(); self.wallet() .coins() - .any(|utxo| XChain::Bitcoin(utxo.outpoint) == output) + .any(|utxo| XChain::Bitcoin(utxo.outpoint) == *output) } }