Merge pull request #52 from ostdotcom/develop

merging develop to release-2.0

Author: puneet-khushwani-eth

.travis.yml

@@ -3,7 +3,6 @@ language: php
 sudo: required
 branches:
   only:
-  - master
   - develop
   - /^release-.*/
 notifications:

CHANGELOG.md

@@ -1,7 +1,8 @@
 [OST PHP SDK v2.0.0](https://github.com/ostdotcom/ost-sdk-php/tree/v2.0.0) 
 ---
-* Released OST V2 API's
-* Cleaned up code for the deprecated V1 & V1.1 API's
+* OST API V2 interaction layer implementation.
+* Removed API V0 and V1 support.
+* [README.md](README.md) has API V2 usage instructions
 
 [OST PHP SDK v1.1.1](https://github.com/ostdotcom/ost-sdk-php/tree/v1.1.1)
 ---

README.md

@@ -68,7 +68,7 @@ $params['apiBaseUrl']='';
 // The config field is optional
 $configParams = array();
 // This is the timeout in seconds for which the socket connection will remain open
-$configParams["timeout"] = 15;
+$configParams["timeout"] = 60;
 $params["config"] = $configParams;
 
 $ostObj = new OSTSdk($params);
@@ -336,8 +336,8 @@ $transferAmount = array("150000000000000000", "100000000000000000");
 $rawCallData['method'] = 'pay';
 $tokenHolderSender = '0xa9632350057c2226c5a10418b1c3bc9acdf7e2ee';
 $payCurrencyCode = 'USD';
-$ostToUsdInWei = '23757000000000000'; // get price-point response
-$rawCallData['parameters'] = array($tokenHolderSender, $transferTo, $transferAmount, $payCurrencyCode, $ostToUsdInWei);
+$ostToUsd = '23757000000000000'; // get price-point response
+$rawCallData['parameters'] = array($tokenHolderSender, $transferTo, $transferAmount, $payCurrencyCode, $ostToUsd);
 $executeParams['raw_calldata'] = json_encode($rawCallData);
 //$executeParams['meta_property'] = $metaPropertyParams;
 $response = $transactionsService->execute($executeParams)->wait();

src/Lib/Request.php

@@ -47,7 +47,7 @@ public function __construct(array $params)
         $this->apiSecret = $params['apiSecret'];
 
         $this->baseUrl = $this->sanitizeApiBaseUrl($params['apiBaseUrl']);
-        $this->timeout = 10;
+        $this->timeout = 60;
         if (array_key_exists("config", $params)) {
           $config = $params["config"];
           if (array_key_exists("timeout", $config) && is_array($config)) {
@@ -357,8 +357,8 @@ private function getCommonRequestParams()
                 'Content-Type' => 'application/x-www-form-urlencoded'
             ],
             'http_errors' => false,
-            'connect_timeout' => 10,
-            'open_timeout' => 10
+            'connect_timeout' => $this->timeout,
+            'open_timeout' => $this->timeout
         ];
 
     }