securesecrets · FloppyDisck · Nov 16, 2021 · Nov 3, 2021 · Nov 4, 2021 · Nov 4, 2021
diff --git a/contracts/governance/Cargo.toml b/contracts/governance/Cargo.toml
@@ -26,7 +26,8 @@ debug-print = ["cosmwasm-std/debug-print"]
 cosmwasm-schema = { git = "https://github.com/enigmampc/SecretNetwork", tag = "v1.0.4-debug-print" }
 cosmwasm-std = { git = "https://github.com/enigmampc/SecretNetwork", tag = "v1.0.4-debug-print" }
 cosmwasm-storage = { git = "https://github.com/enigmampc/SecretNetwork", tag = "v1.0.4-debug-print" }
-secret-toolkit = { git = "https://github.com/enigmampc/secret-toolkit", branch = "debug-print"}
+# TODO: Update when secret-toolkit accepts the branch
+secret-toolkit = { git = "https://github.com/FloppyDisck/secret-toolkit", branch = "snip20-batch-transactions"}
 shade-protocol = { version = "0.1.0", path = "../../packages/shade_protocol" }
 schemars = "0.7"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }

diff --git a/contracts/governance/src/contract.rs b/contracts/governance/src/contract.rs
@@ -6,12 +6,12 @@ use shade_protocol::{
     },
 };
 use crate::{
-    state::{config_w, total_proposals_w},
+    state::{config_w, admin_commands_list_w, supported_contracts_list_w},
+    proposal_state::total_proposals_w,
     handle,
     query
 };
-use crate::state::{admin_commands_list_w, supported_contracts_list_w};
-use crate::handle::try_disable_staker;
+use secret_toolkit::snip20::register_receive_msg;
 
 pub fn init<S: Storage, A: Api, Q: Querier>(
     deps: &mut Extern<S, A, Q>,
@@ -25,7 +25,10 @@ pub fn init<S: Storage, A: Api, Q: Querier>(
             Some(admin) => { admin }
         },
         staker: msg.staker,
-        proposal_deadline: msg.proposal_deadline,
+        funding_token: msg.funding_token.clone(),
+        funding_amount: msg.funding_amount,
+        funding_deadline: msg.funding_deadline,
+        voting_deadline: msg.voting_deadline,
         minimum_votes: msg.quorum
     };
 
@@ -39,7 +42,13 @@ pub fn init<S: Storage, A: Api, Q: Querier>(
     supported_contracts_list_w(&mut deps.storage).save(&vec![])?;
 
     Ok(InitResponse {
-        messages: vec![],
+        messages: vec![register_receive_msg(
+        env.contract_code_hash,
+        None,
+        256,
+        msg.funding_token.code_hash,
+        msg.funding_token.address,
+    )?],
         log: vec![]
     })
 }
@@ -55,13 +64,17 @@ pub fn handle<S: Storage, A: Api, Q: Querier>(
         } => handle::try_create_proposal(deps, &env, target_contract,
                                          Binary::from(proposal.as_bytes()), description),
 
+        HandleMsg::Receive {sender, amount, msg
+        } => handle::try_fund_proposal(deps, &env, sender, amount, msg),
+
         // Self interactions
         // Config
         HandleMsg::UpdateConfig { admin, staker, proposal_deadline,
-            minimum_votes } =>
-            handle::try_update_config(deps, &env, admin, staker, proposal_deadline, minimum_votes),
+            funding_amount, funding_deadline, minimum_votes } =>
+            handle::try_update_config(deps, &env, admin, staker, proposal_deadline,
+                                      funding_amount, funding_deadline, minimum_votes),
 
-        HandleMsg::DisableStaker {} => try_disable_staker(deps, &env),
+        HandleMsg::DisableStaker {} => handle::try_disable_staker(deps, &env),
 
         // Supported contract
         HandleMsg::AddSupportedContract { name, contract
@@ -102,7 +115,7 @@ pub fn query<S: Storage, A: Api, Q: Querier>(
     msg: QueryMsg,
 ) -> StdResult<Binary> {
     match msg {
-        QueryMsg::GetProposals { total, start
+        QueryMsg::GetProposals { total, start, status
         } => to_binary(&query::proposals(deps, total, start)?),
 
         QueryMsg::GetProposal { proposal_id } => to_binary(
@@ -124,4 +137,4 @@ pub fn query<S: Storage, A: Api, Q: Querier>(
         QueryMsg::GetAdminCommand { name
         } => to_binary(&query::admin_command(deps, name)?),
     }
-}
+}