diff --git a/Cargo.lock b/Cargo.lock index 680079f2..7ddc165e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -88,8 +88,9 @@ dependencies = [ [[package]] name = "ascii-armor" -version = "0.4.0" -source = "git+https://github.com/UBIDECO/ascii-armor#38dc9767f36db3957ac3dade280a04d9a72b6be4" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f834c431d27e0e6bedf95c9ee4dbea02fa4e4cd5bc26a61e5a418427178c5495" dependencies = [ "amplify", "baid64", @@ -111,9 +112,9 @@ dependencies = [ [[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", @@ -123,9 +124,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" @@ -171,7 +172,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "client_side_validation" -version = "0.11.0-beta.5" +version = "0.11.0-beta.6" dependencies = [ "commit_verify", "serde", @@ -180,7 +181,7 @@ dependencies = [ [[package]] name = "commit_encoding_derive" -version = "0.11.0-beta.5" +version = "0.11.0-beta.6" dependencies = [ "amplify", "amplify_syn", @@ -194,7 +195,7 @@ dependencies = [ [[package]] name = "commit_verify" -version = "0.11.0-beta.5" +version = "0.11.0-beta.6" dependencies = [ "amplify", "commit_encoding_derive", @@ -209,9 +210,9 @@ dependencies = [ [[package]] name = "compiletest_rs" -version = "0.9.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70489bbb718aea4f92e5f48f2e3b5be670c2051de30e57cb6e5377b4aa08b372" +checksum = "7225fee1bcf9247bb3a1b1a2d7ecfe2f7a990e549a09d766a257a4ae30dac0d6" dependencies = [ "diff", "filetime", @@ -341,10 +342,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", ] @@ -643,7 +645,7 @@ dependencies = [ [[package]] name = "single_use_seals" -version = "0.11.0-beta.5" +version = "0.11.0-beta.6" dependencies = [ "amplify_derive", "async-trait", @@ -651,8 +653,9 @@ dependencies = [ [[package]] name = "strict_encoding" -version = "2.7.0-beta.3" -source = "git+https://github.com/strict-types/strict-encoding?branch=develop#7c46c97c10655612a1c71b984faa62ffc543b226" +version = "2.7.0-beta.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2854135bbecf01fac5bae609ec3408e130259670424e2cd755660556d239c92" dependencies = [ "amplify", "half", @@ -662,7 +665,8 @@ dependencies = [ [[package]] name = "strict_encoding_derive" version = "2.7.0-beta.3" -source = "git+https://github.com/strict-types/strict-encoding?branch=develop#7c46c97c10655612a1c71b984faa62ffc543b226" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "475fa6f1fdde6e0555422b5111ad34bde30a1459af3599f920c3af9829772c0e" dependencies = [ "amplify_syn", "heck", @@ -673,8 +677,9 @@ dependencies = [ [[package]] name = "strict_types" -version = "2.7.0-beta.3" -source = "git+https://github.com/strict-types/strict-types?branch=develop#a2e860f36f24b477712551a6db349edcf08efb3e" +version = "2.7.0-beta.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7a5479921604482fd8775ec07fbb9075c92e12649358d1f70dc9552783d0d1e" dependencies = [ "amplify", "ascii-armor", diff --git a/Cargo.toml b/Cargo.toml index 39d1ec51..01c32975 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ default-members = [ ] [workspace.package] -version = "0.11.0-beta.5" +version = "0.11.0-beta.6" authors = ["Dr Maxim Orlovsky "] homepage = "https://github.com/LNP-BP" repository = "https://github.com/LNP-BP/client_side_validation" @@ -23,8 +23,8 @@ license = "Apache-2.0" [workspace.dependencies] amplify = "4.6.0" -strict_encoding = "2.7.0-beta.3" -strict_types = "2.7.0-beta.3" +strict_encoding = "2.7.0-beta.4" +strict_types = "2.7.0-beta.4" [package] name = "client_side_validation" @@ -46,8 +46,8 @@ name = "client_side_validation" path = "src/lib.rs" [dependencies] -commit_verify = { version = "0.11.0-beta.5", path = "./commit_verify", default-features = false } -single_use_seals = { version = "0.11.0-beta.5", path = "./single_use_seals" } +commit_verify = { version = "0.11.0-beta.6", path = "./commit_verify", default-features = false } +single_use_seals = { version = "0.11.0-beta.6", path = "./single_use_seals" } serde_crate = { package = "serde", version = "1", features = ["derive"], optional = true } [features] @@ -61,8 +61,3 @@ serde = ["serde_crate", "commit_verify/serde"] [package.metadata.docs.rs] features = ["all"] - -[patch.crates-io] -ascii-armor = { git = "https://github.com/UBIDECO/ascii-armor" } -strict_encoding = { git = "https://github.com/strict-types/strict-encoding", branch = "develop" } -strict_types = { git = "https://github.com/strict-types/strict-types", branch = "develop" } diff --git a/commit_verify/derive/Cargo.toml b/commit_verify/derive/Cargo.toml index af53fb4d..4ca0fd23 100644 --- a/commit_verify/derive/Cargo.toml +++ b/commit_verify/derive/Cargo.toml @@ -20,9 +20,9 @@ amplify = { workspace = true } quote = "1" syn = { version = "1", features = ["full"] } proc-macro2 = "1" -amplify_syn = "2.0.0" +amplify_syn = "2.0.1" [dev-dependencies] commit_verify = { path = ".." } -compiletest_rs = "0.9.0" +compiletest_rs = "0.10.2" strict_encoding = { workspace = true } diff --git a/commit_verify/src/stl.rs b/commit_verify/src/stl.rs index 3cdf0c59..8ede6e42 100644 --- a/commit_verify/src/stl.rs +++ b/commit_verify/src/stl.rs @@ -24,7 +24,7 @@ use strict_types::{CompileError, LibBuilder, TypeLib}; use crate::{mpc, MerkleHash, MerkleNode, ReservedBytes, StrictHash, LIB_NAME_COMMIT_VERIFY}; pub const LIB_ID_COMMIT_VERIFY: &str = - "stl:4dHdHDpB-17hoScv-Z8f00we-UaQ4D@G-tTV1vSN-JseSamU#tennis-peace-olympic"; + "stl:4dHdHDpB-17hoScv-Z8f00we-UaQ4D!G-tTV1vSN-JseSamU#tennis-peace-olympic"; fn _commit_verify_stl() -> Result { LibBuilder::new(libname!(LIB_NAME_COMMIT_VERIFY), tiny_bset! { diff --git a/single_use_seals/Cargo.toml b/single_use_seals/Cargo.toml index 18cb7567..7f0944cb 100644 --- a/single_use_seals/Cargo.toml +++ b/single_use_seals/Cargo.toml @@ -18,7 +18,7 @@ path = "src/lib.rs" [dependencies] amplify_derive = "4.0.0" -async-trait = { version = "0.1.73", optional = true } +async-trait = { version = "0.1.80", optional = true } [features] default = [] @@ -26,4 +26,4 @@ all = ["async"] async = ["async-trait"] [package.metadata.docs.rs] -features = [ "all" ] +features = ["all"] diff --git a/stl/CommitVerify@0.1.0.sta b/stl/CommitVerify@0.1.0.sta index dd04c087..2cfbe4d6 100644 --- a/stl/CommitVerify@0.1.0.sta +++ b/stl/CommitVerify@0.1.0.sta @@ -1,37 +1,31 @@ -----BEGIN STRICT TYPE LIB----- -Id: stl:4dHdHDpB-17hoScv-Z8f00we-UaQ4D@G-tTV1vSN-JseSamU#tennis-peace-olympic +Id: stl:4dHdHDpB-17hoScv-Z8f00we-UaQ4D!G-tTV1vSN-JseSamU#tennis-peace-olympic Name: CommitVerify Dependencies: Std#ralph-blue-lucky -Checksum-SHA256: 65c610ae37864b07fc960c412ea98cee2c9c528b0b0ef02d2c0b3ce4ba59290a +Check-SHA256: 65c610ae37864b07fc960c412ea98cee2c9c528b0b0ef02d2c0b3ce4ba59290a -3`1{iZE18?WpZg|c>&5S9&dx0-7pM3Z=O*v*GCA9fL-<|HrZsA`NnJlR3`&dbYuY -oQ*>kj0A^Tl*p6J$36SYb7g#;qpQBTpwL(~+!(f@;t~vt?k^)sV4*&{7Z*6U9bZu -pBbOiwb2LJ#-AOHkRWnpFn0uTvlZfId*X>?^|00sgGaB^>SZ)0z40Wg(*<{e=)S- -S-YV@1=_p5>Oab-~jC -R3C`SFec^=zG+gvC|O;Wo~qGZ*X}41_B3VZgg^QaCra#2m^3$a{vGY3r%HmYiwmg -Y;R+01_T9UWpH$80?I5NZ-bfLFbqC#o>4E?M+l67UG^w8*<_XZ#%uyqCuUf1*p6J -$36SYb7g#;qpQBTpwL(~+!(f@;t~vt?k_cmOW?^G=Z*l+t0t{nvZ*y}~Wn*+{Z*B -kx0ob*-9G+(AKhLw+s!eDmlO2>&}_PPHjCBJR{;P3000000RR90{{R3000 -(7mbaHQSc>n|g00eGtZe;)f009JZZ*64&1pxp62ntPQa%*g5NMUnm1pxpD002NB0 -18cIa%*g5PH$vo1_cRXa$#;`XlZU|0lQ3Y3mf3jZajR1t6%zV^Qs{9ch%g}Wy;2! -c7I|^!UbeyaCB$@009MeX=HS0001BbZf|5|F#$N9Lxv|61vo|sZfv!yd427@;7veO2zMB=|GYd -^+a%*g5P;zf?W(ETTaBp(}00anQZ)Ra*bZ>G100IPXVRUE!2mv^rLxv|61vo|y0X3z7$AZgg^QaCra#2nb_uW?^G=Z*l+t0tjtob8}&5Wpe- -u0Wg(*<{e=)S-S-YmzVsZkZk>V@1=_p5>Oab- -~jCR3C`SFec^=zG+gvC{wm0000000960{{R30000ARVQ>Hn000C41p)yum44Q3WPbltNdpi -4*91)SI!>0000000000|Ns90000002Tf&jb75y?1pxpD002NB01ZxWWMx8fVQyn+ -X>Ml&0|a(&X=DHfb7^j8Y-IrkVsc?_V`u^jP;zf{Z)0z4Nn`~900#g7Kp+4PQe|^ -xa&~28LV0v$b1?-000#g7Kmh;_Qe|^xa&~28LV0v$b20@100#g7Kmq^`Qe|^xa&~ -28LV0v$b2J4300#g7Km-5^Q*?4^V{}Mib7%zt00#g7Kp+4JRB~lyPH$vo1OfmJV{ -dL_WnpY(WKM5nWdH^O1!QG#bZ7#~EFN!zncXl9K5w2;FV{y1jDTJCC^p$-mHEbO0 -#qkvSa8^mT+s=T=}Z?`J=~w8Q=GLzSfImTncuED0}GM_Xkl|`0XUvRh9?yTI7S;; -e;>sZfv!yd427@;7veO2zMB=|GXV}`Z*6U9bZupBbWCMoW&j2P3UG37bZ=vCY)ND -RFqMAh9bq(Cy9Eg3;jcYvA-~r9`yDZYr+MW?bl_I82W@3@b75y?0W~+NQ5DGQh1^ -p2tAX-yWl;qtQ&5S9&dx0-7pM3Z=O*v*GCA9fL-<|HrZsA`NnJlR3`&dbYuYoQ*>kj0A^Tl*p6J$ +36SYb7g#;qpQBTpwL(~+!(f@;t~vt?k^)sV4*&{7Z*6U9bZupBbOiwb2LJ#-AOHkRWnpFn0uTvlZfId* +X>?^|00sgGaB^>SZ)0z40Wg(*<{e=)S-S-YV@1=_p5>Oab-~jCR3C`SFec^=zG+gvC|O;Wo~qGZ*X}41_B3VZgg^QaCra#2m^3$a{vGY3r%HmYiwmg +Y;R+01_T9UWpH$80?I5NZ-bfLFbqC#o>4E?M+l67UG^w8*<_XZ#%uyqCuUf1*p6J$36SYb7g#;qpQBTp +wL(~+!(f@;t~vt?k_cmOW?^G=Z*l+t0t{nvZ*y}~Wn*+{Z*Bkx0ob*-9G+(AKhLw+s!eDmlO2> +&}_PPHjCBJR{;P3000000RR90{{R3000(7mbaHQSc>n|g00eGtZe;)f009JZZ*64&1pxp62ntPQa%*g5 +NMUnm1pxpD002NB018cIa%*g5PH$vo1_cRXa$#;`XlZU|0lQ3Y3mf3jZajR1t6%zV^Qs{9ch%g}Wy;2! +c7I|^!UbeyaCB$@009MeX=HS0001BbZf|5|F#$N9Lxv|61vo|sZfv!yd427@;7veO2zMB=|GYd^+a%*g5P;zf?W(ETTaBp(}00anQZ)Ra* +bZ>G100IPXVRUE!2mv^rLxv|61vo|y0X3z7$AZgg^QaCra#2nb_uW?^G=Z*l+t0tjtob8}&5Wpe-u0Wg(*<{e=)S-S-Y +mzVsZkZk>V@1=_p5>Oab-~jCR3C`SFec^=zG+gvC{wm0000000960 +{{R30000ARVQ>Hn000C41p)yum44Q3WPbltNdpi4*91)SI!>0000000000|Ns90000002Tf&jb75y?1pxpD002NB01ZxWWMx8fVQyn+ +X>Ml&0|a(&X=DHfb7^j8Y-IrkVsc?_V`u^jP;zf{Z)0z4Nn`~900#g7Kp+4PQe|^xa&~28LV0v$b1?-0 +00#g7Kmh;_Qe|^xa&~28LV0v$b20@100#g7Kmq^`Qe|^xa&~28LV0v$b2J4300#g7Km-5^Q*?4^V{}Mi +b7%zt00#g7Kp+4JRB~lyPH$vo1OfmJV{dL_WnpY(WKM5nWdH^O1!QG#bZ7#~EFN!zncXl9K5w2;FV{y1 +jDTJCC^p$-mHEbO0#qkvSa8^mT+s=T=}Z?`J=~w8Q=GLzSfImTncuED0}GM_Xkl|`0XUvRh9?yTI7S;; +e;>sZfv!yd427@;7veO2zMB=|GXV}`Z*6U9bZupBbWCMoW&j2P3UG37bZ=vCY)NDRFqMAh9bq(Cy9Eg3 +;jcYvA-~r9`yDZYr+MW?bl_I82W@3@b75y?0W~+NQ5DGQh1^p2tAX-yWl;qtQ