Support for binance testnet

Author: iilunin

Bot/Exchange/Binance/BinanceWebsocket.py

@@ -20,12 +20,14 @@
 from retrying import retry
 from websockets.connection import State
 
+import Utils.Utils
 from Utils.Logger import Logger
 
 
 class BinanceWebsocket(Thread, Logger):
     REFRESH_KEY_TIMEOUT = 30 * 60
     WS_URL = 'wss://stream.binance.com:9443/'
+    WS_TEST_URL = 'wss://testnet.binance.vision/'
     __EVENT_LOOP = None
 
     def __init__(self, client: Client):
@@ -60,6 +62,10 @@ def __init__(self, client: Client):
         self.name = 'Binance WebSocket Thread'
 
 
+    def get_url(self):
+        return BinanceWebsocket.WS_TEST_URL if Utils.Utils.is_simulation() else BinanceWebsocket.WS_URL
+
+
     @retry(
         stop_max_attempt_number=3,
         wait_fixed=1000
@@ -116,10 +122,10 @@ def start_ticker(self, symbols=None, callback=None):
             self.ticker_cb = callback
 
         if symbols:
-            url = os.path.join(BinanceWebsocket.WS_URL,
+            url = os.path.join(self.get_url(),
                                'stream?streams=' + '/'.join([s.lower() + '@ticker' for s in symbols]))
         else:
-            url = os.path.join(BinanceWebsocket.WS_URL, 'ws/!ticker@arr')
+            url = os.path.join(self.get_url(), 'ws/!ticker@arr')
 
         self.ticker_ws_future = asyncio.run_coroutine_threadsafe(self.websocket_handler(url, self.ticker_cb, True), self.loop)
 
@@ -167,7 +173,7 @@ def listen_key_received(self, future: asyncio.Future):
             if create_user_ws:
                 self.stop_user_future()
                 self.user_ws_future = asyncio.ensure_future(
-                    self.websocket_handler(os.path.join(BinanceWebsocket.WS_URL, 'ws', key), self.user_info_cb))
+                    self.websocket_handler(os.path.join(self.get_url(), 'ws', key), self.user_info_cb))
 
                 self.user_ws_future.add_done_callback(
                     functools.partial(self.feature_finished, reconnect_fn=functools.partial(self.start_user_info, force_reconnect=True), name='user websocket'))

Bot/FXConnector.py

@@ -1,3 +1,5 @@
+import time
+
 from binance.exceptions import BinanceAPIException, BinanceOrderException
 from retrying import retry
 
@@ -45,10 +47,11 @@ class FXConnector(Logger):
     ORDER_RESP_TYPE_RESULT = 'RESULT'
     ORDER_RESP_TYPE_FULL = 'FULL'
 
-    def __init__(self, key=None, secret=None):
+    def __init__(self, key=None, secret=None, simulation=False):
         super().__init__()
         self.__key = key
         self.__secret = secret
+        self._simulation = simulation
         self._client = None #Client(key, secret)
         self.bs: BinanceWebsocket = None
 
@@ -59,10 +62,17 @@ def __init__(self, key=None, secret=None):
     @property
     def client(self):
         if not self._client:
-            self._client = Client(self.__key, self.__secret)
+            self._client = Client(self.__key, self.__secret, testnet=self._simulation)
+            self.test_connectivity()
 
         return self._client
 
+
+    def test_connectivity(self):
+        res = self.get_server_time()
+        self.client.timestamp_offset = res['serverTime'] - int(time.time() * 1000)
+
+
     def listen_symbols(self, symbols, on_ticker_received, user_data_handler):
         self.bs = BinanceWebsocket(self.client)
         self.bs.start_ticker(symbols, on_ticker_received)
@@ -180,16 +190,16 @@ def create_stop_order(self, sym, side, stop_price, price, volume):
             stopPrice=FXConnector.format_number(stop_price),
             price=FXConnector.format_number(price))
 
-    # @retry(stop_max_attempt_number=MAX_ATTEMPTS, wait_fixed=DELAY)
-    def create_test_stop_order(self, sym, side, price, volume):
-        return self.client.create_test_order(
-            symbol=sym,
-            side=side,
-            type=FXConnector.ORDER_TYPE_STOP_LOSS_LIMIT,
-            timeInForce=FXConnector.TIME_IN_FORCE_GTC,
-            quantity=FXConnector.format_number(volume),
-            stopPrice=FXConnector.format_number(price),
-            price=FXConnector.format_number(price))
+    # # @retry(stop_max_attempt_number=MAX_ATTEMPTS, wait_fixed=DELAY)
+    # def create_test_stop_order(self, sym, side, price, volume):
+    #     return self.client.create_test_order(
+    #         symbol=sym,
+    #         side=side,
+    #         type=FXConnector.ORDER_TYPE_STOP_LOSS_LIMIT,
+    #         timeInForce=FXConnector.TIME_IN_FORCE_GTC,
+    #         quantity=FXConnector.format_number(volume),
+    #         stopPrice=FXConnector.format_number(price),
+    #         price=FXConnector.format_number(price))
 
     @retry(**DEFAULT_RETRY_SETTINGS)
     def get_balance(self, asset):

