From cb6892b683193b42b28222c094f3a5b448dee3ce Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Fri, 24 May 2024 17:16:55 +0200 Subject: [PATCH] chore: update dependencies. Release beta 6 --- Cargo.lock | 156 +++++++++++++++++++++++------------------- Cargo.toml | 29 +++----- src/stl.rs | 2 +- src/vm/op_contract.rs | 2 +- stl/RGB@0.1.0.sta | 2 +- stl/RGB@0.1.0.sty | 2 +- 6 files changed, 97 insertions(+), 96 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 86d9ab09..ee0adc5c 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.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673486110323d50d9f33d99f0f526726b4721b1b596284351e75d3692225abe8" +checksum = "f834c431d27e0e6bedf95c9ee4dbea02fa4e4cd5bc26a61e5a418427178c5495" 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.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b8b80494235048845f856b267a4a1d97df59fd14ed7ca92652f834ce93becc6" +checksum = "dd5e666513565d0a35116973541fbcb35700619316e1865cb27c7dba5de98668" dependencies = [ "amplify", "base64", @@ -152,9 +153,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base85" @@ -201,8 +202,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", @@ -215,8 +217,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", @@ -233,8 +236,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", @@ -247,8 +251,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", @@ -269,9 +274,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "cc" -version = "1.0.95" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" [[package]] name = "cfg-if" @@ -296,7 +301,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", @@ -307,8 +313,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", @@ -396,9 +403,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", @@ -409,10 +416,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", ] @@ -478,9 +486,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "log" @@ -508,9 +516,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", ] @@ -523,9 +531,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 = "ppv-lite86" @@ -535,9 +543,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" dependencies = [ "unicode-ident", ] @@ -583,7 +591,7 @@ dependencies = [ [[package]] name = "rgb-core" -version = "0.11.0-beta.5" +version = "0.11.0-beta.6" dependencies = [ "aluvm", "amplify", @@ -614,9 +622,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 = "scoped-tls" @@ -689,29 +697,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.199" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" 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", @@ -720,9 +728,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", ] @@ -763,16 +771,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", @@ -783,7 +793,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", @@ -794,8 +805,9 @@ dependencies = [ [[package]] name = "strict_types" -version = "2.7.0-beta.3" -source = "git+https://github.com/strict-types/strict-types?branch=develop#4effa0b28804f7798a17f5dc6b4411ce6515f2f5" +version = "2.7.0-beta.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7a5479921604482fd8775ec07fbb9075c92e12649358d1f70dc9552783d0d1e" dependencies = [ "amplify", "ascii-armor", @@ -834,9 +846,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", @@ -845,29 +857,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.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" dependencies = [ "serde", "serde_spanned", @@ -877,18 +889,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.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" dependencies = [ "indexmap", "serde", @@ -958,7 +970,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -992,7 +1004,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1025,7 +1037,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -1113,9 +1125,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 5f949b81..43419873 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rgb-core" -version = "0.11.0-beta.5" +version = "0.11.0-beta.6" authors = ["Dr Maxim Orlovsky "] description = "RGB Core Library: confidential & scalable smart contracts on Bitcoin & Lightning (consensus layer)" repository = "https://github.com/RGB-WG/rgb-core" @@ -23,17 +23,17 @@ required-features = ["stl"] [dependencies] amplify = { version = "~4.6.0", features = ["rand"] } -baid64 = "~0.1.0" -strict_encoding = "~2.7.0-beta.3" -strict_types = { version = "~2.7.0-beta.3", features = ["armor"] } -aluvm = { version = "~0.11.0-beta.5", features = ["std", "ascii-armor"] } -commit_verify = { version = "~0.11.0-beta.5", features = ["rand", "derive"] } -single_use_seals = "~0.11.0-beta.5" -bp-core = { version = "~0.11.0-beta.5" } +baid64 = "~0.2.0" +strict_encoding = "~2.7.0-beta.4" +strict_types = { version = "~2.7.0-beta.4", features = ["armor"] } +aluvm = { version = "~0.11.0-beta.6", features = ["std", "ascii-armor"] } +commit_verify = { version = "~0.11.0-beta.6", features = ["rand", "derive"] } +single_use_seals = "~0.11.0-beta.6" +bp-core = { version = "~0.11.0-beta.6" } secp256k1-zkp = { version = "0.10.1", features = ["rand", "rand-std", "global-context"] } # TODO: Update version before the release mime = "~0.3.17" serde_crate = { package = "serde", version = "1", features = ["derive"], optional = true } -chrono = "0.4.31" +chrono = "0.4.38" [features] default = [] @@ -60,14 +60,3 @@ wasm-bindgen-test = "0.3" [package.metadata.docs.rs] features = ["all"] - -[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" } diff --git a/src/stl.rs b/src/stl.rs index 17db50d9..c281ae47 100644 --- a/src/stl.rs +++ b/src/stl.rs @@ -35,7 +35,7 @@ use crate::{ /// Strict types id for the library providing data types for RGB consensus. pub const LIB_ID_RGB: &str = - "stl:sqbS4Bea-l@IK7Dt-86Fkfgg-NOhi22w-S@kz5bC-l$99W@Y#bless-donald-poker"; + "stl:sqbS4Bea-l!IK7Dt-86Fkfgg-NOhi22w-S!kz5bC-l$99W!Y#bless-donald-poker"; fn _rgb_core_stl() -> Result { LibBuilder::new(libname!(LIB_NAME_RGB), tiny_bset! { diff --git a/src/vm/op_contract.rs b/src/vm/op_contract.rs index 246804b8..c734f6d5 100644 --- a/src/vm/op_contract.rs +++ b/src/vm/op_contract.rs @@ -604,7 +604,7 @@ mod test { assert_eq!( alu_id.to_string(), - "alu:zI4PtPCR-Eut023@-Hqblf3X-N2J4GZb-TR2ZEsI-vQfhKOU#ruby-sherman-tonight" + "alu:zI4PtPCR-Eut023!-Hqblf3X-N2J4GZb-TR2ZEsI-vQfhKOU#ruby-sherman-tonight" ); assert_eq!(alu_lib.code.as_ref().to_hex(), "d0a00f"); assert_eq!( diff --git a/stl/RGB@0.1.0.sta b/stl/RGB@0.1.0.sta index e3e78794..0270755f 100644 --- a/stl/RGB@0.1.0.sta +++ b/stl/RGB@0.1.0.sta @@ -1,5 +1,5 @@ -----BEGIN STRICT TYPE LIB----- -Id: stl:sqbS4Bea-l@IK7Dt-86Fkfgg-NOhi22w-S@kz5bC-l$99W@Y#bless-donald-poker +Id: stl:sqbS4Bea-l!IK7Dt-86Fkfgg-NOhi22w-S!kz5bC-l$99W!Y#bless-donald-poker Name: RGB Dependencies: StrictTypes#century-comrade-chess, diff --git a/stl/RGB@0.1.0.sty b/stl/RGB@0.1.0.sty index 8b370f38..5b76f26b 100644 --- a/stl/RGB@0.1.0.sty +++ b/stl/RGB@0.1.0.sty @@ -1,5 +1,5 @@ {- - Id: stl:sqbS4Bea-l@IK7Dt-86Fkfgg-NOhi22w-S@kz5bC-l$99W@Y#bless-donald-poker + Id: stl:sqbS4Bea-l!IK7Dt-86Fkfgg-NOhi22w-S!kz5bC-l$99W!Y#bless-donald-poker Name: RGB Version: 0.1.0 Description: Consensus layer for RGB smart contracts