Merge pull request #71 from AluVM/bytestr-debug

Bytestr debug

Author: dr-orlovsky

.github/workflows/build.yml

@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, ubuntu-22.04, macos-11.0, macos-12.0, windows-2019, windows-2022 ]
+        os: [ ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, windows-2019, windows-2022 ]
     steps:
       - uses: actions/checkout@v2
       - name: Install macos dependencies

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "aluvm"
 description = "Functional registry-based RISC virtual machine"
-version = "0.10.0-rc.1"
+version = "0.10.0"
 authors = ["Dr Maxim Orlovsky <orlovsky@ubideco.org>"]
 repository = "https://github.com/aluvm/rust-aluvm"
 homepage = "https://aluvm.org"
@@ -25,13 +25,13 @@ name = "asm"
 required-features = ["all"]
 
 [dependencies]
-amplify = { version = "4.0.0-beta.20", default-features = false, features = ["apfloat", "derive", "hex"] }
+amplify = { version = "4.0.0-beta.22", default-features = false, features = ["apfloat", "derive", "hex"] }
 paste = "1"
 strict_encoding = { version = "2.0.0", default-features = false, features = ["float", "derive"] }
-strict_types = { version = "1.0.0-rc.1", optional = true }
+strict_types = { version = "1.0.0", optional = true }
 bitcoin_hashes = { version = "0.12.0", default-features = false } # this is most well-maintained generic hash implementation library
 blake3 = { version = "1.3.3", default-features = false }
-baid58 = "0.2.0"
+baid58 = "0.3.0"
 secp256k1 = { version = "0.27.0", optional = true, features = ["global-context"] }
 curve25519-dalek = { version = "3.2", optional = true }
 half = "2.1.0"

Cargo.toml

@@ -41,7 +41,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let args: Vec<String> = env::args().collect();
 
     let sty_id =
-        TypeLibId::from_str("gordon_george_magic_7UDb1RpkpgFcP3LhPVqSiAXAFfxoBLxtRSvWYwhy8F7W")?;
+        TypeLibId::from_str("danube_cotton_kansas_3xcfudRJUuwQ187puYDdNcxGeTpG8AoHyTrfJ9ryo9k6")?;
 
     let imports = bset! {
         Dependency::with(sty_id, libname!(STRICT_TYPES_LIB)),

src/bin/aluvm-stl.rs

@@ -25,14 +25,14 @@ use alloc::boxed::Box;
 use alloc::vec::Vec;
 use core::borrow::{Borrow, BorrowMut};
 use core::convert::TryFrom;
-use core::fmt::{self, Display, Formatter};
+use core::fmt::{self, Debug, Display, Formatter};
 use core::ops::Range;
 
 use amplify::confinement::{SmallBlob, TinyBlob};
 use amplify::num::error::OverflowError;
 
 /// Large binary bytestring object.
-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct ByteStr {
     /// Adjusted slice length.
     len: u16,
@@ -155,12 +155,27 @@ impl ByteStr {
     pub fn to_vec(&self) -> Vec<u8> { self.as_ref().to_vec() }
 }
 
+#[cfg(not(feature = "std"))]
+impl Debug for ByteStr {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { write!(f, "{:#04X?}", self.as_ref()) }
+}
+
+#[cfg(feature = "std")]
+impl Debug for ByteStr {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        use amplify::hex::ToHex;
+
+        f.debug_tuple("ByteStr").field(&self.as_ref().to_hex()).finish()
+    }
+}
+
 #[cfg(feature = "std")]
 impl Display for ByteStr {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         use std::fmt::Write;
 
         use amplify::hex::ToHex;
+
         let vec = Vec::from(&self.bytes[..self.len as usize]);
         if f.alternate() {
             for (line, slice) in self.as_ref().chunks(16).enumerate() {
@@ -207,9 +222,7 @@ impl Display for ByteStr {
 
 #[cfg(not(feature = "std"))]
 impl Display for ByteStr {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        write!(f, "{:#04X?}", &self.bytes[0usize..self.len as usize])
-    }
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { write!(f, "{:#04X?}", self.as_ref()) }
 }
 
 /*

src/data/byte_str.rs

@@ -45,7 +45,7 @@ pub const LIB_ID_TAG: [u8; 32] = *b"urn:ubideco:aluvm:lib:v01#230304";
 /// Unique identifier for a library.
 #[derive(Wrapper, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Default, Debug, Display, From)]
 #[wrapper(Deref, BorrowSlice, Hex, Index, RangeOps)]
-#[display(Self::to_baid58)]
+#[display(Self::to_baid58_string)]
 #[derive(StrictType, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_ALUVM)]
 #[cfg_attr(
@@ -70,6 +70,10 @@ impl FromStr for LibId {
     fn from_str(s: &str) -> Result<Self, Self::Err> { Self::from_baid58_str(s) }
 }
 
+impl LibId {
+    fn to_baid58_string(&self) -> String { format!("{:+}", self.to_baid58()) }
+}
+
 impl LibId {
     /// Computes LibId from the provided data
     pub fn with(

src/library/lib.rs

@@ -1,6 +1,5 @@
 ----- BEGIN STRICT TYPE LIB -----
-Id: 5GpK1xbT5AT8buj9rEh2Tp7iFJf7rr36qmbbaU39aMWD
-Checksum: sardine-ground-beatles
+Id: sardine_ground_beatles_5GpK1xbT5AT8buj9rEh2Tp7iFJf7rr36qmbbaU39aMWD
 
 BUFsdVZNAAIABUxpYklkBQEABwAAASAAB0xpYlNpdGUGAgNsaWIBBUxpYklkBNZYwiy7A7HjJQR9
 MqOnirGxPe4MWiiqVIXEJR6dVcgDcG9zAAAC

stl/AluVM.asc.stl

@@ -1,5 +1,5 @@
 {-
-  Id: 5GpK1xbT5AT8buj9rEh2Tp7iFJf7rr36qmbbaU39aMWD
+  Id: sardine_ground_beatles_5GpK1xbT5AT8buj9rEh2Tp7iFJf7rr36qmbbaU39aMWD
   Name: AluVM
   Description: Consensus layer for RGB smart contracts
   Author: Dr Maxim Orlovsky <orlovsky@ubideco.org>