feat: update rgb isa instrs

Cargo.toml

@@ -59,3 +59,7 @@ wasm-bindgen-test = "0.3"
 
 [package.metadata.docs.rs]
 features = [ "all" ]
+
+[patch.crates-io]
+# TODO: Remove after new release
+aluvm = { git = "https://github.com/AluVM/rust-aluvm", branch = "master" }

src/vm/macroasm.rs

@@ -23,6 +23,7 @@
 #[macro_export]
 macro_rules! rgbasm {
     ($( $tt:tt )+) => {{ #[allow(unused_imports)] {
+        use $crate::AssignmentType;
         use $crate::vm::{RgbIsa, ContractOp, TimechainOp};
         use $crate::vm::aluasm_isa;
         use $crate::isa_instr;
@@ -34,8 +35,28 @@ macro_rules! rgbasm {
 macro_rules! isa_instr {
     (pcvs $no:literal) => {{ RgbIsa::Contract(ContractOp::PcVs($no.into())) }};
     (pccs $no1:literal, $no2:literal) => {{ RgbIsa::Contract(ContractOp::PcCs($no1.into(), $no2.into())) }};
-    (ldg $t:literal, $no:literal,s16[$s_idx:literal]) => {{ RgbIsa::Contract(ContractOp::LdG($t.into(), $no, RegS::from($s_idx))) }};
-    (lds $t:literal, $no:literal,s16[$s_idx:literal]) => {{ RgbIsa::Contract(ContractOp::LdS($t.into(), $no, RegS::from($s_idx))) }};
-    (ldp $t:literal, $no:literal,s16[$s_idx:literal]) => {{ RgbIsa::Contract(ContractOp::LdP($t.into(), $no, RegS::from($s_idx))) }};
+    (cng $t:literal,a8[$a_idx:literal]) => {{ RgbIsa::Contract(ContractOp::CnG($t.into(), Reg32::from($a_idx))) }};
+    (cnc $t:literal,a16[$a_idx:literal]) => {{ RgbIsa::Contract(ContractOp::CnC($t.into(), Reg32::from($a_idx))) }};
+    (ldg $t:literal,a8[$a_idx:literal],s16[$s_idx:literal]) => {{
+        RgbIsa::Contract(ContractOp::LdG(
+            GlobalStateType::from($t as u16),
+            Reg32::from($a_idx),
+            RegS::from($s_idx),
+        ))
+    }};
+    (ldp $t:literal,a16[$a_idx:literal],s16[$s_idx:literal]) => {{
+        RgbIsa::Contract(ContractOp::LdS(
+            AssignmentType::from($t as u16),
+            Reg32::from($a_idx),
+            RegS::from($s_idx),
+        ))
+    }};
+    (lds $t:literal,a16[$a_idx:literal],s16[$s_idx:literal]) => {{
+        RgbIsa::Contract(ContractOp::LdS(
+            AssignmentType::from($t as u16),
+            Reg32::from($a_idx),
+            RegS::from($s_idx),
+        ))
+    }};
     ($op:ident $($tt:tt)+) => {{ compile_error!(concat!("unknown RGB assembly opcode `", stringify!($op), "`")) }};
 }