Merge pull request #5 from ComposableFi/dz/5

bug: fixing clean up, simulate, solve, cancel issues

.gitignore

@@ -314,4 +314,17 @@ cython_debug/
 
 .env
 .ssh/**
-.secrets/**
+.secrets/**
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+.vscode/settings.json

Cargo.toml

@@ -30,13 +30,13 @@ derive_more = { version = "0.99.17", default-features = false, features = [
 hex = { version = "^0.4.3", default-features = false }
 num = { version = "^0.4.1", default-features = false }
 
-prost-build = { version = "^0.12.1" }
+prost-build = { version = "^0.12.2" }
 
 cosmwasm-std = { version = "^1.5.0", features = [
     "iterator",
 ], default-features = false }
 cw-controllers = { version = "^1.1.1", default-features = false }
-sylvia = { version = "^0.9.0", default-features = false }
+sylvia = { version = "^0.9.1", default-features = false }
 schemars = { version = "^0.8.16", default-features = false }
 cosmwasm-schema = { version = "^1.5.0", default-features = false }
 serde = { version = "^1.0.192", default-features = false }
@@ -60,7 +60,8 @@ rust_decimal_macros = "^1.33"
 rand_distr = "^0.4.3"
 strum = "^0.25"
 strum_macros = "^0.25"
-tuples = { version = "^1.12.0" }
+tuples = { version = "^1.14.0" }
 
 
-bip32 = { version = "^0.5.1", default-features = false, features = ["alloc", "secp256k1", "mnemonic", "bip39"] }
+bip32 = { version = "^0.5.1", default-features = false, features = ["alloc", "secp256k1", "mnemonic", "bip39"] }
+prost-types = { version = "^0.12.3", default-features = false }   

contracts/cosmwasm/order/src/lib.rs

@@ -113,8 +113,8 @@ impl OrderContract<'_> {
     pub fn timeout(
         &self,
         ctx: ExecCtx,
-        _orders: Vec<OrderId>,
-        _solutions: Vec<Addr>,
+        orders: Vec<OrderId>,
+        solutions: Vec<Addr>,
     ) -> StdResult<Response> {
         let orders: Result<Vec<(u128, OrderItem)>, _> = self
             .orders

devnet.sh

@@ -2,4 +2,4 @@
 #clear && cargo run --bin mantis -- --centauri "http://localhost:26657" --osmosis "localhost:36657" --neutron "localhost:46657" --cvm-contract "centauri1" --wallet "mnemonic" --order-contract "centauri1"
 
 
-RUST_TRACE=trace cargo run --bin mantis -- --rpc-centauri "https://composable-rpc.polkachu.com:443" --grpc-centauri "https://composable-grpc.polkachu.com:22290" --osmosis "todo" --neutron "todo" --cvm-contract "centauri1wpf2szs4uazej8pe7g8vlck34u24cvxx7ys0esfq6tuw8yxygzuqpjsn0d" --wallet "$WALLET" --order-contract "centauri1lnyecncq9akyk8nk0qlppgrq6yxktr68483ahryn457x9ap4ty2sthjcyt"   
+RUST_TRACE=trace cargo run --bin mantis -- --rpc-centauri "https://composable-rpc.polkachu.com:443" --grpc-centauri "https://composable-grpc.polkachu.com:22290" --osmosis "todo" --neutron "todo" --cvm-contract "centauri1wpf2szs4uazej8pe7g8vlck34u24cvxx7ys0esfq6tuw8yxygzuqpjsn0d" --wallet "$WALLET" --order-contract "centauri1lnyecncq9akyk8nk0qlppgrq6yxktr68483ahryn457x9ap4ty2sthjcyt" --simulate "1000000ppica,1ibc/EF48E6B1A1A19F47ECAEA62F5670C37C0580E86A9E88498B7E393EB6F49F33C0"   

mantis/node/Cargo.toml

@@ -26,4 +26,7 @@ itertools = { workspace = true }
 derive_more = { workspace = true }
 serde-json-wasm = { workspace = true }
 tuples = { workspace = true }
-cosmwasm-std = {workspace = true}
+cosmwasm-std = {workspace = true}
+
+serde ={ workspace = true }
+prost-types = {workspace = true}