feat: save failed submsg result in reply for timelocked contract #ntrn-80

contracts/dao/proposal/cwd-proposal-multiple/schema/cwd-proposal-multiple.json

@@ -2557,6 +2557,30 @@
         },
         "additionalProperties": false
       },
+      {
+        "description": "Returns errors of the failed proposal. Expected in the form of [execution_height, \"codespace=? code=?\"]. Returns `types::FailedProposalErrors`",
+        "type": "object",
+        "required": [
+          "proposal_failed_execution_error"
+        ],
+        "properties": {
+          "proposal_failed_execution_error": {
+            "type": "object",
+            "required": [
+              "proposal_id"
+            ],
+            "properties": {
+              "proposal_id": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
       {
         "type": "object",
         "required": [
@@ -6836,6 +6860,47 @@
         }
       }
     },
+    "proposal_failed_execution_error": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "FailedProposalErrors",
+      "description": "A list of proposals returned by `ProposalFailedExecutionError`.",
+      "type": "object",
+      "required": [
+        "errors"
+      ],
+      "properties": {
+        "errors": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/FailedExecutionError"
+          }
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "FailedExecutionError": {
+          "description": "Proposal failed execution error",
+          "type": "object",
+          "required": [
+            "error",
+            "height"
+          ],
+          "properties": {
+            "error": {
+              "description": "Error text. Error is reduced before cosmwasm reply and is expected in form of \"codespace=? code=?\"",
+              "type": "string"
+            },
+            "height": {
+              "description": "Block height of execution error",
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        }
+      }
+    },
     "proposal_hooks": {
       "$schema": "http://json-schema.org/draft-07/schema#",
       "title": "HooksResponse",

contracts/dao/proposal/cwd-proposal-multiple/schema/raw/query.json

@@ -226,6 +226,30 @@
       },
       "additionalProperties": false
     },
+    {
+      "description": "Returns errors of the failed proposal. Expected in the form of [execution_height, \"codespace=? code=?\"]. Returns `types::FailedProposalErrors`",
+      "type": "object",
+      "required": [
+        "proposal_failed_execution_error"
+      ],
+      "properties": {
+        "proposal_failed_execution_error": {
+          "type": "object",
+          "required": [
+            "proposal_id"
+          ],
+          "properties": {
+            "proposal_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
     {
       "type": "object",
       "required": [

contracts/dao/proposal/cwd-proposal-multiple/schema/raw/response_to_proposal_failed_execution_error.json

@@ -0,0 +1,41 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "FailedProposalErrors",
+  "description": "A list of proposals returned by `ProposalFailedExecutionError`.",
+  "type": "object",
+  "required": [
+    "errors"
+  ],
+  "properties": {
+    "errors": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/FailedExecutionError"
+      }
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "FailedExecutionError": {
+      "description": "Proposal failed execution error",
+      "type": "object",
+      "required": [
+        "error",
+        "height"
+      ],
+      "properties": {
+        "error": {
+          "description": "Error text. Error is reduced before cosmwasm reply and is expected in form of \"codespace=? code=?\"",
+          "type": "string"
+        },
+        "height": {
+          "description": "Block height of execution error",
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false
+    }
+  }
+}

contracts/dao/proposal/cwd-proposal-multiple/src/contract.rs

@@ -1,8 +1,8 @@
 #[cfg(not(feature = "library"))]
 use cosmwasm_std::entry_point;
 use cosmwasm_std::{
-    to_binary, Addr, Binary, Deps, DepsMut, Empty, Env, MessageInfo, Reply, Response, StdResult,
-    Storage, SubMsg, WasmMsg,
+    to_binary, Addr, Binary, Deps, DepsMut, Empty, Env, MessageInfo, Reply, Response, StdError,
+    StdResult, Storage, SubMsg, WasmMsg,
 };
 
 use cw2::set_contract_version;
@@ -26,6 +26,8 @@ use cwd_voting::{
     voting::{get_total_power, get_voting_power, validate_voting_period},
 };
 
+use crate::query::FailedProposalErrors;
+use crate::state::{FailedExecutionError, PROPOSAL_FAILED_EXECUTION_ERRORS};
 use crate::{msg::MigrateMsg, state::CREATION_POLICY};
 use crate::{
     msg::{ExecuteMsg, InstantiateMsg, QueryMsg},
@@ -730,6 +732,9 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<Binary> {
         QueryMsg::ProposalHooks {} => to_binary(&PROPOSAL_HOOKS.query_hooks(deps)?),
         QueryMsg::VoteHooks {} => to_binary(&VOTE_HOOKS.query_hooks(deps)?),
         QueryMsg::Dao {} => query_dao(deps),
+        QueryMsg::ProposalFailedExecutionError { proposal_id } => {
+            query_proposal_failed_execution_error(deps, proposal_id)
+        }
     }
 }
 
@@ -841,8 +846,16 @@ pub fn query_info(deps: Deps) -> StdResult<Binary> {
     to_binary(&cwd_interface::voting::InfoResponse { info })
 }
 
+pub fn query_proposal_failed_execution_error(deps: Deps, proposal_id: u64) -> StdResult<Binary> {
+    let errors = PROPOSAL_FAILED_EXECUTION_ERRORS.may_load(deps.storage, proposal_id)?;
+    let res = FailedProposalErrors {
+        errors: errors.unwrap_or_default(),
+    };
+    to_binary(&res)
+}
+
 #[cfg_attr(not(feature = "library"), entry_point)]
-pub fn reply(deps: DepsMut, _env: Env, msg: Reply) -> Result<Response, ContractError> {
+pub fn reply(deps: DepsMut, env: Env, msg: Reply) -> Result<Response, ContractError> {
     let repl = TaggedReplyId::new(msg.id)?;
     match repl {
         TaggedReplyId::FailedProposalExecution(proposal_id) => {
@@ -853,7 +866,33 @@ pub fn reply(deps: DepsMut, _env: Env, msg: Reply) -> Result<Response, ContractE
                 }
                 None => Err(ContractError::NoSuchProposal { id: proposal_id }),
             })?;
-            Ok(Response::new().add_attribute("proposal execution failed", proposal_id.to_string()))
+
+            // Error is reduced before cosmwasm reply and is expected in form of "codespace=? code=?"
+            PROPOSAL_FAILED_EXECUTION_ERRORS.update::<_, ContractError>(
+                deps.storage,
+                proposal_id,
+                |maybe_errors| {
+                    let error = msg.result.into_result().err().ok_or_else(|| {
+                        // should never happen since we reply only on failure
+                        ContractError::Std(StdError::generic_err(
+                            "must be an error in the failed result",
+                        ))
+                    })?;
+                    let value = FailedExecutionError {
+                        height: env.block.height,
+                        error,
+                    };
+                    match maybe_errors {
+                        Some(mut errors) => {
+                            errors.push(value);
+                            Ok(errors)
+                        }
+                        None => Ok(vec![value]),
+                    }
+                },
+            )?;
+
+            Ok(Response::new().add_attribute("proposal_execution_failed", proposal_id.to_string()))
         }
         TaggedReplyId::FailedProposalHook(idx) => {
             let addr = PROPOSAL_HOOKS.remove_hook_by_index(deps.storage, idx)?;

contracts/dao/proposal/cwd-proposal-multiple/src/msg.rs

@@ -186,6 +186,11 @@ pub enum QueryMsg {
     /// module.
     #[returns(HooksResponse)]
     VoteHooks {},
+    /// Returns errors of the failed proposal.
+    /// Expected in the form of [execution_height, "codespace=? code=?"].
+    /// Returns `types::FailedProposalErrors`
+    #[returns(crate::query::FailedProposalErrors)]
+    ProposalFailedExecutionError { proposal_id: u64 },
 }
 
 #[cw_serde]

contracts/dao/proposal/cwd-proposal-multiple/src/query.rs

@@ -2,6 +2,7 @@ use crate::{proposal::MultipleChoiceProposal, state::Config};
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{Addr, Uint128};
 
+use crate::state::FailedExecutionError;
 use cwd_voting::multiple_choice::MultipleChoiceVote;
 
 #[cw_serde]
@@ -41,3 +42,9 @@ pub struct VoteListResponse {
 pub struct ConfigResponse {
     pub config: Config,
 }
+
+/// A list of proposals returned by `ProposalFailedExecutionError`.
+#[cw_serde]
+pub struct FailedProposalErrors {
+    pub errors: Vec<FailedExecutionError>,
+}

contracts/dao/proposal/cwd-proposal-multiple/src/state.rs

@@ -45,6 +45,15 @@ pub struct Config {
     pub close_proposal_on_execution_failure: bool,
 }
 
+/// Proposal failed execution error
+#[cw_serde]
+pub struct FailedExecutionError {
+    /// Block height of execution error
+    pub height: u64,
+    /// Error text. Error is reduced before cosmwasm reply and is expected in form of "codespace=? code=?"
+    pub error: String,
+}
+
 // we cast a ballot with our chosen vote and a given weight
 // stored under the key that voted
 #[cw_serde]
@@ -67,3 +76,6 @@ pub const VOTE_HOOKS: Hooks = Hooks::new("vote_hooks");
 /// The address of the pre-propose module associated with this
 /// proposal module (if any).
 pub const CREATION_POLICY: Item<ProposalCreationPolicy> = Item::new("creation_policy");
+// Execution errors for proposals that do execute only once
+pub const PROPOSAL_FAILED_EXECUTION_ERRORS: Map<u64, Vec<FailedExecutionError>> =
+    Map::new("failed_proposal_errors");