Merge pull request #264 from srdante/patch-1

Fix Test Caching

.github/workflows/php.yml

@@ -0,0 +1,49 @@
+name: PHP
+
+on: ["push", "pull_request", "workflow_dispatch"]
+
+jobs:
+  build_and_test:
+    name: Build and test web3.php with ${{ matrix.php-version }}
+    strategy:
+      matrix:
+        php-version: ["7.3", "7.4", "8.0"]
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+          php-version: ${{ matrix.php-version }}
+
+    - name: PHP version
+      run: |
+        php --version
+
+    - name: Install nodejs and ganache-cli
+      run: |
+        sudo apt-get update -y
+        sudo apt-get install -y nodejs
+        sudo npm install -g ganache-cli
+
+    - uses: actions/checkout@v2
+
+    - name: Validate composer.json and composer.lock
+      run: composer validate
+
+    - name: Cache Composer packages
+      id: composer-cache
+      uses: actions/cache@v2
+      with:
+        path: vendor
+        key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-php-${{ matrix.php-version }}-
+
+    - name: Install dependencies
+      if: steps.composer-cache.outputs.cache-hit != 'true'
+      run: composer install --prefer-dist --no-progress --no-suggest
+
+    - name: Run test suite
+      run: sudo scripts/test.sh

.gitignore

@@ -1,6 +1,8 @@
 composer.phar
 /vendor/
 .phpintel/
+/.idea/
+
 
 # Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file

.travis.yml

@@ -5,6 +5,8 @@ language: php
 php:
   - 7.1
   - 7.2
+  - 7.3
+  - 7.4
 
 before_install:
   - nvm install 8
@@ -24,4 +26,4 @@ script:
   - scripts/test.sh
 
 after_success:
