finishing flow

ComposableFi · Apr 6, 2024 · 59a9ecd · 59a9ecd
1 parent 1c0b9aa
commit 59a9ecd
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/cosmwasm/xcm/Cargo.toml b/contracts/cosmwasm/xcm/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+description = "CW XCM"
+edition = "2021"
+name = "cw-xcm"
+version = {workspace = true}
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[lints]
+workspace = true
diff --git a/contracts/cosmwasm/xcm/README.md b/contracts/cosmwasm/xcm/README.md
@@ -0,0 +1,9 @@
+# Testbed to support XCM on Cosmos
+
+`executor` - corresponds to parity `xcm-executor`
+`configuraiton` - similar to usual configuration in substrate chain. Maps addresses, IBC connection/ports to and from XCM MultiLocation, barrier
+`transactor` - uses `xcm-configuration` and `cw20-ics20` to transact assets
+`trap-claim` - lost assets traps and claims
+`runtime` - governance of all contracts (like treasury) 
+`simulator` helper tools to run `xcm` message amid several contracts on top of `cosmwasm-vm-test`. For each case there will be at least 1 positive test.
+`sender` - sends message to IBC
diff --git a/contracts/cosmwasm/xcm/src/lib.rs b/contracts/cosmwasm/xcm/src/lib.rs
diff --git a/crates/cvm/src/shared.rs b/crates/cvm/src/shared.rs
@@ -1,5 +1,4 @@
 use crate::{prelude::*, AssetId};
-use cosmwasm_std::{from_json, to_json_binary, Api, Binary, CanonicalAddr, StdError, StdResult};
 use serde::{de::DeserializeOwned, Serialize};
 
 /// A wrapper around a type which is serde-serialised as a string.

diff --git a/mantis/node/src/bin/mantis.rs b/mantis/node/src/bin/mantis.rs
@@ -12,7 +12,6 @@ use cosmrs::{
 
 use cosmrs::{
     cosmwasm::MsgExecuteContract,
-    rpc::Client,
     tx::{self, Fee, SignerInfo},
     AccountId,
 };
@@ -128,7 +127,7 @@ async fn solve_orders(solver_args: &SolverArgs) {
 
 async fn simulate_orders(simulate_args: &SimulateArgs) {
     let args = &simulate_args.shared;
-    let mut wasm_read_client = create_wasm_query_client(&args.grpc_centauri).await;
+    let _wasm_read_client = create_wasm_query_client(&args.grpc_centauri).await;
 
     let signer = mantis_node::mantis::cosmos::signer::from_mnemonic(
         args.wallet.as_str(),
@@ -208,7 +207,7 @@ async fn solve(
 
 async fn send_solution(
     cows: Vec<OrderSolution>,
-    cvm: CvmProgram,
+    _cvm: CvmProgram,
     tip: &Tip,
     optimal_price: Ratio,
     signing_key: &cosmrs::crypto::secp256k1::SigningKey,

diff --git a/mantis/node/src/mantis/solve.rs b/mantis/node/src/mantis/solve.rs
@@ -20,15 +20,15 @@ use super::cosmos::client::timeout;
 /// input batched summarized from users for routing
 pub struct IntentBankInput {
     pub in_asset_id: AssetId,
-    pub in_asset_amount: Displayed<u64>,
+    pub in_asset_amount: Displayed<u128>,
     pub out_asset_id: AssetId,
-    pub order_accounts: Vec<(CvmAddress, Amount)>,
+    pub order_accounts: Vec<CvmInstruction>,
 }
 
 impl IntentBankInput {
     pub fn new(
         in_asset_id: AssetId,
-        in_asset_amount: Displayed<u64>,
+        in_asset_amount: Displayed<u128>,
         out_asset_id: AssetId,
         order_accounts: Vec<CvmInstruction>,
     ) -> Self {
@@ -100,8 +100,8 @@ impl IntentBankInput {
         });
 
         (
-            IntentBankInput::new(a_asset, pair.a.amount, b_asset, b_received.collect()),
-            IntentBankInput::new(b_asset, pair.b.amount, a_asset, a_received.collect()),
+            IntentBankInput::new(a_asset, pair.a.amount.into(), b_asset, b_received.collect()),
+            IntentBankInput::new(b_asset, pair.b.amount.into(), a_asset, a_received.collect()),
         )
     }
 }