fixing astroport

ComposableFi · Nov 29, 2023 · 2cd39a8 · 2cd39a8
1 parent b125362
commit 2cd39a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/contracts/cosmwasm/executor/src/contract.rs b/contracts/cosmwasm/executor/src/contract.rs
@@ -11,7 +11,7 @@ use cosmwasm_std::entry_point;
 use cosmwasm_std::{
     ensure, ensure_eq, to_json_binary, wasm_execute, Addr, BankMsg, Binary, Coin, CosmosMsg, Deps,
     DepsMut, Env, MessageInfo, QueryRequest, Reply, Response, StdError, StdResult, SubMsg,
-    SubMsgResult, WasmQuery, WasmMsg, to_binary,
+    SubMsgResult, WasmQuery, WasmMsg,
 };
 use cvm_runtime::{
     apply_bindings,
@@ -298,7 +298,7 @@ fn interpret_exchange(
                 .add_submessage(msg)
         }
         AstroportRouterContract {
-            pool_id,
+            address,
             token_a,
             token_b,
         } => {
@@ -324,8 +324,8 @@ fn interpret_exchange(
                 max_spread,
             };
             let msg = CosmosMsg::Wasm(WasmMsg::Execute {
-                contract_addr: pool_id.to_string(),
-                msg: to_binary(&msg)?,
+                contract_addr: address.to_string(),
+                msg: to_json_binary(&msg)?,
                 funds: vec![give.try_into().expect("coin")],
             });
             let msg = SubMsg::reply_always(msg, EXCHANGE_ID);

diff --git a/crates/cvm-runtime/src/proto/cvm.rs b/crates/cvm-runtime/src/proto/cvm.rs
@@ -304,7 +304,7 @@ super::define_conversion! {
         use pb::program::binding_value::Type;
         Ok(match binding_value.r#type.non_empty()? {
             Type::Register(reg) => {
-                let reg = pb::program::Register::from_i32(reg).ok_or(())?;
+                let reg = pb::program::Register::try_from(reg).map_err(|_| ())?;
                 Self::Register(reg.into())
             },
             Type::AssetId(asset_id) => Self::Asset(asset_id.into()),

diff --git a/crates/cvm-runtime/src/service/dex/mod.rs b/crates/cvm-runtime/src/service/dex/mod.rs
@@ -15,7 +15,7 @@ pub enum ExchangeType {
     },
     #[cfg(feature = "cosmwasm")]
     AstroportRouterContract {
-        pool_id: u64,
+        address: Addr,
         token_a: String,
         token_b: String,
     },