added restUrl and wsUrl, updated logo

Author: joeri-vv

README.md

@@ -1,5 +1,6 @@
 <p align="center">
-  <a href="https://bitvavo.com"><img src="https://bitvavo.com/media/images/logo/bitvavoGeneral.svg" width="600" title="Bitvavo Logo"></a>
+  <br>
+  <a href="https://bitvavo.com"><img src="https://bitvavo.com/assets/static/ext/logo-shape.svg" width="100" title="Bitvavo Logo">
 </p>
 
 # PHP Bitvavo API
@@ -185,6 +186,9 @@ foreach ($bitvavo->assets([]) as $asset) {
     "withdrawalFee": "0.2",
     "withdrawalMinAmount": "0.2",
     "withdrawalStatus": "OK",
+    "networks": [
+        "Mainnet"
+    ],
     "message": ""
 }
 {
@@ -197,6 +201,9 @@ foreach ($bitvavo->assets([]) as $asset) {
     "withdrawalFee": "2",
     "withdrawalMinAmount": "2",
     "withdrawalStatus": "OK",
+    "networks": [
+        "Mainnet"
+    ],
     "message": ""
 }
 {
@@ -209,6 +216,9 @@ foreach ($bitvavo->assets([]) as $asset) {
     "withdrawalFee": "3",
     "withdrawalMinAmount": "3",
     "withdrawalStatus": "",
+    "networks": [
+        "Mainnet"
+    ],
     "message": ""
 }
 {
@@ -221,6 +231,9 @@ foreach ($bitvavo->assets([]) as $asset) {
     "withdrawalFee": "2",
     "withdrawalMinAmount": "2",
     "withdrawalStatus": "OK",
+    "networks": [
+        "Mainnet"
+    ],
     "message": ""
 }
 ...
@@ -1277,6 +1290,9 @@ $websock->assets([], function($response) {
     "withdrawalFee": "0.2",
     "withdrawalMinAmount": "0.2",
     "withdrawalStatus": "OK",
+    "networks": [
+        "Mainnet"
+    ],
     "message": ""
 }
 {
@@ -1289,6 +1305,9 @@ $websock->assets([], function($response) {
     "withdrawalFee": "2",
     "withdrawalMinAmount": "2",
     "withdrawalStatus": "OK",
+    "networks": [
+        "Mainnet"
+    ],
     "message": ""
 }
 {
@@ -1301,6 +1320,9 @@ $websock->assets([], function($response) {
     "withdrawalFee": "3",
     "withdrawalMinAmount": "3",
     "withdrawalStatus": "",
+    "networks": [
+        "Mainnet"
+    ],
     "message": ""
 }
 {
@@ -1313,6 +1335,9 @@ $websock->assets([], function($response) {
     "withdrawalFee": "2",
     "withdrawalMinAmount": "2",
     "withdrawalStatus": "OK",
+    "networks": [
+        "Mainnet"
+    ],
     "message": ""
 }
 ...

bitvavo.php

@@ -68,11 +68,12 @@ function errorToConsole($message) {
 
 class Bitvavo {
   public function __construct($options) {
-    $this->base = "https://api.bitvavo.com/v2";
     $apiKeySet = false;
     $apiSecretSet = false;
     $accessWindowSet = false;
     $debuggingSet = false;
+    $restUrlSet = false;
+    $wsUrlSet = false;
     foreach ($options as $key => $value) {
       if(strtolower($key) == "apikey") {
         $this->apiKey = $value;
@@ -86,6 +87,12 @@ public function __construct($options) {
       } else if(strtolower($key) == "debugging") {
         $this->debugging = (bool)$value;
         $debuggingSet = true;
+      } else if(strtolower($key) === 'resturl') {
+        $this->base = $value;
+        $restUrlSet = true;
+      } else if(strtolower($key) === 'wsurl') {
+        $this->wsurl = $value;
+        $wsUrlSet = true;
       }
     }
     if(!$apiKeySet) {
@@ -100,6 +107,12 @@ public function __construct($options) {
     if(!$debuggingSet) {
       $this->debugging = false;
     }
+    if(!$restUrlSet) {
+      $this->base = "https://api.bitvavo.com/v2";
+    }
+    if(!$wsUrlSet) {
+      $this->wsurl = "wss://ws.bitvavo.com/v2/";
+    }
   }
 
   public function newWebSocket($reconnect = false, $publicCommandArray = null, $privateCommandArray = null, $oldSocket = null) {
@@ -342,6 +355,7 @@ function sortAndInsert($update, $book, $sortFunc) {
 class Websocket {
   public function __construct($bitvavo = null, $reconnect = false, $publicCommandArray, $privateCommandArray, $oldSocket) {
     $this->parent = $bitvavo;
+    $this->wsurl = $bitvavo->wsurl;
     $this->apiKey = $bitvavo->apiKey;
     $this->apiSecret = $bitvavo->apiSecret;
     $this->accessWindow = $bitvavo->accessWindow;
@@ -387,7 +401,7 @@ public function __construct($bitvavo = null, $reconnect = false, $publicCommandA
     $reactConnector = new React\Socket\Connector($loop, []);
     $connector = new Ratchet\Client\Connector($loop, $reactConnector);
 
-    $connector('wss://ws.bitvavo.com/v2/')->then(function(Ratchet\Client\WebSocket $conn) {
+    $connector($this->wsurl)->then(function(Ratchet\Client\WebSocket $conn) {
 
       $this->reconnectTimer = 1;
       $this->conn = $conn;

example/example.php

@@ -15,6 +15,8 @@ function main() {
   $bitvavo = new Bitvavo([
     "APIKEY" => "<APIKEY>", 
     "APISECRET" => "<APISECRET>",
+    "RESTURL" => "https://api.bitvavo.com/v2",
+    "WSURL" => "wss://ws.bitvavo.com/v2/",
     "ACCESSWINDOW" => 10000,
     "DEBUGGING" => false
   ]);