From fbcee04c2125271f7e1f6d267cedd506d4fd5a37 Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Sat, 8 Jun 2024 10:06:22 +0200 Subject: [PATCH] chore: update dependencies --- Cargo.lock | 172 ++++++++++++++++++++++++++-------------------- Cargo.toml | 22 ++---- src/rgb20/info.rs | 4 +- 3 files changed, 104 insertions(+), 94 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 70ae3f3..f3e6522 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,8 +4,9 @@ version = 3 [[package]] name = "aluvm" -version = "0.11.0-beta.5" -source = "git+https://github.com/AluVM/rust-aluvm?branch=develop#25be42a16519383daaa6ba50e65654ff0a1721aa" +version = "0.11.0-beta.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a05798f882593a692d1e05d2b650d8d19f6dd8b04a9a8d31f09fcf0d44d90a" dependencies = [ "amplify", "ascii-armor", @@ -121,9 +122,9 @@ dependencies = [ [[package]] name = "ascii-armor" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673486110323d50d9f33d99f0f526726b4721b1b596284351e75d3692225abe8" +checksum = "9ad861dfcd5f348ac79e0df2e70494641c62d3ac37587af68c52a16ab355afdb" dependencies = [ "amplify", "baid64", @@ -134,15 +135,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "baid64" -version = "0.1.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b8b80494235048845f856b267a4a1d97df59fd14ed7ca92652f834ce93becc6" +checksum = "95dabc2759e01e2c382968639868a701f384a18890934f9e75d4feb4d6623794" dependencies = [ "amplify", "base64", @@ -229,8 +230,9 @@ dependencies = [ [[package]] name = "bp-consensus" -version = "0.11.0-beta.5" -source = "git+https://github.com/BP-WG/bp-core?branch=develop#970147b7cfa3dd3013ceec5bc6eacaea7c0d7bb9" +version = "0.11.0-beta.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f126ed462c6b054ccd027d3ed59fdc0eed5d720cbada79e4d8b7ef8e4779d9b8" dependencies = [ "amplify", "chrono", @@ -243,8 +245,9 @@ dependencies = [ [[package]] name = "bp-core" -version = "0.11.0-beta.5" -source = "git+https://github.com/BP-WG/bp-core?branch=develop#970147b7cfa3dd3013ceec5bc6eacaea7c0d7bb9" +version = "0.11.0-beta.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea9b90b2e6cfafc0e45dc0a856e9b45e933ab4147c576ca8c26f038ba8c97bb" dependencies = [ "amplify", "bp-consensus", @@ -261,8 +264,9 @@ dependencies = [ [[package]] name = "bp-dbc" -version = "0.11.0-beta.5" -source = "git+https://github.com/BP-WG/bp-core?branch=develop#970147b7cfa3dd3013ceec5bc6eacaea7c0d7bb9" +version = "0.11.0-beta.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec406f105bf1e421ead00b47e309901028d10de7033fe918445b089cf7505669" dependencies = [ "amplify", "base85", @@ -287,8 +291,9 @@ dependencies = [ [[package]] name = "bp-seals" -version = "0.11.0-beta.5" -source = "git+https://github.com/BP-WG/bp-core?branch=develop#970147b7cfa3dd3013ceec5bc6eacaea7c0d7bb9" +version = "0.11.0-beta.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4f81b41d82e4138d4bcac17afbb421099c887e406947430131c14ba22abe45d" dependencies = [ "amplify", "baid64", @@ -309,9 +314,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "cc" -version = "1.0.96" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" [[package]] name = "cfg-if" @@ -337,7 +342,8 @@ dependencies = [ [[package]] name = "commit_encoding_derive" version = "0.11.0-beta.5" -source = "git+https://github.com/LNP-BP/client_side_validation?branch=develop#5e50b251aa5a5c4d83c47dad609a15ef3d50800f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d660fdac917fb67edd1707bc9481e51ed9062ab4ba1c4e56ed7856977fff9f3" dependencies = [ "amplify", "amplify_syn", @@ -348,8 +354,9 @@ dependencies = [ [[package]] name = "commit_verify" -version = "0.11.0-beta.5" -source = "git+https://github.com/LNP-BP/client_side_validation?branch=develop#5e50b251aa5a5c4d83c47dad609a15ef3d50800f" +version = "0.11.0-beta.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b350bc4d1c5992571e3323810921d0eb4a65a3171cbf06fd1b9d1249cf1c3339" dependencies = [ "amplify", "commit_encoding_derive", @@ -415,6 +422,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "fast32" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27ea9bdb2356e5a92403cf23ac493f9b43bd71e4ffd0f800862b841dd723994c" + [[package]] name = "fluent-uri" version = "0.1.4" @@ -436,9 +449,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -449,10 +462,11 @@ dependencies = [ [[package]] name = "half" -version = "2.2.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ + "cfg-if", "crunchy", ] @@ -470,9 +484,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hex-conservative" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2" +checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20" [[package]] name = "iana-time-zone" @@ -524,9 +538,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "log" @@ -554,9 +568,9 @@ checksum = "f2b8f3a258db515d5e91a904ce4ae3f73e091149b90cadbdb93d210bee07f63b" [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -569,9 +583,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -587,9 +601,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -635,8 +649,9 @@ dependencies = [ [[package]] name = "rgb-core" -version = "0.11.0-beta.5" -source = "git+https://github.com/RGB-WG/rgb-core?branch=develop#f0469333a36abcb70dff6667938fc1eae438e1d2" +version = "0.11.0-beta.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd852c74f2b91711ef730a4aa5149442e2488425b3db811c6a55b72eb6db41d4" dependencies = [ "aluvm", "amplify", @@ -672,13 +687,14 @@ dependencies = [ [[package]] name = "rgb-invoice" -version = "0.11.0-beta.5" -source = "git+https://github.com/RGB-WG/rgb-std?branch=develop#47413dfdda70dcf7963a9b4b03f406e374e15fae" +version = "0.11.0-beta.6" +source = "git+https://github.com/RGB-WG/rgb-std?branch=master#9e23bd272a989c5f0315f458565abfe3c1f7b2a0" dependencies = [ "amplify", "baid64", "bp-core", "bp-invoice", + "fast32", "fluent-uri", "indexmap", "percent-encoding", @@ -691,8 +707,8 @@ dependencies = [ [[package]] name = "rgb-std" -version = "0.11.0-beta.5" -source = "git+https://github.com/RGB-WG/rgb-std?branch=develop#47413dfdda70dcf7963a9b4b03f406e374e15fae" +version = "0.11.0-beta.6" +source = "git+https://github.com/RGB-WG/rgb-std?branch=master#9e23bd272a989c5f0315f458565abfe3c1f7b2a0" dependencies = [ "aluvm", "amplify", @@ -724,9 +740,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "secp256k1" @@ -793,29 +809,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.200" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -824,9 +840,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -867,16 +883,18 @@ dependencies = [ [[package]] name = "single_use_seals" -version = "0.11.0-beta.5" -source = "git+https://github.com/LNP-BP/client_side_validation?branch=develop#5e50b251aa5a5c4d83c47dad609a15ef3d50800f" +version = "0.11.0-beta.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55367b3a0d642ee289fec6781fda0b527a35d45511a04bb4cd19fa315c441b77" dependencies = [ "amplify_derive", ] [[package]] name = "strict_encoding" -version = "2.7.0-beta.3" -source = "git+https://github.com/strict-types/strict-encoding?branch=develop#901e26ee8b01b3bcff4d7ac76acff2fcc633634b" +version = "2.7.0-beta.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2854135bbecf01fac5bae609ec3408e130259670424e2cd755660556d239c92" dependencies = [ "amplify", "half", @@ -887,7 +905,8 @@ dependencies = [ [[package]] name = "strict_encoding_derive" version = "2.7.0-beta.3" -source = "git+https://github.com/strict-types/strict-encoding?branch=develop#901e26ee8b01b3bcff4d7ac76acff2fcc633634b" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "475fa6f1fdde6e0555422b5111ad34bde30a1459af3599f920c3af9829772c0e" dependencies = [ "amplify_syn", "heck", @@ -898,8 +917,9 @@ dependencies = [ [[package]] name = "strict_types" -version = "2.7.0-beta.3" -source = "git+https://github.com/strict-types/strict-types?branch=develop#86486d299bf068c734c406e529d35f0c25805293" +version = "2.7.0-beta.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7a5479921604482fd8775ec07fbb9075c92e12649358d1f70dc9552783d0d1e" dependencies = [ "amplify", "ascii-armor", @@ -938,9 +958,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -949,29 +969,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "toml" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", @@ -981,18 +1001,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.12" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap", "serde", @@ -1062,7 +1082,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -1084,7 +1104,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1170,9 +1190,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" -version = "0.6.7" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 1604461..6de1043 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,10 +17,10 @@ name = "ifaces" [dependencies] amplify = "4.6.0" -strict_encoding = "2.7.0-beta.3" -strict_types = "2.7.0-beta.3" -aluvm = "0.11.0-beta.5" -bp-core = "0.11.0-beta.5" +strict_encoding = "2.7.0-beta.4" +strict_types = "2.7.0-beta.4" +aluvm = "0.11.0-beta.6" +bp-core = "0.11.0-beta.6" chrono = "0.4.37" rgb-std = { version = "0.11.0-beta.5", features = ["fs"] } serde_crate = { package = "serde", version = "1.0", optional = true } @@ -33,15 +33,5 @@ all = ["serde"] serde = ["serde_crate", "rgb-std/serde", "chrono/serde"] [patch.crates-io] -strict_encoding = { git = "https://github.com/strict-types/strict-encoding", branch = "develop" } -strict_types = { git = "https://github.com/strict-types/strict-types", branch = "develop" } -commit_verify = { git = "https://github.com/LNP-BP/client_side_validation", branch = "develop" } -single_use_seals = { git = "https://github.com/LNP-BP/client_side_validation", branch = "develop" } -bp-consensus = { git = "https://github.com/BP-WG/bp-core", branch = "develop" } -bp-dbc = { git = "https://github.com/BP-WG/bp-core", branch = "develop" } -bp-seals = { git = "https://github.com/BP-WG/bp-core", branch = "develop" } -bp-core = { git = "https://github.com/BP-WG/bp-core", branch = "develop" } -aluvm = { git = "https://github.com/AluVM/rust-aluvm", branch = "develop" } -rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "develop" } -rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "develop" } -rgb-invoice = { git = "https://github.com/RGB-WG/rgb-std", branch = "develop" } +rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "master" } +rgb-invoice = { git = "https://github.com/RGB-WG/rgb-std", branch = "master" } diff --git a/src/rgb20/info.rs b/src/rgb20/info.rs index d5f7dd5..bb95cd2 100644 --- a/src/rgb20/info.rs +++ b/src/rgb20/info.rs @@ -24,7 +24,7 @@ use std::fmt::{self, Display, Formatter, Write}; use chrono::{DateTime, Utc}; use rgbstd::info::ContractInfo; use rgbstd::stl::Attachment; -use rgbstd::{Amount, CoinAmount, Precision, XOutpoint, XWitnessId}; +use rgbstd::{Amount, Precision, XOutpoint, XWitnessId}; use crate::rgb20::Features; @@ -59,7 +59,7 @@ impl Display for Rgb20Info { f.write_char(f.fill())?; write!(f, "{: >2}", self.precision as u8)?; f.write_char(f.fill())?; - write!(f, "{}", CoinAmount::with(self.issued, self.precision))?; + write!(f, "{}", self.issued)?; f.write_char(f.fill())?; writeln!(f, "{}", self.features)?; if let Some(details) = &self.details {