ohoho

ComposableFi · Apr 10, 2024 · 4f59d9c · 4f59d9c
1 parent 8d3584b
commit 4f59d9c
Show file tree

Hide file tree

Showing 12 changed files with 2,595,384 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -70,7 +70,7 @@ hex = { version = "^0.4.3", default-features = false }
 enumn = { version = "0.1.13", default-features = false }
 prost-build = { version = "^0.12.2" }
 bech32 = { version = "^0.9.0", default-features = false }
-cosmwasm-std = { version = "^1.5.0", features = [
+cosmwasm-std = { version = "1.5.0", features = [
     "iterator",
 ], default-features = false }
 
@@ -79,7 +79,7 @@ cw20 = { version = "^1.1.2", default-features = false }
 cw-controllers = { version = "^1.1.1", 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 }
+cosmwasm-schema = { version = "1.5.0", default-features = false }
 serde = { version = "1.0.192", default-features = false }
 cw-storage-plus = { version = "^1.2.0", features = [
     "iterator",
@@ -88,7 +88,7 @@ itertools = { version = "0.12.0", default-features = false }
 cw-multi-test  = {version = "^1.0.0", default-features = false}
 
 num-integer = { version = "0.1.45", default-features = false }
-num-rational = {git = "https://github.com/dzmitry-lahoda-forks/num-rational.git", rev = "719b4dbe0afd69b98f5875e3bdf936b9df822522", default-features = false}
+num-rational = {git = "https://github.com/dzmitry-lahoda-forks/num-rational.git", rev = "b7350e2f4c64f8f7a468d5321e95f8f523867c66", default-features = false}
 num-traits = { version = "^0.2.18", default-features = false }
 
 
@@ -111,7 +111,7 @@ rand = { version = "^0.8.5", default-features = false }
 rust_decimal = {version =  "1.33", default-features = false}
 rust_decimal_macros = {version = "1.33", default-features = false}
 rand_distr = "^0.4.3"
-strum = "^0.25"
+strum = {version =  "^0.25", default-features = false, features = ["derive"]}
 strum_macros = "^0.25"
 tuples = { version = "^1.14.0" }
 serde-cw-value = { git = "https://github.com/dzmitry-lahoda-forks/serde-cw-value.git", branch = "dz/3", default-features = false }

diff --git a/contracts/cosmwasm/executor/src/contract.rs b/contracts/cosmwasm/executor/src/contract.rs
@@ -43,10 +43,10 @@ pub fn instantiate(
     msg: cvm_runtime::executor::InstantiateMsg,
 ) -> Result {
     set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
-    let gateway_address =
+    let outpost_address =
         cvm_runtime::outpost::Outpost::addr_validate(deps.api, &msg.outpost_address)?;
     let config = Config {
-        outpost_address: gateway_address,
+        outpost_address,
         executor_origin: msg.executor_origin,
     };
     CONFIG.save(deps.storage, &config)?;

diff --git a/contracts/cosmwasm/order/Cargo.toml b/contracts/cosmwasm/order/Cargo.toml
@@ -48,6 +48,12 @@ num-rational = { workspace = true, default-features = false, features = [
 
 
 [features]
-std = ["cvm-runtime/std", "num-rational/std",]
-json-schema = ["cvm-runtime/json-schema", "dep:schemars", "num-rational/json-schema"]
+std = [
+  "cvm-runtime/std",
+  "num-rational/std",
+   ]
+json-schema = [
+  "cvm-runtime/json-schema", "dep:schemars", 
+  "num-rational/json-schema"
+  ]
 
diff --git a/contracts/cosmwasm/order/src/types.rs b/contracts/cosmwasm/order/src/types.rs
@@ -2,7 +2,7 @@ use cosmwasm_std::{ensure, BankMsg, Event, StdResult};
 use cvm_runtime::{outpost::ExecuteProgramMsg, AssetId};
 use mantis_cw::{DenomPair, OrderSide};
 
-pub type Ratio = num_rational::Ratio<u64>;
+pub type Ratio = (u64, u64); // num_rational::Ratio<u64>;
 
 use crate::prelude::*;
 

diff --git a/crates/cvm-runtime/src/executor.rs b/crates/cvm-runtime/src/executor.rs
@@ -12,7 +12,7 @@ use crate::ExecutorOrigin;
 )]
 #[serde(rename_all = "snake_case")]
 pub struct InstantiateMsg {
-    /// Address of the gateway.
+    /// Address of the CVM outpost.
     pub outpost_address: String,
     /// The executor origin.
     pub executor_origin: ExecutorOrigin,

diff --git a/expanded.rs b/expanded.rs
diff --git a/flake.nix b/flake.nix
@@ -415,6 +415,7 @@
               pkgs.zlib.out
               rust.cargo
               rust.rustc
+              pkgs.rustfilt
               pkgs.cargo-expand # TODO: assert no f32/f64 in contracts cargo expand --target=wasm32-unknown-unknown --package=cw-cvm-outpost > expanded.rs
               pkgs.wabt # TODO: val contract no f32/f64  wasm2wat  ../../target/wasm32-unknown-unknown/release/cw1_whitelist_ng.wasm > ./ng.wat
               # pkgs.vscode-extensions.yzhang.markdown-all-in-one

diff --git a/mantis/node/src/bin/mantis.rs b/mantis/node/src/bin/mantis.rs
@@ -200,7 +200,7 @@ async fn solve(
             pair_solution.cows,
             cvm_program,
             tip,
-            pair_solution.optimal_price,
+            pair_solution.optimal_price.into(),
             signing_key,
             order_contract,
             rpc,

diff --git a/mantis/node/src/mantis/solve.rs b/mantis/node/src/mantis/solve.rs
@@ -57,7 +57,7 @@ impl IntentBankInput {
                         .expect("order")
                         .clone();
                     order
-                        .fill(cow.cow_out_amount, optimal_ratio)
+                        .fill(cow.cow_out_amount, optimal_ratio.into())
                         .expect("off chain");
                     pair.add(&order.given);