Bot/Strategy/TradingStrategy.py

@@ -25,7 +25,7 @@ def __init__(self,
         self.fx = fx
         self.balance: Balance = balance if balance else Balance()
         self._exchange_info = None
-        self.simulate = Utils.s2b(environ.get("SIMULTATE", False))
+        self.simulate = Utils.is_simulation()
         self.trade_updated = trade_updated
         self.last_execution_price = 0
         self.paused = False

ConsoleLauncher.py

@@ -69,7 +69,7 @@ def start_bot(self):
         api_path = os.path.join(self.config_path, 'api.json')
         key, secret = self.get_exchange_creds(api_path)
 
-        self.fx = FXConnector(key, secret)
+        self.fx = FXConnector(key, secret, Utils.is_simulation())
 
         self.trade_handler = TradeHandler(
             trades,

Utils/Utils.py

@@ -18,3 +18,6 @@ def s2b(s):
     if s.lower() in ['true', 'yes', '1']:
         return True
     return False
+
+def is_simulation():
+    return s2b(os.environ.get("SIMULTATE", False))

admin/angular.json

@@ -53,6 +53,20 @@
                   "maximumWarning": "6kb"
                 }
               ]
+            },
+            "test": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.test.ts"
+                }
+              ],
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ]
             }
           }
         },
@@ -64,6 +78,9 @@
           "configurations": {
             "production": {
               "browserTarget": "admin:build:production"
+            },
+            "test": {
+              "browserTarget": "admin:build:test"
             }
           }
         },
@@ -129,4 +146,4 @@
     }
   },
   "defaultProject": "admin"
-}
+}

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

@@ -39,7 +39,7 @@
             <mat-form-field class="full-width exit-target-input" appearance="standard">
               <mat-label>Volume</mat-label>
               <input matInput type="text" id="targetPrice" name="targetPrice" [(ngModel)]="exitTarget.vol">
-              <mat-hint *ngIf="exitTarget.calculated_volume">{{exitTarget.calculated_volume | number: '1.0-8'}}</mat-hint>
+              <mat-hint *ngIf="exitTarget.calculated_volume" matTooltip="Calculated Volume">{{exitTarget.calculated_volume | number: '1.0-8'}}</mat-hint>
             </mat-form-field>
           </td>
           <td>

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

@@ -16,17 +16,18 @@
       <td><mat-checkbox [(ngModel)]="trade.stoploss.isTrailing">Trailing</mat-checkbox></td>
       <td><mat-form-field class="full-width exit-target-input" appearance="standard">
         <mat-label>Threshold</mat-label>
-          <input matInput type="text" id="targetPrice" name="targetPrice" [(ngModel)]="trade.stoploss.threshold" [disabled]="trade.stoploss.isFixed()">
+          <input matInput type="text" id="th" name="th" [(ngModel)]="trade.stoploss.threshold" [disabled]="trade.stoploss.isFixed()">
         </mat-form-field>
       </td>
       <td><mat-form-field class="full-width exit-target-input" appearance="standard">
         <mat-label>Price</mat-label>
-          <input matInput type="text" id="targetPrice" name="targetPrice" [(ngModel)]="trade.stoploss.initial_target.price">
+          <input matInput type="text" id="tp" name="tp" [(ngModel)]="trade.stoploss.initial_target.price">
         </mat-form-field></td>
       <td>
         <mat-form-field class="full-width exit-target-input" appearance="standard">
         <mat-label>Volume</mat-label>
-          <input matInput type="text" id="targetPrice" name="targetPrice" [(ngModel)]="trade.stoploss.initial_target.vol">
+          <input matInput type="text" id="vol" name="vol" [(ngModel)]="trade.stoploss.initial_target.vol">
+          <mat-hint *ngIf="trade.stoploss.initial_target.calculated_volume" matTooltip="Calculated Volume">{{trade.stoploss.initial_target.calculated_volume | number: '1.0-8'}}</mat-hint>
         </mat-form-field>
       </td>
       <td>
@@ -36,5 +37,5 @@
       </td>
     </tr>
   </table>
-  
+
 </mat-expansion-panel>

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

@@ -10,11 +10,11 @@ <h1 mat-dialog-title>
             <mat-icon mat-list-icon>close</mat-icon>
         </button> -->
     </mat-toolbar>
-    
+
   </h1>
 
