Feature/fee grant (#1419)

* Temporarily point cosmrs to PR branch

* Expose grant allowance in client

* Move functions in coconut verifier

* Do execute from gateway

* Explicit fee payment by granter

* Include revoke grant after finishing with the op

* Gateway checks the proposal content before proceeding

* Clippy fixes

* CHANGELOG update

validator-api/src/coconut/client.rs

@@ -19,5 +19,4 @@ pub trait Client {
     ) -> Result<u64>;
     async fn vote_proposal(&self, proposal_id: u64, vote_yes: bool, fee: Option<Fee>)
         -> Result<()>;
-    async fn execute_proposal(&self, proposal_id: u64, fee: Option<Fee>) -> Result<()>;
 }

validator-api/src/coconut/mod.rs

@@ -25,9 +25,10 @@ use crypto::shared_key::new_ephemeral_shared_key;
 use crypto::symmetric::stream_cipher;
 use validator_api_requests::coconut::{
     BlindSignRequestBody, BlindedSignatureResponse, CosmosAddressResponse,
-    ExecuteReleaseFundsRequestBody, ProposeReleaseFundsRequestBody, ProposeReleaseFundsResponse,
-    VerificationKeyResponse, VerifyCredentialBody, VerifyCredentialResponse,
+    ProposeReleaseFundsRequestBody, ProposeReleaseFundsResponse, VerificationKeyResponse,
+    VerifyCredentialBody, VerifyCredentialResponse,
 };
+use validator_client::nymd::Fee;
 use validator_client::validator_api::routes::{BANDWIDTH, COCONUT_ROUTES};
 
 use getset::{CopyGetters, Getters};
@@ -175,8 +176,7 @@ impl InternalSignRequest {
                     get_cosmos_address,
                     post_partial_bandwidth_credential,
                     verify_bandwidth_credential,
-                    post_propose_release_funds,
-                    post_execute_release_funds
+                    post_propose_release_funds
                 ],
             )
         })
@@ -282,7 +282,15 @@ pub async fn verify_bandwidth_credential(
     // Vote yes or no on the proposal based on the verification result
     state
         .client
-        .vote_proposal(proposal_id, verification_result, None)
+        .vote_proposal(
+            proposal_id,
+            verification_result,
+            Some(Fee::PayerGranterAuto(
+                None,
+                None,
+                Some(verify_credential_body.0.gateway_cosmos_addr().to_owned()),
+            )),
+        )
         .await?;
 
     Ok(Json(VerifyCredentialResponse::new(verification_result)))
@@ -307,19 +315,17 @@ pub async fn post_propose_release_funds(
     let voucher_value = propose_release_funds.0.credential().voucher_value() as u128;
     let proposal_id = state
         .client
-        .propose_release_funds(title, blinded_serial_number, voucher_value, None)
+        .propose_release_funds(
+            title,
+            blinded_serial_number,
+            voucher_value,
+            Some(Fee::PayerGranterAuto(
+                None,
+                None,
+                Some(propose_release_funds.0.gateway_cosmos_addr().to_owned()),
+            )),
+        )
         .await?;
 
     Ok(Json(ProposeReleaseFundsResponse::new(proposal_id)))
 }
-
-#[post("/execute-release-funds", data = "<execute_release_funds>")]
-pub async fn post_execute_release_funds(
-    execute_release_funds: Json<ExecuteReleaseFundsRequestBody>,
-    state: &RocketState<State>,
-) -> Result<Json<()>> {
-    let proposal_id = *execute_release_funds.0.proposal_id();
-    state.client.execute_proposal(proposal_id, None).await?;
-
-    Ok(Json(()))
-}

validator-api/src/coconut/tests.rs

@@ -86,14 +86,6 @@ impl super::client::Client for DummyClient {
     ) -> Result<()> {
         todo!()
     }
-
-    async fn execute_proposal(
-        &self,
-        _proposal_id: u64,
-        _fee: Option<Fee>,
-    ) -> crate::coconut::error::Result<()> {
-        todo!()
-    }
 }
 
 pub fn tx_entry_fixture(tx_hash: &str) -> TxResponse {

validator-api/src/nymd_client.rs

@@ -497,18 +497,4 @@ where
             .await?;
         Ok(())
     }
-
-    async fn execute_proposal(
-        &self,
-        proposal_id: u64,
-        fee: Option<Fee>,
-    ) -> Result<(), CoconutError> {
-        self.0
-            .read()
-            .await
-            .nymd
-            .execute_proposal(proposal_id, fee)
-            .await?;
-        Ok(())
-    }
 }