Merge pull request #39 from neutron-org/feat/missing-tokenfactory-bin…

…dings

Feat: missing tokenfactory bindings

Cargo.toml

@@ -13,7 +13,7 @@ incremental = false
 overflow-checks = true
 
 [workspace.dependencies]
-neutron-sdk = "0.8.0"
+neutron-sdk = { git = "https://github.com/neutron-org/neutron-sdk", branch = "main" }
 prost = "0.12.1"
 prost-types = "0.12.1"
 cosmos-sdk-proto = { version = "0.20.0", default-features = false }

contracts/reflect/src/contract.rs

@@ -1,16 +1,19 @@
 use crate::query::{ChainResponse, InterchainQueries, QueryMsg};
 use cosmwasm_std::{
-    entry_point, to_json_binary, to_json_vec, Binary, ContractResult, Deps, DepsMut, Env,
-    MessageInfo, QueryRequest, Response, StdError, StdResult, SystemResult,
+    entry_point, to_json_binary, to_json_vec, Binary, ContractResult, CosmosMsg, Deps, DepsMut,
+    Env, MessageInfo, QueryRequest, Reply, Response, StdError, StdResult, SubMsg, SystemResult,
 };
 use cw2::set_contract_version;
+use neutron_sdk::bindings::msg::NeutronMsg;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct InstantiateMsg {}
 use neutron_sdk::sudo::msg::SudoMsg;
 
+const REFLECT_REPLY_ID: u64 = 0;
+
 const CONTRACT_NAME: &str = concat!("crates.io:neutron-contracts__", env!("CARGO_PKG_NAME"));
 const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
 
@@ -30,16 +33,33 @@ pub fn instantiate(
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
     Send { to: String, amount: u128 },
+    ReflectMsg { msgs: Vec<CosmosMsg<NeutronMsg>> },
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct MigrateMsg {}
 
 #[entry_point]
-pub fn execute(deps: DepsMut, _env: Env, _: MessageInfo, msg: ExecuteMsg) -> StdResult<Response> {
+pub fn execute(
+    deps: DepsMut,
+    _env: Env,
+    _: MessageInfo,
+    msg: ExecuteMsg,
+) -> StdResult<Response<NeutronMsg>> {
     deps.api
         .debug(format!("WASMDEBUG: execute: received msg: {:?}", msg).as_str());
-    Ok(Response::default())
+    match msg {
+        ExecuteMsg::Send { .. } => {
+            unimplemented!()
+        }
+        ExecuteMsg::ReflectMsg { msgs } => {
+            let submsgs = msgs
+                .into_iter()
+                .map(|m| SubMsg::reply_on_success(m, REFLECT_REPLY_ID));
+
+            Ok(Response::default().add_submessages(submsgs))
+        }
+    }
 }
 
 #[entry_point]
@@ -49,6 +69,18 @@ pub fn query(deps: Deps<InterchainQueries>, env: Env, msg: QueryMsg) -> StdResul
     }
 }
 
+#[entry_point]
+pub fn reply(_deps: DepsMut, _env: Env, msg: Reply) -> StdResult<Response> {
+    match msg.id {
+        REFLECT_REPLY_ID => {
+            Ok(Response::default().set_data(msg.result.unwrap().data.unwrap_or_default()))
+        }
+        _ => {
+            unimplemented!()
+        }
+    }
+}
+
 fn query_with_payload(
     deps: Deps<InterchainQueries>,
     _env: Env,

contracts/tokenfactory/src/contract.rs

@@ -52,6 +52,32 @@ pub fn execute(
             amount: coins(amount.u128(), denom),
         }
         .into(),
+        ExecuteMsg::ForceTransfer {
+            denom,
+            amount,
+            from,
+            to,
+        } => NeutronMsg::submit_force_transfer(denom, amount, from, to).into(),
+        ExecuteMsg::SetDenomMetadata {
+            description,
+            denom_units,
+            base,
+            display,
+            name,
+            symbol,
+            uri,
+            uri_hash,
+        } => NeutronMsg::submit_set_denom_metadata(
+            description,
+            denom_units,
+            base,
+            display,
+            name,
+            symbol,
+            uri,
+            uri_hash,
+        )
+        .into(),
     };
     Ok(Response::new().add_message(msg))
 }

contracts/tokenfactory/src/msg.rs

@@ -1,4 +1,4 @@
-use cosmwasm_std::Uint128;
+use cosmwasm_std::{DenomUnit, Uint128};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
@@ -32,6 +32,22 @@ pub enum ExecuteMsg {
         denom: String,
         contract_addr: String,
     },
+    ForceTransfer {
+        denom: String,
+        amount: Uint128,
+        from: String,
+        to: String,
+    },
+    SetDenomMetadata {
+        description: String,
+        denom_units: Vec<DenomUnit>,
+        base: String,
+        display: String,
+        name: String,
+        symbol: String,
+        uri: String,
+        uri_hash: String,
+    },
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]