updating builds

ComposableFi · Mar 29, 2024 · f23a40b · f23a40b
1 parent 1a21b14
commit f23a40b
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 73 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -38,10 +38,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    maturin-src = {
-      url = "github:PyO3/maturin";
-      flake = false;
-    };
+    # maturin-src = {
+    #   url = "github:PyO3/maturin";
+    #   flake = false;
+    # };
 
     pydantic-src = {
       url = "github:pydantic/pydantic/v2.5.3";
@@ -258,29 +258,29 @@
           ];
         };
 
-        maturin-latest = pkgs.python3Packages.buildPythonPackage {
-          name = "maturin";
-          version = "0.0.1";
-          format = "pyproject";
-
-          src = inputs.maturin-src;
-
-          cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
-            src = inputs.maturin-src;
-            name = "maturin";
-            version = "0.0.1";
-            hash = "sha256-ujbZ9AfDKPva/E/xGVr6Pq/M++U+B3Iv0TVGpE1aGQM=";
-          };
-
-          nativeBuildInputs = with pkgs.python3Packages; [
-            poetry-core
-            setuptools
-            setuptools-rust
-            setuptools-git-versioning
-            pkgs.rustPlatform.cargoSetupHook
-            pkgs.rustPlatform.maturinBuildHook
-          ];
-        };
+        # maturin-latest = pkgs.python3Packages.buildPythonPackage {
+        #   name = "maturin";
+        #   version = "0.0.1";
+        #   format = "pyproject";
+
+        #   src = inputs.maturin-src;
+
+        #   cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
+        #     src = inputs.maturin-src;
+        #     name = "maturin";
+        #     version = "0.0.1";
+        #     hash = "sha256-ujbZ9AfDKPva/E/xGVr6Pq/M++U+B3Iv0TVGpE1aGQM=";
+        #   };
+
+        #   nativeBuildInputs = with pkgs.python3Packages; [
+        #     poetry-core
+        #     setuptools
+        #     setuptools-rust
+        #     setuptools-git-versioning
+        #     pkgs.rustPlatform.cargoSetupHook
+        #     pkgs.rustPlatform.maturinBuildHook
+        #   ];
+        # };
 
         poetryDeps = mkPoetryPackages {
           projectDir = ./mantis;
@@ -318,7 +318,7 @@
             });
             cvxpy = cvxpy-latest;
 
-            maturin = maturin-latest;
+            # maturin = maturin-latest;
           });
 
         envShell = mkPoetryEnv {
@@ -448,7 +448,7 @@
             cosmwasm-json-schema-ts
             mantis-blackbox
             pyscipopt-latest
-            maturin-latest
+            # maturin-latest
             ;
           all =
             pkgs.linkFarmFromDrvs "all"

diff --git a/mantis/node/src/bin/mantis.rs b/mantis/node/src/bin/mantis.rs
@@ -103,12 +103,6 @@ async fn solve_orders(solver_args: &SolverArgs) {
             get_latest_block_and_account_by_key(&args.rpc_centauri, &args.grpc_centauri, &signer)
                 .await;
         let all_orders = get_all_orders(&args.order_contract, &mut wasm_read_client, &tip).await;
-
-        // 1. proper order structure 1. solve and clean timeout
-        // 2. form CVM from string
-        // 3. deploy to devnet
-        // 4. test
-        // 5. final fix
         if all_orders.any() {
             solve(
                 &mut write_client,