Merge pull request #188 from confio/158-promotetoprivileged

Add promote / demote contract to privileged gov proposals Add set / clear migrate admin gov proposals
confio · Sep 21, 2022 · 8b0ab53 · 8b0ab53
2 parents 3f9d2cf + 64b454f
commit 8b0ab53
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 1 deletion.
diff --git a/contracts/tgrade-validator-voting/src/contract.rs b/contracts/tgrade-validator-voting/src/contract.rs
@@ -150,6 +150,40 @@ pub fn execute_execute<Q: CustomQuery>(
                 proposal: GovProposal::ChangeParams(params),
             })
         }
+        PromoteToPrivilegedContract { contract } => {
+            res = res.add_message(TgradeMsg::ExecuteGovProposal {
+                title: proposal.title,
+                description: proposal.description,
+                proposal: GovProposal::PromoteToPrivilegedContract { contract },
+            })
+        }
+        DemotePrivilegedContract { contract } => {
+            res = res.add_message(TgradeMsg::ExecuteGovProposal {
+                title: proposal.title,
+                description: proposal.description,
+                proposal: GovProposal::DemotePrivilegedContract { contract },
+            })
+        }
+        SetContractAdmin {
+            contract,
+            new_admin,
+        } => {
+            res = res.add_message(TgradeMsg::ExecuteGovProposal {
+                title: proposal.title,
+                description: proposal.description,
+                proposal: GovProposal::SetContractAdmin {
+                    contract,
+                    new_admin,
+                },
+            })
+        }
+        ClearContractAdmin { contract } => {
+            res = res.add_message(TgradeMsg::ExecuteGovProposal {
+                title: proposal.title,
+                description: proposal.description,
+                proposal: GovProposal::ClearContractAdmin { contract },
+            })
+        }
     };
 
     Ok(res

diff --git a/contracts/tgrade-validator-voting/src/error.rs b/contracts/tgrade-validator-voting/src/error.rs
@@ -50,6 +50,9 @@ pub enum ContractError {
 
     #[error("Invalid consensus params: All cannot be none")]
     InvalidConsensusParams {},
+
+    #[error("Empty new admin")]
+    EmptyAdmin {},
 }
 
 impl From<tg_voting_contract::ContractError> for ContractError {

diff --git a/contracts/tgrade-validator-voting/src/msg.rs b/contracts/tgrade-validator-voting/src/msg.rs
@@ -83,6 +83,24 @@ pub enum ValidatorProposal {
     Text {},
     /// Defines a proposal to change one or more parameters.
     ChangeParams(Vec<ParamChange>),
+    PromoteToPrivilegedContract {
+        /// The contract address to be promoted
+        contract: String,
+    },
+    DemotePrivilegedContract {
+        /// The contract address to be demoted
+        contract: String,
+    },
+    SetContractAdmin {
+        /// The contract address to be updated
+        contract: String,
+        /// The account address to become migrate admin of this contract
+        new_admin: String,
+    },
+    ClearContractAdmin {
+        /// The contract address to be cleared
+        contract: String,
+    },
 }
 
 // We can also add this as a tg3 extension

diff --git a/contracts/tgrade-validator-voting/src/validate.rs b/contracts/tgrade-validator-voting/src/validate.rs
@@ -83,7 +83,19 @@ impl ValidatorProposal {
                     return Err(ContractError::InvalidConsensusParams {});
                 }
             }
-            ValidatorProposal::CancelUpgrade {} | ValidatorProposal::Text {} => {}
+            ValidatorProposal::SetContractAdmin {
+                contract: _contract,
+                new_admin,
+            } => {
+                if new_admin.is_empty() {
+                    return Err(ContractError::EmptyAdmin {});
+                }
+            }
+            ValidatorProposal::ClearContractAdmin { .. }
+            | ValidatorProposal::PromoteToPrivilegedContract { .. }
+            | ValidatorProposal::DemotePrivilegedContract { .. }
+            | ValidatorProposal::CancelUpgrade {}
+            | ValidatorProposal::Text {} => {}
         }
         Ok(())
     }