From 7f2e2458d239ccf1c087218625fea145c28135ef Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Sat, 3 Feb 2024 17:13:22 +0100 Subject: [PATCH] chore: update to new STL --- Cargo.lock | 82 +++++++++++++++++++++---------------- Cargo.toml | 4 ++ commit_verify/Cargo.toml | 6 +-- commit_verify/src/stl.rs | 2 +- stl/CommitVerify@0.1.0.sta | 45 ++++++++++---------- stl/CommitVerify@0.1.0.stl | Bin 989 -> 989 bytes stl/CommitVerify@0.1.0.sty | 49 ++++++++++++---------- 7 files changed, 104 insertions(+), 84 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a32a6295..fc68beb0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,9 +13,9 @@ dependencies = [ [[package]] name = "amplify" -version = "4.5.0" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8629db306c0bbeb0a402e2918bdcf0026b5ddb24c46460f3bf5410b350d98710" +checksum = "f8dd50780fa78a67bae725dd164bc993500656112815a9301fd8b797e9006803" dependencies = [ "amplify_apfloat", "amplify_derive", @@ -108,7 +108,7 @@ checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -130,10 +130,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581" [[package]] -name = "base64" -version = "0.21.5" +name = "base85" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "36915bbaca237c626689b5bd14d02f2ba7a5a359d30a2a08be697392e3718079" +dependencies = [ + "thiserror", +] [[package]] name = "bitflags" @@ -400,9 +403,9 @@ checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" dependencies = [ "equivalent", "hashbrown", @@ -498,18 +501,18 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.71" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -628,22 +631,22 @@ checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -678,9 +681,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.29" +version = "0.9.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15e0ef66bf939a7c890a0bf6d5a733c70202225f9888a89ed5c62298b019129" +checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e" dependencies = [ "indexmap", "itoa", @@ -710,9 +713,8 @@ dependencies = [ [[package]] name = "strict_encoding" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab7b75b4af0aff9dd97b68df262bf0e807b7d007cc860fa217943f898a05a5ab" +version = "2.6.2" +source = "git+https://github.com/strict-types/strict-encoding?branch=ident#9c20b327178b449cbb24a18c7db65edeb50a9d5b" dependencies = [ "amplify", "half", @@ -722,8 +724,7 @@ dependencies = [ [[package]] name = "strict_encoding_derive" version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37064ec285e2a633465eb525c8698eea51373dee889fe310e0d32df8343e7f4f" +source = "git+https://github.com/strict-types/strict-encoding?branch=ident#9c20b327178b449cbb24a18c7db65edeb50a9d5b" dependencies = [ "amplify_syn", "heck", @@ -735,16 +736,16 @@ dependencies = [ [[package]] name = "strict_types" version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d10cc45e67d452cfe0d87d4714c3250190d97479af3502bbd823651bfe0f505f" +source = "git+https://github.com/strict-types/strict-types?branch=vesper#f93a63bf785d639de155cc6e2aa2b10bf15a5d84" dependencies = [ "amplify", "baid58", - "base64", + "base85", "half", "indexmap", "sha2", "strict_encoding", + "vesper", ] [[package]] @@ -770,9 +771,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.43" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -820,14 +821,14 @@ checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] name = "toml" -version = "0.8.8" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", "serde_spanned", @@ -846,9 +847,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ "indexmap", "serde", @@ -887,6 +888,15 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "vesper" +version = "0.1.0" +source = "git+https://github.com/UBIDECO/vesper#18107cbbdffeb91d992dc7c76da0640aea152e8f" +dependencies = [ + "amplify", + "strict_encoding", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -914,7 +924,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", "wasm-bindgen-shared", ] @@ -936,7 +946,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/Cargo.toml b/Cargo.toml index 10aa8a93..66eb61f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,3 +56,7 @@ serde = ["serde_crate", "commit_verify/serde"] [package.metadata.docs.rs] features = [ "all" ] + +[patch.crates-io] +strict_encoding = { git = "https://github.com/strict-types/strict-encoding", branch = "ident" } +strict_types = { git = "https://github.com/strict-types/strict-types", branch = "vesper" } diff --git a/commit_verify/Cargo.toml b/commit_verify/Cargo.toml index 228e30af..05b13870 100644 --- a/commit_verify/Cargo.toml +++ b/commit_verify/Cargo.toml @@ -22,9 +22,9 @@ name = "commit-stl" required-features = ["stl"] [dependencies] -amplify = { version = "4.5.0", features = ["hex", "apfloat"] } +amplify = { version = "4.5.1", features = ["hex", "apfloat"] } commit_encoding_derive = { version = "0.11.0-beta.3", path = "derive" } -strict_encoding = "2.6.1" +strict_encoding = "2.6.2" strict_types = { version = "1.6.3" } sha2 = "0.10.8" ripemd = "0.1.3" @@ -38,7 +38,7 @@ rand = "0.8.5" default = ["derive"] all = ["rand", "serde", "stl", "derive"] serde = ["serde_crate", "amplify/serde"] -stl = ["strict_types/base64"] +stl = ["strict_types/base85"] derive = [] [package.metadata.docs.rs] diff --git a/commit_verify/src/stl.rs b/commit_verify/src/stl.rs index 43742919..e36300ba 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, LIB_NAME_COMMIT_VERIFY}; pub const LIB_ID_COMMIT_VERIFY: &str = - "urn:ubideco:stl:Ewz3JJVGUDfT1KkcBpJ1tYHUpVfvwNpQBWdvPqKMEZfY#capitan-bonjour-whiskey"; + "urn:ubideco:stl:4SZ2EgWWtC5LsNXmNpAzogNHZoaZNTCwU3SQhAYwDX6A#citizen-fiction-corner"; fn _commit_verify_stl() -> Result { LibBuilder::new(libname!(LIB_NAME_COMMIT_VERIFY), tiny_bset! { diff --git a/stl/CommitVerify@0.1.0.sta b/stl/CommitVerify@0.1.0.sta index c507e89b..471eb799 100644 --- a/stl/CommitVerify@0.1.0.sta +++ b/stl/CommitVerify@0.1.0.sta @@ -1,30 +1,29 @@ -----BEGIN STRICT TYPE LIB----- -Id: urn:ubideco:stl:ZtHaBzu9ojbDahaGKEXe5v9DfSDxLERbLkEB23R6Q6V +Id: 4SZ2EgWWtC5LsNXmNpAzogNHZoaZNTCwU3SQhAYwDX6A#citizen-fiction-corner Name: CommitVerify Dependencies: - urn:ubideco:stl:9KALDYR8Nyjq4FdMW6kYoL7vdkWnqPqNuFnmE9qHpNjZ + 55f8bsTvyh7zAeYAiNwL9G1DxgwXzDvE8edcTFJz3Q9H#milan-poncho-gray -DENvbW1pdFZlcmlmeQF7hIA8nvriESWnfCw5vHDS/ej5Q64N/Zz05oLtx2bKcANT -dGQBA1N0ZAEAIuTglum9fVyG9eHfXXcBav45xzzZNIVQlECJjKijeV4CVTUIAApD -b21taXRtZW50BQEABwAAQCAAC01lcmtsZUJsb2NrBgQFZGVwdGgCe4SAPJ764hEl -p3wsObxw0v3o+UOuDf2c9OaC7cdmynAi5OCW6b19XIb14d9ddwFq/jnHPNk0hVCU -QImMqKN5Xghjb2ZhY3RvcgAAAgxjcm9zc1NlY3Rpb24ACAFTQ5UPRDMqI//ogM9Q -588IBqEEzeBIaxPhDPwYg0Ow1wAAAAAAAAAA/////wAAAAAHZW50cm9weQAEAgAE -bm9uZQAAAAEEc29tZQAFAQAACApNZXJrbGVOb2RlBQEABwAAQCAAC01lcmtsZVBy -b29mBgMDcG9zAAAECGNvZmFjdG9yAAACBHBhdGgACAFVjTcH+EWGU4DuzEFVJOik -mWBR05SCQ/GU9/GRVyPp5gAAAAAAAAAAIAAAAAAAAAAKTWVya2xlVHJlZQYFBWRl -cHRoAnuEgDye+uIRJad8LDm8cNL96PlDrg39nPTmgu3HZspwIuTglum9fVyG9eHf -XXcBav45xzzZNIVQlECJjKijeV4HZW50cm9weQAACAhjb2ZhY3RvcgAAAghtZXNz -YWdlcwAKATCVfuYdYTRZuwUI5OGvPWohv9b7+x0xgqd55UV04FaxATU3qVEVyOqF -3FL3q4HycWVRBSZTlEJXr4kT6HvUm7HTAAAAAAAAAAD///8AAAAAAANtYXAACgAA -BAAFAgEwlX7mHWE0WbsFCOThrz1qIb/W+/sdMYKneeVFdOBWsQE1N6lRFcjqhdxS -96uB8nFlUQUmU5RCV6+JE+h71Jux0wAAAAAAAAAA////AAAAAAAHTWVzc2FnZQUB -AAcAAEAgAApQcm90b2NvbElkBQEABwAAQCAACFRyZWVOb2RlBAIADWNvbmNlYWxl -ZE5vZGUABgIFZGVwdGgCe4SAPJ764hElp3wsObxw0v3o+UOuDf2c9OaC7cdmynAi -5OCW6b19XIb14d9ddwFq/jnHPNk0hVCUQImMqKN5XgRoYXNoAVWNNwf4RYZTgO7M -QVUk6KSZYFHTlIJD8ZT38ZFXI+nmAQ5jb21taXRtZW50TGVhZgAGAgpwcm90b2Nv -bElkATCVfuYdYTRZuwUI5OGvPWohv9b7+x0xgqd55UV04FaxB21lc3NhZ2UBNTep -URXI6oXcUvergfJxZVEFJlOUQleviRPoe9SbsdM= +3`1{iZE18?WpZg|c>z42FO*VfbYuY +oQ*>kj0A^Tl*p6J$36SYb7g#;qpQBTpwL(~+!(f@;t~vt?k^)sV2mlI0Z*6U9bZu +pBbOiwb2LJ#-AOH(ZWpZn5WkPIkV`~Nk1!QG#bZ7!Rpf8lZe)ws0vsvd(H;<-EjC +!>^Xm2e^s4rySqYNBoSa8^mT+s=T=}Z?`J=~w8Q=GLzSfImTncuED0}GM}V{c|*V +{~tF0006EV{&hEb5mtwbZKvH00;rtwYiq_Rlwao{(T?aUNqayF^88E^#IUpx^^~; +)zDV}0000000030|Ns9000007Wo~qGZ*X}41OfmAZf|a7000011aog~WdH>M000O +IO=WUxY-LDcb7%zt00#g7Kp+4MO=WUxY-Lb#Z*OJ>0|Rhxa{vGY2xD(%VPkY}asU +7V1aM(=XaEQSIG#g>Clv)aMjKgwAH@`bu1x<7g|G$};xvA~n-$_S0000000000AO +HXW000003Qc8lYiwmya%E)(1qEbfaCB$_JfJU>zJB;=bhBCKPB)LHON@H8JZNt%N +vJPm-=hp1W>|38j$F|Rkm*bpSUudIqf?xQ3WPbltNdpi4*91)SI!>0000000000|Ns90000 +0018re&015yA1ONpB0Wg(*<{e=)S-S-YmzVsZ +kZk>V@1=_p5>Oab-~jCR3C`SFec^=zG+gvC{wm0000000960{{R30000L~Wpi_3X +JrKe00#g7Kp+4LP;zf{Z)0z4Nn`~900#g7Kp+4JRB~lyPH$vo1OfmJV{dL_WnpY( +WKM5nWdH^O1!QG#bZ7!Rpf8lZe)ws0vsvd(H;<-EjC!>^Xm2e^s4rySqYNBoSa8^ +mT+s=T=}Z?`J=~w8Q=GLzSfImTncuED0}GM_Xkl|`0XUvRh9?yTI7S;;e;>sZfv! +yd427@;7veO2zMB=|GXV}`Z*6U9bZupBbWCMoW&j2P3UG37bZ=vCY)NDRFqMAh9b +q(Cy9Eg3;jcYvA-~r9`yDZYr+MW?bl_I82W@3@b75y?0W~+NQ5DGQh1^p2tAX-yW +l;qtQ?{*--nKQc=;M?Uv6?_cKKQ?=D5BVX5Zg?`HY z#XK_1!6hk-V1gknqTohf%tg)#FMY%#Z12op96V>MQ^bP92{Z4nvts6+G%-@Io{({b z%-~4QPfJWL$uDAHVB$$G$}cVsPE9V!%+F)sV7#$)=d{nE2kzSatChbSXL9?jVf%F9 zuM8J*c9ofRU%e2{z`!t>jnRa~Be6JRvK^z5g2g=NHg!=}3peS=dikRwjq7~=^R#YY z6Mtkv7*!l7b@ApejM9u0`L=x9bl4rb&_2FG1)YF>#?YGN7#8xvPS MQGQAO0z}Uw%sJWIIM9h0tDe_8+co!42=uIEJdcSTZvq@bZ)< z=Z{mqf1DVu{PNl435+TZl)8BH7e;ADiv7)!kyxC;NXWsAe97Rr%T3KI@kvcgV_;+A ODk#b?$)DWE><<8mN$NTP diff --git a/stl/CommitVerify@0.1.0.sty b/stl/CommitVerify@0.1.0.sty index cb04a287..67eb0d2a 100644 --- a/stl/CommitVerify@0.1.0.sty +++ b/stl/CommitVerify@0.1.0.sty @@ -1,5 +1,5 @@ {- - Id: urn:ubideco:stl:ZtHaBzu9ojbDahaGKEXe5v9DfSDxLERbLkEB23R6Q6V#rhino-cover-frog + Id: urn:ubideco:stl:4SZ2EgWWtC5LsNXmNpAzogNHZoaZNTCwU3SQhAYwDX6A#citizen-fiction-corner Name: CommitVerify Version: 0.1.0 Description: Client-side-validation deterministic commitments @@ -8,38 +8,45 @@ License: Apache-2.0 -} +@context typelib CommitVerify -import urn:ubideco:stl:9KALDYR8Nyjq4FdMW6kYoL7vdkWnqPqNuFnmE9qHpNjZ#justice-rocket-type as Std --- Imports: --- U5 := urn:ubideco:semid:3MDHMYsJt8d1gUiyx5vGCWcNLQ7biek6UTjHg3ksW4Bf#ground-volume-singer +import Std#55f8bsTvyh7zAeYAiNwL9G1DxgwXzDvE8edcTFJz3Q9H#milan-poncho-gray + use U5#nitro-george-nebula +@mnemonic(ventura-equal-think) +data Commitment : [Byte ^ 32] --- urn:ubideco:semid:F8mU5NPc8Z5CMnkSFGdF5UxrPsdcBS6B5DCyP5kJPgWc#ventura-equal-think -data Commitment :: [Byte ^ 32] --- urn:ubideco:semid:qp6pMjMCcukxxZdkM2PtfNWfJjXKoVHXtXSBCsYjQwY#transit-bogart-nissan -data MerkleBlock :: depth Std.U5 {- urn:ubideco:semid:3MDHMYsJt8d1gUiyx5vGCWcNLQ7biek6UTjHg3ksW4Bf#ground-volume-singer -} +@mnemonic(iris-explore-script) +data MerkleBlock : depth Std.U5#nitro-george-nebula , cofactor U16 , crossSection [TreeNode ^ ..0xffffffff] , entropy U64? --- urn:ubideco:semid:6kxYeCatpncbA9UiTdsFbxbxJdU56x6MdmTRkEeGAv6R#iceberg-rocket-velvet -data MerkleNode :: [Byte ^ 32] --- urn:ubideco:semid:9FbrjZLnMDfbrN9gEbWij5HNkxqAVaZBkoW2UvKdYw4B#canyon-exhibit-ravioli -data MerkleProof :: pos U32 + +@mnemonic(culture-metro-modular) +data MerkleHash : [Byte ^ 32] + +@mnemonic(father-adios-common) +data MerkleProof : pos U32 , cofactor U16 - , path [MerkleNode ^ ..0x20] --- urn:ubideco:semid:57jCv2LWrdn89GzuSYaH17f21N3su76uM2tEaG1dwwoT#russian-wedding-florida -data MerkleTree :: depth Std.U5 {- urn:ubideco:semid:3MDHMYsJt8d1gUiyx5vGCWcNLQ7biek6UTjHg3ksW4Bf#ground-volume-singer -} + , path [MerkleHash ^ ..0x20] + +@mnemonic(civil-left-nova) +data MerkleTree : depth Std.U5#nitro-george-nebula , entropy U64 , cofactor U16 , messages {ProtocolId -> ^ ..0xffffff Message} , map {U32 -> ^ ..0xffffff ProtocolId, Message} --- urn:ubideco:semid:4ajqScXjJ6wQ5af2zgBFzzP7k1qzD6DXXU28taQidCcA#shampoo-bishop-morgan -data Message :: [Byte ^ 32] --- urn:ubideco:semid:4GenVCt5Xq6xtnJDjT98FehgCS8rTmwEzbjwGkaUVjHz#gamma-banjo-corona -data ProtocolId :: [Byte ^ 32] --- urn:ubideco:semid:D7Q2eTnYyjN6gMZnZYrMG6gmRwmtnxyGLeqBbki8DFLv#greek-decimal-quiz -data TreeNode :: concealedNode (depth Std.U5 {- urn:ubideco:semid:3MDHMYsJt8d1gUiyx5vGCWcNLQ7biek6UTjHg3ksW4Bf#ground-volume-singer -}, hash MerkleNode) + +@mnemonic(shampoo-bishop-morgan) +data Message : [Byte ^ 32] + +@mnemonic(gamma-banjo-corona) +data ProtocolId : [Byte ^ 32] + +@mnemonic(empty-active-truck) +data TreeNode : concealedNode (depth Std.U5#nitro-george-nebula, hash MerkleHash) | commitmentLeaf (protocolId ProtocolId, message Message) +