Merge #4218

4218: get_operation_id r=Eitu33 a=Eitu33 Co-authored-by: Thomas Plisson <[email protected]>
massalabs · Jul 6, 2023 · 215bce5 · 215bce5
2 parents c1b1328 + 15ef232
commit 215bce5
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/massa-execution-worker/src/interface_impl.rs b/massa-execution-worker/src/interface_impl.rs
@@ -842,6 +842,14 @@ impl Interface for InterfaceImpl {
         Ok(())
     }
 
+    // Returns the operation id that originated the current execution if there is one
+    fn get_origin_operation_id(&self) -> Result<Option<String>> {
+        let operation_id = context_guard!(self)
+            .origin_operation_id
+            .map(|op_id| op_id.to_string());
+        Ok(operation_id)
+    }
+
     /// Returns the period of the current execution slot
     fn get_current_period(&self) -> Result<u64> {
         let slot = context_guard!(self).slot;

diff --git a/massa-node/base_config/gas_costs/abi_gas_costs.json b/massa-node/base_config/gas_costs/abi_gas_costs.json
@@ -40,6 +40,7 @@
   "assembly_script_print": 171,
   "assembly_script_seed": 72,
   "assembly_script_send_message": 286,
+  "assembly_script_get_origin_operation_id": 157,
   "assembly_script_set_bytecode": 187,
   "assembly_script_set_bytecode_for": 227,
   "assembly_script_set_data": 188,