Audit/aug7 scv

contracts/warp-account/Cargo.toml

@@ -45,6 +45,7 @@ schemars = "0.8"
 thiserror = "1"
 serde-json-wasm = "0.4.1"
 json-codec-wasm = "0.1.0"
+prost = "0.11.9"
 
 [dev-dependencies]
 cw-multi-test = "0.16.0"

contracts/warp-account/src/contract.rs

@@ -1,13 +1,18 @@
 use crate::state::CONFIG;
 use crate::ContractError;
-use account::{Config, ExecuteMsg, InstantiateMsg, QueryMsg, WithdrawAssetsMsg};
+use account::{
+    Config, ExecuteMsg, IbcTransferMsg, InstantiateMsg, MigrateMsg, QueryMsg, TimeoutBlock,
+    WithdrawAssetsMsg,
+};
 use controller::account::{AssetInfo, Cw721ExecuteMsg};
+use cosmwasm_std::CosmosMsg::Stargate;
 use cosmwasm_std::{
     entry_point, to_binary, Addr, BankMsg, Binary, CosmosMsg, Deps, DepsMut, Env, MessageInfo,
     Response, StdResult, Uint128, WasmMsg,
 };
 use cw20::{BalanceResponse, Cw20ExecuteMsg};
 use cw721::{Cw721QueryMsg, OwnerOfResponse};
+use prost::Message;
 
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn instantiate(
@@ -47,25 +52,56 @@ pub fn execute(
             .add_messages(data.msgs)
             .add_attribute("action", "generic")),
         ExecuteMsg::WithdrawAssets(data) => withdraw_assets(deps, env, info, data),
+        ExecuteMsg::IbcTransfer(data) => ibc_transfer(deps, env, info, data),
     }
 }
 
 #[cfg_attr(not(feature = "library"), entry_point)]
-pub fn query(_deps: Deps, _env: Env, _msg: QueryMsg) -> StdResult<Binary> {
-    to_binary("")
+pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
+    match msg {
+        QueryMsg::Config => {
+            let config = CONFIG.load(deps.storage)?;
+            to_binary(&config)
+        }
+    }
 }
 
-pub fn migrate(
-    deps: DepsMut,
-    _env: Env,
-    info: MessageInfo,
-    _msg: ExecuteMsg,
+#[cfg_attr(not(feature = "library"), entry_point)]
+pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
+    Ok(Response::new())
+}
+
+pub fn ibc_transfer(
+    _deps: DepsMut,
+    env: Env,
+    _info: MessageInfo,
+    msg: IbcTransferMsg,
 ) -> Result<Response, ContractError> {
-    let config = CONFIG.load(deps.storage)?;
-    if info.sender != config.warp_addr {
-        return Err(ContractError::Unauthorized {});
+    let mut transfer_msg = msg.transfer_msg.clone();
+
+    if msg.timeout_block_delta.is_some() && msg.transfer_msg.timeout_block.is_some() {
+        let block = transfer_msg.timeout_block.unwrap();
+        transfer_msg.timeout_block = Some(TimeoutBlock {
+            revision_number: Some(block.revision_number()),
+            revision_height: Some(env.block.height + msg.timeout_block_delta.unwrap()),
+        })
     }
-    Ok(Response::new())
+
+    if msg.timeout_timestamp_seconds_delta.is_some() {
+        transfer_msg.timeout_timestamp = Some(
+            env.block
+                .time
+                .plus_seconds(
+                    env.block.time.seconds() + msg.timeout_timestamp_seconds_delta.unwrap(),
+                )
+                .nanos(),
+        );
+    }
+
+    Ok(Response::new().add_message(Stargate {
+        type_url: "/ibc.applications.transfer.v1.MsgTransfer".to_string(),
+        value: transfer_msg.encode_to_vec().into(),
+    }))
 }
 
 pub fn withdraw_assets(

contracts/warp-account/src/tests.rs

@@ -11,7 +11,7 @@ use cosmwasm_std::{
 fn test_execute_controller() {
     let mut deps = mock_dependencies();
     let env = mock_env();
-    let info = mock_info("vlad_controller", &vec![]);
+    let info = mock_info("vlad_controller", &[]);
 
     let _instantiate_res = instantiate(
         deps.as_mut(),
@@ -133,12 +133,12 @@ fn test_execute_controller() {
 fn test_execute_owner() {
     let mut deps = mock_dependencies();
     let env = mock_env();
-    let info = mock_info("vlad_controller", &vec![]);
+    let info = mock_info("vlad_controller", &[]);
 
     let _instantiate_res = instantiate(
         deps.as_mut(),
         env.clone(),
-        info.clone(),
+        info,
         InstantiateMsg {
             owner: "vlad".to_string(),
             funds: None,
@@ -195,7 +195,7 @@ fn test_execute_owner() {
         ],
     });
 
-    let info2 = mock_info("vlad", &vec![]);
+    let info2 = mock_info("vlad", &[]);
 
     let execute_res = execute(deps.as_mut(), env, info2, execute_msg).unwrap();
 
@@ -257,12 +257,12 @@ fn test_execute_owner() {
 fn test_execute_unauth() {
     let mut deps = mock_dependencies();
     let env = mock_env();
-    let info = mock_info("vlad_controller", &vec![]);
+    let info = mock_info("vlad_controller", &[]);
 
     let _instantiate_res = instantiate(
         deps.as_mut(),
         env.clone(),
-        info.clone(),
+        info,
         InstantiateMsg {
             owner: "vlad".to_string(),
             funds: None,
@@ -319,7 +319,7 @@ fn test_execute_unauth() {
         ],
     });
 
-    let info2 = mock_info("vlad2", &vec![]);
+    let info2 = mock_info("vlad2", &[]);
 
     let execute_res = execute(deps.as_mut(), env, info2, execute_msg).unwrap_err();
 

contracts/warp-controller/examples/warp-controller-schema.rs

@@ -4,10 +4,9 @@ use std::fs::create_dir_all;
 use controller::{
     account::{AccountResponse, AccountsResponse},
     job::{JobResponse, JobsResponse},
-    QueryMsg, {Config, ConfigResponse, ExecuteMsg, InstantiateMsg, SimulateResponse},
+    QueryMsg, {Config, ConfigResponse, ExecuteMsg, InstantiateMsg},
 };
 use cosmwasm_schema::{export_schema, remove_schemas, schema_for};
-use cosmwasm_std::{CosmosMsg, QueryRequest};
 
 fn main() {
     let mut out_dir = current_dir().unwrap();
@@ -24,7 +23,4 @@ fn main() {
     export_schema(&schema_for!(JobsResponse), &out_dir);
     export_schema(&schema_for!(AccountResponse), &out_dir);
     export_schema(&schema_for!(AccountsResponse), &out_dir);
-    export_schema(&schema_for!(SimulateResponse), &out_dir);
-    export_schema(&schema_for!(CosmosMsg), &out_dir);
-    export_schema(&schema_for!(QueryRequest<String>), &out_dir);
 }