vm: use operation type in ordering

If we have two different state transitions of different mined into the same block, which (by mistake) have the same nonce, we still can order them using type. This allows usage of type id value as a way of setting strong ordering overriding nonce values (for instance token issues can be always ordered before spendings)

src/stl.rs

@@ -40,7 +40,7 @@ pub const LIB_ID_RGB_COMMIT: &str =
     "stl:2$mqHGq5-aV!EhyM-GzDQ0TR-1$98P$3-!2lleId-xAOxKOU#nova-lobby-dialog";
 /// Strict types id for the library providing data types for RGB consensus.
 pub const LIB_ID_RGB_LOGIC: &str =
-    "stl:w3K7P7FD-SQ36YW9-C4zqzxS-9RCkgd$-osrL6RV-gk11t!g#satire-vital-richard";
+    "stl:HgC$jfcl-ooeEyLQ-Fn4ixZg-Z6m5zh2-TQwRbCP-prFfNn4#soprano-nice-total";
 
 fn _rgb_commit_stl() -> Result<TypeLib, CompileError> {
     LibBuilder::new(libname!(LIB_NAME_RGB_COMMIT), tiny_bset! {

src/vm/contract.rs

@@ -170,11 +170,13 @@ impl<'op> OrdOpRef<'op> {
             OrdOpRef::Genesis(_) => OpOrd::Genesis,
             OrdOpRef::Transition(op, _, witness_ord) => OpOrd::Transition {
                 witness: *witness_ord,
+                ty: op.transition_type,
                 nonce: op.nonce,
                 opid: op.id(),
             },
             OrdOpRef::Extension(op, _, witness_ord) => OpOrd::Extension {
                 witness: *witness_ord,
+                ty: op.extension_type,
                 nonce: op.nonce,
                 opid: op.id(),
             },
@@ -418,14 +420,14 @@ pub enum OpOrd {
     #[strict_type(tag = 0x01)]
     Extension {
         witness: WitnessOrd,
-        // TODO: Consider using extension type here
+        ty: ExtensionType,
         nonce: u64,
         opid: OpId,
     },
     #[strict_type(tag = 0xFF)]
     Transition {
         witness: WitnessOrd,
-        // TODO: Consider using transition type here
+        ty: TransitionType,
         nonce: u64,
         opid: OpId,
     },
@@ -468,20 +470,34 @@ impl GlobalOrd {
             idx,
         }
     }
-    pub fn transition(opid: OpId, idx: u16, nonce: u64, witness: WitnessOrd) -> Self {
+    pub fn transition(
+        opid: OpId,
+        idx: u16,
+        ty: TransitionType,
+        nonce: u64,
+        witness: WitnessOrd,
+    ) -> Self {
         Self {
             op_ord: OpOrd::Transition {
                 witness,
+                ty,
                 nonce,
                 opid,
             },
             idx,
         }
     }
-    pub fn extension(opid: OpId, idx: u16, nonce: u64, witness: WitnessOrd) -> Self {
+    pub fn extension(
+        opid: OpId,
+        idx: u16,
+        ty: ExtensionType,
+        nonce: u64,
+        witness: WitnessOrd,
+    ) -> Self {
         Self {
             op_ord: OpOrd::Extension {
                 witness,
+                ty,
                 nonce,
                 opid,
             },

stl/RGBLogic@0.1.0.sta

@@ -1,11 +1,11 @@
 -----BEGIN STRICT TYPE LIB-----
-Id: stl:w3K7P7FD-SQ36YW9-C4zqzxS-9RCkgd$-osrL6RV-gk11t!g#satire-vital-richard
+Id: stl:HgC$jfcl-ooeEyLQ-Fn4ixZg-Z6m5zh2-TQwRbCP-prFfNn4#soprano-nice-total
 Name: RGBLogic
 Dependencies:
 	BPCore#garbo-radius-peru,
 	RGBCommit#nova-lobby-dialog,
 	Bitcoin#signal-color-cipher
-Check-SHA256: b385c363a383d9a2cce01e0c7b4e75acd48725312341a0dcfe23317f431e744b
+Check-SHA256: 0a097ab0847c6dd483bfc7462de13f75a93b22c120ba80fa68eee94143b8be36
 
 2vSEvOmAmtV*_s<midRhTh1hu7-!n@1Cr{swqbZoGSd8tmgp<3rE>;CP(yEWW!w3x9BR2~UxbGv2Fx@x
 O&x#t!~fsyrIq3x!~?M?<q1+pLPKwDZE1A%Y!hN5_Bp3Y36tDMM#=e#tGI($UA5U3KNx<*C>ja}LTPkk
@@ -17,17 +17,21 @@ Wpq+$XJ~Xna$#;`Xh%-ZT+rxDK6vW;JU&?LxLM72H?wDC1Zo}=N}D)4mkLjCa%FT-a&K>D2SRCdV{d70
 DJ{*3f84s>#k$1lf7uIEVQ@}wWMxQUb7)_z*=^-NPQ?`2v5jYd+6t@dEhY>7H!Y*UdZb-BpG^u(WnpGh
 V{&P5bg6}ecT=8d`>?<6$C@F;S3|*6`1-v+nBdcqJ?FPKcnV2wbY*gGVQf%qwlfK-7{9iX4Q|L-q$GzU
 Mp|h<azh8d{~gylbAe9D2TWyQW>#f#{Gz8SzLEaTf~c{WkYggkPIjuQHS#3Ua|L6d7%qre2Ut&TY<W;?
-2~tNwLvL+uX><VqmB{9L9(7`0)Rt93YLV-HLXe?vTA1;^Q1`ZqBog<<1W#~DWCZ{SL}Fu5a&K>D1OfpD
-bYXCEWpn@q0RnFxmidRhTh1hu7-!n@1Cr{swqbZoGSd8tmgp<3rE?FqADBNH?W>M^%H|xc>sh|Dn*!v8
-^Ea7rh?dzC2n+%RZ*X#DbN~eb0&gCc`G>t*&Lor=XWH@ulIpd#VR%e3()@~+=qs(Ib4O0kT+rxDK6vW;
-JU&?LxLM72H?wDC1Zo}=N}D)4mkCE~Z(?C=PjX}i0tIhyPjX}dh8p!P?PmR~yKU>`gXhu%_ym}@7JKPi
-T1gE*r}HDX18HP<00067PjF9iWCQ~M2WMq&WpinB0000131xV6Wo~n6Z*Bkv0|$3$bZ%vHa{=}XBbpbB
-LK#dEwxUFHJ){RjtgLvL_X>0rou@Knb#Vo5Z*F5{000OCZ*Xa30^9kj9BR2~UxbGv2Fx@xO&x#t!~fsy
-rIq3x!~?M?<(0_hdLDIRU(}XWLTZugenOC;Z(5k~zEJnJiX;;E#s3O)a$#<BX>@6CZU6=Y2X|?7Ze??G
-0rm?cniq>g8B7tjqC|5&qz6Q-tazCB3Um~mr!r)9aRqK~ZewKt00;zcaA{-$+xe;-YPo4&goh&r%rrDj
-9e?-3|KIJUmEs-51F<OOmB{9L9(7`0)Rt93YLV-HLXe?vTA1;^Q1`ZqBog<<3Rh`#Ze??GPjX}g0{{qN
-a${&|c4cG$00036ZE0?0WB>&L0S>>o?Kom?q=ULN^A!11b?H{wM>P}NCm0qyW47Umu>uKnWo~p~bZK^F
-0000AS7~%^Wpi^-Z*v9$254nzXJ~W)00aqiX>Db5bYX39002k
+2~tNwLvL+uX><bsG*S<)6P6lYy(#<=BR_>s@(?%#f7ArN-=Rj?7Ns(14peesZgXjLX>V>+d2nT9bsj>g
+6`?#s5rWnKhSeO?L~x^!;Y#eFP|P}0Z%Ez^MR;^&ZgXjGZd7@2WtGV0dLDIRU(}XWLTZugenOC;Z(5k~
+zEJnJiX;;E#RN}qNn`~82t;CIP;zf?W&{EO26SO?a%FS?1pxwY9+vrsy<5&Clo)5)@&l6UwYFh+Ofu5^
+ik9drt)+7hwjY>38tto&d&=e<t?OC7vzr3sh4VL=aEO-K69^0f1#fV2Wpn@q0RnFxmidRhTh1hu7-!n@
+1Cr{swqbZoGSd8tmgp<3rE^D4&s@;xOg?z(`#e5a?6_IYcQ><VWCUs+6H1#nJC_MZY;R&=Y)^7z1_A|d
+a8Gh%0iv75<3GB=m3W}HNi~P4iw~1OQOpPH6tgc2l8S+x4g+aqcmMzb1y68Ka%2Pp00(DfZe??6a{vGU
+0SRSzbY*UHX>V=-1_TFpX>@L7b8`Xq3nQ8ri$WPp5w@a4b3LR7M69fMnD+{F6rHCsWOZ=@ba?{X`Klah
+xoKa7ha(2eG&D^efA_=x-|eN9;vK{Tu_)zabsj>g6`?#s5rWnKhSeO?L~x^!;Y#eFP|P}0Z%Ez+Zf|a5
+WdHyO1aEL@WCGjysvK&$X<vkgBL>VgG)*0U_rw3+?WL9C9mE5%DCL#N=6W7=VqesjRYGc!>wZFzp>JB4
+@xD;^wu&SY_r?DTbaG*Cb7^#GZ*Bkv1P6C%bZ%vHa{=}XBbpbBLK#dEwxUFHJ){RjtgLvL_X>0rou@Kn
+b#Vf8c>>${svK&$X<vkgBL>VgG)*0U_rw3+?WL9C9mE5%DCIO#53UoI8eY9A{1GERg--GiI0S#x1is&)
+M%fmnGH3;EZ*F5{000OCZ*Xa30^9kj9BR2~UxbGv2Fx@xO&x#t!~fsyrIq3x!~?M?<(0_hdLDIRU(}XW
+LTZugenOC;Z(5k~zEJnJiX;;E#R^wxbZ%vHb5C+)1OosFVRB<=X?A5~000011#M|=Wn=&a0Raxbxa~M%
+Zlr^{H1ibsRCVcA*+(@K+$R_oJY%-uiLn9+bY*UIVRUJBWdHyG3Rh`#Ze??GP;YYv0tRShX=iA3000CD
+bZKp6b97;CZ~y>E
 
 -----END STRICT TYPE LIB-----
 

stl/RGBLogic@0.1.0.sty

@@ -1,5 +1,5 @@
 {-
-  Id: stl:w3K7P7FD-SQ36YW9-C4zqzxS-9RCkgd$-osrL6RV-gk11t!g#satire-vital-richard
+  Id: stl:HgC$jfcl-ooeEyLQ-Fn4ixZg-Z6m5zh2-TQwRbCP-prFfNn4#soprano-nice-total
   Name: RGBLogic
   Version: 0.1.0
   Description: Consensus logic layer for RGB smart contracts
@@ -19,6 +19,8 @@ import BPCore#garbo-radius-peru
   use OpretProof#good-village-flex
 
 import RGBCommit#nova-lobby-dialog
+  use TransitionType#picture-reflex-brigade
+  use ExtensionType#apropos-scoop-viva
   use OpId#picnic-single-gloria
 
 import Bitcoin#signal-color-cipher
@@ -37,12 +39,14 @@ data DbcProof          : tapret#1 BPCore.TapretProof
 @mnemonic(east-sunset-extra)
 data GlobalOrd         : opOrd OpOrd, idx U16
 
-@mnemonic(france-fish-fortune)
+@mnemonic(combat-henry-flood)
 data OpOrd             : genesis ()
                        | extension (witness WitnessOrd
+                       , ty RGBCommit.ExtensionType
                        , nonce U64
                        , opid RGBCommit.OpId)
                        | transition#255 (witness WitnessOrd
+                       , ty RGBCommit.TransitionType
                        , nonce U64
                        , opid RGBCommit.OpId)