Compare commits
No commits in common. "master" and "0.1.3" have entirely different histories.
49
.github/workflows/php.yml
vendored
49
.github/workflows/php.yml
vendored
@ -1,49 +0,0 @@
|
|||||||
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
|
|
||||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,8 +1,6 @@
|
|||||||
composer.phar
|
composer.phar
|
||||||
/vendor/
|
/vendor/
|
||||||
.phpintel/
|
.phpintel/
|
||||||
/.idea/
|
|
||||||
|
|
||||||
|
|
||||||
# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
|
# 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
|
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
|
||||||
|
|||||||
@ -5,8 +5,6 @@ language: php
|
|||||||
php:
|
php:
|
||||||
- 7.1
|
- 7.1
|
||||||
- 7.2
|
- 7.2
|
||||||
- 7.3
|
|
||||||
- 7.4
|
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- nvm install 8
|
- nvm install 8
|
||||||
@ -26,4 +24,4 @@ script:
|
|||||||
- scripts/test.sh
|
- scripts/test.sh
|
||||||
|
|
||||||
after_success:
|
after_success:
|
||||||
- bash <(curl -s https://codecov.io/bash) -t 76a0abaf-bbc4-4829-b5b8-474f10a6b9e9
|
- bash <(curl -s https://codecov.io/bash) -t 8436848f-9a99-4b49-be60-629d7ff9a62c
|
||||||
24
README.md
24
README.md
@ -1,10 +1,9 @@
|
|||||||
# web3.php
|
# web3.php
|
||||||
|
|
||||||
[](https://github.com/web3p/web3.php/actions/workflows/php.yml)
|
[](https://travis-ci.org/sc0Vu/web3.php)
|
||||||
[](https://travis-ci.org/web3p/web3.php)
|
[](https://codecov.io/gh/sc0Vu/web3.php)
|
||||||
[](https://codecov.io/gh/web3p/web3.php)
|
|
||||||
[](https://gitter.im/web3-php/web3.php)
|
[](https://gitter.im/web3-php/web3.php)
|
||||||
[](https://github.com/web3p/web3.php/blob/master/LICENSE)
|
[](https://github.com/sc0Vu/web3.php/blob/master/LICENSE)
|
||||||
|
|
||||||
|
|
||||||
A php interface for interacting with the Ethereum blockchain and ecosystem.
|
A php interface for interacting with the Ethereum blockchain and ecosystem.
|
||||||
@ -18,13 +17,13 @@ Set minimum stability to dev
|
|||||||
|
|
||||||
Then
|
Then
|
||||||
```
|
```
|
||||||
composer require web3p/web3.php dev-master
|
composer require sc0vu/web3.php dev-master
|
||||||
```
|
```
|
||||||
|
|
||||||
Or you can add this line in composer.json
|
Or you can add this line in composer.json
|
||||||
|
|
||||||
```
|
```
|
||||||
"web3p/web3.php": "dev-master"
|
"sc0vu/web3.php": "dev-master"
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
@ -56,7 +55,7 @@ $web3->clientVersion(function ($err, $version) {
|
|||||||
// do something
|
// do something
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (isset($version)) {
|
if (isset($client)) {
|
||||||
echo 'Client version: ' . $version;
|
echo 'Client version: ' . $version;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -217,7 +216,7 @@ If you are using docker as development machain, you can try [ethdock](https://gi
|
|||||||
|
|
||||||
1. Clone the repo and install packages.
|
1. Clone the repo and install packages.
|
||||||
```
|
```
|
||||||
git clone https://github.com/web3p/web3.php.git && cd web3.php && composer install
|
git clone https://github.com/sc0Vu/web3.php.git && cd web3.php && composer install
|
||||||
```
|
```
|
||||||
|
|
||||||
2. Run test script.
|
2. Run test script.
|
||||||
@ -229,7 +228,7 @@ vendor/bin/phpunit
|
|||||||
|
|
||||||
1. Clone the repo and run docker container.
|
1. Clone the repo and run docker container.
|
||||||
```
|
```
|
||||||
git clone https://github.com/web3p/web3.php.git
|
git clone https://github.com/sc0Vu/web3.php.git
|
||||||
```
|
```
|
||||||
|
|
||||||
2. Copy web3.php to web3.php/docker/app directory and start container.
|
2. Copy web3.php to web3.php/docker/app directory and start container.
|
||||||
@ -284,12 +283,5 @@ mv /usr/local/etc/php/conf.d/extension-config-name to/directory
|
|||||||
|
|
||||||
Todo.
|
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
|
# License
|
||||||
MIT
|
MIT
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "web3p/web3.php",
|
"name": "sc0vu/web3.php",
|
||||||
"description": "Ethereum web3 interface.",
|
"description": "Ethereum web3 interface.",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@ -10,14 +10,13 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"guzzlehttp/guzzle": "^6.3|^7.0",
|
"guzzlehttp/guzzle": "~6.0",
|
||||||
"PHP": "^7.2|^8.0",
|
"PHP": "^7.1",
|
||||||
"kornrunner/keccak": "~1.0",
|
"kornrunner/keccak": "~1.0",
|
||||||
"phpseclib/phpseclib": "~2.0.30",
|
"phpseclib/phpseclib": "~2.0.11"
|
||||||
"ext-mbstring": "*"
|
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "~8.0|~9.0"
|
"phpunit/phpunit": "~6.0"
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
|
|||||||
@ -6,4 +6,4 @@ RUN npm install -g ganache-cli
|
|||||||
|
|
||||||
EXPOSE 8545
|
EXPOSE 8545
|
||||||
|
|
||||||
CMD ganache-cli -g 0 -l 6000000 --hostname=0.0.0.0
|
CMD ganache-cli --hostname=0.0.0.0
|
||||||
@ -1,23 +1,17 @@
|
|||||||
FROM php:7.1-alpine
|
FROM php:7.1.14-alpine
|
||||||
|
|
||||||
MAINTAINER Peter Lai <alk03073135@gmail.com>
|
MAINTAINER Peter Lai <alk03073135@gmail.com>
|
||||||
|
|
||||||
COPY composer-setup.php composer-setup.php
|
ADD composer-setup.php composer-setup.php
|
||||||
# COPY php.ini-production $PHP_INI_DIR/php.ini
|
|
||||||
|
|
||||||
RUN apk update && \
|
RUN apk update && \
|
||||||
apk add git
|
apk add git
|
||||||
|
|
||||||
# Install gmp
|
|
||||||
Run apk add gmp-dev && \
|
|
||||||
docker-php-ext-install gmp
|
|
||||||
|
|
||||||
# Install nodejs
|
# Install nodejs
|
||||||
# Run apk add --update nodejs nodejs-npm
|
# Run apk add --update nodejs nodejs-npm
|
||||||
|
|
||||||
# Install composer
|
# Install composer
|
||||||
RUN php composer-setup.php && \
|
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
|
WORKDIR /app
|
||||||
@ -1,23 +1,17 @@
|
|||||||
FROM php:7.2-alpine
|
FROM php:7.2.2-alpine
|
||||||
|
|
||||||
MAINTAINER Peter Lai <alk03073135@gmail.com>
|
MAINTAINER Peter Lai <alk03073135@gmail.com>
|
||||||
|
|
||||||
COPY composer-setup.php composer-setup.php
|
ADD composer-setup.php composer-setup.php
|
||||||
# COPY php.ini-production $PHP_INI_DIR/php.ini
|
|
||||||
|
|
||||||
RUN apk update && \
|
RUN apk update && \
|
||||||
apk add git
|
apk add git
|
||||||
|
|
||||||
# Install gmp
|
|
||||||
Run apk add gmp-dev && \
|
|
||||||
docker-php-ext-install gmp
|
|
||||||
|
|
||||||
# Install nodejs
|
# Install nodejs
|
||||||
# Run apk add --update nodejs nodejs-npm
|
# Run apk add --update nodejs nodejs-npm
|
||||||
|
|
||||||
# Install composer
|
# Install composer
|
||||||
RUN php composer-setup.php && \
|
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
|
WORKDIR /app
|
||||||
@ -1,23 +0,0 @@
|
|||||||
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
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
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
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
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
|
|
||||||
@ -1,8 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
$sig = file_get_contents('https://composer.github.io/installer.sig');
|
|
||||||
$sig = trim($sig);
|
|
||||||
|
|
||||||
copy('https://getcomposer.org/installer', 'composer-setup.php');
|
copy('https://getcomposer.org/installer', 'composer-setup.php');
|
||||||
|
|
||||||
if (hash_file('sha384', 'composer-setup.php') === $sig) { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;
|
if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -38,16 +38,3 @@ $web3->eth->getBalance($newAccount, function ($err, $balance) {
|
|||||||
}
|
}
|
||||||
echo 'Balance: ' . $balance->toString() . PHP_EOL;
|
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;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|||||||
@ -7,7 +7,8 @@
|
|||||||
convertNoticesToExceptions="true"
|
convertNoticesToExceptions="true"
|
||||||
convertWarningsToExceptions="true"
|
convertWarningsToExceptions="true"
|
||||||
processIsolation="false"
|
processIsolation="false"
|
||||||
stopOnFailure="false">
|
stopOnFailure="false"
|
||||||
|
syntaxCheck="false">
|
||||||
|
|
||||||
<testsuite name="Web3.php unit test">
|
<testsuite name="Web3.php unit test">
|
||||||
<directory suffix="Test.php">./test/unit</directory>
|
<directory suffix="Test.php">./test/unit</directory>
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
ganache-cli -g 0 -l 6000000 > /dev/null &
|
ganache-cli -g 0 -l 0 > /dev/null &
|
||||||
ganachecli_pid=$!
|
ganachecli_pid=$!
|
||||||
echo "Start ganache-cli pid: $ganachecli_pid and sleep 3 seconds"
|
echo "Start ganache-cli pid: $ganachecli_pid and sleep 3 seconds"
|
||||||
|
|
||||||
|
|||||||
362
src/Contract.php
362
src/Contract.php
@ -22,16 +22,13 @@ use Web3\Contracts\Ethabi;
|
|||||||
use Web3\Contracts\Types\Address;
|
use Web3\Contracts\Types\Address;
|
||||||
use Web3\Contracts\Types\Boolean;
|
use Web3\Contracts\Types\Boolean;
|
||||||
use Web3\Contracts\Types\Bytes;
|
use Web3\Contracts\Types\Bytes;
|
||||||
use Web3\Contracts\Types\DynamicBytes;
|
|
||||||
use Web3\Contracts\Types\Integer;
|
use Web3\Contracts\Types\Integer;
|
||||||
use Web3\Contracts\Types\Str;
|
use Web3\Contracts\Types\Str;
|
||||||
use Web3\Contracts\Types\Uinteger;
|
use Web3\Contracts\Types\Uinteger;
|
||||||
use Web3\Validators\AddressValidator;
|
use Web3\Validators\AddressValidator;
|
||||||
use Web3\Validators\HexValidator;
|
use Web3\Validators\HexValidator;
|
||||||
use Web3\Validators\StringValidator;
|
|
||||||
use Web3\Validators\TagValidator;
|
|
||||||
use Web3\Validators\QuantityValidator;
|
|
||||||
use Web3\Formatters\AddressFormatter;
|
use Web3\Formatters\AddressFormatter;
|
||||||
|
use Web3\Validators\StringValidator;
|
||||||
|
|
||||||
class Contract
|
class Contract
|
||||||
{
|
{
|
||||||
@ -98,22 +95,14 @@ class Contract
|
|||||||
*/
|
*/
|
||||||
protected $ethabi;
|
protected $ethabi;
|
||||||
|
|
||||||
/**
|
|
||||||
* defaultBlock
|
|
||||||
*
|
|
||||||
* @var mixed
|
|
||||||
*/
|
|
||||||
protected $defaultBlock;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* construct
|
* construct
|
||||||
*
|
*
|
||||||
* @param string|\Web3\Providers\Provider $provider
|
* @param string|\Web3\Providers\Provider $provider
|
||||||
* @param string|\stdClass|array $abi
|
* @param string|\stdClass|array $abi
|
||||||
* @param mixed $defaultBlock
|
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function __construct($provider, $abi, $defaultBlock = 'latest')
|
public function __construct($provider, $abi)
|
||||||
{
|
{
|
||||||
if (is_string($provider) && (filter_var($provider, FILTER_VALIDATE_URL) !== false)) {
|
if (is_string($provider) && (filter_var($provider, FILTER_VALIDATE_URL) !== false)) {
|
||||||
// check the uri schema
|
// check the uri schema
|
||||||
@ -125,21 +114,12 @@ class Contract
|
|||||||
} else if ($provider instanceof Provider) {
|
} else if ($provider instanceof Provider) {
|
||||||
$this->provider = $provider;
|
$this->provider = $provider;
|
||||||
}
|
}
|
||||||
|
$abi = Utils::jsonToArray($abi, 5);
|
||||||
|
|
||||||
$abiArray = [];
|
foreach ($abi as $item) {
|
||||||
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 (isset($item['type'])) {
|
||||||
if ($item['type'] === 'function') {
|
if ($item['type'] === 'function') {
|
||||||
$this->functions[] = $item;
|
$this->functions[$item['name']] = $item;
|
||||||
} elseif ($item['type'] === 'constructor') {
|
} elseif ($item['type'] === 'constructor') {
|
||||||
$this->constructor = $item;
|
$this->constructor = $item;
|
||||||
} elseif ($item['type'] === 'event') {
|
} elseif ($item['type'] === 'event') {
|
||||||
@ -147,18 +127,12 @@ class Contract
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (TagValidator::validate($defaultBlock) || QuantityValidator::validate($defaultBlock)) {
|
$this->abi = $abi;
|
||||||
$this->defaultBlock = $defaultBlock;
|
|
||||||
} else {
|
|
||||||
$this->$defaultBlock = 'latest';
|
|
||||||
}
|
|
||||||
$this->abi = $abiArray;
|
|
||||||
$this->eth = new Eth($this->provider);
|
$this->eth = new Eth($this->provider);
|
||||||
$this->ethabi = new Ethabi([
|
$this->ethabi = new Ethabi([
|
||||||
'address' => new Address,
|
'address' => new Address,
|
||||||
'bool' => new Boolean,
|
'bool' => new Boolean,
|
||||||
'bytes' => new Bytes,
|
'bytes' => new Bytes,
|
||||||
'dynamicBytes' => new DynamicBytes,
|
|
||||||
'int' => new Integer,
|
'int' => new Integer,
|
||||||
'string' => new Str,
|
'string' => new Str,
|
||||||
'uint' => new Uinteger,
|
'uint' => new Uinteger,
|
||||||
@ -239,32 +213,6 @@ class Contract
|
|||||||
return $this;
|
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
|
* getFunctions
|
||||||
*
|
*
|
||||||
@ -285,14 +233,6 @@ class Contract
|
|||||||
return $this->events;
|
return $this->events;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
public function getToAddress()
|
|
||||||
{
|
|
||||||
return $this->toAddress;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* getConstructor
|
* getConstructor
|
||||||
*
|
*
|
||||||
@ -409,21 +349,12 @@ class Contract
|
|||||||
if (StringValidator::validate($abi) === false) {
|
if (StringValidator::validate($abi) === false) {
|
||||||
throw new InvalidArgumentException('Please make sure abi is valid.');
|
throw new InvalidArgumentException('Please make sure abi is valid.');
|
||||||
}
|
}
|
||||||
$abiArray = [];
|
$abi = Utils::jsonToArray($abi, 5);
|
||||||
if (is_string($abi)) {
|
|
||||||
$abiArray = json_decode($abi, true);
|
|
||||||
|
|
||||||
if (JSON_ERROR_NONE !== json_last_error()) {
|
foreach ($abi as $item) {
|
||||||
throw new InvalidArgumentException('abi decode error: ' . json_last_error_msg());
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$abiArray = Utils::jsonToArray($abi);
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($abiArray as $item) {
|
|
||||||
if (isset($item['type'])) {
|
if (isset($item['type'])) {
|
||||||
if ($item['type'] === 'function') {
|
if ($item['type'] === 'function') {
|
||||||
$this->functions[] = $item;
|
$this->functions[$item['name']] = $item;
|
||||||
} elseif ($item['type'] === 'constructor') {
|
} elseif ($item['type'] === 'constructor') {
|
||||||
$this->constructor = $item;
|
$this->constructor = $item;
|
||||||
} elseif ($item['type'] === 'event') {
|
} elseif ($item['type'] === 'event') {
|
||||||
@ -431,7 +362,7 @@ class Contract
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$this->abi = $abiArray;
|
$this->abi = $abi;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
@ -450,8 +381,7 @@ class Contract
|
|||||||
$arguments = func_get_args();
|
$arguments = func_get_args();
|
||||||
$callback = array_pop($arguments);
|
$callback = array_pop($arguments);
|
||||||
|
|
||||||
$input_count = isset($constructor['inputs']) ? count($constructor['inputs']) : 0;
|
if (count($arguments) < count($constructor['inputs'])) {
|
||||||
if (count($arguments) < $input_count) {
|
|
||||||
throw new InvalidArgumentException('Please make sure you have put all constructor params and callback.');
|
throw new InvalidArgumentException('Please make sure you have put all constructor params and callback.');
|
||||||
}
|
}
|
||||||
if (is_callable($callback) !== true) {
|
if (is_callable($callback) !== true) {
|
||||||
@ -460,7 +390,7 @@ class Contract
|
|||||||
if (!isset($this->bytecode)) {
|
if (!isset($this->bytecode)) {
|
||||||
throw new \InvalidArgumentException('Please call bytecode($bytecode) before new().');
|
throw new \InvalidArgumentException('Please call bytecode($bytecode) before new().');
|
||||||
}
|
}
|
||||||
$params = array_splice($arguments, 0, $input_count);
|
$params = array_splice($arguments, 0, count($constructor['inputs']));
|
||||||
$data = $this->ethabi->encodeParameters($constructor, $params);
|
$data = $this->ethabi->encodeParameters($constructor, $params);
|
||||||
$transaction = [];
|
$transaction = [];
|
||||||
|
|
||||||
@ -492,75 +422,26 @@ class Contract
|
|||||||
$method = array_splice($arguments, 0, 1)[0];
|
$method = array_splice($arguments, 0, 1)[0];
|
||||||
$callback = array_pop($arguments);
|
$callback = array_pop($arguments);
|
||||||
|
|
||||||
if (!is_string($method)) {
|
if (!is_string($method) || !isset($this->functions[$method])) {
|
||||||
throw new InvalidArgumentException('Please make sure the method is string.');
|
|
||||||
}
|
|
||||||
|
|
||||||
$functions = [];
|
|
||||||
foreach ($this->functions as $function) {
|
|
||||||
if ($function["name"] === $method) {
|
|
||||||
$functions[] = $function;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
if (count($functions) < 1) {
|
|
||||||
throw new InvalidArgumentException('Please make sure the method exists.');
|
throw new InvalidArgumentException('Please make sure the method exists.');
|
||||||
}
|
}
|
||||||
|
$function = $this->functions[$method];
|
||||||
|
|
||||||
|
if (count($arguments) < count($function['inputs'])) {
|
||||||
|
throw new InvalidArgumentException('Please make sure you have put all function params and callback.');
|
||||||
|
}
|
||||||
if (is_callable($callback) !== true) {
|
if (is_callable($callback) !== true) {
|
||||||
throw new \InvalidArgumentException('The last param must be callback function.');
|
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
|
$data = $this->ethabi->encodeParameters($function, $params);
|
||||||
$argsLen = count($arguments);
|
$functionName = Utils::jsonMethodToString($function);
|
||||||
$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);
|
|
||||||
} 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);
|
$functionSignature = $this->ethabi->encodeFunctionSignature($functionName);
|
||||||
|
$transaction = [];
|
||||||
|
|
||||||
|
if (count($arguments) > 0) {
|
||||||
|
$transaction = $arguments[0];
|
||||||
|
}
|
||||||
$transaction['to'] = $this->toAddress;
|
$transaction['to'] = $this->toAddress;
|
||||||
$transaction['data'] = $functionSignature . Utils::stripZero($data);
|
$transaction['data'] = $functionSignature . Utils::stripZero($data);
|
||||||
|
|
||||||
@ -587,78 +468,30 @@ class Contract
|
|||||||
$method = array_splice($arguments, 0, 1)[0];
|
$method = array_splice($arguments, 0, 1)[0];
|
||||||
$callback = array_pop($arguments);
|
$callback = array_pop($arguments);
|
||||||
|
|
||||||
if (!is_string($method)) {
|
if (!is_string($method) || !isset($this->functions[$method])) {
|
||||||
throw new InvalidArgumentException('Please make sure the method is string.');
|
|
||||||
}
|
|
||||||
|
|
||||||
$functions = [];
|
|
||||||
foreach ($this->functions as $function) {
|
|
||||||
if ($function["name"] === $method) {
|
|
||||||
$functions[] = $function;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
if (count($functions) < 1) {
|
|
||||||
throw new InvalidArgumentException('Please make sure the method exists.');
|
throw new InvalidArgumentException('Please make sure the method exists.');
|
||||||
}
|
}
|
||||||
|
$function = $this->functions[$method];
|
||||||
|
|
||||||
|
if (count($arguments) < count($function['inputs'])) {
|
||||||
|
throw new InvalidArgumentException('Please make sure you have put all function params and callback.');
|
||||||
|
}
|
||||||
if (is_callable($callback) !== true) {
|
if (is_callable($callback) !== true) {
|
||||||
throw new \InvalidArgumentException('The last param must be callback function.');
|
throw new \InvalidArgumentException('The last param must be callback function.');
|
||||||
}
|
}
|
||||||
|
$params = array_splice($arguments, 0, count($function['inputs']));
|
||||||
// check the arguments
|
$data = $this->ethabi->encodeParameters($function, $params);
|
||||||
$argsLen = count($arguments);
|
$functionName = Utils::jsonMethodToString($function);
|
||||||
$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);
|
|
||||||
} catch (InvalidArgumentException $e) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
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);
|
$functionSignature = $this->ethabi->encodeFunctionSignature($functionName);
|
||||||
|
$transaction = [];
|
||||||
|
|
||||||
|
if (count($arguments) > 0) {
|
||||||
|
$transaction = $arguments[0];
|
||||||
|
}
|
||||||
$transaction['to'] = $this->toAddress;
|
$transaction['to'] = $this->toAddress;
|
||||||
$transaction['data'] = $functionSignature . Utils::stripZero($data);
|
$transaction['data'] = $functionSignature . Utils::stripZero($data);
|
||||||
|
|
||||||
$this->eth->call($transaction, $defaultBlock, function ($err, $transaction) use ($callback, $function){
|
$this->eth->call($transaction, function ($err, $transaction) use ($callback, $function){
|
||||||
if ($err !== null) {
|
if ($err !== null) {
|
||||||
return call_user_func($callback, $err, null);
|
return call_user_func($callback, $err, null);
|
||||||
}
|
}
|
||||||
@ -701,84 +534,36 @@ class Contract
|
|||||||
if (count($arguments) > 0) {
|
if (count($arguments) > 0) {
|
||||||
$transaction = $arguments[0];
|
$transaction = $arguments[0];
|
||||||
}
|
}
|
||||||
|
$transaction['to'] = '';
|
||||||
$transaction['data'] = '0x' . $this->bytecode . Utils::stripZero($data);
|
$transaction['data'] = '0x' . $this->bytecode . Utils::stripZero($data);
|
||||||
} else {
|
} else {
|
||||||
$method = array_splice($arguments, 0, 1)[0];
|
$method = array_splice($arguments, 0, 1)[0];
|
||||||
|
|
||||||
if (!is_string($method)) {
|
if (!is_string($method) && !isset($this->functions[$method])) {
|
||||||
throw new InvalidArgumentException('Please make sure the method is string.');
|
throw new InvalidArgumentException('Please make sure the method is existed.');
|
||||||
}
|
}
|
||||||
|
$function = $this->functions[$method];
|
||||||
|
|
||||||
$functions = [];
|
if (count($arguments) < count($function['inputs'])) {
|
||||||
foreach ($this->functions as $function) {
|
throw new InvalidArgumentException('Please make sure you have put all function params and callback.');
|
||||||
if ($function["name"] === $method) {
|
|
||||||
$functions[] = $function;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
if (count($functions) < 1) {
|
|
||||||
throw new InvalidArgumentException('Please make sure the method exists.');
|
|
||||||
}
|
}
|
||||||
if (is_callable($callback) !== true) {
|
if (is_callable($callback) !== true) {
|
||||||
throw new \InvalidArgumentException('The last param must be callback function.');
|
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
|
$data = $this->ethabi->encodeParameters($function, $params);
|
||||||
$argsLen = count($arguments);
|
$functionName = Utils::jsonMethodToString($function);
|
||||||
$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);
|
|
||||||
} 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);
|
$functionSignature = $this->ethabi->encodeFunctionSignature($functionName);
|
||||||
|
$transaction = [];
|
||||||
|
|
||||||
|
if (count($arguments) > 0) {
|
||||||
|
$transaction = $arguments[0];
|
||||||
|
}
|
||||||
$transaction['to'] = $this->toAddress;
|
$transaction['to'] = $this->toAddress;
|
||||||
$transaction['data'] = $functionSignature . Utils::stripZero($data);
|
$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) {
|
if ($err !== null) {
|
||||||
return call_user_func($callback, $err, null);
|
return call_user_func($callback, $err, null);
|
||||||
}
|
}
|
||||||
@ -819,38 +604,17 @@ class Contract
|
|||||||
} else {
|
} else {
|
||||||
$method = array_splice($arguments, 0, 1)[0];
|
$method = array_splice($arguments, 0, 1)[0];
|
||||||
|
|
||||||
if (!is_string($method)) {
|
if (!is_string($method) && !isset($this->functions[$method])) {
|
||||||
throw new InvalidArgumentException('Please make sure the method is string.');
|
throw new InvalidArgumentException('Please make sure the method is existed.');
|
||||||
}
|
}
|
||||||
|
$function = $this->functions[$method];
|
||||||
|
|
||||||
$functions = [];
|
if (count($arguments) < count($function['inputs'])) {
|
||||||
foreach ($this->functions as $function) {
|
|
||||||
if ($function["name"] === $method) {
|
|
||||||
$functions[] = $function;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
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.');
|
throw new InvalidArgumentException('Please make sure you have put all function params and callback.');
|
||||||
}
|
}
|
||||||
|
$params = array_splice($arguments, 0, count($function['inputs']));
|
||||||
|
$data = $this->ethabi->encodeParameters($function, $params);
|
||||||
|
$functionName = Utils::jsonMethodToString($function);
|
||||||
$functionSignature = $this->ethabi->encodeFunctionSignature($functionName);
|
$functionSignature = $this->ethabi->encodeFunctionSignature($functionName);
|
||||||
$functionData = Utils::stripZero($functionSignature) . Utils::stripZero($data);
|
$functionData = Utils::stripZero($functionSignature) . Utils::stripZero($data);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -100,7 +100,6 @@ class Ethabi
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* encodeEventSignature
|
* encodeEventSignature
|
||||||
* TODO: Fix same event name with different params
|
|
||||||
*
|
*
|
||||||
* @param string|stdClass|array $functionName
|
* @param string|stdClass|array $functionName
|
||||||
* @return string
|
* @return string
|
||||||
@ -156,6 +155,21 @@ class Ethabi
|
|||||||
}
|
}
|
||||||
$typesLength = count($types);
|
$typesLength = count($types);
|
||||||
$solidityTypes = $this->getSolidityTypes($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, '');
|
$encodes = array_fill(0, $typesLength, '');
|
||||||
|
|
||||||
foreach ($solidityTypes as $key => $type) {
|
foreach ($solidityTypes as $key => $type) {
|
||||||
@ -235,7 +249,7 @@ class Ethabi
|
|||||||
$param = mb_strtolower(Utils::stripZero($param));
|
$param = mb_strtolower(Utils::stripZero($param));
|
||||||
|
|
||||||
for ($i=0; $i<$typesLength; $i++) {
|
for ($i=0; $i<$typesLength; $i++) {
|
||||||
if (isset($outputTypes['outputs'][$i]['name']) && empty($outputTypes['outputs'][$i]['name']) === false) {
|
if (isset($outputTypes['outputs'][$i]['name'])) {
|
||||||
$result[$outputTypes['outputs'][$i]['name']] = $solidityTypes[$i]->decode($param, $offsets[$i], $types[$i]);
|
$result[$outputTypes['outputs'][$i]['name']] = $solidityTypes[$i]->decode($param, $offsets[$i], $types[$i]);
|
||||||
} else {
|
} else {
|
||||||
$result[$i] = $solidityTypes[$i]->decode($param, $offsets[$i], $types[$i]);
|
$result[$i] = $solidityTypes[$i]->decode($param, $offsets[$i], $types[$i]);
|
||||||
@ -266,12 +280,7 @@ class Ethabi
|
|||||||
$className = $this->types[$match[0]];
|
$className = $this->types[$match[0]];
|
||||||
|
|
||||||
if (call_user_func([$this->types[$match[0]], 'isType'], $type) === false) {
|
if (call_user_func([$this->types[$match[0]], 'isType'], $type) === false) {
|
||||||
// check dynamic bytes
|
throw new InvalidArgumentException('Unsupport solidity parameter type: ' . $type);
|
||||||
if ($match[0] === 'bytes') {
|
|
||||||
$className = $this->types['dynamicBytes'];
|
|
||||||
} else {
|
|
||||||
throw new InvalidArgumentException('Unsupport solidity parameter type: ' . $type);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
$solidityTypes[$key] = $className;
|
$solidityTypes[$key] = $className;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -37,7 +37,7 @@ class Address extends SolidityType implements IType
|
|||||||
*/
|
*/
|
||||||
public function isType($name)
|
public function isType($name)
|
||||||
{
|
{
|
||||||
return (preg_match('/^address(\[([0-9]*)\])*$/', $name) === 1);
|
return (preg_match('/address(\[([0-9]*)\])*/', $name) === 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -35,7 +35,7 @@ class Boolean extends SolidityType implements IType
|
|||||||
*/
|
*/
|
||||||
public function isType($name)
|
public function isType($name)
|
||||||
{
|
{
|
||||||
return (preg_match('/^bool(\[([0-9]*)\])*$/', $name) === 1);
|
return (preg_match('/bool(\[([0-9]*)\])*/', $name) === 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -36,7 +36,7 @@ class Bytes extends SolidityType implements IType
|
|||||||
*/
|
*/
|
||||||
public function isType($name)
|
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,10 +63,9 @@ class Bytes extends SolidityType implements IType
|
|||||||
}
|
}
|
||||||
$value = Utils::stripZero($value);
|
$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);
|
||||||
// throw new InvalidArgumentException('The value to inputFormat has invalid length. Value: ' . $value);
|
// }
|
||||||
}
|
|
||||||
|
|
||||||
if (mb_strlen($value) > 64) {
|
if (mb_strlen($value) > 64) {
|
||||||
throw new InvalidArgumentException('The value to inputFormat is too long.');
|
throw new InvalidArgumentException('The value to inputFormat is too long.');
|
||||||
@ -91,11 +90,6 @@ class Bytes extends SolidityType implements IType
|
|||||||
if (empty($checkZero)) {
|
if (empty($checkZero)) {
|
||||||
return '0';
|
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;
|
return '0x' . $value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -36,7 +36,7 @@ class DynamicBytes extends SolidityType implements IType
|
|||||||
*/
|
*/
|
||||||
public function isType($name)
|
public function isType($name)
|
||||||
{
|
{
|
||||||
return (preg_match('/^bytes(\[([0-9]*)\])*$/', $name) === 1);
|
return (preg_match('/bytes(\[([0-9]*)\])*/', $name) === 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -63,17 +63,12 @@ class DynamicBytes extends SolidityType implements IType
|
|||||||
}
|
}
|
||||||
$value = Utils::stripZero($value);
|
$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.');
|
||||||
// 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);
|
$bnHex = $bn->toHex(true);
|
||||||
$padded = mb_substr($bnHex, 0, 1);
|
$padded = mb_substr($bnHex, 0, 1);
|
||||||
|
|
||||||
if ($padded !== '0' && $padded !== 'f') {
|
|
||||||
$padded = '0';
|
|
||||||
}
|
|
||||||
$l = floor((mb_strlen($value) + 63) / 64);
|
$l = floor((mb_strlen($value) + 63) / 64);
|
||||||
$padding = (($l * 64 - mb_strlen($value) + 1) >= 0) ? $l * 64 - mb_strlen($value) : 0;
|
$padding = (($l * 64 - mb_strlen($value) + 1) >= 0) ? $l * 64 - mb_strlen($value) : 0;
|
||||||
|
|
||||||
@ -94,9 +89,6 @@ class DynamicBytes extends SolidityType implements IType
|
|||||||
if (empty($checkZero)) {
|
if (empty($checkZero)) {
|
||||||
return '0';
|
return '0';
|
||||||
}
|
}
|
||||||
$size = intval(Utils::toBn('0x' . mb_substr($value, 0, 64))->toString());
|
return '0x' . $value;
|
||||||
$length = 2 * $size;
|
|
||||||
|
|
||||||
return '0x' . mb_substr($value, 64, $length);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -37,7 +37,7 @@ class Integer extends SolidityType implements IType
|
|||||||
*/
|
*/
|
||||||
public function isType($name)
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -37,7 +37,7 @@ class Str extends SolidityType implements IType
|
|||||||
*/
|
*/
|
||||||
public function isType($name)
|
public function isType($name)
|
||||||
{
|
{
|
||||||
return (preg_match('/^string(\[([0-9]*)\])*$/', $name) === 1);
|
return (preg_match('/string(\[([0-9]*)\])*/', $name) === 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -37,7 +37,7 @@ class Uinteger extends SolidityType implements IType
|
|||||||
*/
|
*/
|
||||||
public function isType($name)
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -38,7 +38,7 @@ class Eth
|
|||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
private $allowedMethods = [
|
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_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_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'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -9,31 +9,26 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace Web3\Methods\Personal;
|
namespace Web3\Methods\Eth;
|
||||||
|
|
||||||
|
use InvalidArgumentException;
|
||||||
use Web3\Methods\EthMethod;
|
use Web3\Methods\EthMethod;
|
||||||
use Web3\Validators\AddressValidator;
|
|
||||||
use Web3\Formatters\AddressFormatter;
|
|
||||||
|
|
||||||
class LockAccount extends EthMethod
|
class GetCompilers extends EthMethod
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* validators
|
* validators
|
||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
protected $validators = [
|
protected $validators = [];
|
||||||
AddressValidator::class
|
|
||||||
];
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* inputFormatters
|
* inputFormatters
|
||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
protected $inputFormatters = [
|
protected $inputFormatters = [];
|
||||||
AddressFormatter::class
|
|
||||||
];
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* outputFormatters
|
* outputFormatters
|
||||||
@ -61,4 +56,3 @@ class LockAccount extends EthMethod
|
|||||||
// parent::__construct($method, $arguments);
|
// parent::__construct($method, $arguments);
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -23,14 +23,18 @@ class NewBlockFilter extends EthMethod
|
|||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
protected $validators = [];
|
protected $validators = [
|
||||||
|
QuantityValidator::class
|
||||||
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* inputFormatters
|
* inputFormatters
|
||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
protected $inputFormatters = [];
|
protected $inputFormatters = [
|
||||||
|
QuantityFormatter::class
|
||||||
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* outputFormatters
|
* outputFormatters
|
||||||
|
|||||||
@ -38,7 +38,7 @@ class Personal
|
|||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
private $allowedMethods = [
|
private $allowedMethods = [
|
||||||
'personal_listAccounts', 'personal_newAccount', 'personal_unlockAccount', 'personal_lockAccount', 'personal_sendTransaction'
|
'personal_listAccounts', 'personal_newAccount', 'personal_unlockAccount', 'personal_sendTransaction'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -12,7 +12,6 @@
|
|||||||
namespace Web3\RequestManagers;
|
namespace Web3\RequestManagers;
|
||||||
|
|
||||||
use InvalidArgumentException;
|
use InvalidArgumentException;
|
||||||
use Psr\Http\Message\StreamInterface;
|
|
||||||
use RuntimeException as RPCException;
|
use RuntimeException as RPCException;
|
||||||
use Psr\Http\Message\ResponseInterface;
|
use Psr\Http\Message\ResponseInterface;
|
||||||
use GuzzleHttp\Exception\RequestException;
|
use GuzzleHttp\Exception\RequestException;
|
||||||
@ -54,7 +53,22 @@ class HttpRequestManager extends RequestManager implements IRequestManager
|
|||||||
if (!is_string($payload)) {
|
if (!is_string($payload)) {
|
||||||
throw new \InvalidArgumentException('Payload must be string.');
|
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 {
|
try {
|
||||||
$res = $this->client->post($this->host, [
|
$res = $this->client->post($this->host, [
|
||||||
'headers' => [
|
'headers' => [
|
||||||
@ -64,12 +78,7 @@ class HttpRequestManager extends RequestManager implements IRequestManager
|
|||||||
'timeout' => $this->timeout,
|
'timeout' => $this->timeout,
|
||||||
'connect_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()) {
|
if (JSON_ERROR_NONE !== json_last_error()) {
|
||||||
call_user_func($callback, new InvalidArgumentException('json_decode error: ' . json_last_error_msg()), null);
|
call_user_func($callback, new InvalidArgumentException('json_decode error: ' . json_last_error_msg()), null);
|
||||||
@ -80,7 +89,7 @@ class HttpRequestManager extends RequestManager implements IRequestManager
|
|||||||
$errors = [];
|
$errors = [];
|
||||||
|
|
||||||
foreach ($json as $result) {
|
foreach ($json as $result) {
|
||||||
if (property_exists($result,'result')) {
|
if (isset($result->result)) {
|
||||||
$results[] = $result->result;
|
$results[] = $result->result;
|
||||||
} else {
|
} else {
|
||||||
if (isset($json->error)) {
|
if (isset($json->error)) {
|
||||||
@ -96,7 +105,7 @@ class HttpRequestManager extends RequestManager implements IRequestManager
|
|||||||
} else {
|
} else {
|
||||||
call_user_func($callback, null, $results);
|
call_user_func($callback, null, $results);
|
||||||
}
|
}
|
||||||
} elseif (property_exists($json,'result')) {
|
} elseif (isset($json->result)) {
|
||||||
call_user_func($callback, null, $json->result);
|
call_user_func($callback, null, $json->result);
|
||||||
} else {
|
} else {
|
||||||
if (isset($json->error)) {
|
if (isset($json->error)) {
|
||||||
|
|||||||
@ -212,31 +212,6 @@ class Utils
|
|||||||
return true;
|
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
|
* isHex
|
||||||
*
|
*
|
||||||
@ -291,15 +266,12 @@ class Utils
|
|||||||
* $wei = Utils::toWei('1', 'kwei');
|
* $wei = Utils::toWei('1', 'kwei');
|
||||||
* $wei->toString(); // 1000
|
* $wei->toString(); // 1000
|
||||||
*
|
*
|
||||||
* @param BigNumber|string $number
|
* @param BigNumber|string|int $number
|
||||||
* @param string $unit
|
* @param string $unit
|
||||||
* @return \phpseclib\Math\BigInteger
|
* @return \phpseclib\Math\BigInteger
|
||||||
*/
|
*/
|
||||||
public static function toWei($number, $unit)
|
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);
|
$bn = self::toBn($number);
|
||||||
|
|
||||||
if (!is_string($unit)) {
|
if (!is_string($unit)) {
|
||||||
@ -447,34 +419,52 @@ class Utils
|
|||||||
/**
|
/**
|
||||||
* jsonToArray
|
* jsonToArray
|
||||||
*
|
*
|
||||||
* @param stdClass|array $json
|
* @param stdClass|array|string $json
|
||||||
|
* @param int $depth
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public static function jsonToArray($json)
|
public static function jsonToArray($json, $depth=1)
|
||||||
{
|
{
|
||||||
|
if (!is_int($depth) || $depth <= 0) {
|
||||||
|
throw new InvalidArgumentException('jsonToArray depth must be int and depth must bigger than 0.');
|
||||||
|
}
|
||||||
if ($json instanceof stdClass) {
|
if ($json instanceof stdClass) {
|
||||||
$json = (array) $json;
|
$json = (array) $json;
|
||||||
$typeName = [];
|
$typeName = [];
|
||||||
|
|
||||||
foreach ($json as $key => $param) {
|
if ($depth > 1) {
|
||||||
if (is_array($param)) {
|
foreach ($json as $key => $param) {
|
||||||
foreach ($param as $subKey => $subParam) {
|
if (is_array($param)) {
|
||||||
$json[$key][$subKey] = self::jsonToArray($subParam);
|
foreach ($param as $subKey => $subParam) {
|
||||||
|
$json[$key][$subKey] = self::jsonToArray($subParam, $depth-1);
|
||||||
|
}
|
||||||
|
} elseif ($param instanceof stdClass) {
|
||||||
|
$json[$key] = self::jsonToArray($param, $depth-1);
|
||||||
}
|
}
|
||||||
} elseif ($param instanceof stdClass) {
|
|
||||||
$json[$key] = self::jsonToArray($param);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return $json;
|
||||||
} elseif (is_array($json)) {
|
} elseif (is_array($json)) {
|
||||||
foreach ($json as $key => $param) {
|
if ($depth > 1) {
|
||||||
if (is_array($param)) {
|
foreach ($json as $key => $param) {
|
||||||
foreach ($param as $subKey => $subParam) {
|
if (is_array($param)) {
|
||||||
$json[$key][$subKey] = self::jsonToArray($subParam);
|
foreach ($param as $subKey => $subParam) {
|
||||||
|
$json[$key][$subKey] = self::jsonToArray($subParam, $depth-1);
|
||||||
|
}
|
||||||
|
} elseif ($param instanceof stdClass) {
|
||||||
|
$json[$key] = self::jsonToArray($param, $depth-1);
|
||||||
}
|
}
|
||||||
} elseif ($param instanceof stdClass) {
|
|
||||||
$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;
|
return $json;
|
||||||
}
|
}
|
||||||
@ -529,7 +519,7 @@ class Utils
|
|||||||
$number = str_replace('-', '', $number, $count);
|
$number = str_replace('-', '', $number, $count);
|
||||||
$negative1 = new BigNumber(-1);
|
$negative1 = new BigNumber(-1);
|
||||||
}
|
}
|
||||||
if (self::isZeroPrefixed($number) || preg_match('/^[0-9a-f]+$/i', $number) === 1) {
|
if (self::isZeroPrefixed($number) || preg_match('/[a-f]+/', $number) === 1) {
|
||||||
$number = self::stripZero($number);
|
$number = self::stripZero($number);
|
||||||
$bn = new BigNumber($number, 16);
|
$bn = new BigNumber($number, 16);
|
||||||
} elseif (empty($number)) {
|
} elseif (empty($number)) {
|
||||||
|
|||||||
@ -37,8 +37,10 @@ class TestCase extends BaseTestCase
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* setUp
|
* setUp
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
$web3 = new Web3($this->testHost);
|
$web3 = new Web3($this->testHost);
|
||||||
$this->web3 = $web3;
|
$this->web3 = $web3;
|
||||||
@ -53,6 +55,8 @@ class TestCase extends BaseTestCase
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* tearDown
|
* tearDown
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function tearDown(): void {}
|
public function tearDown() {}
|
||||||
}
|
}
|
||||||
@ -1,15 +0,0 @@
|
|||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -19,7 +19,7 @@ class AddressFormatterTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->formatter = new AddressFormatter;
|
$this->formatter = new AddressFormatter;
|
||||||
|
|||||||
@ -47,7 +47,7 @@ class AddressTypeTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->solidityType = new Address;
|
$this->solidityType = new Address;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class AddressValidatorTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->validator = new AddressValidator;
|
$this->validator = new AddressValidator;
|
||||||
|
|||||||
@ -20,7 +20,7 @@ class BigNumberFormatterTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->formatter = new BigNumberFormatter;
|
$this->formatter = new BigNumberFormatter;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class BlockHashValidatorTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->validator = new BlockHashValidator;
|
$this->validator = new BlockHashValidator;
|
||||||
|
|||||||
@ -20,7 +20,7 @@ class BooleanFormatterTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->formatter = new BooleanFormatter;
|
$this->formatter = new BooleanFormatter;
|
||||||
|
|||||||
@ -47,7 +47,7 @@ class BooleanTypeTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->solidityType = new Boolean;
|
$this->solidityType = new Boolean;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class BooleanValidatorTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->validator = new BooleanValidator;
|
$this->validator = new BooleanValidator;
|
||||||
|
|||||||
@ -16,22 +16,22 @@ class BytesTypeTest extends TestCase
|
|||||||
protected $testTypes = [
|
protected $testTypes = [
|
||||||
[
|
[
|
||||||
'value' => 'bytes',
|
'value' => 'bytes',
|
||||||
'result' => false
|
'result' => true
|
||||||
], [
|
], [
|
||||||
'value' => 'bytes[]',
|
'value' => 'bytes[]',
|
||||||
'result' => false
|
'result' => true
|
||||||
], [
|
], [
|
||||||
'value' => 'bytes[4]',
|
'value' => 'bytes[4]',
|
||||||
'result' => false
|
'result' => true
|
||||||
], [
|
], [
|
||||||
'value' => 'bytes[][]',
|
'value' => 'bytes[][]',
|
||||||
'result' => false
|
'result' => true
|
||||||
], [
|
], [
|
||||||
'value' => 'bytes[3][]',
|
'value' => 'bytes[3][]',
|
||||||
'result' => false
|
'result' => true
|
||||||
], [
|
], [
|
||||||
'value' => 'bytes[][6][]',
|
'value' => 'bytes[][6][]',
|
||||||
'result' => false
|
'result' => true
|
||||||
], [
|
], [
|
||||||
'value' => 'bytes32',
|
'value' => 'bytes32',
|
||||||
'result' => true
|
'result' => true
|
||||||
@ -53,7 +53,7 @@ class BytesTypeTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->solidityType = new Bytes;
|
$this->solidityType = new Bytes;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class CallValidatorTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->validator = new CallValidator;
|
$this->validator = new CallValidator;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -34,10 +34,10 @@ class DynamicBytesTypeTest extends TestCase
|
|||||||
'result' => true
|
'result' => true
|
||||||
], [
|
], [
|
||||||
'value' => 'bytes32',
|
'value' => 'bytes32',
|
||||||
'result' => false
|
'result' => true
|
||||||
], [
|
], [
|
||||||
'value' => 'bytes8[4]',
|
'value' => 'bytes8[4]',
|
||||||
'result' => false
|
'result' => true
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -53,7 +53,7 @@ class DynamicBytesTypeTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->solidityType = new DynamicBytes;
|
$this->solidityType = new DynamicBytes;
|
||||||
|
|||||||
@ -21,7 +21,7 @@ class EthApiTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
@ -439,7 +439,7 @@ class EthApiTest extends TestCase
|
|||||||
if ($err !== null) {
|
if ($err !== null) {
|
||||||
return $this->assertTrue($err !== null);
|
return $this->assertTrue($err !== null);
|
||||||
}
|
}
|
||||||
// weird behavior, see https://github.com/web3p/web3.php/issues/16
|
// weired behavior, see https://github.com/sc0Vu/web3.php/issues/16
|
||||||
$this->assertTrue($block !== null);
|
$this->assertTrue($block !== null);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -457,7 +457,7 @@ class EthApiTest extends TestCase
|
|||||||
if ($err !== null) {
|
if ($err !== null) {
|
||||||
return $this->assertTrue($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) {
|
if ($err !== null) {
|
||||||
return $this->assertTrue($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) {
|
if ($err !== null) {
|
||||||
return $this->assertTrue($err !== null);
|
return $this->assertTrue($err !== null);
|
||||||
}
|
}
|
||||||
$this->assertTrue($transaction == null);
|
$this->assertTrue($transaction !== null);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -546,6 +546,24 @@ 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
|
* testCompileSolidity
|
||||||
*
|
*
|
||||||
@ -629,7 +647,7 @@ class EthApiTest extends TestCase
|
|||||||
{
|
{
|
||||||
$eth = $this->eth;
|
$eth = $this->eth;
|
||||||
|
|
||||||
$eth->newBlockFilter(function ($err, $filter) {
|
$eth->newBlockFilter('0x01', function ($err, $filter) {
|
||||||
if ($err !== null) {
|
if ($err !== null) {
|
||||||
// infura banned us to new block filter
|
// infura banned us to new block filter
|
||||||
return $this->assertTrue($err !== null);
|
return $this->assertTrue($err !== null);
|
||||||
|
|||||||
@ -20,7 +20,7 @@ class EthBatchTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@ class EthTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
|
|||||||
@ -9,7 +9,6 @@ use Web3\Contracts\Ethabi;
|
|||||||
use Web3\Contracts\Types\Address;
|
use Web3\Contracts\Types\Address;
|
||||||
use Web3\Contracts\Types\Boolean;
|
use Web3\Contracts\Types\Boolean;
|
||||||
use Web3\Contracts\Types\Bytes;
|
use Web3\Contracts\Types\Bytes;
|
||||||
use Web3\Contracts\Types\DynamicBytes;
|
|
||||||
use Web3\Contracts\Types\Integer;
|
use Web3\Contracts\Types\Integer;
|
||||||
use Web3\Contracts\Types\Str;
|
use Web3\Contracts\Types\Str;
|
||||||
use Web3\Contracts\Types\Uinteger;
|
use Web3\Contracts\Types\Uinteger;
|
||||||
@ -163,7 +162,7 @@ class EthabiTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
// Error: Using $this when not in object context
|
// Error: Using $this when not in object context
|
||||||
@ -180,10 +179,9 @@ class EthabiTest extends TestCase
|
|||||||
'address' => new Address,
|
'address' => new Address,
|
||||||
'bool' => new Boolean,
|
'bool' => new Boolean,
|
||||||
'bytes' => new Bytes,
|
'bytes' => new Bytes,
|
||||||
'dynamicBytes' => new DynamicBytes,
|
|
||||||
'int' => new Integer,
|
'int' => new Integer,
|
||||||
'string' => new Str,
|
'string' => new Str,
|
||||||
'uint' => new Uinteger
|
'uint' => new Uinteger,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -298,7 +296,7 @@ class EthabiTest extends TestCase
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* testIssue71
|
* testIssue71
|
||||||
* test 33 bytes and 128 bytes string, see: https://github.com/web3p/web3.php/issues/71
|
* test 33 bytes and 128 bytes string, see: https://github.com/sc0Vu/web3.php/issues/71
|
||||||
* string generated from: https://www.lipsum.com/
|
* string generated from: https://www.lipsum.com/
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class FilterValidatorTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->validator = new FilterValidator;
|
$this->validator = new FilterValidator;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class HexFormatterTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->formatter = new HexFormatter;
|
$this->formatter = new HexFormatter;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class HexValidatorTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->validator = new HexValidator;
|
$this->validator = new HexValidator;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class IdentityValidatorTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->validator = new IdentityValidator;
|
$this->validator = new IdentityValidator;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class IntegerFormatterTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->formatter = new IntegerFormatter;
|
$this->formatter = new IntegerFormatter;
|
||||||
|
|||||||
@ -53,7 +53,7 @@ class IntegerTypeTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->solidityType = new Integer;
|
$this->solidityType = new Integer;
|
||||||
|
|||||||
@ -21,7 +21,7 @@ class NetApiTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@ class NetBatchTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@ class NetTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class NonceValidatorTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->validator = new NonceValidator;
|
$this->validator = new NonceValidator;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class NumberFormatterTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->formatter = new NumberFormatter;
|
$this->formatter = new NumberFormatter;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class OptionalQuantityFormatterTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->formatter = new OptionalQuantityFormatter;
|
$this->formatter = new OptionalQuantityFormatter;
|
||||||
@ -55,8 +55,6 @@ class OptionalQuantityFormatterTest extends TestCase
|
|||||||
$this->assertEquals('latest', $formatter->format('latest'));
|
$this->assertEquals('latest', $formatter->format('latest'));
|
||||||
$this->assertEquals('earliest', $formatter->format('earliest'));
|
$this->assertEquals('earliest', $formatter->format('earliest'));
|
||||||
$this->assertEquals('pending', $formatter->format('pending'));
|
$this->assertEquals('pending', $formatter->format('pending'));
|
||||||
|
$this->assertEquals('0x0', $formatter->format('hello'));
|
||||||
$this->expectExceptionMessage('toBn number must be valid hex string.');
|
|
||||||
$formatter->format('hello');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -27,7 +27,7 @@ class PersonalApiTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
@ -121,39 +121,6 @@ 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
|
* testSendTransaction
|
||||||
*
|
*
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class PersonalBatchTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@ class PersonalTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class PostFormatterTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->formatter = new PostFormatter;
|
$this->formatter = new PostFormatter;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class PostValidatorTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->validator = new PostValidator;
|
$this->validator = new PostValidator;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class QuantityFormatterTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->formatter = new QuantityFormatter;
|
$this->formatter = new QuantityFormatter;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class QuantityValidatorTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->validator = new QuantityValidator;
|
$this->validator = new QuantityValidator;
|
||||||
|
|||||||
@ -21,7 +21,7 @@ class ShhApiTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class ShhBatchTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class ShhFilterValidatorTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->validator = new ShhFilterValidator;
|
$this->validator = new ShhFilterValidator;
|
||||||
|
|||||||
@ -23,7 +23,7 @@ class ShhTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@ class SolidityTypeTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->type = new SolidityType();
|
$this->type = new SolidityType();
|
||||||
|
|||||||
@ -47,7 +47,7 @@ class StrTypeTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->solidityType = new Str;
|
$this->solidityType = new Str;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class StringFormatterTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->formatter = new StringFormatter;
|
$this->formatter = new StringFormatter;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class StringValidatorTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->validator = new StringValidator;
|
$this->validator = new StringValidator;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class TagValidatorTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->validator = new TagValidator;
|
$this->validator = new TagValidator;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class TransactionFormatterTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->formatter = new TransactionFormatter;
|
$this->formatter = new TransactionFormatter;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class TransactionValidatorTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->validator = new TransactionValidator;
|
$this->validator = new TransactionValidator;
|
||||||
|
|||||||
@ -53,7 +53,7 @@ class UintegerTypeTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->solidityType = new Uinteger;
|
$this->solidityType = new Uinteger;
|
||||||
|
|||||||
@ -7,7 +7,6 @@ use stdClass;
|
|||||||
use Test\TestCase;
|
use Test\TestCase;
|
||||||
use phpseclib\Math\BigInteger as BigNumber;
|
use phpseclib\Math\BigInteger as BigNumber;
|
||||||
use Web3\Utils;
|
use Web3\Utils;
|
||||||
use Web3\Contract;
|
|
||||||
|
|
||||||
class UtilsTest extends TestCase
|
class UtilsTest extends TestCase
|
||||||
{
|
{
|
||||||
@ -53,91 +52,12 @@ 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
|
* setUp
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
}
|
}
|
||||||
@ -291,33 +211,6 @@ class UtilsTest extends TestCase
|
|||||||
$isAddressChecksum = Utils::isAddressChecksum(new stdClass);
|
$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
|
* testStripZero
|
||||||
*
|
*
|
||||||
@ -359,58 +252,82 @@ class UtilsTest extends TestCase
|
|||||||
public function testToWei()
|
public function testToWei()
|
||||||
{
|
{
|
||||||
$bn = Utils::toWei('0x1', 'wei');
|
$bn = Utils::toWei('0x1', 'wei');
|
||||||
$this->assertEquals('1', $bn->toString());
|
$this->assertEquals($bn->toString(), '1');
|
||||||
|
|
||||||
$bn = Utils::toWei('18', 'wei');
|
$bn = Utils::toWei('18', 'wei');
|
||||||
$this->assertEquals('18', $bn->toString());
|
$this->assertEquals($bn->toString(), '18');
|
||||||
|
|
||||||
|
$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');
|
$bn = Utils::toWei('1', 'ether');
|
||||||
$this->assertEquals('1000000000000000000', $bn->toString());
|
$this->assertEquals($bn->toString(), '1000000000000000000');
|
||||||
|
|
||||||
$bn = Utils::toWei('0x5218', 'wei');
|
$bn = Utils::toWei('0x5218', 'wei');
|
||||||
$this->assertEquals('21016', $bn->toString());
|
$this->assertEquals($bn->toString(), '21016');
|
||||||
|
|
||||||
$bn = Utils::toWei('0.000012', 'ether');
|
|
||||||
$this->assertEquals('12000000000000', $bn->toString());
|
|
||||||
|
|
||||||
$bn = Utils::toWei('0.1', 'ether');
|
$bn = Utils::toWei('0.1', 'ether');
|
||||||
$this->assertEquals('100000000000000000', $bn->toString());
|
$this->assertEquals($bn->toString(), '100000000000000000');
|
||||||
|
|
||||||
$bn = Utils::toWei('1.69', 'ether');
|
$bn = Utils::toWei('1.69', 'ether');
|
||||||
$this->assertEquals('1690000000000000000', $bn->toString());
|
$this->assertEquals($bn->toString(), '1690000000000000000');
|
||||||
|
|
||||||
$bn = Utils::toWei('0.01', 'ether');
|
$bn = Utils::toWei('0.01', 'ether');
|
||||||
$this->assertEquals('10000000000000000', $bn->toString());
|
$this->assertEquals($bn->toString(), '10000000000000000');
|
||||||
|
|
||||||
$bn = Utils::toWei('0.002', 'ether');
|
$bn = Utils::toWei('0.002', 'ether');
|
||||||
$this->assertEquals('2000000000000000', $bn->toString());
|
$this->assertEquals($bn->toString(), '2000000000000000');
|
||||||
|
|
||||||
|
$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(0.01, 'ether');
|
||||||
|
$this->assertEquals($bn->toString(), '10000000000000000');
|
||||||
|
|
||||||
|
$bn = Utils::toWei(0.002, 'ether');
|
||||||
|
$this->assertEquals($bn->toString(), '2000000000000000');
|
||||||
|
|
||||||
$bn = Utils::toWei('-0.1', 'ether');
|
$bn = Utils::toWei('-0.1', 'ether');
|
||||||
$this->assertEquals('-100000000000000000', $bn->toString());
|
$this->assertEquals($bn->toString(), '-100000000000000000');
|
||||||
|
|
||||||
$bn = Utils::toWei('-1.69', 'ether');
|
$bn = Utils::toWei('-1.69', 'ether');
|
||||||
$this->assertEquals('-1690000000000000000', $bn->toString());
|
$this->assertEquals($bn->toString(), '-1690000000000000000');
|
||||||
|
|
||||||
|
$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');
|
$bn = Utils::toWei('', 'ether');
|
||||||
$this->assertEquals('0', $bn->toString());
|
$this->assertEquals($bn->toString(), '0');
|
||||||
|
|
||||||
|
$bn = Utils::toWei(-1.697, 'kwei');
|
||||||
|
$this->assertEquals($bn->toString(), '-1697');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$bn = Utils::toWei('0x5218', new stdClass);
|
$bn = Utils::toWei('0x5218', new stdClass);
|
||||||
} catch (InvalidArgumentException $e) {
|
} catch (InvalidArgumentException $e) {
|
||||||
$this->assertEquals('toWei unit must be string.', $e->getMessage());
|
$this->assertTrue($e !== null);
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$bn = Utils::toWei('0x5218', 'test');
|
$bn = Utils::toWei('0x5218', 'test');
|
||||||
} catch (InvalidArgumentException $e) {
|
} catch (InvalidArgumentException $e) {
|
||||||
$this->assertEquals('toWei doesn\'t support test unit.', $e->getMessage());
|
$this->assertTrue($e !== null);
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// out of limit
|
// out of limit
|
||||||
$bn = Utils::toWei(-1.6977, 'kwei');
|
$bn = Utils::toWei(-1.6977, 'kwei');
|
||||||
} catch (InvalidArgumentException $e) {
|
} catch (InvalidArgumentException $e) {
|
||||||
$this->assertEquals('toWei number must be string or bignumber.', $e->getMessage());
|
$this->assertTrue($e !== null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -431,6 +348,16 @@ class UtilsTest extends TestCase
|
|||||||
$this->assertEquals($bnq->toString(), '0');
|
$this->assertEquals($bnq->toString(), '0');
|
||||||
$this->assertEquals($bnr->toString(), '18');
|
$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');
|
list($bnq, $bnr) = Utils::toEther('1', 'kether');
|
||||||
|
|
||||||
$this->assertEquals($bnq->toString(), '1000');
|
$this->assertEquals($bnq->toString(), '1000');
|
||||||
@ -525,16 +452,39 @@ class UtilsTest extends TestCase
|
|||||||
*/
|
*/
|
||||||
public function testJsonToArray()
|
public function testJsonToArray()
|
||||||
{
|
{
|
||||||
$decodedJson = json_decode($this->testJsonMethodString);
|
$json = json_decode($this->testJsonMethodString);
|
||||||
$jsonArray = Utils::jsonToArray($decodedJson);
|
$jsonArrayDepth1 = Utils::jsonToArray($json);
|
||||||
$jsonAssoc = json_decode($this->testJsonMethodString, true);
|
|
||||||
$jsonArray2 = Utils::jsonToArray($jsonAssoc);
|
|
||||||
$this->assertEquals($jsonAssoc, $jsonArray);
|
|
||||||
$this->assertEquals($jsonAssoc, $jsonArray2);
|
|
||||||
|
|
||||||
$jsonAssoc = json_decode($this->testIssue112Json, true);
|
$this->assertEquals($jsonArrayDepth1, (array) $json);
|
||||||
$jsonArray = Utils::jsonToArray($jsonAssoc);
|
|
||||||
$this->assertEquals($jsonAssoc, $jsonArray);
|
$jsonAssoc = json_decode($this->testJsonMethodString, true);
|
||||||
|
$jsonArrayDepth2 = Utils::jsonToArray($json, 2);
|
||||||
|
|
||||||
|
$this->assertEquals($jsonArrayDepth2, $jsonAssoc);
|
||||||
|
|
||||||
|
$jsonArrayDepth2 = Utils::jsonToArray($jsonArrayDepth1, 2);
|
||||||
|
$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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -29,7 +29,7 @@ class Web3ApiTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -28,7 +28,7 @@ class Web3BatchTest extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -37,7 +37,7 @@ class Web3Test extends TestCase
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setUp(): void
|
public function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user