-    - bash <(curl -s https://codecov.io/bash) -t 8436848f-9a99-4b49-be60-629d7ff9a62c
+    - bash <(curl -s https://codecov.io/bash) -t 76a0abaf-bbc4-4829-b5b8-474f10a6b9e9

README.md

@@ -1,9 +1,10 @@
 # web3.php
 
-[![Build Status](https://travis-ci.org/sc0Vu/web3.php.svg?branch=master)](https://travis-ci.org/sc0Vu/web3.php)
+[![PHP](https://github.com/web3p/web3.php/actions/workflows/php.yml/badge.svg)](https://github.com/web3p/web3.php/actions/workflows/php.yml)
-[![codecov](https://codecov.io/gh/sc0Vu/web3.php/branch/master/graph/badge.svg)](https://codecov.io/gh/sc0Vu/web3.php)
+[![Build Status](https://travis-ci.org/web3p/web3.php.svg?branch=master)](https://travis-ci.org/web3p/web3.php)
+[![codecov](https://codecov.io/gh/web3p/web3.php/branch/master/graph/badge.svg)](https://codecov.io/gh/web3p/web3.php)
 [![Join the chat at https://gitter.im/web3-php/web3.php](https://img.shields.io/badge/gitter-join%20chat-brightgreen.svg)](https://gitter.im/web3-php/web3.php)
-[![Licensed under the MIT License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/sc0Vu/web3.php/blob/master/LICENSE)
+[![Licensed under the MIT License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/web3p/web3.php/blob/master/LICENSE)
 
 
 A php interface for interacting with the Ethereum blockchain and ecosystem.
@@ -17,13 +18,13 @@ Set minimum stability to dev
 
 Then
 ```
-composer require sc0vu/web3.php dev-master
+composer require web3p/web3.php dev-master
 ```
 
 Or you can add this line in composer.json
 
 ```
-"sc0vu/web3.php": "dev-master"
+"web3p/web3.php": "dev-master"
 ```
 
 
@@ -55,7 +56,7 @@ $web3->clientVersion(function ($err, $version) {
         // do something
         return;
     }
-    if (isset($client)) {
+    if (isset($version)) {
         echo 'Client version: ' . $version;
     }
 });
@@ -216,7 +217,7 @@ If you are using docker as development machain, you can try [ethdock](https://gi
 
 1. Clone the repo and install packages.
 ```
-git clone https://github.com/sc0Vu/web3.php.git && cd web3.php && composer install
+git clone https://github.com/web3p/web3.php.git && cd web3.php && composer install
 ```
 
 2. Run test script.
@@ -228,12 +229,12 @@ vendor/bin/phpunit
 
 1. Clone the repo and run docker container.
 ```
-git clone https://github.com/sc0Vu/web3.php.git
+git clone https://github.com/web3p/web3.php.git
 ```
 
 2. Copy web3.php to web3.php/docker/app directory and start container.
 ```
-cp files docker/app && docker-compose up -d php
+cp files docker/app && docker-compose up -d php ganache
 ```
 
 3. Enter php container and install packages.
@@ -241,14 +242,54 @@ cp files docker/app && docker-compose up -d php
 docker-compose exec php ash
 ```
 
-4. Run test script
+4. Change testHost in `TestCase.php`
+```
+/**
+ * testHost
+ * 
+ * @var string
+ */
+protected $testHost = 'http://ganache:8545';
+```
+
+5. Run test script
 ```
 vendor/bin/phpunit
 ```
 
+###### Install packages
+Enter container first
+```
+docker-compose exec php ash
+```
+
+1. gmp
+```
+apk add gmp-dev
+docker-php-ext-install gmp
+```
+
+2. bcmath
+```
+docker-php-ext-install bcmath
+```
+
+###### Remove extension
+Move the extension config from `/usr/local/etc/php/conf.d/`
+```
+mv /usr/local/etc/php/conf.d/extension-config-name to/directory
+```
+
 # API
 
 Todo.
 
+# Contribution
+
+Thank you to all the people who already contributed to web3.php!
+<a href="https://github.com/web3p/web3.php/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=web3p/web3.php" />
+</a>
+
 # License
 MIT

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "sc0vu/web3.php",
+    "name": "web3p/web3.php",
     "description": "Ethereum web3 interface.",
     "type": "library",
     "license": "MIT",
@@ -9,15 +9,15 @@
             "email": "alk03073135@gmail.com"
         }
     ],
-    "minimum-stability": "dev",
     "require": {
-        "guzzlehttp/guzzle": "~6.0",
+        "guzzlehttp/guzzle": "^6.3|^7.0",
-        "PHP": "^7.1",
+        "PHP": "^7.2|^8.0",
-        "kornrunner/keccak": "dev-master",
+        "kornrunner/keccak": "~1.0",
-        "phpseclib/phpseclib": "dev-master"
+        "phpseclib/phpseclib": "~2.0.30",
+        "ext-mbstring": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "~6.0"
+        "phpunit/phpunit": "~8.0|~9.0"
     },
     "autoload": {
         "psr-4": {

docker/docker-compose.yml

@@ -9,3 +9,10 @@ services:
         volumes:
             - ./app:/app
         tty: true
+
+    ganache:
+        build:
+            context: ./ganache
+            dockerfile: Dockerfile
+        ports:
+            - "8545"

docker/ganache/Dockerfile

@@ -0,0 +1,9 @@
+FROM node:9.11.1-alpine
+
+MAINTAINER Peter Lai <alk03073135@gmail.com>
+
+RUN npm install -g ganache-cli
+
+EXPOSE 8545
+
+CMD ganache-cli -g 0 -l 6000000 --hostname=0.0.0.0

docker/php/Dockerfile-71

@@ -1,17 +1,23 @@
-FROM php:7.1.14-alpine
+FROM php:7.1-alpine
 
 MAINTAINER Peter Lai <alk03073135@gmail.com>
 
-ADD composer-setup.php composer-setup.php
+COPY composer-setup.php composer-setup.php
+# COPY php.ini-production $PHP_INI_DIR/php.ini
 
 RUN apk update && \
     apk add git
 
+# Install gmp
+Run apk add gmp-dev && \
+    docker-php-ext-install gmp
+
 # Install nodejs
 # Run apk add --update nodejs nodejs-npm
 
 # Install composer
 RUN php composer-setup.php && \
-    php composer-setup.php --install-dir=/usr/bin --filename=composer
+    php composer-setup.php --install-dir=/usr/bin --filename=composer && \
+    php -r "unlink('composer-setup.php');"
 
 WORKDIR /app

docker/php/Dockerfile-72

@@ -1,17 +1,23 @@
-FROM php:7.2.2-alpine
+FROM php:7.2-alpine
 
 MAINTAINER Peter Lai <alk03073135@gmail.com>
 
-ADD composer-setup.php composer-setup.php
+COPY composer-setup.php composer-setup.php
+# COPY php.ini-production $PHP_INI_DIR/php.ini
 
 RUN apk update && \
     apk add git
 
+# Install gmp
+Run apk add gmp-dev && \
+    docker-php-ext-install gmp
+
 # Install nodejs
 # Run apk add --update nodejs nodejs-npm
 
 # Install composer
 RUN php composer-setup.php && \
-    php composer-setup.php --install-dir=/usr/bin --filename=composer
+    php composer-setup.php --install-dir=/usr/bin --filename=composer && \
+    php -r "unlink('composer-setup.php');"
 
 WORKDIR /app

docker/php/Dockerfile-73

@@ -0,0 +1,23 @@
+FROM php:7.3-alpine
+
+MAINTAINER Peter Lai <alk03073135@gmail.com>
+
+COPY composer-setup.php composer-setup.php
+# COPY php.ini-production $PHP_INI_DIR/php.ini
+
+RUN apk update && \
+    apk add git
+
+# Install gmp
+Run apk add gmp-dev && \
+    docker-php-ext-install gmp
+
+# Install nodejs
+# Run apk add --update nodejs nodejs-npm
+
+# Install composer
+RUN php composer-setup.php && \
+    php composer-setup.php --install-dir=/usr/bin --filename=composer && \
+    php -r "unlink('composer-setup.php');"
+
+WORKDIR /app

docker/php/Dockerfile-74

@@ -0,0 +1,23 @@
+FROM php:7.4-alpine
+
+MAINTAINER Peter Lai <alk03073135@gmail.com>
+
+COPY composer-setup.php composer-setup.php
+# COPY php.ini-production $PHP_INI_DIR/php.ini
+
+RUN apk update && \
+    apk add git
+
+# Install gmp
+Run apk add gmp-dev && \
+    docker-php-ext-install gmp
+
+# Install nodejs
+# Run apk add --update nodejs nodejs-npm
+
+# Install composer
+RUN php composer-setup.php && \
+    php composer-setup.php --install-dir=/usr/bin --filename=composer && \
+    php -r "unlink('composer-setup.php');"
+
+WORKDIR /app

docker/php/Dockerfile-80

@@ -0,0 +1,23 @@
+FROM php:8.0-alpine
+
+MAINTAINER Peter Lai <alk03073135@gmail.com>
+
+COPY composer-setup.php composer-setup.php
+# COPY php.ini-production $PHP_INI_DIR/php.ini
+
+RUN apk update && \
+    apk add git
+
+# Install gmp
+Run apk add gmp-dev && \
+    docker-php-ext-install gmp
+
+# Install nodejs
+# Run apk add --update nodejs nodejs-npm
+
+# Install composer
+RUN php composer-setup.php && \
+    php composer-setup.php --install-dir=/usr/bin --filename=composer && \
+    php -r "unlink('composer-setup.php');"
+
+WORKDIR /app

docker/php/composer-setup.php

@@ -1,5 +1,8 @@
 <?php
 
+$sig = file_get_contents('https://composer.github.io/installer.sig');
+$sig = trim($sig);
+
 copy('https://getcomposer.org/installer', 'composer-setup.php');
 
-if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;
+if (hash_file('sha384', 'composer-setup.php') === $sig) { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;

examples/personal.php

@@ -38,3 +38,16 @@ $web3->eth->getBalance($newAccount, function ($err, $balance) {
 	}
 	echo 'Balance: ' . $balance->toString() . PHP_EOL;
 });
+
+// remember to lock account after transaction
+$personal->lockAccount($newAccount, function ($err, $locked) {
+	if ($err !== null) {
+		echo 'Error: ' . $err->getMessage();
+		return;
+	}
+	if ($locked) {
+        echo 'New account is locked!' . PHP_EOL;
+	} else {
+	    echo 'New account isn\'t locked' . PHP_EOL;
+	}
+});

phpunit.xml

@@ -7,8 +7,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
+         stopOnFailure="false">
-         syntaxCheck="false">
 
     <testsuite name="Web3.php unit test">
         <directory suffix="Test.php">./test/unit</directory>

scripts/test.sh

@@ -1,12 +1,15 @@
 #!/usr/bin/env bash
 
-ganache-cli -g 0 -l 0 > /dev/null & 
+ganache-cli -g 0 -l 6000000 > /dev/null & 
 ganachecli_pid=$!
 echo "Start ganache-cli pid: $ganachecli_pid and sleep 3 seconds"
 
 sleep 3
 
 vendor/bin/phpunit --coverage-clover=coverage.xml
+ret=$?
 
 kill -9 $ganachecli_pid
 echo "Kill ganache-cli"
+
+exit $ret

src/Contract.php

@@ -22,13 +22,16 @@ use Web3\Contracts\Ethabi;
 use Web3\Contracts\Types\Address;
 use Web3\Contracts\Types\Boolean;
 use Web3\Contracts\Types\Bytes;
+use Web3\Contracts\Types\DynamicBytes;
 use Web3\Contracts\Types\Integer;
 use Web3\Contracts\Types\Str;
 use Web3\Contracts\Types\Uinteger;
 use Web3\Validators\AddressValidator;
 use Web3\Validators\HexValidator;
-use Web3\Formatters\AddressFormatter;
 use Web3\Validators\StringValidator;
+use Web3\Validators\TagValidator;
+use Web3\Validators\QuantityValidator;
+use Web3\Formatters\AddressFormatter;
 
 class Contract
 {
@@ -95,14 +98,22 @@ class Contract
      */
     protected $ethabi;
 
+    /**
+     * defaultBlock
+     *
+     * @var mixed
+     */
+    protected $defaultBlock;
+
     /**
      * construct
      *
      * @param string|\Web3\Providers\Provider $provider
      * @param string|\stdClass|array $abi
+     * @param mixed $defaultBlock
      * @return void
      */
-    public function __construct($provider, $abi)
+    public function __construct($provider, $abi, $defaultBlock = 'latest')
     {
         if (is_string($provider) && (filter_var($provider, FILTER_VALIDATE_URL) !== false)) {
             // check the uri schema
@@ -114,12 +125,21 @@ class Contract
         } else if ($provider instanceof Provider) {
             $this->provider = $provider;
         }
-        $abi = Utils::jsonToArray($abi, 5);
 
-        foreach ($abi as $item) {
+        $abiArray = [];
+        if (is_string($abi)) {
+            $abiArray = json_decode($abi, true);
+
+            if (JSON_ERROR_NONE !== json_last_error()) {
+                throw new InvalidArgumentException('abi decode error: ' . json_last_error_msg());
+            }
+        } else {
+            $abiArray = Utils::jsonToArray($abi);
+        }
+        foreach ($abiArray as $item) {
             if (isset($item['type'])) {
                 if ($item['type'] === 'function') {
-                    $this->functions[$item['name']] = $item;
+                    $this->functions[] = $item;
                 } elseif ($item['type'] === 'constructor') {
                     $this->constructor = $item;
                 } elseif ($item['type'] === 'event') {
@@ -127,12 +147,18 @@ class Contract
                 }
             }
         }
-        $this->abi = $abi;
+        if (TagValidator::validate($defaultBlock) || QuantityValidator::validate($defaultBlock)) {
+            $this->defaultBlock = $defaultBlock;
+        } else {
+            $this->$defaultBlock = 'latest';
+        }
+        $this->abi = $abiArray;
         $this->eth = new Eth($this->provider);
         $this->ethabi = new Ethabi([
             'address' => new Address,
             'bool' => new Boolean,
             'bytes' => new Bytes,
+            'dynamicBytes' => new DynamicBytes,
             'int' => new Integer,
             'string' => new Str,
             'uint' => new Uinteger,
@@ -213,6 +239,32 @@ class Contract
         return $this;
     }
 
+    /**
+     * getDefaultBlock
+     * 
+     * @return string
+     */
+    public function getDefaultBlock()
+    {
+        return $this->defaultBlock;
+    }
+
+    /**
+     * setDefaultBlock
+     *
+     * @param mixed $defaultBlock
+     * @return $this
+     */
+    public function setDefaultBlock($defaultBlock)
+    {
+        if (TagValidator::validate($defaultBlock) || QuantityValidator::validate($defaultBlock)) {
+            $this->defaultBlock = $defaultBlock;
+        } else {
+            $this->$defaultBlock = 'latest';
+        }
+        return $this;
+    }
+
     /**
      * getFunctions
      *
@@ -233,6 +285,14 @@ class Contract
         return $this->events;
     }
 
+    /**
+     * @return string
+     */
+    public function getToAddress()
+    {
+        return $this->toAddress;
+    }
+
     /**
      * getConstructor
      *
@@ -349,12 +409,21 @@ class Contract
         if (StringValidator::validate($abi) === false) {
             throw new InvalidArgumentException('Please make sure abi is valid.');
         }
-        $abi = Utils::jsonToArray($abi, 5);
+        $abiArray = [];
+        if (is_string($abi)) {
+            $abiArray = json_decode($abi, true);
 
-        foreach ($abi as $item) {
+            if (JSON_ERROR_NONE !== json_last_error()) {
+                throw new InvalidArgumentException('abi decode error: ' . json_last_error_msg());
+            }
+        } else {
+            $abiArray = Utils::jsonToArray($abi);
+        }
+
+        foreach ($abiArray as $item) {
             if (isset($item['type'])) {
                 if ($item['type'] === 'function') {
-                    $this->functions[$item['name']] = $item;
+                    $this->functions[] = $item;
                 } elseif ($item['type'] === 'constructor') {
                     $this->constructor = $item;
                 } elseif ($item['type'] === 'event') {
@@ -362,7 +431,7 @@ class Contract
                 }
             }
         }
-        $this->abi = $abi;
+        $this->abi = $abiArray;
 
         return $this;
     }
@@ -381,7 +450,8 @@ class Contract
             $arguments = func_get_args();
             $callback = array_pop($arguments);
 
-            if (count($arguments) < count($constructor['inputs'])) {
+            $input_count = isset($constructor['inputs']) ? count($constructor['inputs']) : 0;
+            if (count($arguments) < $input_count) {
                 throw new InvalidArgumentException('Please make sure you have put all constructor params and callback.');
             }
             if (is_callable($callback) !== true) {
@@ -390,14 +460,13 @@ class Contract
             if (!isset($this->bytecode)) {
                 throw new \InvalidArgumentException('Please call bytecode($bytecode) before new().');
             }
-            $params = array_splice($arguments, 0, count($constructor['inputs']));
+            $params = array_splice($arguments, 0, $input_count);
             $data = $this->ethabi->encodeParameters($constructor, $params);
             $transaction = [];
 
             if (count($arguments) > 0) {
                 $transaction = $arguments[0];
             }
-            $transaction['to'] = '';
             $transaction['data'] = '0x' . $this->bytecode . Utils::stripZero($data);
 
             $this->eth->sendTransaction($transaction, function ($err, $transaction) use ($callback){
@@ -423,26 +492,75 @@ class Contract
             $method = array_splice($arguments, 0, 1)[0];
             $callback = array_pop($arguments);
 
-            if (!is_string($method) && !isset($this->functions[$method])) {
+            if (!is_string($method)) {
-                throw new InvalidArgumentException('Please make sure the method is existed.');
+                throw new InvalidArgumentException('Please make sure the method is string.');
             }
-            $function = $this->functions[$method];
 
-            if (count($arguments) < count($function['inputs'])) {
+            $functions = [];
-                throw new InvalidArgumentException('Please make sure you have put all function params and callback.');
+            foreach ($this->functions as $function) {
+                if ($function["name"] === $method) {
+                    $functions[] = $function;
+                }
+            };
+            if (count($functions) < 1) {
+                throw new InvalidArgumentException('Please make sure the method exists.');
             }
             if (is_callable($callback) !== true) {
                 throw new \InvalidArgumentException('The last param must be callback function.');
             }
-            $params = array_splice($arguments, 0, count($function['inputs']));
+
+            // check the last one in arguments is transaction object
+            $argsLen = count($arguments);
+            $transaction = [];
+            $hasTransaction = false;
+
+            if ($argsLen > 0) {
+                $transaction = $arguments[$argsLen - 1];
+            }
+            if (
+                isset($transaction["from"]) ||
+                isset($transaction["to"]) ||
+                isset($transaction["gas"]) ||
+                isset($transaction["gasPrice"]) ||
+                isset($transaction["value"]) ||
+                isset($transaction["data"]) ||
+                isset($transaction["nonce"])
+            ) {
+                $hasTransaction = true;
+            } else {
+                $transaction = [];
+            }
+
+            $params = [];
+            $data = "";
+            $functionName = "";
+            foreach ($functions as $function) {
+                if ($hasTransaction) {
+                    if ($argsLen - 1 !== count($function['inputs'])) {
+                        continue;
+                    } else {
+                        $paramsLen = $argsLen - 1;
+                    }
+                } else {
+                    if ($argsLen !== count($function['inputs'])) {
+                        continue;
+                    } else {
+                        $paramsLen = $argsLen;
+                    }
+                }
+                try {
+                    $params = array_splice($arguments, 0, $paramsLen);
                     $data = $this->ethabi->encodeParameters($function, $params);
                     $functionName = Utils::jsonMethodToString($function);
-            $functionSignature = $this->ethabi->encodeFunctionSignature($functionName);
+                } catch (InvalidArgumentException $e) {
-            $transaction = [];
+                    continue;
-
-            if (count($arguments) > 0) {
-                $transaction = $arguments[0];
                 }
+                break;
+            }
+            if (empty($data) || empty($functionName)) {
+                throw new InvalidArgumentException('Please make sure you have put all function params and callback.');
+            }
+            $functionSignature = $this->ethabi->encodeFunctionSignature($functionName);
             $transaction['to'] = $this->toAddress;
             $transaction['data'] = $functionSignature . Utils::stripZero($data);
 
@@ -469,30 +587,78 @@ class Contract
             $method = array_splice($arguments, 0, 1)[0];
             $callback = array_pop($arguments);
 
-            if (!is_string($method) && !isset($this->functions[$method])) {
+            if (!is_string($method)) {
-                throw new InvalidArgumentException('Please make sure the method is existed.');
+                throw new InvalidArgumentException('Please make sure the method is string.');
             }
-            $function = $this->functions[$method];
 
-            if (count($arguments) < count($function['inputs'])) {
+            $functions = [];
-                throw new InvalidArgumentException('Please make sure you have put all function params and callback.');
+            foreach ($this->functions as $function) {
+                if ($function["name"] === $method) {
+                    $functions[] = $function;
+                }
+            };
+            if (count($functions) < 1) {
+                throw new InvalidArgumentException('Please make sure the method exists.');
             }
             if (is_callable($callback) !== true) {
                 throw new \InvalidArgumentException('The last param must be callback function.');
             }
-            $params = array_splice($arguments, 0, count($function['inputs']));
+
+            // check the arguments
+            $argsLen = count($arguments);
+            $transaction = [];
+            $defaultBlock = $this->defaultBlock;
+            $params = [];
+            $data = "";
+            $functionName = "";
+            foreach ($functions as $function) {
+                try {
+                    $paramsLen = count($function['inputs']);
+                    $params = array_slice($arguments, 0, $paramsLen);
                     $data = $this->ethabi->encodeParameters($function, $params);
                     $functionName = Utils::jsonMethodToString($function);
-            $functionSignature = $this->ethabi->encodeFunctionSignature($functionName);
+                } catch (InvalidArgumentException $e) {
-            $transaction = [];
+                    continue;
-
-            if (count($arguments) > 0) {
-                $transaction = $arguments[0];
                 }
+                break;
+            }
+            if (empty($data) || empty($functionName)) {
+                throw new InvalidArgumentException('Please make sure you have put all function params and callback.');
+            }
+            // remove arguments
+            array_splice($arguments, 0, $paramsLen);
+            $argsLen -= $paramsLen;
+
+            if ($argsLen > 1) {
+                $defaultBlock = $arguments[$argsLen - 1];
+                $transaction = $arguments[$argsLen - 2];
+            } else if ($argsLen > 0) {
+                if (is_array($arguments[$argsLen - 1])) {
+                    $transaction = $arguments[$argsLen - 1];
+                } else {
+                    $defaultBlock = $arguments[$argsLen - 1];
+                }
+            }
+            if (!TagValidator::validate($defaultBlock) && !QuantityValidator::validate($defaultBlock)) {
+                $defaultBlock = $this->defaultBlock;
+            }
+            if (
+                !is_array($transaction) &&
+                !isset($transaction["from"]) &&
+                !isset($transaction["to"]) &&
+                !isset($transaction["gas"]) &&
+                !isset($transaction["gasPrice"]) &&
+                !isset($transaction["value"]) &&
+                !isset($transaction["data"]) &&
+                !isset($transaction["nonce"])
+            ) {
+                $transaction = [];
+            }
+            $functionSignature = $this->ethabi->encodeFunctionSignature($functionName);
             $transaction['to'] = $this->toAddress;
             $transaction['data'] = $functionSignature . Utils::stripZero($data);
 
-            $this->eth->call($transaction, function ($err, $transaction) use ($callback, $function){
+            $this->eth->call($transaction, $defaultBlock, function ($err, $transaction) use ($callback, $function){
                 if ($err !== null) {
                     return call_user_func($callback, $err, null);
                 }
@@ -535,36 +701,84 @@ class Contract
                 if (count($arguments) > 0) {
                     $transaction = $arguments[0];
                 }
-                $transaction['to'] = '';
                 $transaction['data'] = '0x' . $this->bytecode . Utils::stripZero($data);
             } else {
                 $method = array_splice($arguments, 0, 1)[0];
 
-                if (!is_string($method) && !isset($this->functions[$method])) {
+                if (!is_string($method)) {
-                    throw new InvalidArgumentException('Please make sure the method is existed.');
+                    throw new InvalidArgumentException('Please make sure the method is string.');
                 }
-                $function = $this->functions[$method];
     
-                if (count($arguments) < count($function['inputs'])) {
+                $functions = [];
-                    throw new InvalidArgumentException('Please make sure you have put all function params and callback.');
+                foreach ($this->functions as $function) {
+                    if ($function["name"] === $method) {
+                        $functions[] = $function;
+                    }
+                };
+                if (count($functions) < 1) {
+                    throw new InvalidArgumentException('Please make sure the method exists.');
                 }
                 if (is_callable($callback) !== true) {
                     throw new \InvalidArgumentException('The last param must be callback function.');
                 }
-                $params = array_splice($arguments, 0, count($function['inputs']));
+    
+                // check the last one in arguments is transaction object
+                $argsLen = count($arguments);
+                $transaction = [];
+                $hasTransaction = false;
+
+                if ($argsLen > 0) {
+                    $transaction = $arguments[$argsLen - 1];
+                }
+                if (
+                    isset($transaction["from"]) ||
+                    isset($transaction["to"]) ||
+                    isset($transaction["gas"]) ||
+                    isset($transaction["gasPrice"]) ||
+                    isset($transaction["value"]) ||
+                    isset($transaction["data"]) ||
+                    isset($transaction["nonce"])
+                ) {
+                    $hasTransaction = true;
+                } else {
+                    $transaction = [];
+                }
+
+                $params = [];
+                $data = "";
+                $functionName = "";
+                foreach ($functions as $function) {
+                    if ($hasTransaction) {
+                        if ($argsLen - 1 !== count($function['inputs'])) {
+                            continue;
+                        } else {
+                            $paramsLen = $argsLen - 1;
+                        }
+                    } else {
+                        if ($argsLen !== count($function['inputs'])) {
+                            continue;
+                        } else {
+                            $paramsLen = $argsLen;
+                        }
+                    }
+                    try {
+                        $params = array_splice($arguments, 0, $paramsLen);
                         $data = $this->ethabi->encodeParameters($function, $params);
                         $functionName = Utils::jsonMethodToString($function);
-                $functionSignature = $this->ethabi->encodeFunctionSignature($functionName);
+                    } catch (InvalidArgumentException $e) {
-                $transaction = [];
+                        continue;
-
-                if (count($arguments) > 0) {
-                    $transaction = $arguments[0];
                     }
+                    break;
+                }
+                if (empty($data) || empty($functionName)) {
+                    throw new InvalidArgumentException('Please make sure you have put all function params and callback.');
+                }
+                $functionSignature = $this->ethabi->encodeFunctionSignature($functionName);
                 $transaction['to'] = $this->toAddress;
                 $transaction['data'] = $functionSignature . Utils::stripZero($data);
             }
 
-            $this->eth->estimateGas($transaction, function ($err, $gas) use ($callback){
+            $this->eth->estimateGas($transaction, function ($err, $gas) use ($callback) {
                 if ($err !== null) {
                     return call_user_func($callback, $err, null);
                 }
@@ -605,17 +819,38 @@ class Contract
             } else {
                 $method = array_splice($arguments, 0, 1)[0];
 
-                if (!is_string($method) && !isset($this->functions[$method])) {
+                if (!is_string($method)) {
-                    throw new InvalidArgumentException('Please make sure the method is existed.');
+                    throw new InvalidArgumentException('Please make sure the method is string.');
                 }
-                $function = $this->functions[$method];
     
-                if (count($arguments) < count($function['inputs'])) {
+                $functions = [];
-                    throw new InvalidArgumentException('Please make sure you have put all function params and callback.');
+                foreach ($this->functions as $function) {
+                    if ($function["name"] === $method) {
+                        $functions[] = $function;
                     }
-                $params = array_splice($arguments, 0, count($function['inputs']));
+                };
+                if (count($functions) < 1) {
+                    throw new InvalidArgumentException('Please make sure the method exists.');
+                }
+    
+                $params = $arguments;
+                $data = "";
+                $functionName = "";
+                foreach ($functions as $function) {
+                    if (count($arguments) !== count($function['inputs'])) {
+                        continue;
+                    }
+                    try {
                         $data = $this->ethabi->encodeParameters($function, $params);
                         $functionName = Utils::jsonMethodToString($function);
+                    } catch (InvalidArgumentException $e) {
+                        continue;
+                    }
+                    break;
+                }
+                if (empty($data) || empty($functionName)) {
+                    throw new InvalidArgumentException('Please make sure you have put all function params and callback.');
+                }
                 $functionSignature = $this->ethabi->encodeFunctionSignature($functionName);
                 $functionData = Utils::stripZero($functionSignature) . Utils::stripZero($data);
             }

src/Contracts/Ethabi.php

@@ -100,6 +100,7 @@ class Ethabi
 
     /**
      * encodeEventSignature
+     * TODO: Fix same event name with different params
      * 
      * @param string|stdClass|array $functionName
      * @return string
@@ -155,21 +156,6 @@ class Ethabi
         }
         $typesLength = count($types);
         $solidityTypes = $this->getSolidityTypes($types);
-
-        foreach ($types as $key => $type) {
-            $match = [];
-
-            if (preg_match('/^([a-zA-Z]+)/', $type, $match) === 1) {
-                if (isset($this->types[$match[0]])) {
-                    $className = $this->types[$match[0]];
-
-                    if (call_user_func([$this->types[$match[0]], 'isType'], $type) === false) {
-                        throw new InvalidArgumentException('Unsupport solidity parameter type: ' . $type);
-                    }
-                    $solidityTypes[$key] = $className;
-                }
-            }
-        }
         $encodes = array_fill(0, $typesLength, '');
 
         foreach ($solidityTypes as $key => $type) {
@@ -249,7 +235,7 @@ class Ethabi
         $param = mb_strtolower(Utils::stripZero($param));
 
         for ($i=0; $i<$typesLength; $i++) {
-            if (isset($outputTypes['outputs'][$i]['name'])) {
+            if (isset($outputTypes['outputs'][$i]['name']) && empty($outputTypes['outputs'][$i]['name']) === false) {
                 $result[$outputTypes['outputs'][$i]['name']] = $solidityTypes[$i]->decode($param, $offsets[$i], $types[$i]);
             } else {
                 $result[$i] = $solidityTypes[$i]->decode($param, $offsets[$i], $types[$i]);
@@ -280,8 +266,13 @@ class Ethabi
                     $className = $this->types[$match[0]];
 
                     if (call_user_func([$this->types[$match[0]], 'isType'], $type) === false) {
+                        // check dynamic bytes
+                        if ($match[0] === 'bytes') {
+                            $className = $this->types['dynamicBytes'];
+                        } else {
                             throw new InvalidArgumentException('Unsupport solidity parameter type: ' . $type);
                         }
+                    }
                     $solidityTypes[$key] = $className;
                 }
             }

src/Contracts/Types/Address.php

@@ -37,7 +37,7 @@ class Address extends SolidityType implements IType
      */
     public function isType($name)
     {
-        return (preg_match('/address(\[([0-9]*)\])*/', $name) === 1);
+        return (preg_match('/^address(\[([0-9]*)\])*$/', $name) === 1);
     }
 
     /**

src/Contracts/Types/Boolean.php

@@ -35,7 +35,7 @@ class Boolean extends SolidityType implements IType
      */
     public function isType($name)
     {
-        return (preg_match('/bool(\[([0-9]*)\])*/', $name) === 1);
+        return (preg_match('/^bool(\[([0-9]*)\])*$/', $name) === 1);
     }
 
     /**

src/Contracts/Types/Bytes.php

@@ -36,7 +36,7 @@ class Bytes extends SolidityType implements IType
      */
     public function isType($name)
     {
-        return (preg_match('/bytes([0-9]{1,})?(\[([0-9]*)\])*/', $name) === 1);
+        return (preg_match('/^bytes([0-9]{1,})(\[([0-9]*)\])*$/', $name) === 1);
     }
 
     /**
@@ -63,9 +63,10 @@ class Bytes extends SolidityType implements IType
         }
         $value = Utils::stripZero($value);
 
-        // if (mb_strlen($value) % 2 !== 0) {
+        if (mb_strlen($value) % 2 !== 0) {
+            $value = "0" . $value;
             // throw new InvalidArgumentException('The value to inputFormat has invalid length. Value: ' . $value);
-        // }
+        }
 
         if (mb_strlen($value) > 64) {
             throw new InvalidArgumentException('The value to inputFormat is too long.');
@@ -90,6 +91,11 @@ class Bytes extends SolidityType implements IType
         if (empty($checkZero)) {
             return '0';
         }
+        if (preg_match('/^bytes([0-9]*)/', $name, $match) === 1) {
+            $size = intval($match[1]);
+            $length = 2 * $size;
+            $value = mb_substr($value, 0, $length);
+        }
         return '0x' . $value;
     }
 }

src/Contracts/Types/DynamicBytes.php

@@ -36,7 +36,7 @@ class DynamicBytes extends SolidityType implements IType
      */
     public function isType($name)
     {
-        return (preg_match('/bytes(\[([0-9]*)\])*/', $name) === 1);
+        return (preg_match('/^bytes(\[([0-9]*)\])*$/', $name) === 1);
     }
 
     /**
@@ -63,12 +63,17 @@ class DynamicBytes extends SolidityType implements IType
         }
         $value = Utils::stripZero($value);
 
-        // if (mb_strlen($value) % 2 !== 0) {
+        if (mb_strlen($value) % 2 !== 0) {
+            $value = "0" . $value;
             // throw new InvalidArgumentException('The value to inputFormat has invalid length.');
-        // }
+        }
-        $bn = Utils::toBn(mb_strlen($value) / 2);
+        $bn = Utils::toBn(floor(mb_strlen($value) / 2));
         $bnHex = $bn->toHex(true);
         $padded = mb_substr($bnHex, 0, 1);
+
+        if ($padded !== '0' && $padded !== 'f') {
+            $padded = '0';
+        }
         $l = floor((mb_strlen($value) + 63) / 64);
         $padding = (($l * 64 - mb_strlen($value) + 1) >= 0) ? $l * 64 - mb_strlen($value) : 0;
 
@@ -89,6 +94,9 @@ class DynamicBytes extends SolidityType implements IType
         if (empty($checkZero)) {
             return '0';
         }
-        return '0x' . $value;
+        $size = intval(Utils::toBn('0x' . mb_substr($value, 0, 64))->toString());
+        $length = 2 * $size;
+        
+        return '0x' . mb_substr($value, 64, $length);
     }
 }

src/Contracts/Types/Integer.php

@@ -37,7 +37,7 @@ class Integer extends SolidityType implements IType
      */
     public function isType($name)
     {
-        return (preg_match('/int([0-9]{1,})?(\[([0-9]*)\])*/', $name) === 1);
+        return (preg_match('/^int([0-9]{1,})?(\[([0-9]*)\])*$/', $name) === 1);
     }
 
     /**

src/Contracts/Types/Str.php

@@ -37,7 +37,7 @@ class Str extends SolidityType implements IType
      */
     public function isType($name)
     {
-        return (preg_match('/string(\[([0-9]*)\])*/', $name) === 1);
+        return (preg_match('/^string(\[([0-9]*)\])*$/', $name) === 1);
     }
 
     /**
@@ -77,7 +77,7 @@ class Str extends SolidityType implements IType
     public function outputFormat($value, $name)
     {
         $strLen = mb_substr($value, 0, 64);
-        $strValue = mb_substr($value, 64, 64);
+        $strValue = mb_substr($value, 64);
         $match = [];
 
         if (preg_match('/^[0]+([a-f0-9]+)$/', $strLen, $match) === 1) {

src/Contracts/Types/Uinteger.php

@@ -37,7 +37,7 @@ class Uinteger extends SolidityType implements IType
      */
     public function isType($name)
     {
-        return (preg_match('/uint([0-9]{1,})?(\[([0-9]*)\])*/', $name) === 1);
+        return (preg_match('/^uint([0-9]{1,})?(\[([0-9]*)\])*$/', $name) === 1);
     }
 
     /**

src/Eth.php

@@ -38,7 +38,7 @@ class Eth
      * @var array
      */
     private $allowedMethods = [
-        'eth_protocolVersion', 'eth_syncing', 'eth_coinbase', 'eth_mining', 'eth_hashrate', 'eth_gasPrice', 'eth_accounts', 'eth_blockNumber', 'eth_getBalance', 'eth_getStorageAt', 'eth_getTransactionCount', 'eth_getBlockTransactionCountByHash', 'eth_getBlockTransactionCountByNumber', 'eth_getUncleCountByBlockHash', 'eth_getUncleCountByBlockNumber', 'eth_getUncleByBlockHashAndIndex', 'eth_getUncleByBlockNumberAndIndex', 'eth_getCode', 'eth_sign', 'eth_sendTransaction', 'eth_sendRawTransaction', 'eth_call', 'eth_estimateGas', 'eth_getBlockByHash', 'eth_getBlockByNumber', 'eth_getTransactionByHash', 'eth_getTransactionByBlockHashAndIndex', 'eth_getTransactionByBlockNumberAndIndex', 'eth_getTransactionReceipt', 'eth_getCompilers', 'eth_compileSolidity', 'eth_compileLLL', 'eth_compileSerpent', 'eth_getWork', 'eth_newFilter', 'eth_newBlockFilter', 'eth_newPendingTransactionFilter', 'eth_uninstallFilter', 'eth_getFilterChanges', 'eth_getFilterLogs', 'eth_getLogs', 'eth_submitWork', 'eth_submitHashrate'
+        'eth_protocolVersion', 'eth_syncing', 'eth_coinbase', 'eth_mining', 'eth_hashrate', 'eth_gasPrice', 'eth_accounts', 'eth_blockNumber', 'eth_getBalance', 'eth_getStorageAt', 'eth_getTransactionCount', 'eth_getBlockTransactionCountByHash', 'eth_getBlockTransactionCountByNumber', 'eth_getUncleCountByBlockHash', 'eth_getUncleCountByBlockNumber', 'eth_getUncleByBlockHashAndIndex', 'eth_getUncleByBlockNumberAndIndex', 'eth_getCode', 'eth_sign', 'eth_sendTransaction', 'eth_sendRawTransaction', 'eth_call', 'eth_estimateGas', 'eth_getBlockByHash', 'eth_getBlockByNumber', 'eth_getTransactionByHash', 'eth_getTransactionByBlockHashAndIndex', 'eth_getTransactionByBlockNumberAndIndex', 'eth_getTransactionReceipt', 'eth_compileSolidity', 'eth_compileLLL', 'eth_compileSerpent', 'eth_getWork', 'eth_newFilter', 'eth_newBlockFilter', 'eth_newPendingTransactionFilter', 'eth_uninstallFilter', 'eth_getFilterChanges', 'eth_getFilterLogs', 'eth_getLogs', 'eth_submitWork', 'eth_submitHashrate'
     ];
 
     /**

src/Methods/Eth/NewBlockFilter.php

@@ -23,18 +23,14 @@ class NewBlockFilter extends EthMethod
      * 
      * @var array
      */
-    protected $validators = [
+    protected $validators = [];
-        QuantityValidator::class
-    ];
 
     /**
      * inputFormatters
      * 
      * @var array
      */
-    protected $inputFormatters = [
+    protected $inputFormatters = [];
-        QuantityFormatter::class
-    ];
 
     /**
      * outputFormatters

src/Methods/Personal/LockAccount.php

@@ -9,26 +9,31 @@
  * @license MIT
  */
 
-namespace Web3\Methods\Eth;
+namespace Web3\Methods\Personal;
 
-use InvalidArgumentException;
 use Web3\Methods\EthMethod;
+use Web3\Validators\AddressValidator;
+use Web3\Formatters\AddressFormatter;
 
-class GetCompilers extends EthMethod
+class LockAccount extends EthMethod
 {
     /**
      * validators
      * 
      * @var array
      */
-    protected $validators = [];
+    protected $validators = [
+        AddressValidator::class
+    ];
 
     /**
      * inputFormatters
      * 
      * @var array
      */
-    protected $inputFormatters = [];
+    protected $inputFormatters = [
+        AddressFormatter::class
+    ];
 
     /**
      * outputFormatters
@@ -56,3 +61,4 @@ class GetCompilers extends EthMethod
     //     parent::__construct($method, $arguments);
     // }
 }
+

src/Personal.php

@@ -38,7 +38,7 @@ class Personal
      * @var array
      */
     private $allowedMethods = [
-        'personal_listAccounts', 'personal_newAccount', 'personal_unlockAccount', 'personal_sendTransaction'
+        'personal_listAccounts', 'personal_newAccount', 'personal_unlockAccount', 'personal_lockAccount', 'personal_sendTransaction'
     ];
 
     /**

src/RequestManagers/HttpRequestManager.php

@@ -12,6 +12,7 @@
 namespace Web3\RequestManagers;
 
 use InvalidArgumentException;
+use Psr\Http\Message\StreamInterface;
 use RuntimeException as RPCException;
 use Psr\Http\Message\ResponseInterface;
 use GuzzleHttp\Exception\RequestException;
@@ -53,22 +54,7 @@ class HttpRequestManager extends RequestManager implements IRequestManager
         if (!is_string($payload)) {
             throw new \InvalidArgumentException('Payload must be string.');
         }
-        // $promise = $this->client->postAsync($this->host, [
+
-        //     'headers' => [
-        //         'content-type' => 'application/json'
-        //     ],
-        //     'body' => $payload
-        // ]);
-        // $promise->then(
-        //     function (ResponseInterface $res) use ($callback) {
-        //         var_dump($res->body());
-        //         call_user_func($callback, null, $res);
-        //     },
-        //     function (RequestException $err) use ($callback) {
-        //         var_dump($err->getMessage());
-        //         call_user_func($callback, $err, null);
-        //     }
-        // );
         try {
             $res = $this->client->post($this->host, [
                 'headers' => [
@@ -78,7 +64,12 @@ class HttpRequestManager extends RequestManager implements IRequestManager
                 'timeout' => $this->timeout,
                 'connect_timeout' => $this->timeout
             ]);
-            $json = json_decode($res->getBody());
+            /**
+             * @var StreamInterface $stream ;
+             */
+            $stream = $res->getBody();
+            $json = json_decode($stream);
+            $stream->close();
 
             if (JSON_ERROR_NONE !== json_last_error()) {
                 call_user_func($callback, new InvalidArgumentException('json_decode error: ' . json_last_error_msg()), null);
@@ -89,7 +80,7 @@ class HttpRequestManager extends RequestManager implements IRequestManager
                 $errors = [];
 
                 foreach ($json as $result) {
-                    if (isset($result->result)) {
+                    if (property_exists($result,'result')) {
                         $results[] = $result->result;
                     } else {
                         if (isset($json->error)) {
@@ -105,7 +96,7 @@ class HttpRequestManager extends RequestManager implements IRequestManager
                 } else {
                     call_user_func($callback, null, $results);
                 }
-            } elseif (isset($json->result)) {
+            } elseif (property_exists($json,'result')) {
                 call_user_func($callback, null, $json->result);
             } else {
                 if (isset($json->error)) {

src/Utils.php

@@ -212,6 +212,31 @@ class Utils
         return true;
     }
 
+    /**
+     * toChecksumAddress
+     *
+     * @param string $value
+     * @return string
+     */
+    public static function toChecksumAddress($value)
+    {
+        if (!is_string($value)) {
+            throw new InvalidArgumentException('The value to toChecksumAddress function must be string.');
+        }
+        $value = self::stripZero(strtolower($value));
+        $hash = self::stripZero(self::sha3($value));
+        $ret = '0x';
+
+        for ($i = 0; $i < 40; $i++) {
+            if (intval($hash[$i], 16) >= 8) {
+                $ret .= strtoupper($value[$i]);
+            } else {
+                $ret .= $value[$i];
+            }
+        }
+        return $ret;
+    }
+
     /**
      * isHex
      * 
@@ -266,12 +291,15 @@ class Utils
      * $wei = Utils::toWei('1', 'kwei'); 
      * $wei->toString(); // 1000
      * 
-     * @param BigNumber|string|int $number
+     * @param BigNumber|string $number
      * @param string $unit
      * @return \phpseclib\Math\BigInteger
      */
     public static function toWei($number, $unit)
     {
+        if (!is_string($number) && !($number instanceof BigNumber)) {
+            throw new InvalidArgumentException('toWei number must be string or bignumber.');
+        }
         $bn = self::toBn($number);
 
         if (!is_string($unit)) {
@@ -284,15 +312,33 @@ class Utils
 
         if (is_array($bn)) {
             // fraction number
-            list($whole, $fraction, $negative1) = $bn;
+            list($whole, $fraction, $fractionLength, $negative1) = $bn;
-
-            $fractionLength = strlen($fraction->toString());
 
             if ($fractionLength > strlen(self::UNITS[$unit])) {
                 throw new InvalidArgumentException('toWei fraction part is out of limit.');
             }
             $whole = $whole->multiply($bnt);
-            $base = (new BigNumber(10))->pow(new BigNumber($fractionLength));
+
+            // There is no pow function in phpseclib 2.0, only can see in dev-master
+            // Maybe implement own biginteger in the future
+            // See 2.0 BigInteger: https://github.com/phpseclib/phpseclib/blob/2.0/phpseclib/Math/BigInteger.php
+            // See dev-master BigInteger: https://github.com/phpseclib/phpseclib/blob/master/phpseclib/Math/BigInteger.php#L700
+            // $base = (new BigNumber(10))->pow(new BigNumber($fractionLength));
+
+            // So we switch phpseclib special global param, change in the future
+            switch (MATH_BIGINTEGER_MODE) {
+                case $whole::MODE_GMP:
+                    static $two;
+                    $powerBase = gmp_pow(gmp_init(10), (int) $fractionLength);
+                    break;
+                case $whole::MODE_BCMATH:
+                    $powerBase = bcpow('10', (string) $fractionLength, 0);
+                    break;
+                default:
+                    $powerBase = pow(10, (int) $fractionLength);
+                    break;
+            }
+            $base = new BigNumber($powerBase);
             $fraction = $fraction->multiply($bnt)->divide($base)[0];
 
             if ($negative1 !== false) {
@@ -401,53 +447,35 @@ class Utils
     /**
      * jsonToArray
      * 
-     * @param stdClass|array|string $json
+     * @param stdClass|array $json
-     * @param int $depth
      * @return array
      */
-    public static function jsonToArray($json, $depth=1)
+    public static function jsonToArray($json)
     {
-        if (!is_int($depth) || $depth <= 0) {
-            throw new InvalidArgumentException('jsonToArray depth must be int and depth must bigger than 0.');
-        }
         if ($json instanceof stdClass) {
             $json = (array) $json;
             $typeName = [];
 
-            if ($depth > 1) {
             foreach ($json as $key => $param) {
                 if (is_array($param)) {
                     foreach ($param as $subKey => $subParam) {
-                            $json[$key][$subKey] = self::jsonToArray($subParam, $depth-1);
+                        $json[$key][$subKey] = self::jsonToArray($subParam);
                     }
                 } elseif ($param instanceof stdClass) {
-                        $json[$key] = self::jsonToArray($param, $depth-1);
+                    $json[$key] = self::jsonToArray($param);
                 }
             }
-            }
-            return $json;
         } elseif (is_array($json)) {
-            if ($depth > 1) {
             foreach ($json as $key => $param) {
                 if (is_array($param)) {
                     foreach ($param as $subKey => $subParam) {
-                            $json[$key][$subKey] = self::jsonToArray($subParam, $depth-1);
+                        $json[$key][$subKey] = self::jsonToArray($subParam);
                     }
                 } elseif ($param instanceof stdClass) {
-                        $json[$key] = self::jsonToArray($param, $depth-1);
+                    $json[$key] = self::jsonToArray($param);
                 }
             }
         }
-        } elseif (is_string($json)) {
-            $json = json_decode($json, true);
-
-            if (JSON_ERROR_NONE !== json_last_error()) {
-                throw new InvalidArgumentException('json_decode error: ' . json_last_error_msg());
-            }
-            return $json;
-        } else {
-            throw new InvalidArgumentException('The json param to jsonToArray must be array or stdClass or string.');
-        }
         return $json;
     }
 
@@ -484,6 +512,7 @@ class Utils
                 return [
                     new BigNumber($whole),
                     new BigNumber($fraction),
+                    strlen($comps[1]),
                     isset($negative1) ? $negative1 : false
                 ];
             } else {
@@ -500,7 +529,7 @@ class Utils
                 $number = str_replace('-', '', $number, $count);
                 $negative1 = new BigNumber(-1);
             }
-            if (self::isZeroPrefixed($number) || preg_match('/[a-f]+/', $number) === 1) {
+            if (self::isZeroPrefixed($number) || preg_match('/^[0-9a-f]+$/i', $number) === 1) {
                 $number = self::stripZero($number);
                 $bn = new BigNumber($number, 16);
             } elseif (empty($number)) {

test/TestCase.php

@@ -37,10 +37,8 @@ class TestCase extends BaseTestCase
 
     /**
      * setUp
-     * 
-     * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $web3 = new Web3($this->testHost);
         $this->web3 = $web3;
@@ -55,8 +53,6 @@ class TestCase extends BaseTestCase
 
     /**
      * tearDown
-     * 
-     * @return void
      */
-    public function tearDown() {}
+    public function tearDown(): void {}
 }

test/contracts/issue125.sol

@@ -0,0 +1,15 @@
+pragma solidity ^0.5.1;
+
+contract FIX125 {
+    
+    bytes public data;
+    
+    event SetData(
+        bytes indexed _data
+    );
+    
+    function setData(bytes memory _data) public {
+        data = _data;
+        emit SetData(_data);
+    }
+}

test/contracts/issue134.sol

@@ -0,0 +1,26 @@
+pragma solidity ^0.5.1;
+
+contract FIX134 {
+    bytes public data;
+    uint256 public number;
+    
+    event Say(
+        uint256 indexed _number
+    );
+    
+    event Say(
+        uint256 indexed _number,
+        bytes indexed _data
+    );
+
+    function say(uint256 _number) public {
+        number = _number;
+        emit Say(_number);
+    }
+    
+    function say(uint256 _number, bytes memory _data) public {
+        data = _data;
+        number = _number;
+        emit Say(_number, _data);
+    }
+}

test/unit/AddressFormatterTest.php

@@ -19,7 +19,7 @@ class AddressFormatterTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->formatter = new AddressFormatter;

test/unit/AddressTypeTest.php

@@ -47,7 +47,7 @@ class AddressTypeTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->solidityType = new Address;

test/unit/AddressValidatorTest.php

@@ -19,7 +19,7 @@ class AddressValidatorTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->validator = new AddressValidator;

test/unit/BigNumberFormatterTest.php

@@ -20,7 +20,7 @@ class BigNumberFormatterTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->formatter = new BigNumberFormatter;

test/unit/BlockHashValidatorTest.php

@@ -19,7 +19,7 @@ class BlockHashValidatorTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->validator = new BlockHashValidator;

test/unit/BooleanFormatterTest.php

@@ -20,7 +20,7 @@ class BooleanFormatterTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->formatter = new BooleanFormatter;

test/unit/BooleanTypeTest.php

@@ -47,7 +47,7 @@ class BooleanTypeTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->solidityType = new Boolean;

test/unit/BooleanValidatorTest.php

@@ -19,7 +19,7 @@ class BooleanValidatorTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->validator = new BooleanValidator;

test/unit/BytesTypeTest.php

@@ -16,22 +16,22 @@ class BytesTypeTest extends TestCase
     protected $testTypes = [
         [
             'value' => 'bytes',
-            'result' => true
+            'result' => false
         ], [
             'value' => 'bytes[]',
-            'result' => true
+            'result' => false
         ], [
             'value' => 'bytes[4]',
-            'result' => true
+            'result' => false
         ], [
             'value' => 'bytes[][]',
-            'result' => true
+            'result' => false
         ], [
             'value' => 'bytes[3][]',
-            'result' => true
+            'result' => false
         ], [
             'value' => 'bytes[][6][]',
-            'result' => true
+            'result' => false
         ], [
             'value' => 'bytes32',
             'result' => true
@@ -53,7 +53,7 @@ class BytesTypeTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->solidityType = new Bytes;

test/unit/CallValidatorTest.php

@@ -19,7 +19,7 @@ class CallValidatorTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->validator = new CallValidator;

test/unit/DynamicBytesTypeTest.php

@@ -34,10 +34,10 @@ class DynamicBytesTypeTest extends TestCase
             'result' => true
         ], [
             'value' => 'bytes32',
-            'result' => true
+            'result' => false
         ], [
             'value' => 'bytes8[4]',
-            'result' => true
+            'result' => false
         ],
     ];
 
@@ -53,7 +53,7 @@ class DynamicBytesTypeTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->solidityType = new DynamicBytes;

test/unit/EthApiTest.php

@@ -21,7 +21,7 @@ class EthApiTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -439,7 +439,7 @@ class EthApiTest extends TestCase
             if ($err !== null) {
                 return $this->assertTrue($err !== null);
             }
-            // weired behavior, see https://github.com/sc0Vu/web3.php/issues/16
+            // weird behavior, see https://github.com/web3p/web3.php/issues/16
             $this->assertTrue($block !== null);
         });
     }
@@ -457,7 +457,7 @@ class EthApiTest extends TestCase
             if ($err !== null) {
                 return $this->assertTrue($err !== null);
             }
-            $this->assertTrue($transaction !== null);
+            $this->assertTrue($transaction == null);
         });
     }
 
@@ -474,7 +474,7 @@ class EthApiTest extends TestCase
             if ($err !== null) {
                 return $this->assertTrue($err !== null);
             }
-            $this->assertTrue($transaction !== null);
+            $this->assertTrue($transaction == null);
         });
     }
 
@@ -508,7 +508,7 @@ class EthApiTest extends TestCase
             if ($err !== null) {
                 return $this->assertTrue($err !== null);
             }
-            $this->assertTrue($transaction !== null);
+            $this->assertTrue($transaction == null);
         });
     }
 
@@ -546,24 +546,6 @@ class EthApiTest extends TestCase
         });
     }
 
-    /**
-     * testGetCompilers
-     * 
-     * @return void
-     */    
-    public function testGetCompilers()
-    {
-        $eth = $this->eth;
-
-        $eth->getCompilers(function ($err, $compilers) {
-            if ($err !== null) {
-                return $this->assertTrue($err !== null);
-            }
-            $this->assertTrue(is_array($compilers));
-            $this->assertEquals($compilers[0], 'solidity');
-        });
-    }
-
     /**
      * testCompileSolidity
      * 
@@ -647,7 +629,7 @@ class EthApiTest extends TestCase
     {
         $eth = $this->eth;
 
-        $eth->newBlockFilter('0x01', function ($err, $filter) {
+        $eth->newBlockFilter(function ($err, $filter) {
             if ($err !== null) {
                 // infura banned us to new block filter
                 return $this->assertTrue($err !== null);

test/unit/EthBatchTest.php

@@ -20,7 +20,7 @@ class EthBatchTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

test/unit/EthTest.php

@@ -23,7 +23,7 @@ class EthTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

test/unit/EthabiTest.php

@@ -9,6 +9,7 @@ use Web3\Contracts\Ethabi;
 use Web3\Contracts\Types\Address;
 use Web3\Contracts\Types\Boolean;
 use Web3\Contracts\Types\Bytes;
+use Web3\Contracts\Types\DynamicBytes;
 use Web3\Contracts\Types\Integer;
 use Web3\Contracts\Types\Str;
 use Web3\Contracts\Types\Uinteger;
@@ -162,7 +163,7 @@ class EthabiTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         // Error: Using $this when not in object context
@@ -179,9 +180,10 @@ class EthabiTest extends TestCase
             'address' => new Address,
             'bool' => new Boolean,
             'bytes' => new Bytes,
+            'dynamicBytes' => new DynamicBytes,
             'int' => new Integer,
             'string' => new Str,
-            'uint' => new Uinteger,
+            'uint' => new Uinteger
         ]);
     }
 
@@ -293,4 +295,23 @@ class EthabiTest extends TestCase
             }
         }
     }
+
+    /**
+     * testIssue71
+     * test 33 bytes and 128 bytes string, see: https://github.com/web3p/web3.php/issues/71
+     * string generated from: https://www.lipsum.com/
+     * 
+     * @return void
+     */
+    public function testIssue71()
+    {
+        $abi = $this->abi;
+        $specialString = 'Lorem ipsum dolor sit amet metus.';
+        $encodedString = $abi->encodeParameter('string', $specialString);
+        $this->assertEquals($specialString, $abi->decodeParameter('string', $encodedString));
+
+        $specialString = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce pulvinar quam felis, suscipit posuere neque aliquam in cras amet.';
+        $encodedString = $abi->encodeParameter('string', $specialString);
+        $this->assertEquals($specialString, $abi->decodeParameter('string', $encodedString));
+    }
 }

test/unit/FilterValidatorTest.php

@@ -19,7 +19,7 @@ class FilterValidatorTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->validator = new FilterValidator;

test/unit/HexFormatterTest.php

@@ -19,7 +19,7 @@ class HexFormatterTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->formatter = new HexFormatter;

test/unit/HexValidatorTest.php

@@ -19,7 +19,7 @@ class HexValidatorTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->validator = new HexValidator;

test/unit/HttpProviderTest.php

@@ -17,7 +17,7 @@ class HttpProviderTest extends TestCase
      */
     public function testSend()
     {
-        $requestManager = new HttpRequestManager('http://localhost:8545');
+        $requestManager = new HttpRequestManager($this->testHost);
         $provider = new HttpProvider($requestManager);
         $method = new ClientVersion('web3_clientVersion', []);
 
@@ -36,7 +36,7 @@ class HttpProviderTest extends TestCase
      */
     public function testBatch()
     {
-        $requestManager = new HttpRequestManager('http://localhost:8545');
+        $requestManager = new HttpRequestManager($this->testHost);
         $provider = new HttpProvider($requestManager);
         $method = new ClientVersion('web3_clientVersion', []);
         $callback = function ($err, $data) {

test/unit/IdentityValidatorTest.php

@@ -19,7 +19,7 @@ class IdentityValidatorTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->validator = new IdentityValidator;

test/unit/IntegerFormatterTest.php

@@ -19,7 +19,7 @@ class IntegerFormatterTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->formatter = new IntegerFormatter;
@@ -45,5 +45,11 @@ class IntegerFormatterTest extends TestCase
 
         $hex = $formatter->format('1', 20);
         $this->assertEquals($hex, implode('', array_fill(0, 19, '0')) . '1');
+
+        $hex = $formatter->format(48);
+        $this->assertEquals($hex, implode('', array_fill(0, 62, '0')) . '30');
+
+        $hex = $formatter->format('48');
+        $this->assertEquals($hex, implode('', array_fill(0, 62, '0')) . '30');
     }
 }

test/unit/IntegerTypeTest.php

@@ -53,7 +53,7 @@ class IntegerTypeTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->solidityType = new Integer;

test/unit/NetApiTest.php

@@ -21,7 +21,7 @@ class NetApiTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

test/unit/NetBatchTest.php

@@ -20,7 +20,7 @@ class NetBatchTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

test/unit/NetTest.php

@@ -23,7 +23,7 @@ class NetTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

test/unit/NonceValidatorTest.php

@@ -19,7 +19,7 @@ class NonceValidatorTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->validator = new NonceValidator;

test/unit/NumberFormatterTest.php

@@ -19,7 +19,7 @@ class NumberFormatterTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->formatter = new NumberFormatter;

test/unit/OptionalQuantityFormatterTest.php

@@ -19,7 +19,7 @@ class OptionalQuantityFormatterTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->formatter = new OptionalQuantityFormatter;
@@ -55,6 +55,8 @@ class OptionalQuantityFormatterTest extends TestCase
         $this->assertEquals('latest', $formatter->format('latest'));
         $this->assertEquals('earliest', $formatter->format('earliest'));
         $this->assertEquals('pending', $formatter->format('pending'));
-        $this->assertEquals('0x0', $formatter->format('hello'));
+
+        $this->expectExceptionMessage('toBn number must be valid hex string.');
+        $formatter->format('hello');
     }
 }

test/unit/PersonalApiTest.php

@@ -27,7 +27,7 @@ class PersonalApiTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -63,7 +63,7 @@ class PersonalApiTest extends TestCase
 
         $personal->newAccount('123456', function ($err, $account) {
             if ($err !== null) {
-                return $this->fail($e->getMessage());
+                return $this->fail($err->getMessage());
             }
             $this->assertTrue(is_string($account));
         });
@@ -81,7 +81,7 @@ class PersonalApiTest extends TestCase
         // create account
         $personal->newAccount('123456', function ($err, $account) {
             if ($err !== null) {
-                return $this->fail($e->getMessage());
+                return $this->fail($err->getMessage());
             }
             $this->newAccount = $account;
             $this->assertTrue(is_string($account));
@@ -107,7 +107,7 @@ class PersonalApiTest extends TestCase
         // create account
         $personal->newAccount('123456', function ($err, $account) {
             if ($err !== null) {
-                return $this->fail($e->getMessage());
+                return $this->fail($err->getMessage());
             }
             $this->newAccount = $account;
             $this->assertTrue(is_string($account));
@@ -121,6 +121,39 @@ class PersonalApiTest extends TestCase
         });
     }
 
+    /**
+     * testLockAccount
+     * 
+     * @return void
+     */
+    public function testLockAccount()
+    {
+        $personal = $this->personal;
+
+        // create account
+        $personal->newAccount('123456', function ($err, $account) {
+            if ($err !== null) {
+                return $this->fail($err->getMessage());
+            }
+            $this->newAccount = $account;
+            $this->assertTrue(is_string($account));
+        });
+
+        $personal->unlockAccount($this->newAccount, '123456', function ($err, $unlocked) {
+            if ($err !== null) {
+                return $this->fail($err->getMessage());
+            }
+            $this->assertTrue($unlocked);
+        });
+
+        $personal->lockAccount($this->newAccount, function ($err, $locked) {
+            if ($err !== null) {
+                return $this->fail($err->getMessage());
+            }
+            $this->assertTrue($locked);
+        });
+    }
+
     /**
      * testSendTransaction
      * 
@@ -133,7 +166,7 @@ class PersonalApiTest extends TestCase
         // create account
         $personal->newAccount('123456', function ($err, $account) {
             if ($err !== null) {
-                return $this->fail($e->getMessage());
+                return $this->fail($err->getMessage());
             }
             $this->newAccount = $account;
             $this->assertTrue(is_string($account));

test/unit/PersonalBatchTest.php

@@ -19,7 +19,7 @@ class PersonalBatchTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

test/unit/PersonalTest.php

@@ -23,7 +23,7 @@ class PersonalTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

test/unit/PostFormatterTest.php

@@ -19,7 +19,7 @@ class PostFormatterTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->formatter = new PostFormatter;

test/unit/PostValidatorTest.php

@@ -19,7 +19,7 @@ class PostValidatorTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->validator = new PostValidator;

test/unit/QuantityFormatterTest.php

@@ -19,7 +19,7 @@ class QuantityFormatterTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->formatter = new QuantityFormatter;

test/unit/QuantityValidatorTest.php

@@ -19,7 +19,7 @@ class QuantityValidatorTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->validator = new QuantityValidator;

test/unit/ShhApiTest.php

@@ -21,7 +21,7 @@ class ShhApiTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

test/unit/ShhBatchTest.php

@@ -19,7 +19,7 @@ class ShhBatchTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

test/unit/ShhFilterValidatorTest.php

@@ -19,7 +19,7 @@ class ShhFilterValidatorTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->validator = new ShhFilterValidator;

test/unit/ShhTest.php

@@ -23,7 +23,7 @@ class ShhTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

test/unit/SolidityTypeTest.php

@@ -20,7 +20,7 @@ class SolidityTypeTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->type = new SolidityType();

test/unit/StrTypeTest.php

@@ -47,7 +47,7 @@ class StrTypeTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->solidityType = new Str;

test/unit/StringFormatterTest.php

@@ -19,7 +19,7 @@ class StringFormatterTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->formatter = new StringFormatter;

test/unit/StringValidatorTest.php

@@ -19,7 +19,7 @@ class StringValidatorTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->validator = new StringValidator;

test/unit/TagValidatorTest.php

@@ -19,7 +19,7 @@ class TagValidatorTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->validator = new TagValidator;

test/unit/TransactionFormatterTest.php

@@ -19,7 +19,7 @@ class TransactionFormatterTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->formatter = new TransactionFormatter;

test/unit/TransactionValidatorTest.php

@@ -19,7 +19,7 @@ class TransactionValidatorTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->validator = new TransactionValidator;

test/unit/UintegerTypeTest.php

@@ -53,7 +53,7 @@ class UintegerTypeTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->solidityType = new Uinteger;

test/unit/UtilsTest.php

@@ -7,6 +7,7 @@ use stdClass;
 use Test\TestCase;
 use phpseclib\Math\BigInteger as BigNumber;
 use Web3\Utils;
+use Web3\Contract;
 
 class UtilsTest extends TestCase
 {
@@ -52,12 +53,91 @@ class UtilsTest extends TestCase
       }
     }';
 
+    /**
+     * testIssue112Json
+     * see: https://github.com/web3p/web3.php/issues/112
+     * 
+     * @var string
+     */
+    protected $testIssue112Json = '[
+        {
+          "constant": true,
+          "inputs": [],
+          "name": "name",
+          "outputs": [
+            {
+              "name": "",
+              "type": "string"
+            }
+          ],
+          "payable": false,
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "constant": true,
+          "inputs": [],
+          "name": "decimals",
+          "outputs": [
+            {
+              "name": "",
+              "type": "uint256"
+            }
+          ],
+          "payable": false,
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "constant": true,
+          "inputs": [
+            {
+              "name": "tokenOwner",
+              "type": "address"
+            }
+          ],
+          "name": "balanceOf",
+          "outputs": [
+            {
+              "name": "balance",
+              "type": "uint256"
+            }
+          ],
+          "payable": false,
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "constant": false,
+          "inputs": [
+            {
+              "name": "to",
+              "type": "address"
+            },
+            {
+              "name": "tokens",
+              "type": "uint256"
+            }
+          ],
+          "name": "transfer",
+          "outputs": [
+            {
+              "name": "success",
+              "type": "bool"
+            }
+          ],
+          "payable": false,
+          "stateMutability": "nonpayable",
+          "type": "function"
+        }
+    ]';
+
     /**
      * setUp
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }
@@ -87,6 +167,16 @@ class UtilsTest extends TestCase
         $this->assertEquals('0x', Utils::toHex(0, true));
         $this->assertEquals('0x', Utils::toHex(new BigNumber(0), true));
 
+        $this->assertEquals('0x30', Utils::toHex(48, true));
+        $this->assertEquals('0x30', Utils::toHex('48', true));
+        $this->assertEquals('30', Utils::toHex(48));
+        $this->assertEquals('30', Utils::toHex('48'));
+
+        $this->assertEquals('0x30', Utils::toHex(new BigNumber(48), true));
+        $this->assertEquals('0x30', Utils::toHex(new BigNumber('48'), true));
+        $this->assertEquals('30', Utils::toHex(new BigNumber(48)));
+        $this->assertEquals('30', Utils::toHex(new BigNumber('48')));
+
         $this->expectException(InvalidArgumentException::class);
         $hex = Utils::toHex(new stdClass);
     }
@@ -201,6 +291,33 @@ class UtilsTest extends TestCase
         $isAddressChecksum = Utils::isAddressChecksum(new stdClass);
     }
 
+    /**
+     * testToChecksumAddress
+     *
+     * @return void
+     */
+    public function testToChecksumAddress()
+    {
+        $checksumAddressTest = [
+            // All caps
+            '0x52908400098527886E0F7030069857D2E4169EE7',
+            '0x8617E340B3D01FA5F11F306F4090FD50E238070D',
+            // All Lower
+            '0xde709f2102306220921060314715629080e2fb77',
+            '0x27b1fdb04752bbc536007a920d24acb045561c26',
+            // Normal
+            '0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed',
+            '0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359',
+            '0xdbF03B407c01E7cD3CBea99509d93f8DDDC8C6FB',
+            '0xD1220A0cf47c7B9Be7A2E6BA89F429762e7b9aDb'
+        ];
+
+        for ($i=0; $i<count($checksumAddressTest); $i++) {
+            $checksumAddress = Utils::toChecksumAddress(strtolower($checksumAddressTest[$i]));
+            $this->assertEquals($checksumAddressTest[$i], $checksumAddress);
+        }
+    }
+
     /**
      * testStripZero
      *
@@ -242,70 +359,58 @@ class UtilsTest extends TestCase
     public function testToWei()
     {
         $bn = Utils::toWei('0x1', 'wei');
-        $this->assertEquals($bn->toString(), '1');
+        $this->assertEquals('1', $bn->toString());
 
         $bn = Utils::toWei('18', 'wei');
-        $this->assertEquals($bn->toString(), '18');
+        $this->assertEquals('18', $bn->toString());
-
-        $bn = Utils::toWei(1, 'wei');
-        $this->assertEquals($bn->toString(), '1');
-
-        $bn = Utils::toWei(0x11, 'wei');
-        $this->assertEquals($bn->toString(), '17');
 
         $bn = Utils::toWei('1', 'ether');
-        $this->assertEquals($bn->toString(), '1000000000000000000');
+        $this->assertEquals('1000000000000000000', $bn->toString());
 
         $bn = Utils::toWei('0x5218', 'wei');
-        $this->assertEquals($bn->toString(), '21016');
+        $this->assertEquals('21016', $bn->toString());
+
+        $bn = Utils::toWei('0.000012', 'ether');
+        $this->assertEquals('12000000000000', $bn->toString());
 
         $bn = Utils::toWei('0.1', 'ether');
-        $this->assertEquals($bn->toString(), '100000000000000000');
+        $this->assertEquals('100000000000000000', $bn->toString());
 
         $bn = Utils::toWei('1.69', 'ether');
-        $this->assertEquals($bn->toString(), '1690000000000000000');
+        $this->assertEquals('1690000000000000000', $bn->toString());
 
-        $bn = Utils::toWei(0.1, 'ether');
+        $bn = Utils::toWei('0.01', 'ether');
-        $this->assertEquals($bn->toString(), '100000000000000000');
+        $this->assertEquals('10000000000000000', $bn->toString());
 
-        $bn = Utils::toWei(1.69, 'ether');
+        $bn = Utils::toWei('0.002', 'ether');
-        $this->assertEquals($bn->toString(), '1690000000000000000');
+        $this->assertEquals('2000000000000000', $bn->toString());
 
         $bn = Utils::toWei('-0.1', 'ether');
-        $this->assertEquals($bn->toString(), '-100000000000000000');
+        $this->assertEquals('-100000000000000000', $bn->toString());
 
         $bn = Utils::toWei('-1.69', 'ether');
-        $this->assertEquals($bn->toString(), '-1690000000000000000');
+        $this->assertEquals('-1690000000000000000', $bn->toString());
-
-        $bn = Utils::toWei(-0.1, 'ether');
-        $this->assertEquals($bn->toString(), '-100000000000000000');
-
-        $bn = Utils::toWei(-1.69, 'ether');
-        $this->assertEquals($bn->toString(), '-1690000000000000000');
 
         $bn = Utils::toWei('', 'ether');
-        $this->assertEquals($bn->toString(), '0');
+        $this->assertEquals('0', $bn->toString());
-
-        $bn = Utils::toWei(-1.697, 'kwei');
-        $this->assertEquals($bn->toString(), '-1697');
 
         try {
             $bn = Utils::toWei('0x5218', new stdClass);
         } catch (InvalidArgumentException $e) {
-            $this->assertTrue($e !== null);
+            $this->assertEquals('toWei unit must be string.', $e->getMessage());
         }
 
         try {
             $bn = Utils::toWei('0x5218', 'test');
         } catch (InvalidArgumentException $e) {
-            $this->assertTrue($e !== null);
+            $this->assertEquals('toWei doesn\'t support test unit.', $e->getMessage());
         }
 
         try {
             // out of limit
             $bn = Utils::toWei(-1.6977, 'kwei');
         } catch (InvalidArgumentException $e) {
-            $this->assertTrue($e !== null);
+            $this->assertEquals('toWei number must be string or bignumber.', $e->getMessage());
         }
     }
 
@@ -326,16 +431,6 @@ class UtilsTest extends TestCase
         $this->assertEquals($bnq->toString(), '0');
         $this->assertEquals($bnr->toString(), '18');
 
-        list($bnq, $bnr) = Utils::toEther(1, 'wei');
-
-        $this->assertEquals($bnq->toString(), '0');
-        $this->assertEquals($bnr->toString(), '1');
-
-        list($bnq, $bnr) = Utils::toEther(0x11, 'wei');
-
-        $this->assertEquals($bnq->toString(), '0');
-        $this->assertEquals($bnr->toString(), '17');
-
         list($bnq, $bnr) = Utils::toEther('1', 'kether');
 
         $this->assertEquals($bnq->toString(), '1000');
@@ -430,39 +525,16 @@ class UtilsTest extends TestCase
      */
     public function testJsonToArray()
     {
-        $json = json_decode($this->testJsonMethodString);
+        $decodedJson = json_decode($this->testJsonMethodString);
-        $jsonArrayDepth1 = Utils::jsonToArray($json);
+        $jsonArray = Utils::jsonToArray($decodedJson);
-
-        $this->assertEquals($jsonArrayDepth1, (array) $json);
-
         $jsonAssoc = json_decode($this->testJsonMethodString, true);
-        $jsonArrayDepth2 = Utils::jsonToArray($json, 2);
+        $jsonArray2 = Utils::jsonToArray($jsonAssoc);
+        $this->assertEquals($jsonAssoc, $jsonArray);
+        $this->assertEquals($jsonAssoc, $jsonArray2);
 
-        $this->assertEquals($jsonArrayDepth2, $jsonAssoc);
+        $jsonAssoc = json_decode($this->testIssue112Json, true);
-
+        $jsonArray = Utils::jsonToArray($jsonAssoc);
-        $jsonArrayDepth2 = Utils::jsonToArray($jsonArrayDepth1, 2);
+        $this->assertEquals($jsonAssoc, $jsonArray);
-        $this->assertEquals($jsonArrayDepth2, $jsonAssoc);
-
-        $jsonArray = Utils::jsonToArray($this->testJsonMethodString);
-        $this->assertEquals($jsonArray, $jsonAssoc);
-
-        try {
-            $jsonArray = Utils::jsonToArray($json, 0);
-        } catch (InvalidArgumentException $e) {
-            $this->assertTrue($e !== null);
-        }
-
-        try {
-            $jsonArray = Utils::jsonToArray(mb_substr($this->testJsonMethodString, 0, 50), 1);
-        } catch (InvalidArgumentException $e) {
-            $this->assertTrue($e !== null);
-        }
-
-        try {
-            $jsonArray = Utils::jsonToArray(0, 1);
-        } catch (InvalidArgumentException $e) {
-            $this->assertTrue($e !== null);
-        }
     }
 
     /**
@@ -531,39 +603,45 @@ class UtilsTest extends TestCase
         $this->assertEquals($bn->toString(), '-1');
 
         $bn = Utils::toBn('-0.1');
-        $this->assertEquals(count($bn), 3);
+        $this->assertEquals(count($bn), 4);
         $this->assertEquals($bn[0]->toString(), '0');
         $this->assertEquals($bn[1]->toString(), '1');
-        $this->assertEquals($bn[2]->toString(), '-1');
+        $this->assertEquals($bn[2], 1);
+        $this->assertEquals($bn[3]->toString(), '-1');
 
         $bn = Utils::toBn(-0.1);
-        $this->assertEquals(count($bn), 3);
+        $this->assertEquals(count($bn), 4);
         $this->assertEquals($bn[0]->toString(), '0');
         $this->assertEquals($bn[1]->toString(), '1');
-        $this->assertEquals($bn[2]->toString(), '-1');
+        $this->assertEquals($bn[2], 1);
+        $this->assertEquals($bn[3]->toString(), '-1');
 
         $bn = Utils::toBn('0.1');
-        $this->assertEquals(count($bn), 3);
+        $this->assertEquals(count($bn), 4);
         $this->assertEquals($bn[0]->toString(), '0');
         $this->assertEquals($bn[1]->toString(), '1');
-        $this->assertEquals($bn[2], false);
+        $this->assertEquals($bn[2], 1);
+        $this->assertEquals($bn[3], false);
 
         $bn = Utils::toBn('-1.69');
-        $this->assertEquals(count($bn), 3);
+        $this->assertEquals(count($bn), 4);
         $this->assertEquals($bn[0]->toString(), '1');
         $this->assertEquals($bn[1]->toString(), '69');
-        $this->assertEquals($bn[2]->toString(), '-1');
+        $this->assertEquals($bn[2], 2);
+        $this->assertEquals($bn[3]->toString(), '-1');
 
         $bn = Utils::toBn(-1.69);
         $this->assertEquals($bn[0]->toString(), '1');
         $this->assertEquals($bn[1]->toString(), '69');
-        $this->assertEquals($bn[2]->toString(), '-1');
+        $this->assertEquals($bn[2], 2);
+        $this->assertEquals($bn[3]->toString(), '-1');
 
         $bn = Utils::toBn('1.69');
-        $this->assertEquals(count($bn), 3);
+        $this->assertEquals(count($bn), 4);
         $this->assertEquals($bn[0]->toString(), '1');
         $this->assertEquals($bn[1]->toString(), '69');
-        $this->assertEquals($bn[2], false);
+        $this->assertEquals($bn[2], 2);
+        $this->assertEquals($bn[3], false);
 
         $bn = Utils::toBn(new BigNumber(1));
         $this->assertEquals($bn->toString(), '1');

test/unit/Web3ApiTest.php

@@ -29,7 +29,7 @@ class Web3ApiTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }

test/unit/Web3BatchTest.php

@@ -28,7 +28,7 @@ class Web3BatchTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }

test/unit/Web3Test.php

@@ -37,7 +37,7 @@ class Web3Test extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }