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:ZMTVCU25-QDo98xR-wI91wcu-ydb7kui-QfZbF$n-0KDS2ow#tuna-safari-design";
 /// Strict types id for the library providing data types for RGB consensus.
 pub const LIB_ID_RGB_LOGIC: &str =
-    "stl:LpE2Q!Jf-pKsvjM$-ntKgUld-!zeRRa!-v7l6pzJ-qW2YceY#africa-choice-biology";
+    "stl:bioTBozT-NqelHGE-SPbnpMA-XBNSbXZ-6X0dANE-WHVirL8#explain-marvin-bless";
 
 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(),
             },
@@ -415,14 +417,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,
     },
@@ -465,20 +467,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:LpE2Q!Jf-pKsvjM$-ntKgUld-!zeRRa!-v7l6pzJ-qW2YceY#africa-choice-biology
+Id: stl:bioTBozT-NqelHGE-SPbnpMA-XBNSbXZ-6X0dANE-WHVirL8#explain-marvin-bless
 Name: RGBLogic
 Dependencies:
 	RGBCommit#tuna-safari-design,
 	BPCore#totem-holiday-helena,
 	Bitcoin#signal-color-cipher
-Check-SHA256: ec5fbe3beec7e0816d76eb90ea8fb35c931847f2b189f7befdde4e7e16d53e18
+Check-SHA256: b4f6b967a70e12d12c5831aa223bd85052f40dbc2bfd5ab3f739e1aa37242f31
 
 2vSEvOmAmtV*_Nw)d@|xKsr716mTQmaB}ROZ@Dgs2ia_2=g^?i+KdTOM?ynyZEb0ErdhI3FM~0|p{<6(
 sS&)~H{Xkb4j+}v9*QG}Q6KKm20~CnZ*pbzY!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@q0RpC3vQRIBF~gy)hQg^4yxce6i-HaxmCGKABZpBR?$8gmADBNH?W>M^%H|xc>sh|Dn*!v8
-^Ea7rh?dzC2n+%RZ*X#DbN~eb0;XBAP%ncq!=bH)!l@Cw+&ABgf({>*%N~j&hfyEy&__<sT+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%XM12~D{`Iz96ga3kGta_pUNxh{zZ
-*=%3u(4f-VjFrgddLDIRU(}XWLTZugenOC;Z(5k~zEJnJiX;;E#s3O)a$#<BX>@6CZU6=Y2X|?7Ze??G
-0rm?cniq>g8B7tjqC|5&qz6Q-tazCB3Um~mr!r)9aRqK~ZewKt00;zcaA{-$WW?18O}RiiJ@XWBBi(Rv
-?4579E{O-(Y+vWlpwilmmB{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?1pxx4S+Y<sgE7OQt%ky>5xm?t-;06{AC=1<
+iX(?nAMVf(wjY>38tto&d&=e<t?OC7vzr3sh4VL=aEO-K69^0f1#fV2Wpn@q0RpC3vQRIBF~gy)hQg^4
+yxce6i-HaxmCGKABZpBR?$Ae0&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?_~#MKE+
+xj;HS^AvC+-Eea3oo~4=i3iziU+2)E(%Ot<bsj>g6`?#s5rWnKhSeO?L~x^!;Y#eFP|P}0Z%Ez+Zf|a5
+WdHyO1aEL@WCCQw)d@|xKsr716mTQmaB}ROZ@Dgs2ia_2=g^?i+KiRR=6W7=VqesjRYGc!>wZFzp>JB4
+@xD;^wu&SY_r?DTbaG*Cb7^#GZ*Bkv1P6C%bZ%vHa{=}XBbpbBLK#dEwxUFHJ){RjtgLvL_X>0rou@Kn
+b#Vf8c>-j_)d@|xKsr716mTQmaB}ROZ@Dgs2ia_2=g^?i+Ke<(53UoI8eY9A{1GERg--GiI0S#x1is&)
+M%fmnGH3;EZ*F5{000OCZ*Xa30%XM12~D{`Iz96ga3kGta_pUNxh{zZ*=%3u(4f-VjFrgddLDIRU(}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:LpE2Q!Jf-pKsvjM$-ntKgUld-!zeRRa!-v7l6pzJ-qW2YceY#africa-choice-biology
+  Id: stl:bioTBozT-NqelHGE-SPbnpMA-XBNSbXZ-6X0dANE-WHVirL8#explain-marvin-bless
   Name: RGBLogic
   Version: 0.1.0
   Description: Consensus logic layer for RGB smart contracts
@@ -12,6 +12,8 @@
 typelib RGBLogic
 
 import RGBCommit#tuna-safari-design
+  use TransitionType#picture-reflex-brigade
+  use ExtensionType#apropos-scoop-viva
   use OpId#picnic-single-gloria
 
 import BPCore#totem-holiday-helena
@@ -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)