Improved Min Notional handling. Simplified Exit Details

Author: iilunin

Bot/ExchangeInfo.py

@@ -34,8 +34,8 @@ def adjust_quanity(self, q, round_down=True):
         res = float(Decimal(q) if self.stepSize == 0.0 else Decimal(q).quantize(self.stepSize, rounding=ROUND_DOWN if round_down else ROUND_UP))
         return float(min(max(res, self.minQty), self.maxQty))
 
-    def adjust_price(self, q, round_down=True):
-        res = round(Decimal(q), 8)
+    def adjust_price(self, p, round_down=True):
+        res = round(Decimal(p), 8)
 
         if self.tickSize:  # if tickSize Enabled
             res = res.quantize(self.tickSize, rounding=ROUND_DOWN if round_down else ROUND_UP)
@@ -51,6 +51,9 @@ def adjust_price(self, q, round_down=True):
     def is_quanity_above_min(self, q):
         return q > self.minQty
 
+    def is_min_notional_ok(self, q, p):
+        return q * p >= self.minNotional
+
 
 class ExchangeInfo:
     __shared_state = {}

Bot/FXConnector.py

@@ -168,6 +168,7 @@ def create_limit_order(self, sym, side, price, volume):
 
     # @retry(stop_max_attempt_number=MAX_ATTEMPTS, wait_fixed=DELAY)
     def create_stop_order(self, sym, side, stop_price, price, volume):
+        self.logInfo("Creating Stop Order:{}; {} Vol:{:.08f}, Trigger Price {:.08f}, Limit Price {:.08f}".format(side, sym, volume, stop_price, price))
         return self.client.create_order(
             symbol=sym,
             side=side,

Bot/Strategy/EntryStrategy.py

@@ -167,13 +167,21 @@ def handle_stoploss_order(self, trigger_order_price, current_price):
 
             # if was sold externaly
             if not self.exchange_info.is_quanity_above_min(vol):
-                self.logInfo(
+                self.logError(
                     'Volume {} is less than min allowed by pair rules {}. Marking target as completed.'.format(vol,
                                                                                                                self.exchange_info.minQty))
                 self.current_target.set_completed()
                 self.trigger_target_updated()
                 return
 
+            if not self.exchange_info.is_min_notional_ok(vol, limit):
+                l = self.exchange_info.adjust_price(limit)
+                v = self.exchange_info.adjust_quanity(vol)
+                self.logError(
+                    'Min notional "price * volume" ({:.08f}*{:.08f}={:.08f}) is less than allowed by pair rules {:.08f}; Trigger Price {}'.format(l, v, l * v, self.exchange_info.minNotional, self.exchange_info.adjust_price(trigger_order_price))
+                )
+                return
+
             try:
                 order = self.fx.create_stop_order(
                     sym=self.symbol(),

admin/src/app/trade-details/exit-details.component.html

@@ -7,7 +7,7 @@
       Configuration For Exit Targets
     </mat-panel-description>
   </mat-expansion-panel-header>
-  <mat-expansion-panel>
+  <!-- <mat-expansion-panel>
     <mat-expansion-panel-header>
       <mat-panel-title>
         Default Settings
@@ -25,7 +25,7 @@
         </mat-form-field>
       </td></tr>
     </table>
-  </mat-expansion-panel>
+  </mat-expansion-panel> -->
     <div class="trade-section">
       <table class="full-width" cellspasing=0>
         <tr *ngFor="let exitTarget of trade.exit.targets">
@@ -70,9 +70,14 @@
           </td>
         </tr>
       </table>
-      <button mat-icon-button class="resume-btn" matTooltip="Add Target" (click)="addNewTarget()">
+      <button mat-icon-button class="resume-btn" matTooltip="Add Target" (click)="addNewTarget()"
+      [disabled]="!(!lastAddedTarget || (lastAddedTarget && lastAddedTarget.vol && lastAddedTarget.price))">
         <mat-icon>add_circle_outline</mat-icon>
       </button>
+      <mat-form-field appearance="standard" style="display: block; width: 30%;">
+        <mat-label>Smart Target Threshold</mat-label>
+        <input matInput type="text" id="targetPrice" name="targetPrice" [(ngModel)]="trade.exit.threshold">
+      </mat-form-field>
     </div>
 </mat-expansion-panel>