From 171318dda594afe08f32d1a74ff93ae8434aa219 Mon Sep 17 00:00:00 2001
From: Dr Maxim Orlovsky <orlovsky@lnp-bp.org>
Date: Mon, 11 Mar 2024 17:39:11 +0100
Subject: [PATCH 1/4] vm: add support for new ASCII Armor

---
 Cargo.lock           |  41 ++++----
 Cargo.toml           |  11 +-
 src/schema/script.rs |  26 ++++-
 src/stl.rs           |   2 +-
 stl/RGB@0.1.0.sta    | 238 +++++++++++++++++++++----------------------
 stl/RGB@0.1.0.stl    | Bin 18452 -> 18462 bytes
 stl/RGB@0.1.0.sty    |  53 +++++-----
 stl/Schema.vesper    |  79 +++++++-------
 8 files changed, 244 insertions(+), 206 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dfd900dc..a2813e4c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,10 +5,10 @@ version = 3
 [[package]]
 name = "aluvm"
 version = "0.11.0-beta.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0278873e02b7eca06433f4f13aaf77bbf6e6976444d17c811e140c254a67c38"
+source = "git+https://github.com/AluVM/rust-aluvm?branch=armor#3bf009122c09a90df495049e0182712c675c2b26"
 dependencies = [
  "amplify",
+ "ascii-armor",
  "baid58",
  "getrandom",
  "half",
@@ -118,6 +118,19 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "ascii-armor"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "743d90b41a39d6e3920eef64a70f6411097cbb47141606a45b2a96533ec7111c"
+dependencies = [
+ "amplify",
+ "baid58",
+ "base85",
+ "sha2",
+ "strict_encoding",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -188,8 +201,7 @@ dependencies = [
 [[package]]
 name = "bp-consensus"
 version = "0.11.0-beta.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4455276e0c26bc4a742b8cf2a2a8fe1a42b06f15873dd6145c32af9a7a387a94"
+source = "git+https://github.com/BP-WG/bp-core?branch=armor#628854dff6f82f873d6389e1ec8c7ec0b7d00c2d"
 dependencies = [
  "amplify",
  "chrono",
@@ -203,8 +215,7 @@ dependencies = [
 [[package]]
 name = "bp-core"
 version = "0.11.0-beta.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c1a3c6505e4fbf81d3f7ba5b79c789336e7b959d6b87ff3f37e0b70df68a51"
+source = "git+https://github.com/BP-WG/bp-core?branch=armor#628854dff6f82f873d6389e1ec8c7ec0b7d00c2d"
 dependencies = [
  "amplify",
  "bp-consensus",
@@ -222,8 +233,7 @@ dependencies = [
 [[package]]
 name = "bp-dbc"
 version = "0.11.0-beta.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9efc8f72528ae16a84aeac95657f326268289bb5b5b64c24309c1a6bc0b97caa"
+source = "git+https://github.com/BP-WG/bp-core?branch=armor#628854dff6f82f873d6389e1ec8c7ec0b7d00c2d"
 dependencies = [
  "amplify",
  "base85",
@@ -237,8 +247,7 @@ dependencies = [
 [[package]]
 name = "bp-seals"
 version = "0.11.0-beta.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a54af971320d2b3358eb7b4380d0dda72810b8f8b417790f38e2a8f28a10cad"
+source = "git+https://github.com/BP-WG/bp-core?branch=armor#628854dff6f82f873d6389e1ec8c7ec0b7d00c2d"
 dependencies = [
  "amplify",
  "baid58",
@@ -292,8 +301,7 @@ dependencies = [
 [[package]]
 name = "commit_encoding_derive"
 version = "0.11.0-beta.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d25b4b09de08ea8530138fb8a7ca45d90b53fef8d582a944a1b08eedf3f2583e"
+source = "git+https://github.com/LNP-BP/client_side_validation?branch=armor#78f22a51b87115869f454ed0516a1bcdd8994db4"
 dependencies = [
  "amplify",
  "amplify_syn",
@@ -305,8 +313,7 @@ dependencies = [
 [[package]]
 name = "commit_verify"
 version = "0.11.0-beta.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00351b49be0ce72775b37cca336c3c10e958d810ca097f0712d95a63684b4f99"
+source = "git+https://github.com/LNP-BP/client_side_validation?branch=armor#78f22a51b87115869f454ed0516a1bcdd8994db4"
 dependencies = [
  "amplify",
  "commit_encoding_derive",
@@ -595,6 +602,7 @@ version = "0.11.0-beta.4"
 dependencies = [
  "aluvm",
  "amplify",
+ "ascii-armor",
  "baid58",
  "bp-core",
  "chrono",
@@ -786,12 +794,11 @@ dependencies = [
 [[package]]
 name = "strict_types"
 version = "2.7.0-beta.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66de5cdf197b68e13fcac9fad7ed288f44052a319a3df3abbaba9c6e52f735b"
+source = "git+https://github.com/strict-types/strict-types?branch=armor#00741ba09189536d8cdaf048a7f17795393ee382"
 dependencies = [
  "amplify",
+ "ascii-armor",
  "baid58",
- "base85",
  "half",
  "indexmap",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index d9b74fc7..de1439a8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,9 +23,10 @@ required-features = ["stl"]
 
 [dependencies]
 amplify = { version = "~4.6.0", features = ["rand"] }
+ascii-armor = "0.2.0"
 strict_encoding = "~2.7.0-beta.1"
-strict_types = "~2.7.0-beta.1"
-aluvm = { version = "~0.11.0-beta.4", features = ["std"] }
+strict_types = { version = "~2.7.0-beta.1", features = ["armor"] }
+aluvm = { version = "~0.11.0-beta.4", features = ["std", "ascii-armor"] }
 commit_verify = { version = "~0.11.0-beta.4", features = ["rand", "derive"] }
 single_use_seals = "~0.11.0-beta.4"
 bp-core = { version = "~0.11.0-beta.4" }
@@ -60,3 +61,9 @@ wasm-bindgen-test = "0.3"
 
 [package.metadata.docs.rs]
 features = [ "all" ]
+
+[patch.crates-io]
+strict_types = { git = "https://github.com/strict-types/strict-types", branch = "armor" }
+aluvm = { git = "https://github.com/AluVM/rust-aluvm", branch = "armor" }
+commit_verify = { git = "https://github.com/LNP-BP/client_side_validation", branch = "armor" }
+bp-core = { git = "https://github.com/BP-WG/bp-core", branch = "armor" }
diff --git a/src/schema/script.rs b/src/schema/script.rs
index 8b9324d6..84db3cfb 100644
--- a/src/schema/script.rs
+++ b/src/schema/script.rs
@@ -105,8 +105,18 @@ impl Default for Types {
     fn default() -> Self { Types::Strict(none!()) }
 }
 
+impl Types {
+    pub fn as_strict(&self) -> &TypeSystem {
+        match self {
+            Types::Strict(ts) => ts,
+        }
+    }
+}
+
 #[cfg(feature = "serde")]
 mod _serde {
+    use armor::AsciiArmor;
+    use serde_crate::de::Error;
     use serde_crate::{Deserialize, Deserializer, Serialize, Serializer};
 
     use super::*;
@@ -114,14 +124,24 @@ mod _serde {
     impl Serialize for Types {
         fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
         where S: Serializer {
-            serializer.serialize_str(&self.to_string())
+            if serializer.is_human_readable() {
+                serializer.serialize_str(&self.as_strict().to_ascii_armored_string())
+            } else {
+                self.as_strict().serialize(serializer)
+            }
         }
     }
 
     impl<'de> Deserialize<'de> for Types {
-        fn deserialize<D>(_deserializer: D) -> Result<Self, D::Error>
+        fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
         where D: Deserializer<'de> {
-            todo!()
+            if deserializer.is_human_readable() {
+                let s = String::deserialize(deserializer)?;
+                let sys = TypeSystem::from_ascii_armored_str(&s).map_err(D::Error::custom)?;
+                Ok(Types::Strict(sys))
+            } else {
+                Ok(Types::Strict(TypeSystem::deserialize(deserializer)?))
+            }
         }
     }
 }
diff --git a/src/stl.rs b/src/stl.rs
index 3a8129a7..ca97f162 100644
--- a/src/stl.rs
+++ b/src/stl.rs
@@ -34,7 +34,7 @@ use crate::{
 
 /// Strict types id for the library providing data types for RGB consensus.
 pub const LIB_ID_RGB: &str =
-    "urn:ubideco:stl:BSZqoDzjgGJxgRUwLUEJ7FZC74RV87ighGBsbx59AUPa#package-rapid-record";
+    "urn:ubideco:stl:6NAFZspAZ14Y1NynHeQBJVNqep4arKkKx8zchhHrESvr#airport-border-match";
 
 fn _rgb_core_stl() -> Result<TypeLib, CompileError> {
     LibBuilder::new(libname!(LIB_NAME_RGB), tiny_bset! {
diff --git a/stl/RGB@0.1.0.sta b/stl/RGB@0.1.0.sta
index 9ecc3cb4..c3a9c086 100644
--- a/stl/RGB@0.1.0.sta
+++ b/stl/RGB@0.1.0.sta
@@ -1,17 +1,17 @@
 -----BEGIN STRICT TYPE LIB-----
-Id: 4Q4DnsLMN2YERM8yrZWoDx6tUBwkR3A9SHhCFYxNSaeW#miranda-romeo-value
+Id: urn:ubideco:stl:6NAFZspAZ14Y1NynHeQBJVNqep4arKkKx8zchhHrESvr#airport-border-match
 Name: RGB
-Dependencies: 
-  c8Tnib31q1p7szyPukEGDoQzJQ5qJwPCn5uZCHUXzB9#cupid-metro-warning,
-  57sPvZcwQaziec3ux249XoCMhziQpKB8Yw99U5oRwfqW#deluxe-safari-random,
-  5teCJyjMWaxbQK8vdga2soWh2U7waERS3ev8KHShJcgv#trumpet-scratch-pelican,
-  DVtm25LRKU4TjbyZmVxPhvCmctZ6vKkPKqfpU2QsDNUo#exodus-axiom-tommy,
-  DzTvt9gGhPUKD8Dkkjk9PDBhkJ4gtWxXWQjxnmUYLNrs#voyage-kimono-disco,
-  HX2UBak8vPsTokug1DGMDvTpzns3xUdwZ7QJdyt4qBA9#speed-atlanta-trilogy
+Dependency: 5teCJyjMWaxbQK8vdga2soWh2U7waERS3ev8KHShJcgv#trumpet-scratch-pelican
+Dependency: 7qvjR4HCwJKF3mxE5GqsAaADces5JDRwb8ajAse9mkz3#exhibit-karate-ritual
+Dependency: BeAiDVK898mzgHrmWgxHtysDhmffgMEoDwBgNuZo7QeZ#connect-verona-secret
+Dependency: DVtm25LRKU4TjbyZmVxPhvCmctZ6vKkPKqfpU2QsDNUo#exodus-axiom-tommy
+Dependency: DzTvt9gGhPUKD8Dkkjk9PDBhkJ4gtWxXWQjxnmUYLNrs#voyage-kimono-disco
+Dependency: HX2UBak8vPsTokug1DGMDvTpzns3xUdwZ7QJdyt4qBA9#speed-atlanta-trilogy
+Checksum-SHA256: 4c5c6caa9696714569f28468625105bc9ca18685314e9cec06688db9125ec93b
 
-15!sq1_=Md_Ce;SSLEx{oG{4aHr^2iyiLDUBh#^}_A@_Ma0Wt9LvM0rJux=&4zPT
-b9*IMFYW>~BZ&yS~-fAwW*(Pc?@Ubg}3`1{iZE18?WpZg|c}S^j?8_As^WnPDotH
-zoVsdtr@aSRwVWi2G1l#x)zY9}za%p39RC#b^bGfqzpjxL^Nrpp0Zn_o=KaY%P`R
+15!sq21u!F?8_As^WnPDotHzoVsdtr@aSRwVWi2G1l#x)zY9}za%p39RC#b^b7ii
+<DwN$Dn#u#Aoe)adbl9>Q;}PlOTz3o-rV4|wcnm{tZEb0ER%LQ&W_g|(R>}VzkYu
+K&;gYF}`ST85zfDapD^Lh_E~IU~<qifyP(yEWWx2BlpjxL^Nrpp0Zn_o=KaY%P`R
 Gsm%`JsM3VH1hU<E;JbyiKm1k6TWEM#tEO?YD!yU6acy5+5>Uo2?YlHei-0Jn$(Q
 *>nYY!hN5_Bp3Y36tDMM#=e#tGI($UA5U3KNx<*C>ja}LTPkkZ)t7@1wm|eR!sr`
 ZSSEb;k<R>|42*wg~2q@3^Lq|9zft}OB~jx>)hO72TW;VQ)zT%r!Z9lE%{u?@QI^
@@ -52,18 +52,18 @@ uLb6QJd!r4rMT?gybhb+7)1`v1STXd2nS@d2@7SZKxFND6s8S?e4Bod8Fs%pFp$u
 RTdC#o53z}8oz#490^8gWo%?lVQpo>(!!T*!6CpSAZ@ZpjiDMu$$f>uzFMDM-zty
 UwM{z*RC!ZnZAoOz*VP7EGy*S=nP^gIFHh@#z{+#L^D9E+qxG=WVR;M(R$+2!VQz
 HrPArtZUYsn1#>3pADvHfH$;e<5S!D{TQ^>7ijMb15Rc>i-ZdPG(X<=@3b5mt)Nn
-}<42|;XhOksItaxnt|25f0@b!lV)3_)ykOksItaxqh7bOiwb2?5A!f_n>Eea4XlB
+}?52|;XhOksItaxnt|25f0@b!lV)3_)ykOksItaxqh7bOiwb2?5A!f_n>Eea4XlB
 y!~<Cy&t2#Tr*=pi4ihF+dwUej@+?000000093000000000R=Y;{v(a%pgM1_A_Z
 X<~B#3Ie&a2cTM~R!N3KLT<Vi3qOyHX!+<*{mm_fKni*74`8P-RRS&fT*&Z=qeY@
 Wmfle*z!SF)@h8|JkU^FEQwjhG002M$0000000030{{R30000000000000030000
 000000BWo~qGc~Ea@Zgg`13IGQH06+r(0=csXpjxL^Nrpp0Zn_o=KaY%P`RGsm%`
 JsM3VH1hU~TWACgHqw;r~cW`-Q<Y(F`)&j2=MXX-gc|r|aC@VE_OC000000RR600
-000000}{EV`y)3Q)P4n0|5qfVQ_L~bN~eb0to-Z_Ce;SSLEx{oG{4aHr^2iyiLDU
-Bh#^}_A@_MaKYL@=60F^Mce9hV@kEAv~dJM2k-Wy*xwxV$=>!YxB>-laB^jI00jX
-82>-+OLFT7d<m=O%Fv#OJ-Vp}8O}|tl)3K`dGe1{wYoxJ*r=1Ym781z2z}Xa8AUD
-L%7X0(MZ+m5XM3^r;0|aDsVQc^f0tR$paB^jI0to-Z_Ce;SSLEx{oG{4aHr^2iyi
-LDUBh#^}_A@_MaKYL@=60F^Mce9hV@kEAv~dJM2k-Wy*xwxV$=>!YxCL);a%FS^2
->-+OLFT7d<m=O%Fv#OJ-Vp}8O}|tl)3K`dGe1{wYoxJ*r=1Ym781z2z}Xa8AUDL%
+000000}{EV`y)3Q)P4n0|5qfVQ_L~bN~eb0-hRH$^RXYWTvL!lBtUM^A29WO-(K<
+PzZJ|q;0<C4#C<$=60F^Mce9hV@kEAv~dJM2k-Wy*xwxV$=>!YxB>-laB^jI00jX
+8o*Guk{~eHIrl#SNsfzjY4qm@aO)e`?2zD-{ZNB9WYoxJ*r=1Ym781z2z}Xa8AUD
+L%7X0(MZ+m5XM3^r;0|aDsVQc^f0tR$paB^jI0-hRH$^RXYWTvL!lBtUM^A29WO-
+(K<PzZJ|q;0<C4#C<$=60F^Mce9hV@kEAv~dJM2k-Wy*xwxV$=>!YxCL);a%FS^o
+*Guk{~eHIrl#SNsfzjY4qm@aO)e`?2zD-{ZNB9WYoxJ*r=1Ym781z2z}Xa8AUDL%
 7X0(MZ+m5XM3^r;4nb~XXm4_5WI}arWNc*y0tR7jV`y)30X6Cu6ZFTF{1(Q>0mQB
 U&A7nhZflGzYjutGK7Ikb(*|O7Ze(m_0Y!?)zegi%Q%1`*IadPUvJHjC=x|NK{gn
 A{C>lLf{|G^Ib7gc?VP^#a00#g7Kp+4jL349yXKqquc4c8~Wn@8gbYWv?LTqVnWK
@@ -165,9 +165,9 @@ t0buIt^000000093000000000O<baY{3Xh~!R0RRU806-uB4nkpbWkYXmZE19EWo
 ~o^1_fqpVP|szllNeFa6}P}rq7L!(40)FbL%msz%JU8hqvFyoea2o2y<g-Wo=<eW
 C4^?)7t~9tEf?*r}jS36zkMYeK9}${s8)2BzjZ?kPr!UX>Db5bYX39002k_bY*jN
 Ze?@=!34}kUMys8WKDQu6}!mpvbyE1r(Y~+*plEP2LQK-VTK~nd#><i0^jF#$$;R
-qYi_#e2@QaC_fb3SOOy6Z3Sn$?OksIta&s{PJux=&4zPTb9*IMFYW>~BZ&yS~-fA
-wW*(Pc?@Ubg}ZLh7x^`{^P$fKg#%8c8X#<$(NgM!uni2C|Kr}onZ25ED1b!Bn_Ju
-x=&4zPTb9*IMFYW>~BZ&yS~-fAwW*(Pc?@Ubg}ZLh7x^`{^P$fKg#%8c8X#<$(Ng
+qYi_#e2@QaC_fb3SOOy6Z3Sn$?OksIta&s{PWv;<0l-(Pe$^)UD5K7r}*s>bq5$W
+SxcMKAy3WKnCZLh7x^`{^P$fKg#%8c8X#<$(NgM!uni2C|Kr}onZ25ED1b!Bn_Wv
+;<0l-(Pe$^)UD5K7r}*s>bq5$WSxcMKAy3WKnCZLh7x^`{^P$fKg#%8c8X#<$(Ng
 M!uni2C|Kr}onZ4nk~cZe(e0XGURTbZ>G60RRU806-uB4?}NmV`X7%Wn@8gbYWv?
 1pxpD002NB01ZQLZewL(Y-MCbVRT^y0RRU806-uB5kqfoV`X7%Wn@NmZf9v?Y-I)
 l3S)0=ZE19EWo~o<NWB_v7yE`g7JPmsUNvXif<x~rUb^d|#R|;{uAWgE3UXm?XJt
@@ -183,7 +183,7 @@ W_507X<}?;a{vhewpx-GF=y^G+yi$Y<0;{FN)+c9*m85~M02&HeQV0i000000000
 0|NsC0000001Y}`!VE_pMO<M!73ee$%%cXxzW&s3kLV3B}%Q!jNox5$B>CMj_000
 0000000|NsC00000024Qq`VPj|j2?4>GwFIPNm9p@0Q=N4quj=`j_>&t6$4Wi|KW
 ;46+RXp}0000000960|Nj60000U@Z*FvQVPkYjWCZ~L2LJ#-AOH<RZ*FvQVPkYtb
-YXO51_B0iV`yb<VF9sQJyIs7J2NvHREbgKf0m&PYKz}3vDmoOr90Ais*(q2X>)XM
+YXO51_B0iV`yb<VF6Ah(4W$7^rut4U@+yV;f3~UN%73c3@26RG#Ze4>*EJ#X>)XM
 a(Mw(=vZ=c&j?2kZ}m2l1S)3m|2(paO!_1u7=ROpoS?f2L}7GcQ*>c;Wd#8M2mk;
 ;0000000000|Nj60000002}O8xWo~n6Z*B$(17>D+0ot2U6Id2jc94hrndMfLayE
 e1ISdA&%p{mB1!VWk)e2*8Zgg^CV{}Pm0iOsgNjk^^qPoT1+zTRnAg`3vXv9d*8d
@@ -236,18 +236,18 @@ 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
-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
+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
@@ -285,91 +285,91 @@ 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
-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
-N~lqHg;>vsoU&`ys3~=1W<7?!)Pf^s=!pRU000000096000000000nFa$#<BX>@6
-CZc}4uWo=;w1qf|rbYWy+bYTKWsch`a6%+H}y3w7NL%Cvdc9ihwVg6yH$(01#_!h
-rw1fvw5rj-B|XP@r^w5ufb=C_Ju$l1`nW&GEpSWb-xXKZg`VQg~%3IWybk`76Tvu
-W{aQ_%-X`?VwZ$5L?~`!+pRSq0(b70UrO!8D=zpn(&o-7tVWUa<1Q{n`|;)uYyv!
-)~4rGOBq100000000300000000006X>M?JbaMa-0f+wLWmt%8=p4R=gtK{LClh6Z
-#kObxUW*hKHnBv9xdAr8G@<&SffJ|QFn~N>u=2wF+7z(Wqt=tdZk`V^s(Ana0000
-00093000000000YNb8~5DZf#|5baMa-0f+wLWmt%8=p4R=gtK{LClh6Z#kObxUW*
-hKHnBv9xdAr8G@<&SffJ|QFn~N>u=2wF+7z(Wqt=tdZk`V^s(Ana000000093000
-000000SgVQgh?V`*h`00{v`?dHP>9R0ZFSEMRj;Km4qfBYZ5UUs>0bg9bqiCNA70
-000000030000000000ERB~Z%b7^#GZ*Ek1aAgGn0006GRC#b^LvL+uX>@I6Zgd0#
-00(DfZe??6a{vVa0bfr};;)}DMntPPag~|pcFiphlPw>bE^oIw3-`sIg8>S3a$#<
-BX>@6CZU6-W0iOsgNjk^^qPoT1+zTRnAg`3vXv9d*8d@RXy~6c6G66JF53UoI8eY
-9A{1GERg--GiI0S#x1is&)M%fmnGH3z`Wq5RDZgXjGZU6-W0iOsgNjk^^qPoT1+z
-TRnAg`3vXv9d*8d@RXy~6c6G67_D9zv-Vp*%wog4O?q)g04AaHEjnO6;Ie%sNwVN
-ZuM$d2nT9L349yXKr&sY-w&}Q)OXnRCrKyas&hb3uI+uY+-U?bZK^F00jX62mv`K
-^WREqS2tt~EBII@xVqZNcP`ond^UU-JbUWd$~FK100000009600000000039W_50
-7X<}?;00jX62m#u~=^e=I{=p`1zMng|0+NmwUpUW`Z@54^_oW>WVpRYD00000009
-60000000006Cb98cbV{~<LWn=&a0RRXAfgb0V4v@cHO73HjlbgFm42mCs2<+~e+;
-O=m63^mM0000000000|Nj6000000{|aGrbYWv?ZDnqB00jX62m#)eg(V1~mpVc?s
-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
-;b1RT)c9`>#Kd;Rz-U=aO9W+B
+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
+Li5Yl(a@n1+Ku60FILp}Zw|!7cE!MGSxid=WmW
 
 -----END STRICT TYPE LIB-----
 
diff --git a/stl/RGB@0.1.0.stl b/stl/RGB@0.1.0.stl
index d231b66d53d1a7e48859987763d901f6014a92b0..56c2b8b8431d4f3659351bacd08441804875a9e8 100644
GIT binary patch
delta 1244
zcmbO-fpOjhMpot^cPF;Vc~%M&D|tdv*B#WFa#woRDdvT91-x#S+}I@bSn%cJm~tMW
zWn9f0DtMgpb8|CG!cvPe(<<jlg`NB_J0WG+vWJsacK!U!7q{QnS5G^DqfBo}?!Kpd
zY)%2r`9-Od8#xs=F8#{R7`}NnhaaN?A#Ia6xwHu@dc&nKxr9rQutH8Q1$EZ^f}+$C
zCPFrEe#4a_qChANCKt$S5Ti(8^9^|>W(7ah3-d4KeOVs7FTvpHiifS=vOGVYIl-eI
z`rJfnLe=ZXn|~=y;v&kt$!Byq2`jYKQ_x_`%qu7@DP|(*6<a-BqD-8;N{=`<YIBw)
z=A`B&XQmQidx5;dWP5#L{ZyP>lvz+h&`+B;=&xp1XDz8LNG)cJIXva`Lu-$15t9RU
zw=hgxbuEMS{xj|73+FReEl9AxA2fNLmB!@r<~<5g@ARhVPrIC8oEfs}U+;rAKV-d^
zPfIJ;j-6>=YPzt!ZgaK8b4FrK-Mr2!okN&41mpx3Mn<;clA_Gy5(ZYr$%3kill!a`
zHj6qRAR;3;x+>@}vgKqJmS&~^brVd#lO0{131<icW)e;P;Oa)$)J{ecP3>e<oP5|#
Pp0LS&?j)M*=Y9+TwTC3U

delta 1153
zcmbO?fpN+N#z^KMcPBQE|A)UhK3g9C<n`q_1}7ey-4kTn<GVjZ`SQk9-;C|U3)q|j
zob!uPZ4J#n@olJ?BG>6$nf3SXk^FEM&wE*VD{iV~nSa=*-OA&fpPQRm5|&z&nN~UZ
zzLNqEcW_BjW^zeLWkG83<VH?~jZ43>Glp%R&EdzWK*-X`oLt(36}{n7m|VgoNLV2!
zmx4NLenC-c2@@fkH^1RZ5m6xI+sOs;8pJ44*nC5tiCJM|v~7^uGHYXFsgTaVC-u`7
z@?>@2*WGwy$Cahlmnv3G+Wbpt5*JbCO+KT`Nm!w+o`MEjW?n&QNih>auh{D85@q7#
zReHp^QJb?YF()-IIWv_A+Y96sCfn;1>!;%6qRfI4f_~b(L4P$nH&+QT=>=C7m!#%S
z7F1Q7{NG7oa*CD4<W=T93XD&Kt}L}VD&k?GCU{j}j`P^ofct)%#eS~ReO%b{Ny&F}
zn8kBOY$j|@u}bIIEbn}Ph(!F~MTc<O%x6-Vob9SiSfK&4!sK(VJj5xKa#JI$Fu{!o
b_a(R~Og`hLK-e@McOp#VaaWjJ;l2z2--i}8

diff --git a/stl/RGB@0.1.0.sty b/stl/RGB@0.1.0.sty
index fb0105f8..0fbcffd6 100644
--- a/stl/RGB@0.1.0.sty
+++ b/stl/RGB@0.1.0.sty
@@ -1,5 +1,5 @@
 {-
-  Id: urn:ubideco:stl:4Q4DnsLMN2YERM8yrZWoDx6tUBwkR3A9SHhCFYxNSaeW#miranda-romeo-value
+  Id: urn:ubideco:stl:6NAFZspAZ14Y1NynHeQBJVNqep4arKkKx8zchhHrESvr#airport-border-match
   Name: RGB
   Version: 0.1.0
   Description: Consensus layer for RGB smart contracts
@@ -11,26 +11,6 @@
 @context
 typelib RGB
 
-import BPCore#c8Tnib31q1p7szyPukEGDoQzJQ5qJwPCn5uZCHUXzB9#cupid-metro-warning
-  use TapretNodePartner#iceberg-poker-active
-  use ExplicitSealTxid#antenna-darwin-emotion
-  use TapretProof#forum-paint-tunnel
-  use TapretPathProof#stage-element-update
-  use Method#trilogy-tahiti-valid
-  use TapretRightBranch#basket-prelude-bridge
-  use BlindSealTxPtr#austria-icon-waiter
-  use OpretProof#segment-ambient-totem
-  use SecretSeal#santana-domingo-needle
-  use AnchorMerkleProofOpretProof#mammal-ethnic-crown
-  use BlindSealTxid#kimono-golf-price
-  use TxPtr#strange-source-father
-  use AnchorMerkleProofTapretProof#forward-chemist-panda
-
-import CommitVerify#57sPvZcwQaziec3ux249XoCMhziQpKB8Yw99U5oRwfqW#deluxe-safari-random
-  use MerkleHash#culture-metro-modular
-  use StrictHash#cheese-final-locate
-  use MerkleProof#labor-hilton-magenta
-
 import StrictTypes#5teCJyjMWaxbQK8vdga2soWh2U7waERS3ev8KHShJcgv#trumpet-scratch-pelican
   use VariantName#snow-gray-extreme
   use Primitive#hobby-cable-puzzle
@@ -48,6 +28,26 @@ import StrictTypes#5teCJyjMWaxbQK8vdga2soWh2U7waERS3ev8KHShJcgv#trumpet-scratch-
   use Variant#textile-cowboy-dragon
   use UnionVariantsSemId#iceberg-road-crack
 
+import CommitVerify#7qvjR4HCwJKF3mxE5GqsAaADces5JDRwb8ajAse9mkz3#exhibit-karate-ritual
+  use MerkleHash#culture-metro-modular
+  use StrictHash#cheese-final-locate
+  use MerkleProof#labor-hilton-magenta
+
+import BPCore#BeAiDVK898mzgHrmWgxHtysDhmffgMEoDwBgNuZo7QeZ#connect-verona-secret
+  use TapretNodePartner#iceberg-poker-active
+  use ExplicitSealTxid#antenna-darwin-emotion
+  use TapretProof#forum-paint-tunnel
+  use TapretPathProof#stage-element-update
+  use Method#trilogy-tahiti-valid
+  use TapretRightBranch#basket-prelude-bridge
+  use BlindSealTxPtr#austria-icon-waiter
+  use OpretProof#segment-ambient-totem
+  use SecretSeal#santana-domingo-needle
+  use AnchorMerkleProofOpretProof#mammal-ethnic-crown
+  use BlindSealTxid#kimono-golf-price
+  use TxPtr#strange-source-father
+  use AnchorMerkleProofTapretProof#forward-chemist-panda
+
 import AluVM#DVtm25LRKU4TjbyZmVxPhvCmctZ6vKkPKqfpU2QsDNUo#exodus-axiom-tommy
   use LibSite#mission-papa-mercy
   use LibId#rebel-factor-rodeo
@@ -413,7 +413,7 @@ data RevealedFungible  : value FungibleState
                        , blinding BlindingFactor
                        , tag AssetTag
 
-@mnemonic(divide-heavy-culture)
+@mnemonic(data-buenos-bikini)
 data Schema            : ffv Ffv
                        , flags ReservedBytes1
                        , subsetOf ()?
@@ -423,13 +423,13 @@ data Schema            : ffv Ffv
                        , genesis GenesisSchema
                        , extensions {ExtensionType -> ^ ..0xff ExtensionSchema}
                        , transitions {TransitionType -> ^ ..0xff TransitionSchema}
-                       , typeSystem StrictTypes.TypeSystem#panel-data-lazarus
+                       , types Types
                        , script Script
 
 @mnemonic(garcia-smoke-ozone)
 data SchemaId          : [Byte ^ 32]
 
-@mnemonic(archive-number-arnold)
+@mnemonic(zebra-amanda-linear)
 data SchemaSchema      : ffv Ffv
                        , flags ReservedBytes1
                        , subsetOf Schema?
@@ -439,7 +439,7 @@ data SchemaSchema      : ffv Ffv
                        , genesis GenesisSchema
                        , extensions {ExtensionType -> ^ ..0xff ExtensionSchema}
                        , transitions {TransitionType -> ^ ..0xff TransitionSchema}
-                       , typeSystem StrictTypes.TypeSystem#panel-data-lazarus
+                       , types Types
                        , script Script
 
 @mnemonic(venus-trust-north)
@@ -493,6 +493,9 @@ data TypedAssignsBlindSealTxid : declarative [AssignVoidStateBlindSealTxid]
                        | structured [AssignRevealedDataBlindSealTxid]
                        | attachment#255 [AssignRevealedAttachBlindSealTxid]
 
+@mnemonic(titanic-front-courage)
+data Types             : strict#1 StrictTypes.TypeSystem#panel-data-lazarus
+
 @mnemonic(andy-mango-brother)
 data Valencies         : {ValencyType ^ ..0xff}
 
diff --git a/stl/Schema.vesper b/stl/Schema.vesper
index 9d9db90a..38fd7a64 100644
--- a/stl/Schema.vesper
+++ b/stl/Schema.vesper
@@ -100,45 +100,46 @@ Schema rec
           max is U16
       valencies set len=0..MAX8
         element is U16 aka=ValencyType
-  typeSystem map len=0..MAX24 aka=TypeSystem
-    key bytes len=32 aka=SemId
-    TySemId union -- mapped to
-      primitive is U8 wrapped aka=Primitive tag=0
-      unicode is Unit tag=1
-      enum set len=1..MAX8 wrapped aka=EnumVariants tag=2
-        Variant rec
-          name ascii len=1..100 aka=VariantName aka=Ident charset=AlphaNumLodash
-          tag is U8
-      union map len=0..MAX8 wrapped aka=UnionVariantsSemId tag=3
-        key is U8
-        VariantInfoSemId rec -- mapped to
-          name ascii len=1..100 aka=VariantName aka=Ident charset=AlphaNumLodash
-          ty bytes len=32 aka=SemId
-      tuple list len=1..MAX8 wrapped aka=UnnamedFieldsSemId tag=4
-        element bytes len=32 aka=SemId
-      struct list len=1..MAX8 wrapped aka=NamedFieldsSemId tag=5
-        FieldSemId rec
-          name ascii len=1..100 aka=FieldName aka=Ident charset=AlphaNumLodash
-          ty bytes len=32 aka=SemId
-      array tuple tag=6
-        _ bytes len=32 aka=SemId
-        _ is U16
-      list tuple tag=7
-        _ bytes len=32 aka=SemId
-        Sizing rec
-          min is U64
-          max is U64
-      set tuple tag=8
-        _ bytes len=32 aka=SemId
-        Sizing rec
-          min is U64
-          max is U64
-      map tuple tag=9
-        _ bytes len=32 aka=SemId
-        _ bytes len=32 aka=SemId
-        Sizing rec
-          min is U64
-          max is U64
+  types union -- Types
+    strict map len=0..MAX24 wrapped aka=TypeSystem tag=0
+      key bytes len=32 aka=SemId
+      TySemId union -- mapped to
+        primitive is U8 wrapped aka=Primitive tag=0
+        unicode is Unit tag=1
+        enum set len=1..MAX8 wrapped aka=EnumVariants tag=2
+          Variant rec
+            name ascii len=1..100 aka=VariantName aka=Ident charset=AlphaNumLodash
+            tag is U8
+        union map len=0..MAX8 wrapped aka=UnionVariantsSemId tag=3
+          key is U8
+          VariantInfoSemId rec -- mapped to
+            name ascii len=1..100 aka=VariantName aka=Ident charset=AlphaNumLodash
+            ty bytes len=32 aka=SemId
+        tuple list len=1..MAX8 wrapped aka=UnnamedFieldsSemId tag=4
+          element bytes len=32 aka=SemId
+        struct list len=1..MAX8 wrapped aka=NamedFieldsSemId tag=5
+          FieldSemId rec
+            name ascii len=1..100 aka=FieldName aka=Ident charset=AlphaNumLodash
+            ty bytes len=32 aka=SemId
+        array tuple tag=6
+          _ bytes len=32 aka=SemId
+          _ is U16
+        list tuple tag=7
+          _ bytes len=32 aka=SemId
+          Sizing rec
+            min is U64
+            max is U64
+        set tuple tag=8
+          _ bytes len=32 aka=SemId
+          Sizing rec
+            min is U64
+            max is U64
+        map tuple tag=9
+          _ bytes len=32 aka=SemId
+          _ bytes len=32 aka=SemId
+          Sizing rec
+            min is U64
+            max is U64
   script union -- Script
     aluVm rec wrapped tag=0 -- AluScript
       libs map len=0..MAX8

From f65566678d688dff0b9bd987bfb4133adf32bcda Mon Sep 17 00:00:00 2001
From: Dr Maxim Orlovsky <orlovsky@lnp-bp.org>
Date: Mon, 11 Mar 2024 18:19:13 +0100
Subject: [PATCH 2/4] schema: add ASCII armoring support

---
 src/schema/schema.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/schema/schema.rs b/src/schema/schema.rs
index e4979d26..22456c50 100644
--- a/src/schema/schema.rs
+++ b/src/schema/schema.rs
@@ -26,6 +26,7 @@ use std::str::FromStr;
 
 use amplify::confinement::{TinyOrdMap, TinyOrdSet};
 use amplify::{ByteArray, Bytes32};
+use armor::StrictArmor;
 use baid58::{Baid58ParseError, Chunking, FromBaid58, ToBaid58, CHUNKING_32};
 use commit_verify::{CommitEncode, CommitEngine, CommitId, CommitmentId, DigestExt, Sha256};
 use strict_encoding::{StrictDecode, StrictDeserialize, StrictEncode, StrictSerialize, StrictType};
@@ -227,6 +228,13 @@ impl<Root: SchemaRoot> Schema<Root> {
     }
 }
 
+impl<Root: SchemaRoot> StrictArmor for Schema<Root> {
+    type Id = SchemaId;
+    const PLATE_TITLE: &'static str = "RGB SCHEMA";
+
+    fn armor_id(&self) -> Self::Id { self.schema_id() }
+}
+
 #[cfg(test)]
 mod test {
     use strict_encoding::StrictDumb;

From be751660fb5408c6df0ff0ac10e9d15f362f2f9b Mon Sep 17 00:00:00 2001
From: Dr Maxim Orlovsky <orlovsky@lnp-bp.org>
Date: Mon, 11 Mar 2024 22:38:24 +0100
Subject: [PATCH 3/4] vm: improve ASCII armor support

---
 src/vm/script.rs | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/vm/script.rs b/src/vm/script.rs
index d11fe5f0..524e38ab 100644
--- a/src/vm/script.rs
+++ b/src/vm/script.rs
@@ -133,7 +133,9 @@ pub struct AluLib(pub aluvm::library::Lib);
 
 #[cfg(feature = "serde")]
 mod _serde {
-    use serde_crate::ser::Error;
+    use aluvm::library::Lib;
+    use armor::AsciiArmor;
+    use serde_crate::de::Error;
     use serde_crate::{Deserialize, Deserializer, Serialize, Serializer};
 
     use super::*;
@@ -141,18 +143,25 @@ mod _serde {
     impl Serialize for AluLib {
         fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
         where S: Serializer {
-            let mut buf = Vec::<u8>::new();
-            self.print_disassemble::<RgbIsa>(&mut buf)
-                .map_err(S::Error::custom)?;
-            let s = String::from_utf8(buf).map_err(S::Error::custom)?;
-            serializer.serialize_str(&s)
+            if serializer.is_human_readable() {
+                serializer.serialize_str(&self.0.to_ascii_armored_string())
+            } else {
+                Serialize::serialize(&self.0, serializer)
+            }
         }
     }
 
     impl<'de> Deserialize<'de> for AluLib {
-        fn deserialize<D>(_deserializer: D) -> Result<Self, D::Error>
+        fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
         where D: Deserializer<'de> {
-            todo!()
+            if deserializer.is_human_readable() {
+                let s: String = Deserialize::deserialize(deserializer)?;
+                let lib = Lib::from_ascii_armored_str(&s).map_err(D::Error::custom)?;
+                Ok(lib.into())
+            } else {
+                let lib: Lib = Deserialize::deserialize(deserializer)?;
+                Ok(lib.into())
+            }
         }
     }
 }

From 5232162d8ba0bb6373646e4eadda269608b4c924 Mon Sep 17 00:00:00 2001
From: Dr Maxim Orlovsky <orlovsky@lnp-bp.org>
Date: Wed, 13 Mar 2024 13:00:03 +0100
Subject: [PATCH 4/4] chore: update dependencies

---
 Cargo.lock | 22 ++++++++++++----------
 Cargo.toml | 10 ++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a2813e4c..f722ead7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,8 +4,9 @@ version = 3
 
 [[package]]
 name = "aluvm"
-version = "0.11.0-beta.4"
-source = "git+https://github.com/AluVM/rust-aluvm?branch=armor#3bf009122c09a90df495049e0182712c675c2b26"
+version = "0.11.0-beta.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2032d213fd6b80b26217efb9846b273671acff3f696ada7e0314c6af2b4c3275"
 dependencies = [
  "amplify",
  "ascii-armor",
@@ -201,7 +202,7 @@ dependencies = [
 [[package]]
 name = "bp-consensus"
 version = "0.11.0-beta.4"
-source = "git+https://github.com/BP-WG/bp-core?branch=armor#628854dff6f82f873d6389e1ec8c7ec0b7d00c2d"
+source = "git+https://github.com/BP-WG/bp-core?branch=master#1339f9fd96bbba0b3b949c65af1598496ba930eb"
 dependencies = [
  "amplify",
  "chrono",
@@ -215,7 +216,7 @@ dependencies = [
 [[package]]
 name = "bp-core"
 version = "0.11.0-beta.4"
-source = "git+https://github.com/BP-WG/bp-core?branch=armor#628854dff6f82f873d6389e1ec8c7ec0b7d00c2d"
+source = "git+https://github.com/BP-WG/bp-core?branch=master#1339f9fd96bbba0b3b949c65af1598496ba930eb"
 dependencies = [
  "amplify",
  "bp-consensus",
@@ -233,7 +234,7 @@ dependencies = [
 [[package]]
 name = "bp-dbc"
 version = "0.11.0-beta.4"
-source = "git+https://github.com/BP-WG/bp-core?branch=armor#628854dff6f82f873d6389e1ec8c7ec0b7d00c2d"
+source = "git+https://github.com/BP-WG/bp-core?branch=master#1339f9fd96bbba0b3b949c65af1598496ba930eb"
 dependencies = [
  "amplify",
  "base85",
@@ -247,7 +248,7 @@ dependencies = [
 [[package]]
 name = "bp-seals"
 version = "0.11.0-beta.4"
-source = "git+https://github.com/BP-WG/bp-core?branch=armor#628854dff6f82f873d6389e1ec8c7ec0b7d00c2d"
+source = "git+https://github.com/BP-WG/bp-core?branch=master#1339f9fd96bbba0b3b949c65af1598496ba930eb"
 dependencies = [
  "amplify",
  "baid58",
@@ -301,7 +302,7 @@ dependencies = [
 [[package]]
 name = "commit_encoding_derive"
 version = "0.11.0-beta.4"
-source = "git+https://github.com/LNP-BP/client_side_validation?branch=armor#78f22a51b87115869f454ed0516a1bcdd8994db4"
+source = "git+https://github.com/LNP-BP/client_side_validation?branch=master#e963d5df29e9c04cb24dfc7d0b3553d286bb1986"
 dependencies = [
  "amplify",
  "amplify_syn",
@@ -313,7 +314,7 @@ dependencies = [
 [[package]]
 name = "commit_verify"
 version = "0.11.0-beta.4"
-source = "git+https://github.com/LNP-BP/client_side_validation?branch=armor#78f22a51b87115869f454ed0516a1bcdd8994db4"
+source = "git+https://github.com/LNP-BP/client_side_validation?branch=master#e963d5df29e9c04cb24dfc7d0b3553d286bb1986"
 dependencies = [
  "amplify",
  "commit_encoding_derive",
@@ -793,8 +794,9 @@ dependencies = [
 
 [[package]]
 name = "strict_types"
-version = "2.7.0-beta.1"
-source = "git+https://github.com/strict-types/strict-types?branch=armor#00741ba09189536d8cdaf048a7f17795393ee382"
+version = "2.7.0-beta.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78c32716de4b99b0e8fb0c114e99b6929613e8d7302999c6b8c77251783923ad"
 dependencies = [
  "amplify",
  "ascii-armor",
diff --git a/Cargo.toml b/Cargo.toml
index de1439a8..607098da 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,7 +25,7 @@ required-features = ["stl"]
 amplify = { version = "~4.6.0", features = ["rand"] }
 ascii-armor = "0.2.0"
 strict_encoding = "~2.7.0-beta.1"
-strict_types = { version = "~2.7.0-beta.1", features = ["armor"] }
+strict_types = { version = "~2.7.0-beta.2", features = ["armor"] }
 aluvm = { version = "~0.11.0-beta.4", features = ["std", "ascii-armor"] }
 commit_verify = { version = "~0.11.0-beta.4", features = ["rand", "derive"] }
 single_use_seals = "~0.11.0-beta.4"
@@ -60,10 +60,8 @@ getrandom = { version = "0.2", features = ["js"] }
 wasm-bindgen-test = "0.3"
 
 [package.metadata.docs.rs]
-features = [ "all" ]
+features = ["all"]
 
 [patch.crates-io]
-strict_types = { git = "https://github.com/strict-types/strict-types", branch = "armor" }
-aluvm = { git = "https://github.com/AluVM/rust-aluvm", branch = "armor" }
-commit_verify = { git = "https://github.com/LNP-BP/client_side_validation", branch = "armor" }
-bp-core = { git = "https://github.com/BP-WG/bp-core", branch = "armor" }
+commit_verify = { git = "https://github.com/LNP-BP/client_side_validation", branch = "master" }
+bp-core = { git = "https://github.com/BP-WG/bp-core", branch = "master" }