operation: introduce StateData type

src/operation/commit.rs

@@ -25,7 +25,7 @@ use std::fmt::{Display, Formatter};
 use std::str::FromStr;
 use std::{fmt, vec};
 
-use amplify::confinement::{Confined, MediumOrdMap, SmallBlob, U16 as U16MAX};
+use amplify::confinement::{Confined, MediumOrdMap, U16 as U16MAX};
 use amplify::hex::{FromHex, ToHex};
 use amplify::num::u256;
 use amplify::{hex, ByteArray, Bytes32, FromSliceError, Wrapper};
@@ -40,7 +40,8 @@ use crate::operation::state::StateCommitment;
 use crate::{
     impl_serde_baid64, Assign, AssignmentType, Assignments, BundleId, ExposedSeal, Extension,
     ExtensionType, Ffv, Genesis, GlobalState, GlobalStateType, Operation, Redeemed, SchemaId,
-    SecretSeal, Transition, TransitionBundle, TransitionType, XChain, LIB_NAME_RGB_COMMIT,
+    SecretSeal, StateData, Transition, TransitionBundle, TransitionType, XChain,
+    LIB_NAME_RGB_COMMIT,
 };
 
 /// Unique contract identifier equivalent to the contract genesis commitment
@@ -385,7 +386,7 @@ impl<Seal: ExposedSeal> MerkleLeaves for Assignments<Seal> {
 #[derive(Clone, Eq, PartialEq, Hash, Debug)]
 pub struct GlobalCommitment {
     pub ty: GlobalStateType,
-    pub state: SmallBlob,
+    pub state: StateData,
 }
 
 impl CommitEncode for GlobalCommitment {

src/operation/global.rs

@@ -23,11 +23,11 @@
 use std::collections::btree_map;
 use std::vec;
 
-use amplify::confinement::{Confined, NonEmptyVec, SmallBlob, TinyOrdMap, U16 as U16MAX};
+use amplify::confinement::{Confined, NonEmptyVec, TinyOrdMap, U16 as U16MAX};
 use amplify::{confinement, Wrapper};
 use strict_encoding::StrictDumb;
 
-use crate::{schema, LIB_NAME_RGB_COMMIT};
+use crate::{schema, StateData, LIB_NAME_RGB_COMMIT};
 
 #[derive(Wrapper, WrapperMut, Clone, PartialEq, Eq, Hash, Debug, From)]
 #[wrapper(Deref)]
@@ -39,19 +39,19 @@ use crate::{schema, LIB_NAME_RGB_COMMIT};
     derive(Serialize, Deserialize),
     serde(crate = "serde_crate", transparent)
 )]
-pub struct GlobalValues(NonEmptyVec<SmallBlob, U16MAX>);
+pub struct GlobalValues(NonEmptyVec<StateData, U16MAX>);
 
 impl StrictDumb for GlobalValues {
-    fn strict_dumb() -> Self { Self(NonEmptyVec::with(SmallBlob::strict_dumb())) }
+    fn strict_dumb() -> Self { Self(NonEmptyVec::with(StateData::strict_dumb())) }
 }
 
 impl GlobalValues {
-    pub fn with(state: SmallBlob) -> Self { GlobalValues(Confined::with(state)) }
+    pub fn with(state: impl Into<StateData>) -> Self { GlobalValues(Confined::with(state.into())) }
 }
 
 impl IntoIterator for GlobalValues {
-    type Item = SmallBlob;
-    type IntoIter = vec::IntoIter<SmallBlob>;
+    type Item = StateData;
+    type IntoIter = vec::IntoIter<StateData>;
 
     fn into_iter(self) -> Self::IntoIter { self.0.into_iter() }
 }
