Remove bank send authorization

AbstractSDK · Jan 25, 2024 · 81ac41c · 81ac41c
1 parent a83fac9
commit 81ac41c
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,5 @@ Cargo.lock
 
 state.json
 
-typescript/node_modules
+typescript/node_modules
+cobertura.xml
diff --git a/artifacts/app.wasm b/artifacts/app.wasm
diff --git a/artifacts/checksums.txt b/artifacts/checksums.txt
@@ -1 +1 @@
-e31e1674db09cc0a5d33f766c4d038223969fe299412325403b7dc1f1249a0f3  app-x86_64.wasm
+f334310c60b8f4440d4d56ffaa73d1ee68ae70ed9354da486666180f2874ee27  app-x86_64.wasm
diff --git a/artifacts/checksums_intermediate.txt b/artifacts/checksums_intermediate.txt
@@ -1 +1 @@
-4cb9315e570f5e0b884a19f2fb9823df53695e7cca9d5f9761c4ae78b6b095d2  app.wasm
+4ec4d2bf2f978997cbf8bf02d11800cd07b6082bec5ca1d2962605f5ed7bda5d  app.wasm
diff --git a/contracts/savings-app/src/handlers/execute.rs b/contracts/savings-app/src/handlers/execute.rs
@@ -267,6 +267,8 @@ fn swap_msg(
     Ok(trigger_swap_msg
         .messages
         .into_iter()
+        // filter out bank messages
+        .filter(|m| !matches!(m, CosmosMsg::Bank(_)))
         .map(|m| wrap_authz(m, sender.clone(), env))
         .collect())
 }

diff --git a/contracts/savings-app/src/helpers.rs b/contracts/savings-app/src/helpers.rs
@@ -2,10 +2,7 @@ use cosmwasm_std::{CosmosMsg, Deps, Env, WasmMsg};
 use osmosis_std::{
     cosmwasm_to_proto_coins,
     shim::Any,
-    types::{
-        cosmos::{authz::v1beta1::MsgExec, bank::v1beta1::MsgSend},
-        cosmwasm::wasm::v1::MsgExecuteContract,
-    },
+    types::{cosmos::authz::v1beta1::MsgExec, cosmwasm::wasm::v1::MsgExecuteContract},
 };
 
 use prost::Message;
@@ -40,18 +37,18 @@ pub fn wrap_authz(
             not_supported => unimplemented!("{not_supported:?}"),
         },
         CosmosMsg::Stargate { type_url, value } => (type_url.clone(), value.into()),
-        CosmosMsg::Bank(bank_msg) => match bank_msg {
-            cosmwasm_std::BankMsg::Send { to_address, amount } => (
-                MsgSend::TYPE_URL.to_string(),
-                MsgSend {
-                    from_address: sender.to_string(),
-                    to_address,
-                    amount: cosmwasm_to_proto_coins(amount),
-                }
-                .encode_to_vec(),
-            ),
-            not_supported => unimplemented!("{not_supported:?}"),
-        },
+        // CosmosMsg::Bank(bank_msg) => match bank_msg {
+        //     cosmwasm_std::BankMsg::Send { to_address, amount } => (
+        //         MsgSend::TYPE_URL.to_string(),
+        //         MsgSend {
+        //             from_address: sender.to_string(),
+        //             to_address,
+        //             amount: cosmwasm_to_proto_coins(amount),
+        //         }
+        //         .encode_to_vec(),
+        //     ),
+        //     not_supported => unimplemented!("{not_supported:?}"),
+        // },
         not_supported => unimplemented!("{not_supported:?}"),
     };
 

diff --git a/contracts/savings-app/tests/interface.rs b/contracts/savings-app/tests/interface.rs
@@ -21,7 +21,6 @@ use cw_orch::osmosis_test_tube::osmosis_test_tube::osmosis_std::types::cosmos::a
 use cw_orch::osmosis_test_tube::osmosis_test_tube::osmosis_std::types::cosmos::authz::v1beta1::Grant;
 use cw_orch::osmosis_test_tube::osmosis_test_tube::osmosis_std::types::cosmos::authz::v1beta1::MsgGrant;
 use cw_orch::osmosis_test_tube::osmosis_test_tube::osmosis_std::types::cosmos::authz::v1beta1::MsgGrantResponse;
-use cw_orch::osmosis_test_tube::osmosis_test_tube::osmosis_std::types::cosmos::bank::v1beta1::MsgSend;
 use cw_orch::osmosis_test_tube::osmosis_test_tube::osmosis_std::types::osmosis::gamm::v1beta1::MsgSwapExactAmountIn;
 use cw_orch::osmosis_test_tube::osmosis_test_tube::ConcentratedLiquidity;
 use cw_orch::osmosis_test_tube::osmosis_test_tube::ExecuteResponse;
@@ -326,23 +325,23 @@ fn give_authorizations(
         )?;
     }
     // TODO: keeping it separate since we may want to be more restrictive on this one
-    let _: ExecuteResponse<MsgGrantResponse> = app.execute(
-        MsgGrant {
-            granter: chain.sender().to_string(),
-            grantee: savings_app.addr_str().unwrap(),
-            grant: Some(Grant {
-                authorization: Some(
-                    GenericAuthorization {
-                        msg: MsgSend::TYPE_URL.to_string(),
-                    }
-                    .to_any(),
-                ),
-                expiration: None,
-            }),
-        },
-        MsgGrant::TYPE_URL,
-        chain.sender.as_ref(),
-    )?;
+    // let _: ExecuteResponse<MsgGrantResponse> = app.execute(
+    //     MsgGrant {
+    //         granter: chain.sender().to_string(),
+    //         grantee: savings_app.addr_str().unwrap(),
+    //         grant: Some(Grant {
+    //             authorization: Some(
+    //                 GenericAuthorization {
+    //                     msg: MsgSend::TYPE_URL.to_string(),
+    //                 }
+    //                 .to_any(),
+    //             ),
+    //             expiration: None,
+    //         }),
+    //     },
+    //     MsgGrant::TYPE_URL,
+    //     chain.sender.as_ref(),
+    // )?;
 
     Ok(())
 }