From a8cb76029607206e4e8adf5f5f884fd04b815de2 Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Tue, 5 Mar 2024 14:10:53 +0100 Subject: [PATCH] chore: update dependencies --- Cargo.lock | 6 +++--- Cargo.toml | 4 ++-- cli/src/command.rs | 2 +- examples/transfer.psbt | Bin 1593 -> 0 bytes examples/transfer.rgb | Bin 21041 -> 0 bytes psbt/src/lib.rs | 2 +- src/runtime.rs | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 examples/transfer.psbt delete mode 100644 examples/transfer.rgb diff --git a/Cargo.lock b/Cargo.lock index 75f1ec9..90faf56 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#601e5c0d90271203facd52706d8eec01fb97db41" 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#7c0d865748f156e6b10f9a5b75e5e01a88b7bc93" 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#7c0d865748f156e6b10f9a5b75e5e01a88b7bc93" 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/cli/src/command.rs b/cli/src/command.rs index c76cfd9..916fb18 100644 --- a/cli/src/command.rs +++ b/cli/src/command.rs @@ -521,7 +521,7 @@ impl Exec for RgbArgs { "no known interface implementation for {iface_name}" )) })?; - let types = &schema.type_system; + let types = &schema.types; let mut builder = ContractBuilder::with( iface.clone(), diff --git a/examples/transfer.psbt b/examples/transfer.psbt deleted file mode 100644 index 0053932fc68414a4591735d37c181b2ce8849c18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1593 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 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) } }