-  
-  <div mat-dialog-content *ngIf="trade" class="trade-section"> 
+
+  <div mat-dialog-content *ngIf="trade" class="trade-section">
     <mat-accordion class="exp-headers-align" multi class="accordeon">
       <mat-expansion-panel expanded>
         <mat-expansion-panel-header>
@@ -29,16 +29,16 @@ <h1 mat-dialog-title>
           <p><span>ID: </span><span><strong>{{trade.id}}</strong></span></p>
           <table class="full-width" cellspacing="0"><tr>
             <td><app-auto-complete #symAutoComplete
-              [fieldCtrl]="myControl" 
+              [fieldCtrl]="myControl"
               [placeHolder]="'ETHUSDC'"
               [appearance]="'standard'"
               [smartList]="symbols"
               [label] = "'Trading Pair'"
-              (optionSelected)="onSymbolSelected($event)" 
+              (optionSelected)="onSymbolSelected($event)"
               [model]="trade.symbol"
               [class]="'full-width'"
               [disabled]="!mode.isCreate()"
-              
+
               >
               </app-auto-complete></td>
             <td><mat-form-field class="full-width" appearance="standard">
@@ -71,14 +71,15 @@ <h1 mat-dialog-title>
           </table>
         </div>
       </mat-expansion-panel>
-    
+
     <app-entry-details [trade]="trade" [mode]="mode"></app-entry-details>
     <app-exit-details [trade]="trade" [mode]="mode"></app-exit-details>
     <app-sl-details [trade]="trade" [mode]="mode"></app-sl-details>
   </mat-accordion>
   </div>
+  <mat-progress-bar #progress mode="query" *ngIf="showProgress"></mat-progress-bar>
   <div mat-dialog-actions align="end">
-    <button mat-button type="submit" color="primary" (click)="confirm()" *ngIf="!mode.isView()" [disabled]="myControl.errors && mode.isCreate()" >{{ mode.isCreate()? "Create":"Save" }}</button>
+    <button mat-button type="submit" color="primary" (click)="showProgress = true; confirm()" *ngIf="!mode.isView()" [disabled]="myControl.errors && mode.isCreate()" >{{ mode.isCreate()? "Create":"Save" }}</button>
     <button mat-button mat-dialog-close="cancel" color="primary">Cancel</button>
   </div>
 </form>

admin/src/app/trade-details/trade-details.component.ts

@@ -30,17 +30,18 @@ export class TradeDetailsComponent implements OnInit {
 
   // trade$: Observable<TradeDetails>;
   trade: TradeDetails;
-  
+
   tradeId: string;
   mode: Mode;
   // trade: TradeDetails;
   priceInfo: BinancePriceResult;
 
   exchangeInfo: Map<string, string>;
   symbols: string[] = [];
+  public showProgress: Boolean = false;
 
   myControl = new FormControl('', Validators.required);
-  
+
   // private config = {
   //   class: 'modal-lg',
   //   keyboard: false,
@@ -72,7 +73,7 @@ export class TradeDetailsComponent implements OnInit {
     });
     // tdDialog.afterClosed().subscribe(result => {
     //   console.log(`Dialog result: ${result}`);
-    // });  
+    // });
   }
 
   ngOnInit() {
@@ -83,7 +84,7 @@ export class TradeDetailsComponent implements OnInit {
 
     if (this.mode.isCreate()) {
       this.trade = new TradeDetails(true);
-      
+
       this.api.getExchangeInfo().subscribe(
         res => {
           this.exchangeInfo = new Map<string, string>();
@@ -107,7 +108,7 @@ export class TradeDetailsComponent implements OnInit {
     }
   }
 
-  confirm() {    
+  confirm() {
     this.api.addTrade(this.trade).subscribe(
       res => {
         if (this.mode.isCreate() || this.mode.isEdit()) {
@@ -137,7 +138,7 @@ export class TradeDetailsComponent implements OnInit {
   //   this.priceInfo = price;
   // }
 
-  // as entry doesn't allow to choose side now, changing side on the 
+  // as entry doesn't allow to choose side now, changing side on the
   // parent level will set opposite side for the entry
   onSideChanged(event): void {
     if (this.trade.entry){
@@ -152,11 +153,11 @@ export class TradeDetailsComponent implements OnInit {
       if (this.mode.isCreate()) {
 
       let asset = this.exchangeInfo.get(symbol)
-      
+
       if (this.trade.symbol !== symbol) {
         this.trade.asset = asset;
         this.trade.symbol = symbol;
-        
+
         this.api.bookTicker(symbol).subscribe(
           result => { this.priceInfo = result;}
         )

requirements.txt

@@ -1,5 +1,5 @@
 numpy
-python-binance==1.0.3
+python-binance==1.0.10
 retrying==1.3.3
 boto3==1.17.62
 websockets==9.0.1