Fix proposal deposits

chain/rust/src/builders/certificate_builder.rs

@@ -190,7 +190,7 @@ pub fn add_cert_vkeys(
             StakeCredential::PubKey { hash, .. } => {
                 vkeys.insert(*hash);
             }
-        }
+        },
         Certificate::UnregDrepCert(cert) => match &cert.drep_credential {
             StakeCredential::Script { hash, .. } => {
                 return Err(CertBuilderError::ExpectedKeyHash(*hash))

chain/rust/src/builders/proposal_builder.rs

@@ -46,7 +46,10 @@ impl ProposalBuilder {
         }
     }
 
-    pub fn with_proposal(mut self, proposal: ProposalProcedure) -> Result<Self, ProposalBuilderError> {
+    pub fn with_proposal(
+        mut self,
+        proposal: ProposalProcedure,
+    ) -> Result<Self, ProposalBuilderError> {
         if proposal.gov_action.script_hash().is_some() {
             return Err(ProposalBuilderError::ProposalIsScript);
         }

chain/rust/src/builders/redeemer_builder.rs

@@ -148,14 +148,14 @@ impl RedeemerSetBuilder {
                 )));
             }
             RedeemerTag::Proposing => {
-                let entry = self.proposals.iter_mut().nth(key.index as usize).unwrap();
+                let entry = self.proposals.get_mut(key.index as usize).unwrap();
                 *entry = Some(UntaggedRedeemerPlaceholder::Full(UntaggedRedeemer::new(
                     entry.as_ref().unwrap().data().clone(),
                     ex_units,
                 )));
             }
             RedeemerTag::Voting => {
-                let entry = self.votes.iter_mut().nth(key.index as usize).unwrap();
+                let entry = self.votes.get_mut(key.index as usize).unwrap();
                 *entry = Some(UntaggedRedeemerPlaceholder::Full(UntaggedRedeemer::new(
                     entry.as_ref().unwrap().data().clone(),
                     ex_units,

chain/rust/src/builders/tx_builder.rs

@@ -1185,6 +1185,7 @@ impl TransactionBuilder {
     pub fn get_deposit(&self) -> Result<Coin, TxBuilderError> {
         internal_get_deposit(
             self.certs.as_deref(),
+            self.proposals.as_deref(),
             self.config.pool_deposit,
             self.config.key_deposit,
         )

chain/rust/src/deposit.rs

@@ -1,6 +1,9 @@
 use cml_core::ArithmeticError;
 
-use crate::{certs::Certificate, transaction::TransactionBody, Coin, Value, Withdrawals};
+use crate::{
+    certs::Certificate, governance::ProposalProcedure, transaction::TransactionBody, Coin, Value,
+    Withdrawals,
+};
 
 pub fn internal_get_implicit_input(
     withdrawals: Option<&Withdrawals>,
@@ -39,6 +42,7 @@ pub fn internal_get_implicit_input(
 
 pub fn internal_get_deposit(
     certs: Option<&[Certificate]>,
+    proposals: Option<&[ProposalProcedure]>,
     pool_deposit: Coin, // // protocol parameter
     key_deposit: Coin,  // protocol parameter
 ) -> Result<Coin, ArithmeticError> {
@@ -58,7 +62,16 @@ pub fn internal_get_deposit(
             })
             .ok_or(ArithmeticError::IntegerOverflow)?,
     };
-    Ok(certificate_refund)
+    let proposal_refund = match proposals {
+        None => 0,
+        Some(proposals) => proposals
+            .iter()
+            .try_fold(0u64, |acc, proposal| acc.checked_add(proposal.deposit))
+            .ok_or(ArithmeticError::IntegerOverflow)?,
+    };
+    certificate_refund
+        .checked_add(proposal_refund)
+        .ok_or(ArithmeticError::IntegerOverflow)
 }
 
 pub fn get_implicit_input(
@@ -81,6 +94,10 @@ pub fn get_deposit(
 ) -> Result<Coin, ArithmeticError> {
     internal_get_deposit(
         txbody.certs.as_ref().map(|certs| certs.as_ref()),
+        txbody
+            .proposal_procedures
+            .as_ref()
+            .map(|proposals| proposals.as_ref()),
         pool_deposit,
         key_deposit,
     )

chain/wasm/src/builders/proposal_builder.rs

@@ -32,23 +32,23 @@ impl ProposalBuilder {
         Self(cml_chain::builders::proposal_builder::ProposalBuilder::new())
     }
 
-    pub fn with_vote(&self, proposal: ProposalProcedure) -> Result<ProposalBuilder, JsError> {
+    pub fn with_proposal(&self, proposal: ProposalProcedure) -> Result<ProposalBuilder, JsError> {
         self.0
             .clone()
-            .with_vote(proposal.clone().into())
+            .with_proposal(proposal.clone().into())
             .map(Into::into)
             .map_err(Into::into)
     }
 
-    pub fn with_native_script_vote(
+    pub fn with_native_script_proposal(
         &self,
         proposal: ProposalProcedure,
         native_script: NativeScript,
         witness_info: NativeScriptWitnessInfo,
     ) -> Result<ProposalBuilder, JsError> {
         self.0
             .clone()
-            .with_native_script_vote(
+            .with_native_script_proposal(
                 proposal.clone().into(),
                 native_script.clone().into(),
                 witness_info.clone().into(),
@@ -57,7 +57,7 @@ impl ProposalBuilder {
             .map_err(Into::into)
     }
 
-    pub fn with_plutus_vote(
+    pub fn with_plutus_proposal(
         &self,
         proposal: &ProposalProcedure,
         partial_witness: &PartialPlutusWitness,
@@ -66,7 +66,7 @@ impl ProposalBuilder {
     ) -> Result<ProposalBuilder, JsError> {
         self.0
             .clone()
-            .with_plutus_vote(
+            .with_plutus_proposal(
                 proposal.clone().into(),
                 partial_witness.clone().into(),
                 required_signers.clone().into(),
@@ -76,15 +76,15 @@ impl ProposalBuilder {
             .map_err(Into::into)
     }
 
-    pub fn with_plutus_vote_inline_datum(
+    pub fn with_plutus_proposal_inline_datum(
         &self,
         proposal: ProposalProcedure,
         partial_witness: PartialPlutusWitness,
         required_signers: RequiredSigners,
     ) -> Result<ProposalBuilder, JsError> {
         self.0
             .clone()
-            .with_plutus_vote_inline_datum(
+            .with_plutus_proposal_inline_datum(
                 proposal.clone().into(),
                 partial_witness.clone().into(),
                 required_signers.clone().into(),