@@ -72,7 +72,7 @@ impl GlobalState {
     pub fn add_state(
         &mut self,
         ty: schema::GlobalStateType,
-        state: SmallBlob,
+        state: StateData,
     ) -> Result<(), confinement::Error> {
         match self.0.get_mut(&ty) {
             Some(vec) => vec.push(state),
@@ -83,7 +83,7 @@ impl GlobalState {
     pub fn extend_state(
         &mut self,
         ty: schema::GlobalStateType,
-        iter: impl IntoIterator<Item = SmallBlob>,
+        iter: impl IntoIterator<Item = StateData>,
     ) -> Result<(), confinement::Error> {
         match self.0.get_mut(&ty) {
             Some(vec) => vec.extend(iter),

src/operation/mod.rs

@@ -46,7 +46,7 @@ pub use seal::{
     ExposedSeal, GenesisSeal, GraphSeal, OutputSeal, SecretSeal, TxoSeal, XGenesisSeal, XGraphSeal,
     XOutputSeal,
 };
-pub use state::{AttachId, State, StateCommitment};
+pub use state::{AttachId, State, StateCommitment, StateData};
 pub use xchain::{
     AltLayer1, AltLayer1Set, Impossible, Layer1, XChain, XChainParseError, XOutpoint,
     XCHAIN_BITCOIN_PREFIX, XCHAIN_LIQUID_PREFIX,

src/operation/state.rs

@@ -26,7 +26,7 @@ use std::fmt::{Display, Formatter};
 use std::str::FromStr;
 
 use amplify::confinement::{SmallBlob, U16 as U16MAX};
-use amplify::{Bytes32, Wrapper};
+use amplify::{ByteArray, Bytes32, Wrapper};
 use baid64::{Baid64ParseError, DisplayBaid64, FromBaid64Str};
 use commit_verify::{CommitmentId, DigestExt, ReservedBytes, Sha256};
 use strict_encoding::{StrictDeserialize, StrictSerialize, StrictType};
@@ -63,6 +63,30 @@ impl Display for AttachId {
 
 impl_serde_baid64!(AttachId);
 
+#[derive(Wrapper, Clone, PartialOrd, Ord, Eq, PartialEq, Hash, Debug, From)]
+#[wrapper(Deref, BorrowSlice, Index, RangeOps)]
+#[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
+#[strict_type(lib = LIB_NAME_RGB_COMMIT)]
+#[cfg_attr(
+    feature = "serde",
+    derive(Serialize, Deserialize),
+    serde(crate = "serde_crate", transparent)
+)]
+pub struct StateData(SmallBlob);
+
+impl StrictSerialize for StateData {}
+impl StrictDeserialize for StateData {}
+
+impl AsRef<[u8]> for StateData {
+    fn as_ref(&self) -> &[u8] { self.0.as_slice() }
+}
+
+impl StateData {
+    pub fn from_checked(vec: Vec<u8>) -> Self { Self(SmallBlob::from_checked(vec)) }
+
+    pub fn as_slice(&self) -> &[u8] { self.0.as_slice() }
+}
+
 #[derive(Clone, PartialOrd, Ord, Eq, PartialEq, Hash, Debug)]
 #[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_RGB_COMMIT)]
@@ -71,12 +95,19 @@ impl_serde_baid64!(AttachId);
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate = "serde_crate"))]
 pub struct State {
     pub reserved: ReservedBytes<1>,
-    pub value: SmallBlob,
+    pub value: StateData,
     pub attach: Option<AttachId>,
 }
 
-impl StrictSerialize for State {}
-impl StrictDeserialize for State {}
+impl From<StateData> for State {
+    fn from(value: StateData) -> Self {
+        State {
+            reserved: default!(),
+            value,
+            attach: None,
+        }
+    }
+}
 
 impl State {
     /// # Panics
@@ -87,7 +118,8 @@ impl State {
             reserved: default!(),
             value: value
                 .to_strict_serialized::<U16MAX>()
-                .expect("unable to fit in the data"),
+                .expect("unable to fit in the data")
+                .into(),
             attach: None,
         }
     }
@@ -100,7 +132,8 @@ impl State {
             reserved: default!(),
             value: value
                 .to_strict_serialized::<U16MAX>()
-                .expect("unable to fit in the data"),
+                .expect("unable to fit in the data")
+                .into(),
             attach: Some(attach),
         }
     }

src/stl.rs

@@ -37,10 +37,10 @@ use crate::{
 
 /// Strict types id for the library providing data types for RGB consensus.
 pub const LIB_ID_RGB_COMMIT: &str =
-    "stl:JepgtiGZ-TYqkSmV-vo6ysWP-gZZEU03-pVoHbyj-nR02608#aspect-shoe-garcia";
+    "stl:r43G92Ru-4TQgKzY-eeZQr$e-k0DccV0-6d0mlAI-Dil$Hr4#printer-window-alpine";
 /// Strict types id for the library providing data types for RGB consensus.
 pub const LIB_ID_RGB_LOGIC: &str =
-    "stl:nKQEKac1-dDxkN3M-dXhgnba-CkprxwT-So5aC5D-meYuULE#charm-chief-invite";
+    "stl:51OgjzV6-F5XuTyt-FMJe4k6-opdtsQd-cptXuc4-FqM7npk#ohio-electra-dilemma";
 
 fn _rgb_commit_stl() -> Result<TypeLib, CompileError> {
     LibBuilder::new(libname!(LIB_NAME_RGB_COMMIT), tiny_bset! {

src/vm/contract.rs

@@ -28,7 +28,6 @@ use std::num::NonZeroU32;
 use std::rc::Rc;
 
 use amplify::confinement;
-use amplify::confinement::SmallBlob;
 use amplify::num::u24;
 use bp::seals::txout::{CloseMethod, ExplicitSeal, VerifyError, Witness};
 use bp::{dbc, Tx, Txid};
@@ -40,8 +39,8 @@ use strict_encoding::{StrictDecode, StrictDumb, StrictEncode};
 use crate::{
     AssignmentType, Assignments, AssignmentsRef, ContractId, ExposedSeal, Extension, ExtensionType,
     Genesis, GlobalState, GlobalStateType, GraphSeal, Impossible, Inputs, Layer1, Metadata,
-    OpFullType, OpId, OpType, Operation, State, Transition, TransitionType, TxoSeal, TypedAssigns,
-    Valencies, XChain, XOutpoint, XOutputSeal, LIB_NAME_RGB_LOGIC,
+    OpFullType, OpId, OpType, Operation, State, StateData, Transition, TransitionType, TxoSeal,
+    TypedAssigns, Valencies, XChain, XOutpoint, XOutputSeal, LIB_NAME_RGB_LOGIC,
 };
 
 pub type XWitnessId = XChain<Txid>;
@@ -572,7 +571,7 @@ impl GlobalOrd {
 }
 
 pub trait GlobalStateIter {
-    type Data: Borrow<SmallBlob>;
+    type Data: Borrow<StateData>;
     fn size(&mut self) -> u24;
     fn prev(&mut self) -> Option<(GlobalOrd, Self::Data)>;
     fn last(&mut self) -> Option<(GlobalOrd, Self::Data)>;
@@ -633,7 +632,7 @@ impl<I: GlobalStateIter> GlobalContractState<I> {
     /// Retrieves global state data located `depth` items back from the most
     /// recent global state value. Ensures that the global state ordering is
     /// consensus-based.
-    pub fn nth(&mut self, depth: u24) -> Option<impl Borrow<SmallBlob> + '_> {
+    pub fn nth(&mut self, depth: u24) -> Option<impl Borrow<StateData> + '_> {
         if depth >= self.iter.size() {
             return None;
         }

src/vm/op_contract.rs

@@ -239,7 +239,7 @@ impl<S: ContractStateAccess> InstructionSet for ContractOp<S> {
                 else {
                     fail!()
                 };
-                regs.set_s(*reg, Some(&state.value));
+                regs.set_s(*reg, Some(state.value.as_inner()));
             }
             ContractOp::LdS(state_type, reg_32, reg) => {
                 let Some(reg_32) = *regs.get_n(RegA::A16, *reg_32) else {
@@ -255,7 +255,7 @@ impl<S: ContractStateAccess> InstructionSet for ContractOp<S> {
                 else {
                     fail!()
                 };
-                regs.set_s(*reg, Some(state.value));
+                regs.set_s(*reg, Some(state.value.into_inner()));
             }
             ContractOp::LdG(state_type, reg_8, reg_s) => {
                 let Some(reg_32) = *regs.get_n(RegA::A8, *reg_8) else {
@@ -271,7 +271,7 @@ impl<S: ContractStateAccess> InstructionSet for ContractOp<S> {
                 else {
                     fail!()
                 };
-                regs.set_s(*reg_s, Some(state));
+                regs.set_s(*reg_s, Some(state.as_inner()));
             }
 
             ContractOp::LdC(state_type, reg_32, reg_s) => {
@@ -289,7 +289,7 @@ impl<S: ContractStateAccess> InstructionSet for ContractOp<S> {
                 let Some(state) = global.nth(index) else {
                     fail!()
                 };
-                regs.set_s(*reg_s, Some(state.borrow()));
+                regs.set_s(*reg_s, Some(state.borrow().as_inner()));
             }
             ContractOp::LdM(type_id, reg) => {
                 let Some(meta) = context.op_info.metadata.get(type_id) else {

stl/AnchoredBundle.vesper

@@ -37,7 +37,7 @@ TransitionBundle rec
       globals map len=0..MAX8 aka=GlobalState
         key is U16 aka=GlobalStateType
         value list len=1..MAX16 aka=GlobalValues
-          element bytes len=0..MAX16
+          element bytes len=0..MAX16 aka=StateData
       inputs set len=0..MAX16 aka=Inputs
         Input rec
           prevOut rec Opout
@@ -55,7 +55,7 @@ TransitionBundle rec
                 liquid bytes len=32 wrapped aka=SecretSeal tag=1
               state rec State
                 reserved bytes len=1 aka=ReservedBytes1
-                value bytes len=0..MAX16
+                value bytes len=0..MAX16 aka=StateData
                   some bytes len=32 option wrapped aka=AttachId tag=1
               lock bytes len=2 aka=ReservedBytes2
             revealed rec tag=1
@@ -76,7 +76,7 @@ TransitionBundle rec
                   blinding is U64
               state rec State
                 reserved bytes len=1 aka=ReservedBytes1
-                value bytes len=0..MAX16
+                value bytes len=0..MAX16 aka=StateData
                   some bytes len=32 option wrapped aka=AttachId tag=1
               lock bytes len=2 aka=ReservedBytes2
       valencies set len=0..MAX8 aka=Valencies