improved err handling

Author: bl4z

NHB3/ApiConnect.cs

@@ -236,17 +236,6 @@ public ApiSettings readSettings() {
             return new ApiSettings();
         }
 
-        public OrdersSettings readOrdersSettings()
-        {
-            String fileName = Path.Combine(Directory.GetCurrentDirectory(), "orders.json");
-            if (File.Exists(fileName))
-            {
-                OrdersSettings saved = JsonConvert.DeserializeObject<OrdersSettings>(File.ReadAllText(@fileName));
-                return saved;
-            }
-            return new OrdersSettings();
-        }
-
         public JObject getAlgo(string algo) {
             foreach (JObject obj in algorithms)
             {
@@ -263,8 +252,8 @@ private string getApiUrl(int Enviorment)
             if (Enviorment == 1)
             {
                 return "https://api2.nicehash.com";
-            }
-            else if (Enviorment == 99) {
+            } else if (Enviorment == 99)
+            {
                 return "https://api-test-dev.nicehash.com";
             }
             return "https://api-test.nicehash.com";
@@ -280,18 +269,5 @@ public class ApiSettings
 
             public int Enviorment { get; set; }
         }
-
-        public class OrdersSettings 
-        { 
-            public List<OrderSettings> OrderList { get; set; }
-        }
-
-        public class OrderSettings 
-        { 
-            
-            public string Id { get; set; }
-
-            public string MaxPrice { get; set; }
-        }
     }
 }

NHB3/Home.cs

@@ -31,7 +31,6 @@ public Home()
             ac = new ApiConnect();
 
             ApiSettings saved = ac.readSettings();
-            OrdersSettings orders = ac.readOrdersSettings();
 
             if (saved.OrganizationID != null) {
                 ac.setup(saved);
@@ -102,9 +101,6 @@ private void refreshBalance() {
 
         private void refreshOrders(bool fromThread)
         {
-            //read custom order settings
-            ApiConnect.OrdersSettings cos = ac.readOrdersSettings();
-
             if (ac.connected)
             {
                 orders = ac.getOrders();
@@ -131,9 +127,6 @@ private void refreshOrders(bool fromThread)
                     cleanOrder.Add("limit", "" + order["limit"]);
                     cleanOrder.Add("price", "" + order["price"]);
 
-                    //max price
-                    cleanOrder.Add("maxPrice", getMaxPrice("" + order["id"], cos));
-
                     cleanOrder.Add("rigsCount", "" + order["rigsCount"]);
                     cleanOrder.Add("acceptedCurrentSpeed", "" + order["acceptedCurrentSpeed"]);
                     cleanOrders.Add(cleanOrder);
@@ -157,17 +150,6 @@ private void refreshOrders(bool fromThread)
             }
         }
 
-        private string getMaxPrice(string id, ApiConnect.OrdersSettings cos) {
-            foreach (var order in cos.OrderList)
-            {
-                if (id.Equals(order.Id))
-                {
-                    return order.MaxPrice;
-                }
-            }
-            return "";
-        }
-
         private void refreshMarket() {
             if (ac.connected)
             {
@@ -218,9 +200,6 @@ private void runBot() {
 
             toolStripStatusLabel1.Text = "Working";
 
-            //read order individual settings
-            ApiConnect.OrdersSettings cos = ac.readOrdersSettings();
-
             BotSettings saved = JsonConvert.DeserializeObject<BotSettings>(File.ReadAllText(@fileName));
             Console.ForegroundColor = ConsoleColor.Green;
             Console.WriteLine("bot iteration tasks {0} {1} {2}", saved.reffilOrder, saved.lowerPrice, saved.increasePrice);
@@ -261,35 +240,20 @@ private void runBot() {
                     string order_type = "" + order["type"]["code"];
                     if (order_type.Equals("STANDARD"))
                     {
-                        //get order custom settings
-                        String omp = getMaxPrice("" + order["id"], cos);
-                        float maxOrderPriceLimit = 0F;
-                        if (!String.IsNullOrEmpty(omp)) {
-                            maxOrderPriceLimit = float.Parse("" + omp, CultureInfo.InvariantCulture);
-                        }
-
                         JObject algo = ac.getAlgo("" + order["algorithm"]["algorithm"]);
                         float order_speed = float.Parse("" + order["acceptedCurrentSpeed"], CultureInfo.InvariantCulture);
                         float rigs_count = float.Parse("" + order["rigsCount"], CultureInfo.InvariantCulture);
                         float order_price = float.Parse("" + order["price"], CultureInfo.InvariantCulture);
                         float price_step_down = float.Parse("" + algo["priceDownStep"], CultureInfo.InvariantCulture);
 
                         Console.ForegroundColor = ConsoleColor.Green;
-                        Console.WriteLine("?adjust price?; order {0}, speed {1}, rigs {2}, price {3}, step_down {4}, max order limit {5}", order["id"], order_speed, rigs_count, order_price, price_step_down, maxOrderPriceLimit);
+                        Console.WriteLine("?adjust price?; order {0}, speed {1}, rigs {2}, price {3}, step_down {4}", order["id"], order_speed, rigs_count, order_price, price_step_down);
 
                         if (saved.increasePrice && (order_speed == 0 || rigs_count == 0)) {
                             float new_price = (float)Math.Round(order_price + (price_step_down * -1), 4);
-
-                            if (maxOrderPriceLimit > 0 && new_price > maxOrderPriceLimit) {
-                                Console.ForegroundColor = ConsoleColor.Red;
-                                Console.WriteLine("===> price up denied - max limit enforced {0} {1}", new_price, maxOrderPriceLimit);
-                            } 
-                            else
-                            {
-                                Console.ForegroundColor = ConsoleColor.Yellow;
-                                Console.WriteLine("===> price up order to {0}", new_price);
-                                ac.updateOrder("" + order["algorithm"]["algorithm"], "" + order["id"], new_price.ToString(new CultureInfo("en-US")), "" + order["limit"]);
-                            }
+                            Console.ForegroundColor = ConsoleColor.Yellow;
+                            Console.WriteLine("===> price up order to {0}", new_price);
+                            ac.updateOrder("" + order["algorithm"]["algorithm"], "" + order["id"], new_price.ToString(new CultureInfo("en-US")), "" + order["limit"]);
                         } else if (saved.lowerPrice && (order_speed > 0 || rigs_count > 0)) {
                             Dictionary<string, float> market = getOrderPriceRangesForAlgoAndMarket("" + order["algorithm"]["algorithm"], "" + order["market"]);
                             var list = market.Keys.ToList();