Use PanicReason from fuel_asm

Follows FuelLabs/fuel-asm#34

Cargo.toml

@@ -9,7 +9,7 @@ repository = "https:/FuelLabs/fuel-tx"
 description = "FuelVM transaction."
 
 [dependencies]
-fuel-asm = { git = "ssh://[email protected]/FuelLabs/fuel-asm.git", default-features = false }
+fuel-asm = { git = "ssh://[email protected]/FuelLabs/fuel-asm.git", default-features = false, branch = "vlopes11/panic-reason" }
 fuel-types = { git = "ssh://[email protected]/FuelLabs/fuel-types.git", default-features = false }
 itertools = { version = "0.10", optional = true }
 rand = { version = "0.8", optional = true }

src/lib.rs

@@ -9,6 +9,7 @@
 
 pub mod consts;
 
+pub use fuel_asm::PanicReason;
 pub use fuel_types::{Address, Bytes32, Bytes4, Bytes64, Bytes8, Color, ContractId, Salt};
 
 #[cfg(feature = "std")]
@@ -24,4 +25,4 @@ mod receipt;
 pub use transaction::{Input, Metadata, Output, Transaction, ValidationError, Witness};
 
 #[cfg(feature = "std")]
-pub use receipt::{PanicReason, Receipt, ScriptResult};
+pub use receipt::{Receipt, ScriptResult};

src/receipt.rs

@@ -5,12 +5,12 @@ use std::convert::TryFrom;
 use std::io::{self, Write};
 use std::mem;
 
-mod panic_reason;
 mod receipt_repr;
+mod script_result;
 
 use receipt_repr::ReceiptRepr;
 
-pub use panic_reason::{PanicReason, ScriptResult};
+pub use script_result::ScriptResult;
 
 const WORD_SIZE: usize = mem::size_of::<Word>();
 

src/receipt/script_result.rs

@@ -0,0 +1,69 @@
+use fuel_asm::{Instruction, Opcode, PanicReason};
+use fuel_types::Word;
+
+use std::mem;
+
+const WORD_SIZE: usize = mem::size_of::<Word>();
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde-types", derive(serde::Serialize, serde::Deserialize))]
+pub struct ScriptResult {
+ result: PanicReason,
+ instruction: Instruction,
+}
+
+impl ScriptResult {
+ pub const fn new(result: PanicReason, instruction: Instruction) -> Self {
+ Self {
+ result,
+ instruction,
+ }
+ }
+
+ pub const fn result(&self) -> &PanicReason {
+ &self.result
+ }
+
+ pub const fn instruction(&self) -> &Instruction {
+ &self.instruction
+ }
+}
+
+const RESULT_OFFSET: Word = (WORD_SIZE * 8 - 8) as Word;
+const INSTR_OFFSET: Word = ((WORD_SIZE - mem::size_of::<u32>()) * 8 - 8) as Word;
+
+impl From<ScriptResult> for Word {
+ fn from(r: ScriptResult) -> Word {
+ let result = Word::from(r.result);
+ let instruction = u32::from(r.instruction) as Word;
+
+ (result << RESULT_OFFSET) | (instruction << INSTR_OFFSET)
+ }
+}
+
+impl From<Word> for ScriptResult {
+ fn from(val: Word) -> Self {
+ let result = PanicReason::from(val >> RESULT_OFFSET);
+ let instruction = Instruction::from((val >> INSTR_OFFSET) as u32);
+
+ Self::new(result, instruction)
+ }
+}
+
+impl From<ScriptResult> for Instruction {
+ fn from(r: ScriptResult) -> Self {
+ r.instruction
+ }
+}
+
+impl From<ScriptResult> for Opcode {
+ fn from(r: ScriptResult) -> Self {
+ r.instruction.into()
+ }
+}
+
+impl From<ScriptResult> for PanicReason {
+ fn from(r: ScriptResult) -> Self {
+ r.result
+ }
+}