Merge branch 'master' of github.com:ccxt/ccxt

ngugc · Sep 12, 2018 · 31516c3 · 31516c3
2 parents ea9668e + a4a0318
commit 31516c3
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 9 deletions.
diff --git a/build/ccxt.browser.js b/build/ccxt.browser.js
@@ -45,7 +45,7 @@ const Exchange  = require ('./js/base/Exchange')
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
 
-const version = '1.17.278'
+const version = '1.17.279'
 
 Exchange.ccxtVersion = version
 
@@ -21951,15 +21951,27 @@ module.exports = class cobinhood extends Exchange {
         let response = await this.privateGetWalletDepositAddresses (this.extend ({
             'currency': currency['id'],
         }, params));
+        //
+        //     { success:    true,
+        //        result: { deposit_addresses: [ {       address: "abcdefg",
+        //                                         blockchain_id: "eosio",
+        //                                            created_at:  1536768050235,
+        //                                              currency: "EOS",
+        //                                                  memo: "12345678",
+        //                                                  type: "exchange"      } ] } }
+        //
         let addresses = this.safeValue (response['result'], 'deposit_addresses', []);
         let address = undefined;
+        let tag = undefined;
         if (addresses.length > 0) {
             address = this.safeString (addresses[0], 'address');
+            tag = this.safeString2 (addresses[0], 'memo', 'tag');
         }
         this.checkAddress (address);
         return {
             'currency': code,
             'address': address,
+            'tag': tag,
             'info': response,
         };
     }

diff --git a/ccxt.js b/ccxt.js
@@ -37,7 +37,7 @@ const Exchange  = require ('./js/base/Exchange')
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
 
-const version = '1.17.278'
+const version = '1.17.279'
 
 Exchange.ccxtVersion = version
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "1.17.278",
+  "version": "1.17.279",
   "description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 100+ exchanges",
   "main": "./ccxt.js",
   "unpkg": "build/ccxt.browser.js",

diff --git a/php/Exchange.php b/php/Exchange.php
@@ -34,7 +34,7 @@
 use kornrunner\Secp256k1;
 use kornrunner\Solidity;
 
-$version = '1.17.278';
+$version = '1.17.279';
 
 // rounding mode
 const TRUNCATE = 0;
@@ -50,7 +50,7 @@
 
 class Exchange {
 
-    const VERSION = '1.17.278';
+    const VERSION = '1.17.279';
 
     public static $eth_units = array (
         'wei'        => '1',

diff --git a/php/cobinhood.php b/php/cobinhood.php
@@ -598,15 +598,27 @@ public function fetch_deposit_address ($code, $params = array ()) {
         $response = $this->privateGetWalletDepositAddresses (array_merge (array (
             'currency' => $currency['id'],
         ), $params));
+        //
+        //     { success =>    true,
+        //        result => { deposit_addresses => array ( {       $address => "abcdefg",
+        //                                         blockchain_id => "eosio",
+        //                                            created_at =>  1536768050235,
+        //                                              $currency => "EOS",
+        //                                                  memo => "12345678",
+        //                                                  type => "exchange"      } ) } }
+        //
         $addresses = $this->safe_value($response['result'], 'deposit_addresses', array ());
         $address = null;
+        $tag = null;
         if (strlen ($addresses) > 0) {
             $address = $this->safe_string($addresses[0], 'address');
+            $tag = $this->safe_string_2($addresses[0], 'memo', 'tag');
         }
         $this->check_address($address);
         return array (
             'currency' => $code,
             'address' => $address,
+            'tag' => $tag,
             'info' => $response,
         );
     }

diff --git a/python/ccxt/__init__.py b/python/ccxt/__init__.py
@@ -22,7 +22,7 @@
 
 # ----------------------------------------------------------------------------
 
-__version__ = '1.17.278'
+__version__ = '1.17.279'
 
 # ----------------------------------------------------------------------------
 

diff --git a/python/ccxt/async_support/__init__.py b/python/ccxt/async_support/__init__.py
@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.17.278'
+__version__ = '1.17.279'
 
 # -----------------------------------------------------------------------------
 

diff --git a/python/ccxt/async_support/base/exchange.py b/python/ccxt/async_support/base/exchange.py
@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.17.278'
+__version__ = '1.17.279'
 
 # -----------------------------------------------------------------------------
 

diff --git a/python/ccxt/async_support/cobinhood.py b/python/ccxt/async_support/cobinhood.py
@@ -569,14 +569,26 @@ async def fetch_deposit_address(self, code, params={}):
         response = await self.privateGetWalletDepositAddresses(self.extend({
             'currency': currency['id'],
         }, params))
+        #
+        #     {success:    True,
+        #        result: {deposit_addresses: [{      address: "abcdefg",
+        #                                         blockchain_id: "eosio",
+        #                                            created_at:  1536768050235,
+        #                                              currency: "EOS",
+        #                                                  memo: "12345678",
+        #                                                  type: "exchange"      }]} }
+        #
         addresses = self.safe_value(response['result'], 'deposit_addresses', [])
         address = None
+        tag = None
         if len(addresses) > 0:
             address = self.safe_string(addresses[0], 'address')
+            tag = self.safe_string_2(addresses[0], 'memo', 'tag')
         self.check_address(address)
         return {
             'currency': code,
             'address': address,
+            'tag': tag,
             'info': response,
         }
 

diff --git a/python/ccxt/base/exchange.py b/python/ccxt/base/exchange.py
@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.17.278'
+__version__ = '1.17.279'
 
 # -----------------------------------------------------------------------------
 

diff --git a/python/ccxt/cobinhood.py b/python/ccxt/cobinhood.py
@@ -569,14 +569,26 @@ def fetch_deposit_address(self, code, params={}):
         response = self.privateGetWalletDepositAddresses(self.extend({
             'currency': currency['id'],
         }, params))
+        #
+        #     {success:    True,
+        #        result: {deposit_addresses: [{      address: "abcdefg",
+        #                                         blockchain_id: "eosio",
+        #                                            created_at:  1536768050235,
+        #                                              currency: "EOS",
+        #                                                  memo: "12345678",
+        #                                                  type: "exchange"      }]} }
+        #
         addresses = self.safe_value(response['result'], 'deposit_addresses', [])
         address = None
+        tag = None
         if len(addresses) > 0:
             address = self.safe_string(addresses[0], 'address')
+            tag = self.safe_string_2(addresses[0], 'memo', 'tag')
         self.check_address(address)
         return {
             'currency': code,
             'address': address,
+            'tag': tag,
             'info': response,
         }