diff --git a/Cargo.lock b/Cargo.lock index a533dfa..12870db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,10 +8,10 @@ version = "0.11.0-beta.5" dependencies = [ "amplify", "ascii-armor", - "baid58", + "baid64", "blake3", "curve25519-dalek", - "getrandom 0.2.12", + "getrandom 0.2.14", "half", "paste", "rand", @@ -108,34 +108,34 @@ dependencies = [ [[package]] name = "ascii-armor" -version = "0.2.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743d90b41a39d6e3920eef64a70f6411097cbb47141606a45b2a96533ec7111c" +checksum = "673486110323d50d9f33d99f0f526726b4721b1b596284351e75d3692225abe8" dependencies = [ "amplify", - "baid58", + "baid64", "base85", "sha2", "strict_encoding", ] [[package]] -name = "baid58" -version = "0.4.4" +name = "baid64" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0585242d87ed976e05db6ae86a0f771f140104a4b6c91b4c3e43b9b2357486" +checksum = "7b8b80494235048845f856b267a4a1d97df59fd14ed7ca92652f834ce93becc6" dependencies = [ - "base58", - "blake3", + "amplify", + "base64", "mnemonic", "sha2", ] [[package]] -name = "base58" -version = "0.2.0" +name = "base64" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] name = "base85" @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "blake3" @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -188,12 +188,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" [[package]] name = "cfg-if" @@ -303,9 +300,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "js-sys", @@ -325,9 +322,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -337,9 +334,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "indexmap" -version = "2.2.3" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -347,19 +344,13 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - [[package]] name = "libc" version = "0.2.153" @@ -368,19 +359,15 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "mnemonic" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29fae0e4c0b155d3b019a7cbc27abe4a90e15c06814d27889ce9f5f44e2faf77" -dependencies = [ - "byteorder", - "lazy_static", -] +checksum = "f2b8f3a258db515d5e91a904ce4ae3f73e091149b90cadbdb93d210bee07f63b" [[package]] name = "once_cell" @@ -402,18 +389,18 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -454,7 +441,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.14", ] [[package]] @@ -492,22 +479,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.196" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.49", + "syn 2.0.60", ] [[package]] @@ -534,8 +521,7 @@ dependencies = [ [[package]] name = "strict_encoding" version = "2.7.0-beta.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c463f8ea993e323740d78544473e791adb91ac659f5bf2c1a59db64a34f99fc" +source = "git+https://github.com/strict-types/strict-encoding?branch=develop#901e26ee8b01b3bcff4d7ac76acff2fcc633634b" dependencies = [ "amplify", "half", @@ -546,8 +532,7 @@ dependencies = [ [[package]] name = "strict_encoding_derive" version = "2.7.0-beta.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475fa6f1fdde6e0555422b5111ad34bde30a1459af3599f920c3af9829772c0e" +source = "git+https://github.com/strict-types/strict-encoding?branch=develop#901e26ee8b01b3bcff4d7ac76acff2fcc633634b" dependencies = [ "amplify_syn", "heck", @@ -559,12 +544,11 @@ dependencies = [ [[package]] name = "strict_types" version = "2.7.0-beta.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "152bd04284e9093f23a911d0d89b7dd950a461af1ed5e243f6215fbcd45e9445" +source = "git+https://github.com/strict-types/strict-types?branch=develop#4effa0b28804f7798a17f5dc6b4411ce6515f2f5" dependencies = [ "amplify", "ascii-armor", - "baid58", + "baid64", "half", "indexmap", "sha2", @@ -601,9 +585,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.49" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -612,22 +596,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.49", + "syn 2.0.60", ] [[package]] @@ -672,9 +656,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -682,24 +666,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.49", + "syn 2.0.60", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -709,9 +693,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -719,28 +703,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.49", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-bindgen-test" -version = "0.3.41" +version = "0.3.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143ddeb4f833e2ed0d252e618986e18bfc7b0e52f2d28d77d05b2f045dd8eb61" +checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b" dependencies = [ "console_error_panic_hook", "js-sys", @@ -752,20 +736,20 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.41" +version = "0.3.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5211b7550606857312bba1d978a8ec75692eae187becc5e680444fffc5e6f89" +checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.49", + "syn 2.0.60", ] [[package]] name = "web-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index df2f99a..22b0b40 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,14 +22,14 @@ required-features = ["stl"] [dependencies] amplify = { version = "4.6.0", default-features = false, features = ["apfloat", "derive", "hex"] } -ascii-armor = { version = "0.2.0", optional = true } +ascii-armor = { version = "0.6.0", optional = true } +baid64 = "0.1.0" paste = "1" strict_encoding = { version = "2.7.0-beta.3", default-features = false, features = ["float", "derive"] } strict_types = { version = "2.7.0-beta.3", optional = true } sha2 = "0.10.8" blake3 = "1.5.1" ripemd = "0.1.3" -baid58 = "0.4.4" secp256k1 = { version = "0.28.2", optional = true, features = ["global-context"] } curve25519-dalek = { version = "3.2", optional = true } half = "~2.2.0" # Required to maintain MSRV @@ -55,3 +55,7 @@ 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" } diff --git a/src/isa/instr.rs b/src/isa/instr.rs index 8979e26..ecd7cac 100644 --- a/src/isa/instr.rs +++ b/src/isa/instr.rs @@ -429,12 +429,12 @@ pub enum ArithmeticOp { #[display("add.{0} {1}{2},{1}{3}")] AddF(RoundingFlag, RegF, Reg32, Reg32), - /// Subtracts values from two integer arithmetic registers and puts result into the second + /// Subtracts the second register value from the first one and puts result into the second /// register. #[display("sub.{0} {1}{2},{1}{3}")] SubA(IntFlags, RegA, Reg32, Reg32), - /// Subtracts values from two float arithmetic registers and puts result into the second + /// Subtracts the second register value from the first one and puts result into the second /// register. #[display("sub.{0} {1}{2},{1}{3}")] SubF(RoundingFlag, RegF, Reg32, Reg32), @@ -449,7 +449,7 @@ pub enum ArithmeticOp { #[display("mul.{0} {1}{2},{1}{3}")] MulF(RoundingFlag, RegF, Reg32, Reg32), - /// Divides values from two integer arithmetic registers and puts result into the second + /// Divides the first register value by the second one and puts result into the second /// register. /// /// Since the division operation may not result in overflow, the overflow flag is used to @@ -462,14 +462,14 @@ pub enum ArithmeticOp { #[display("div.{0} {1}{2},{1}{3}")] DivA(IntFlags, RegA, Reg32, Reg32), - /// Divides values from two float arithmetic registers and puts result into the second + /// Divides the first register value by the second one and puts result into the second /// register. #[display("div.{0} {1}{2},{1}{3}")] DivF(RoundingFlag, RegF, Reg32, Reg32), /// Modulo division. /// - /// Puts a reminder of the division of source register on destination register into the + /// Puts a reminder of the division of the first register on the second register into the /// second register. #[display("rem {0}{1},{2}{3}")] Rem(RegA, Reg32, RegA, Reg32), diff --git a/src/library/lib.rs b/src/library/lib.rs index d8bf84b..996ea94 100644 --- a/src/library/lib.rs +++ b/src/library/lib.rs @@ -32,7 +32,7 @@ use core::str::FromStr; use amplify::confinement::SmallBlob; use amplify::{confinement, ByteArray, Bytes32}; -use baid58::{Baid58ParseError, Chunking, FromBaid58, ToBaid58, CHUNKING_32}; +use baid64::{Baid64ParseError, DisplayBaid64, FromBaid64Str}; use sha2::{Digest, Sha256}; use strict_encoding::{StrictDeserialize, StrictSerialize}; @@ -65,31 +65,21 @@ pub struct LibId( Bytes32, ); -impl ToBaid58<32> for LibId { +impl DisplayBaid64 for LibId { const HRI: &'static str = "alu"; - const CHUNKING: Option = CHUNKING_32; - fn to_baid58_payload(&self) -> [u8; 32] { self.to_byte_array() } - fn to_baid58_string(&self) -> String { self.to_string() } + const CHUNKING: bool = true; + const PREFIX: bool = true; + const EMBED_CHECKSUM: bool = false; + const MNEMONIC: bool = true; + fn to_baid64_payload(&self) -> [u8; 32] { self.to_byte_array() } } -impl FromBaid58<32> for LibId {} - +impl FromBaid64Str for LibId {} impl FromStr for LibId { - type Err = Baid58ParseError; - fn from_str(s: &str) -> Result { - Self::from_baid58_str(s.trim_start_matches("urn:ubideco:")) - } + type Err = Baid64ParseError; + fn from_str(s: &str) -> Result { Self::from_baid64_str(s) } } impl Display for LibId { - fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { - if f.alternate() { - f.write_str("urn:ubideco:alu:")?; - } - if f.sign_minus() { - write!(f, "{:.2}", self.to_baid58()) - } else { - write!(f, "{:#.2}", self.to_baid58()) - } - } + fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { self.fmt_baid64(f) } } impl LibId { @@ -489,38 +479,33 @@ mod test { let id = LibId::with("FLOAT", b"", b"", &none!()); assert_eq!( format!("{id}"), - "Grjjwm-eTsibiEe-YYtjokmc-8j4Jn1KW-L2SX8Nug-G6T5kZ#pinball-eternal-colombo" + "alu:650XHPmh-WpXWR5R-Uz4B5jX-jeDqcyr-HXpdZxY-aX9gfO4#plasma-tunnel-mama" ); - assert_eq!(format!("{id:-}"), "Grjjwm-eTsibiEe-YYtjokmc-8j4Jn1KW-L2SX8Nug-G6T5kZ"); assert_eq!( - format!("{id:#}"), - "urn:ubideco:alu:Grjjwm-eTsibiEe-YYtjokmc-8j4Jn1KW-L2SX8Nug-G6T5kZ#\ - pinball-eternal-colombo" + format!("{id:-}"), + "650XHPmh-WpXWR5R-Uz4B5jX-jeDqcyr-HXpdZxY-aX9gfO4#plasma-tunnel-mama" ); + assert_eq!(format!("{id:#}"), "alu:650XHPmh-WpXWR5R-Uz4B5jX-jeDqcyr-HXpdZxY-aX9gfO4"); + assert_eq!(format!("{id:-#}"), "650XHPmh-WpXWR5R-Uz4B5jX-jeDqcyr-HXpdZxY-aX9gfO4"); } #[test] fn lib_id_from_str() { let id = LibId::with("FLOAT", b"", b"", &none!()); assert_eq!( - Ok(id), + id, LibId::from_str( - "urn:ubideco:alu:GrjjwmeTsibiEeYYtjokmc8j4Jn1KWL2SX8NugG6T5kZ#\ - pinball-eternal-colombo" + "alu:650XHPmh-WpXWR5R-Uz4B5jX-jeDqcyr-HXpdZxY-aX9gfO4#plasma-tunnel-mama" ) + .unwrap() ); + assert_eq!(id, LibId::from_str("alu:650XHPmhWpXWR5RUz4B5jXjeDqcyrHXpdZxYaX9gfO4").unwrap()); assert_eq!( - Ok(id), - LibId::from_str("urn:ubideco:alu:GrjjwmeTsibiEeYYtjokmc8j4Jn1KWL2SX8NugG6T5kZ") - ); - assert_eq!( - Ok(id), - LibId::from_str( - "alu:GrjjwmeTsibiEeYYtjokmc8j4Jn1KWL2SX8NugG6T5kZ#pinball-eternal-colombo" - ) + id, + LibId::from_str("alu:650XHPmhWpXWR5RUz4B5jXjeDqcyrHXpdZxYaX9gfO4#plasma-tunnel-mama") + .unwrap() ); - assert_eq!(Ok(id), LibId::from_str("alu:GrjjwmeTsibiEeYYtjokmc8j4Jn1KWL2SX8NugG6T5kZ")); - assert_eq!(Ok(id), LibId::from_str("GrjjwmeTsibiEeYYtjokmc8j4Jn1KWL2SX8NugG6T5kZ")); + assert_eq!(id, LibId::from_str("650XHPmhWpXWR5RUz4B5jXjeDqcyrHXpdZxYaX9gfO4").unwrap()); } } diff --git a/src/stl.rs b/src/stl.rs index 8e0d202..fca9490 100644 --- a/src/stl.rs +++ b/src/stl.rs @@ -33,7 +33,7 @@ use crate::LIB_NAME_ALUVM; /// Strict type id for the library providing data types from this crate. pub const LIB_ID_ALUVM: &str = - "urn:ubideco:stl:APYERRUMyWqLadwTv8tEFifHMPGpL3xGFSBxwaKYpmcV#square-mammal-uncle"; + "stl:YnA1fyHl-46C2hsC-tZPxn60-w1jLk5Y-rDTjRmy-xo@5xjY#congo-archive-folio"; fn _aluvm_stl() -> Result { LibBuilder::new(libname!(LIB_NAME_ALUVM), tiny_bset! { diff --git a/stl/AluVM@0.1.0.sta b/stl/AluVM@0.1.0.sta index 603e5a1..cc75a77 100644 --- a/stl/AluVM@0.1.0.sta +++ b/stl/AluVM@0.1.0.sta @@ -1,19 +1,19 @@ -----BEGIN STRICT TYPE LIB----- -Id: urn:ubideco:stl:APYERRUMyWqLadwTv8tEFifHMPGpL3xGFSBxwaKYpmcV#square-mammal-uncle +Id: stl:YnA1fyHl-46C2hsC-tZPxn60-w1jLk5Y-rDTjRmy-xo@5xjY#congo-archive-folio Name: AluVM -Dependency: EcCNgrgLaygt3tCZNu2ZVEzMzSAZYEUeTNAVi5E81YWi#aspirin-mango-average -Checksum-SHA256: d0b37000d730beef023af7883b4664c10ecce81ab144c4ac0cc4a85687b96fac +Dependencies: Std#ralph-blue-lucky +Check-SHA256: 33bd3f759d49fd0e46f3179acda055dcc81082b29db36d949482f9e168b6781c -1wm|eR!srQEFN!zncXl9K5w2;FV{y1jDTJCC^p$-mHEbO0#qjhQ*>kj15cBr>9x-Cs#sheE97?nsOaXHkb)PY;b5{Lt$`p1^@?1b74+lZDj -=k00;ugEFN!zncXl9K5w2;FV{y1jDTJCC^p$-mHEbO0#qj_gwc#^4#qsMUl{*1zN -e>I^CwqAYJB+ZKALhJOg5MT00000000080000000006NpoRSWoHEe00{wQLP%5x# -+Iwz1XmoMZUe8>*JiqdOAW_7Xq?evcVyE5000000000$0000000003Ole{U1O#bw -VPydUTVY%eB()|DVs5)j?WBU==a=KzyTg3px>h43uaSoYV{c?-00;m8KmY&$0000 -00RR600000000d-VbYTDp002M$0000000030{{R3000004Y-wV10n*|aTPJY^=0y -A22XT>kj15cB +r>9x-Cs#sheE97?nsOaXHkb)PY;b5{Lt$`pdPjz(4^OqB|1Bk8zGh-IHIi*o-3_)yg +XkkNPaC1&|Z3X}bNpoRNVQpmv0RRO80?I5NZ-bfLFbqC#o>4E?M+l67UG^w8*<_XZ#%uyqCnto_jB5_Y +Jg;9E|1`d*r&;qSS3+uh`0YNLave-Im;eX@$}AplgPGkh3_fq3Q7_j=2#kPT_9!;lWR>~GYywm#dPjz( +4^OqB|1Bk8zGh-IHIi*o-0RR91000002LJ#70000021#>aQ)Oob0RRaBlI1_jdG2&s +5l|&f*ZHF;qIbkhZU7>Kq8jXl$Dv2x0000000000KmY&$00000159aR1_T6Yb75rxvkfUR&BN*@p#4(i +bP}+ptVxWdH~O06+i$000000096000000000DJVRT^t2mk;;0000000000 +|Nj60000001Z-(ya{6isfX<|ua1pxpD002NB00vBH +VpC;j1pxpF0jDrk0xkJm$nc4yMWR2J-cc#Q6SofWC)gp7L6!Sc3IG5A000000RI300000000&HIVpC~! +Wd;HRY-wTvr!Z9lE%{u?@QI^EqCb}2Q7OO^w+`_q*ddTXmHSf)18{G10006 -----END STRICT TYPE LIB----- diff --git a/stl/AluVM@0.1.0.stl b/stl/AluVM@0.1.0.stl index 9dd4e23..3007346 100644 Binary files a/stl/AluVM@0.1.0.stl and b/stl/AluVM@0.1.0.stl differ diff --git a/stl/AluVM@0.1.0.sty b/stl/AluVM@0.1.0.sty index a6338f4..69081d5 100644 --- a/stl/AluVM@0.1.0.sty +++ b/stl/AluVM@0.1.0.sty @@ -1,5 +1,5 @@ {- - Id: urn:ubideco:stl:APYERRUMyWqLadwTv8tEFifHMPGpL3xGFSBxwaKYpmcV#square-mammal-uncle + Id: stl:YnA1fyHl-46C2hsC-tZPxn60-w1jLk5Y-rDTjRmy-xo@5xjY#congo-archive-folio Name: AluVM Version: 0.1.0 Description: AluVM data type library @@ -11,29 +11,30 @@ @context typelib AluVM -import Std#EcCNgrgLaygt3tCZNu2ZVEzMzSAZYEUeTNAVi5E81YWi#aspirin-mango-average - use AlphaCaps#digital-mirage-dream +import Std#ralph-blue-lucky + use AlphaCaps#picnic-soprano-aurora + use AlphaCapsNum#aladdin-zebra-marble -@mnemonic(spirit-example-carrot) -data IsaName : [Std.AlphaCaps#digital-mirage-dream ^ 2..0x8] +@mnemonic(taboo-olympic-cloud) +data IsaName : Std.AlphaCaps, [Std.AlphaCapsNum ^ 1..0x7] -@mnemonic(blonde-format-kansas) +@mnemonic(freedom-ship-canal) data IsaSeg : {IsaName ^ ..0x40} -@mnemonic(volcano-daniel-ticket) +@mnemonic(bernard-igor-version) data Lib : isae IsaSeg , code [Byte] , data [Byte] , libs LibSeg -@mnemonic(rebel-factor-rodeo) +@mnemonic(germany-culture-olivia) data LibId : [Byte ^ 32] -@mnemonic(imitate-cargo-region) +@mnemonic(gilbert-tomato-caesar) data LibSeg : {LibId ^ ..0xff} -@mnemonic(organic-escort-ceramic) +@mnemonic(chance-agent-ivory) data LibSite : lib LibId, pos U16