[feature] #3516: make FindTrigger queries return original WASM

Signed-off-by: Artemii Gerasimovich <[email protected]>
hyperledger-iroha · Oct 17, 2023 · 745a0bc · 745a0bc
1 parent 185416e
commit 745a0bc
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 14 deletions.
diff --git a/client/src/client.rs b/client/src/client.rs
@@ -329,7 +329,7 @@ impl_query_result! {
     iroha_data_model::query::MetadataValue,
     iroha_data_model::query::TransactionQueryOutput,
     iroha_data_model::permission::PermissionTokenSchema,
-    iroha_data_model::trigger::Trigger<iroha_data_model::events::TriggeringFilterBox, iroha_data_model::trigger::OptimizedExecutable>,
+    iroha_data_model::trigger::Trigger<iroha_data_model::events::TriggeringFilterBox, iroha_data_model::transaction::Executable>,
 }
 
 /// Iroha client

diff --git a/client/tests/integration/triggers/by_call_trigger.rs b/client/tests/integration/triggers/by_call_trigger.rs
@@ -5,7 +5,7 @@ use iroha_client::client::{self, Client};
 use iroha_data_model::{
     prelude::*,
     query::error::{FindError, QueryExecutionFail},
-    trigger::OptimizedExecutable,
+    transaction::Executable,
 };
 use iroha_genesis::GenesisNetwork;
 use iroha_logger::info;
@@ -286,7 +286,7 @@ fn unregister_trigger() -> Result<()> {
     };
     let found_trigger = test_client.request(find_trigger.clone())?;
     let found_action = found_trigger.action;
-    let OptimizedExecutable::Instructions(found_instructions) = found_action.executable else {
+    let Executable::Instructions(found_instructions) = found_action.executable else {
         panic!("Expected instructions");
     };
     let found_trigger = Trigger::new(

diff --git a/core/src/smartcontracts/isi/query.rs b/core/src/smartcontracts/isi/query.rs
@@ -47,7 +47,7 @@ impl_lazy! {
     iroha_data_model::query::MetadataValue,
     iroha_data_model::query::TransactionQueryOutput,
     iroha_data_model::permission::PermissionTokenSchema,
-    iroha_data_model::trigger::Trigger<iroha_data_model::events::TriggeringFilterBox, iroha_data_model::trigger::OptimizedExecutable>,
+    iroha_data_model::trigger::Trigger<iroha_data_model::events::TriggeringFilterBox, iroha_data_model::transaction::Executable>,
 }
 
 /// Query Request statefully validated on the Iroha node side.

diff --git a/core/src/smartcontracts/isi/triggers/mod.rs b/core/src/smartcontracts/isi/triggers/mod.rs
@@ -198,11 +198,11 @@ pub mod query {
     use iroha_data_model::{
         events::TriggeringFilterBox,
         query::{error::QueryExecutionFail as Error, MetadataValue},
-        trigger::{OptimizedExecutable, Trigger, TriggerId},
+        trigger::{Trigger, TriggerId},
     };
 
     use super::*;
-    use crate::prelude::*;
+    use crate::{prelude::*, smartcontracts::triggers::set::LoadedExecutable};
 
     impl ValidQuery for FindAllActiveTriggerIds {
         #[metrics(+"find_all_active_triggers")]
@@ -219,7 +219,7 @@ pub mod query {
         fn execute(
             &self,
             wsv: &WorldStateView,
-        ) -> Result<Trigger<TriggeringFilterBox, OptimizedExecutable>, Error> {
+        ) -> Result<Trigger<TriggeringFilterBox, Executable>, Error> {
             let id = wsv
                 .evaluate(&self.id)
                 .map_err(|e| Error::Evaluate(format!("Failed to evaluate trigger id. {e}")))?;
@@ -237,8 +237,20 @@ pub mod query {
                 .inspect_by_id(&id, |action| action.clone_and_box())
                 .ok_or_else(|| Error::Find(FindError::Trigger(id.clone())))?;
 
-            let action =
-                Action::new(loaded_executable, repeats, authority, filter).with_metadata(metadata);
+            let original_executable = match loaded_executable {
+                LoadedExecutable::Wasm(_) => {
+                    let original_wasm = wsv
+                        .triggers()
+                        .get_original_contract(&id)
+                        .cloned()
+                        .expect("No original smartcontract saved for trigger. This is a bug.");
+                    Executable::Wasm(original_wasm)
+                }
+                LoadedExecutable::Instructions(isi) => Executable::Instructions(isi),
+            };
+
+            let action = Action::new(original_executable, repeats, authority, filter)
+                .with_metadata(metadata);
 
             // TODO: Should we redact the metadata if the account is not the authority/owner?
             Ok(Trigger::new(id, action))
@@ -274,7 +286,7 @@ pub mod query {
             &self,
             wsv: &'wsv WorldStateView,
         ) -> eyre::Result<
-            Box<dyn Iterator<Item = Trigger<TriggeringFilterBox, OptimizedExecutable>> + 'wsv>,
+            Box<dyn Iterator<Item = Trigger<TriggeringFilterBox, Executable>> + 'wsv>,
             Error,
         > {
             let domain_id = wsv
@@ -292,9 +304,21 @@ pub mod query {
                         metadata,
                     } = action.clone_and_box();
 
+                    let original_executable =
+                        match loaded_executable {
+                            LoadedExecutable::Wasm(_) => {
+                                let original_wasm =
+                                wsv.triggers().get_original_contract(&trigger_id).cloned().expect(
+                                    "No original smartcontract saved for trigger. This is a bug.",
+                                );
+                                Executable::Wasm(original_wasm)
+                            }
+                            LoadedExecutable::Instructions(isi) => Executable::Instructions(isi),
+                        };
+
                     Trigger::new(
                         trigger_id.clone(),
-                        Action::new(loaded_executable, repeats, authority, filter)
+                        Action::new(original_executable, repeats, authority, filter)
                             .with_metadata(metadata),
                     )
                 },

diff --git a/data_model/src/query/mod.rs b/data_model/src/query/mod.rs
@@ -971,7 +971,7 @@ pub mod trigger {
         events::TriggeringFilterBox,
         expression::EvaluatesTo,
         prelude::InstructionExpr,
-        trigger::{OptimizedExecutable, Trigger, TriggerId},
+        trigger::{Trigger, TriggerId},
         Executable, Identifiable, Name, Value,
     };
 
@@ -1025,15 +1025,15 @@ pub mod trigger {
     }
 
     impl Query for FindTriggerById {
-        type Output = Trigger<TriggeringFilterBox, OptimizedExecutable>;
+        type Output = Trigger<TriggeringFilterBox, Executable>;
     }
 
     impl Query for FindTriggerKeyValueByIdAndKey {
         type Output = MetadataValue;
     }
 
     impl Query for FindTriggersByDomainId {
-        type Output = Vec<Trigger<TriggeringFilterBox, OptimizedExecutable>>;
+        type Output = Vec<Trigger<TriggeringFilterBox, Executable>>;
     }
 
     impl FindTriggerById {