Compare commits
No commits in common. "master" and "0.1.4" 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
|
||||
/vendor/
|
||||
.phpintel/
|
||||
/.idea/
|
||||
|
||||
|
||||
# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
|
||||
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
|
||||
|
||||
@ -5,8 +5,6 @@ language: php
|
||||
php:
|
||||
- 7.1
|
||||
- 7.2
|
||||
- 7.3
|
||||
- 7.4
|
||||
|
||||
before_install:
|
||||
- nvm install 8
|
||||
@ -26,4 +24,4 @@ script:
|
||||
- scripts/test.sh
|
||||
|
||||
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
|
||||
|
||||
[](https://github.com/web3p/web3.php/actions/workflows/php.yml)
|
||||
[](https://travis-ci.org/web3p/web3.php)
|
||||
[](https://codecov.io/gh/web3p/web3.php)
|
||||
[](https://travis-ci.org/sc0Vu/web3.php)
|
||||
[](https://codecov.io/gh/sc0Vu/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.
|
||||
@ -18,13 +17,13 @@ Set minimum stability to dev
|
||||
|
||||
Then
|
||||
```
|
||||
composer require web3p/web3.php dev-master
|
||||
composer require sc0vu/web3.php dev-master
|
||||
```
|
||||
|
||||
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
|
||||
return;
|
||||
}
|
||||
if (isset($version)) {
|
||||
if (isset($client)) {
|
||||
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.
|
||||
```
|
||||
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.
|
||||
@ -229,7 +228,7 @@ vendor/bin/phpunit
|
||||
|
||||
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.
|
||||
@ -284,12 +283,5 @@ mv /usr/local/etc/php/conf.d/extension-config-name to/directory
|
||||
|
||||
Todo.
|
||||
|
||||
# Contribution
|
||||
|
||||
Thank you to all the people who already contributed to web3.php!
|
||||
<a href="https://github.com/web3p/web3.php/graphs/contributors">
|
||||
<img src="https://contrib.rocks/image?repo=web3p/web3.php" />
|
||||
</a>
|
||||
|
||||
# License
|
||||
MIT
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "web3p/web3.php",
|
||||
"name": "sc0vu/web3.php",
|
||||
"description": "Ethereum web3 interface.",
|
||||
"type": "library",
|
||||
"license": "MIT",
|
||||
@ -10,14 +10,13 @@
|
||||
}
|
||||
],
|
||||
"require": {
|
||||
"guzzlehttp/guzzle": "^6.3|^7.0",
|
||||
"PHP": "^7.2|^8.0",
|
||||
"guzzlehttp/guzzle": "~6.0",
|
||||
"PHP": "^7.1",
|
||||
"kornrunner/keccak": "~1.0",
|
||||
"phpseclib/phpseclib": "~2.0.30",
|
||||
"ext-mbstring": "*"
|
||||
"phpseclib/phpseclib": "~2.0.11"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "~8.0|~9.0"
|
||||
"phpunit/phpunit": "~6.0"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
|
||||
@ -1,23 +1,17 @@
|
||||
FROM php:7.1-alpine
|
||||
FROM php:7.1.14-alpine
|
||||
|
||||
MAINTAINER Peter Lai <alk03073135@gmail.com>
|
||||
|
||||
COPY composer-setup.php composer-setup.php
|
||||
# COPY php.ini-production $PHP_INI_DIR/php.ini
|
||||
ADD composer-setup.php composer-setup.php
|
||||
|
||||
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');"
|
||||
php composer-setup.php --install-dir=/usr/bin --filename=composer
|
||||
|
||||
WORKDIR /app
|
||||
@ -1,23 +1,17 @@
|
||||
FROM php:7.2-alpine
|
||||
FROM php:7.2.2-alpine
|
||||
|
||||
MAINTAINER Peter Lai <alk03073135@gmail.com>
|
||||
|
||||
COPY composer-setup.php composer-setup.php
|
||||
# COPY php.ini-production $PHP_INI_DIR/php.ini
|
||||
ADD composer-setup.php composer-setup.php
|
||||
|
||||
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');"
|
||||
php composer-setup.php --install-dir=/usr/bin --filename=composer
|
||||
|
||||
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
|
||||
|
||||
$sig = file_get_contents('https://composer.github.io/installer.sig');
|
||||
$sig = trim($sig);
|
||||
|
||||
copy('https://getcomposer.org/installer', 'composer-setup.php');
|
||||
|
||||
if (hash_file('sha384', 'composer-setup.php') === $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;
|
||||
});
|
||||
|
||||
// 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"
|
||||
convertWarningsToExceptions="true"
|
||||
processIsolation="false"
|
||||
stopOnFailure="false">
|
||||
stopOnFailure="false"
|
||||
syntaxCheck="false">
|
||||
|
||||
<testsuite name="Web3.php unit test">
|
||||
<directory suffix="Test.php">./test/unit</directory>
|
||||
|
||||
368
src/Contract.php
368
src/Contract.php
@ -28,10 +28,8 @@ use Web3\Contracts\Types\Str;
|
||||
use Web3\Contracts\Types\Uinteger;
|
||||
use Web3\Validators\AddressValidator;
|
||||
use Web3\Validators\HexValidator;
|
||||
use Web3\Validators\StringValidator;
|
||||
use Web3\Validators\TagValidator;
|
||||
use Web3\Validators\QuantityValidator;
|
||||
use Web3\Formatters\AddressFormatter;
|
||||
use Web3\Validators\StringValidator;
|
||||
|
||||
class Contract
|
||||
{
|
||||
@ -98,22 +96,14 @@ class Contract
|
||||
*/
|
||||
protected $ethabi;
|
||||
|
||||
/**
|
||||
* defaultBlock
|
||||
*
|
||||
* @var mixed
|
||||
*/
|
||||
protected $defaultBlock;
|
||||
|
||||
/**
|
||||
* construct
|
||||
*
|
||||
* @param string|\Web3\Providers\Provider $provider
|
||||
* @param string|\stdClass|array $abi
|
||||
* @param mixed $defaultBlock
|
||||
* @return void
|
||||
*/
|
||||
public function __construct($provider, $abi, $defaultBlock = 'latest')
|
||||
public function __construct($provider, $abi)
|
||||
{
|
||||
if (is_string($provider) && (filter_var($provider, FILTER_VALIDATE_URL) !== false)) {
|
||||
// check the uri schema
|
||||
@ -125,21 +115,12 @@ class Contract
|
||||
} else if ($provider instanceof Provider) {
|
||||
$this->provider = $provider;
|
||||
}
|
||||
$abi = Utils::jsonToArray($abi, 5);
|
||||
|
||||
$abiArray = [];
|
||||
if (is_string($abi)) {
|
||||
$abiArray = json_decode($abi, true);
|
||||
|
||||
if (JSON_ERROR_NONE !== json_last_error()) {
|
||||
throw new InvalidArgumentException('abi decode error: ' . json_last_error_msg());
|
||||
}
|
||||
} else {
|
||||
$abiArray = Utils::jsonToArray($abi);
|
||||
}
|
||||
foreach ($abiArray as $item) {
|
||||
foreach ($abi as $item) {
|
||||
if (isset($item['type'])) {
|
||||
if ($item['type'] === 'function') {
|
||||
$this->functions[] = $item;
|
||||
$this->functions[$item['name']] = $item;
|
||||
} elseif ($item['type'] === 'constructor') {
|
||||
$this->constructor = $item;
|
||||
} elseif ($item['type'] === 'event') {
|
||||
@ -147,12 +128,7 @@ class Contract
|
||||
}
|
||||
}
|
||||
}
|
||||
if (TagValidator::validate($defaultBlock) || QuantityValidator::validate($defaultBlock)) {
|
||||
$this->defaultBlock = $defaultBlock;
|
||||
} else {
|
||||
$this->$defaultBlock = 'latest';
|
||||
}
|
||||
$this->abi = $abiArray;
|
||||
$this->abi = $abi;
|
||||
$this->eth = new Eth($this->provider);
|
||||
$this->ethabi = new Ethabi([
|
||||
'address' => new Address,
|
||||
@ -227,7 +203,7 @@ class Contract
|
||||
|
||||
/**
|
||||
* setProvider
|
||||
*
|
||||
*
|
||||
* @param \Web3\Providers\Provider $provider
|
||||
* @return $this
|
||||
*/
|
||||
@ -239,35 +215,9 @@ class Contract
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* getDefaultBlock
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function getDefaultBlock()
|
||||
{
|
||||
return $this->defaultBlock;
|
||||
}
|
||||
|
||||
/**
|
||||
* setDefaultBlock
|
||||
*
|
||||
* @param mixed $defaultBlock
|
||||
* @return $this
|
||||
*/
|
||||
public function setDefaultBlock($defaultBlock)
|
||||
{
|
||||
if (TagValidator::validate($defaultBlock) || QuantityValidator::validate($defaultBlock)) {
|
||||
$this->defaultBlock = $defaultBlock;
|
||||
} else {
|
||||
$this->$defaultBlock = 'latest';
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* getFunctions
|
||||
*
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function getFunctions()
|
||||
@ -277,7 +227,7 @@ class Contract
|
||||
|
||||
/**
|
||||
* getEvents
|
||||
*
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function getEvents()
|
||||
@ -295,7 +245,7 @@ class Contract
|
||||
|
||||
/**
|
||||
* getConstructor
|
||||
*
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function getConstructor()
|
||||
@ -305,7 +255,7 @@ class Contract
|
||||
|
||||
/**
|
||||
* getAbi
|
||||
*
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function getAbi()
|
||||
@ -409,21 +359,12 @@ class Contract
|
||||
if (StringValidator::validate($abi) === false) {
|
||||
throw new InvalidArgumentException('Please make sure abi is valid.');
|
||||
}
|
||||
$abiArray = [];
|
||||
if (is_string($abi)) {
|
||||
$abiArray = json_decode($abi, true);
|
||||
$abi = Utils::jsonToArray($abi, 5);
|
||||
|
||||
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) {
|
||||
foreach ($abi as $item) {
|
||||
if (isset($item['type'])) {
|
||||
if ($item['type'] === 'function') {
|
||||
$this->functions[] = $item;
|
||||
$this->functions[$item['name']] = $item;
|
||||
} elseif ($item['type'] === 'constructor') {
|
||||
$this->constructor = $item;
|
||||
} elseif ($item['type'] === 'event') {
|
||||
@ -431,7 +372,7 @@ class Contract
|
||||
}
|
||||
}
|
||||
}
|
||||
$this->abi = $abiArray;
|
||||
$this->abi = $abi;
|
||||
|
||||
return $this;
|
||||
}
|
||||
@ -450,8 +391,7 @@ class Contract
|
||||
$arguments = func_get_args();
|
||||
$callback = array_pop($arguments);
|
||||
|
||||
$input_count = isset($constructor['inputs']) ? count($constructor['inputs']) : 0;
|
||||
if (count($arguments) < $input_count) {
|
||||
if (count($arguments) < count($constructor['inputs'])) {
|
||||
throw new InvalidArgumentException('Please make sure you have put all constructor params and callback.');
|
||||
}
|
||||
if (is_callable($callback) !== true) {
|
||||
@ -460,7 +400,7 @@ class Contract
|
||||
if (!isset($this->bytecode)) {
|
||||
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);
|
||||
$transaction = [];
|
||||
|
||||
@ -492,75 +432,26 @@ class Contract
|
||||
$method = array_splice($arguments, 0, 1)[0];
|
||||
$callback = array_pop($arguments);
|
||||
|
||||
if (!is_string($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) {
|
||||
if (!is_string($method) || !isset($this->functions[$method])) {
|
||||
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) {
|
||||
throw new \InvalidArgumentException('The last param must be callback function.');
|
||||
}
|
||||
|
||||
// check the last one in arguments is transaction object
|
||||
$argsLen = count($arguments);
|
||||
$transaction = [];
|
||||
$hasTransaction = false;
|
||||
|
||||
if ($argsLen > 0) {
|
||||
$transaction = $arguments[$argsLen - 1];
|
||||
}
|
||||
if (
|
||||
isset($transaction["from"]) ||
|
||||
isset($transaction["to"]) ||
|
||||
isset($transaction["gas"]) ||
|
||||
isset($transaction["gasPrice"]) ||
|
||||
isset($transaction["value"]) ||
|
||||
isset($transaction["data"]) ||
|
||||
isset($transaction["nonce"])
|
||||
) {
|
||||
$hasTransaction = true;
|
||||
} else {
|
||||
$transaction = [];
|
||||
}
|
||||
|
||||
$params = [];
|
||||
$data = "";
|
||||
$functionName = "";
|
||||
foreach ($functions as $function) {
|
||||
if ($hasTransaction) {
|
||||
if ($argsLen - 1 !== count($function['inputs'])) {
|
||||
continue;
|
||||
} else {
|
||||
$paramsLen = $argsLen - 1;
|
||||
}
|
||||
} else {
|
||||
if ($argsLen !== count($function['inputs'])) {
|
||||
continue;
|
||||
} else {
|
||||
$paramsLen = $argsLen;
|
||||
}
|
||||
}
|
||||
try {
|
||||
$params = array_splice($arguments, 0, $paramsLen);
|
||||
$data = $this->ethabi->encodeParameters($function, $params);
|
||||
$functionName = Utils::jsonMethodToString($function);
|
||||
} catch (InvalidArgumentException $e) {
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (empty($data) || empty($functionName)) {
|
||||
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);
|
||||
$transaction = [];
|
||||
|
||||
if (count($arguments) > 0) {
|
||||
$transaction = $arguments[0];
|
||||
}
|
||||
$transaction['to'] = $this->toAddress;
|
||||
$transaction['data'] = $functionSignature . Utils::stripZero($data);
|
||||
|
||||
@ -576,7 +467,7 @@ class Contract
|
||||
/**
|
||||
* call
|
||||
* Call function method.
|
||||
*
|
||||
*
|
||||
* @param mixed
|
||||
* @return void
|
||||
*/
|
||||
@ -587,78 +478,30 @@ class Contract
|
||||
$method = array_splice($arguments, 0, 1)[0];
|
||||
$callback = array_pop($arguments);
|
||||
|
||||
if (!is_string($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) {
|
||||
if (!is_string($method) || !isset($this->functions[$method])) {
|
||||
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) {
|
||||
throw new \InvalidArgumentException('The last param must be callback function.');
|
||||
}
|
||||
|
||||
// check the arguments
|
||||
$argsLen = count($arguments);
|
||||
$transaction = [];
|
||||
$defaultBlock = $this->defaultBlock;
|
||||
$params = [];
|
||||
$data = "";
|
||||
$functionName = "";
|
||||
foreach ($functions as $function) {
|
||||
try {
|
||||
$paramsLen = count($function['inputs']);
|
||||
$params = array_slice($arguments, 0, $paramsLen);
|
||||
$data = $this->ethabi->encodeParameters($function, $params);
|
||||
$functionName = Utils::jsonMethodToString($function);
|
||||
} 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 = [];
|
||||
}
|
||||
$params = array_splice($arguments, 0, count($function['inputs']));
|
||||
$data = $this->ethabi->encodeParameters($function, $params);
|
||||
$functionName = Utils::jsonMethodToString($function);
|
||||
$functionSignature = $this->ethabi->encodeFunctionSignature($functionName);
|
||||
$transaction = [];
|
||||
|
||||
if (count($arguments) > 0) {
|
||||
$transaction = $arguments[0];
|
||||
}
|
||||
$transaction['to'] = $this->toAddress;
|
||||
$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) {
|
||||
return call_user_func($callback, $err, null);
|
||||
}
|
||||
@ -701,84 +544,36 @@ class Contract
|
||||
if (count($arguments) > 0) {
|
||||
$transaction = $arguments[0];
|
||||
}
|
||||
$transaction['to'] = '';
|
||||
$transaction['data'] = '0x' . $this->bytecode . Utils::stripZero($data);
|
||||
} else {
|
||||
$method = array_splice($arguments, 0, 1)[0];
|
||||
|
||||
if (!is_string($method)) {
|
||||
throw new InvalidArgumentException('Please make sure the method is string.');
|
||||
if (!is_string($method) && !isset($this->functions[$method])) {
|
||||
throw new InvalidArgumentException('Please make sure the method is existed.');
|
||||
}
|
||||
|
||||
$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.');
|
||||
$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) {
|
||||
throw new \InvalidArgumentException('The last param must be callback function.');
|
||||
}
|
||||
|
||||
// check the last one in arguments is transaction object
|
||||
$argsLen = count($arguments);
|
||||
$transaction = [];
|
||||
$hasTransaction = false;
|
||||
|
||||
if ($argsLen > 0) {
|
||||
$transaction = $arguments[$argsLen - 1];
|
||||
}
|
||||
if (
|
||||
isset($transaction["from"]) ||
|
||||
isset($transaction["to"]) ||
|
||||
isset($transaction["gas"]) ||
|
||||
isset($transaction["gasPrice"]) ||
|
||||
isset($transaction["value"]) ||
|
||||
isset($transaction["data"]) ||
|
||||
isset($transaction["nonce"])
|
||||
) {
|
||||
$hasTransaction = true;
|
||||
} else {
|
||||
$transaction = [];
|
||||
}
|
||||
|
||||
$params = [];
|
||||
$data = "";
|
||||
$functionName = "";
|
||||
foreach ($functions as $function) {
|
||||
if ($hasTransaction) {
|
||||
if ($argsLen - 1 !== count($function['inputs'])) {
|
||||
continue;
|
||||
} else {
|
||||
$paramsLen = $argsLen - 1;
|
||||
}
|
||||
} else {
|
||||
if ($argsLen !== count($function['inputs'])) {
|
||||
continue;
|
||||
} else {
|
||||
$paramsLen = $argsLen;
|
||||
}
|
||||
}
|
||||
try {
|
||||
$params = array_splice($arguments, 0, $paramsLen);
|
||||
$data = $this->ethabi->encodeParameters($function, $params);
|
||||
$functionName = Utils::jsonMethodToString($function);
|
||||
} catch (InvalidArgumentException $e) {
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (empty($data) || empty($functionName)) {
|
||||
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);
|
||||
$transaction = [];
|
||||
|
||||
if (count($arguments) > 0) {
|
||||
$transaction = $arguments[0];
|
||||
}
|
||||
$transaction['to'] = $this->toAddress;
|
||||
$transaction['data'] = $functionSignature . Utils::stripZero($data);
|
||||
}
|
||||
|
||||
$this->eth->estimateGas($transaction, function ($err, $gas) use ($callback) {
|
||||
$this->eth->estimateGas($transaction, function ($err, $gas) use ($callback){
|
||||
if ($err !== null) {
|
||||
return call_user_func($callback, $err, null);
|
||||
}
|
||||
@ -819,38 +614,17 @@ class Contract
|
||||
} else {
|
||||
$method = array_splice($arguments, 0, 1)[0];
|
||||
|
||||
if (!is_string($method)) {
|
||||
throw new InvalidArgumentException('Please make sure the method is string.');
|
||||
if (!is_string($method) && !isset($this->functions[$method])) {
|
||||
throw new InvalidArgumentException('Please make sure the method is existed.');
|
||||
}
|
||||
|
||||
$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.');
|
||||
}
|
||||
|
||||
$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)) {
|
||||
$function = $this->functions[$method];
|
||||
|
||||
if (count($arguments) < count($function['inputs'])) {
|
||||
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);
|
||||
$functionData = Utils::stripZero($functionSignature) . Utils::stripZero($data);
|
||||
}
|
||||
|
||||
@ -100,7 +100,6 @@ class Ethabi
|
||||
|
||||
/**
|
||||
* encodeEventSignature
|
||||
* TODO: Fix same event name with different params
|
||||
*
|
||||
* @param string|stdClass|array $functionName
|
||||
* @return string
|
||||
@ -156,6 +155,21 @@ class Ethabi
|
||||
}
|
||||
$typesLength = count($types);
|
||||
$solidityTypes = $this->getSolidityTypes($types);
|
||||
|
||||
foreach ($types as $key => $type) {
|
||||
$match = [];
|
||||
|
||||
if (preg_match('/^([a-zA-Z]+)/', $type, $match) === 1) {
|
||||
if (isset($this->types[$match[0]])) {
|
||||
$className = $this->types[$match[0]];
|
||||
|
||||
if (call_user_func([$this->types[$match[0]], 'isType'], $type) === false) {
|
||||
throw new InvalidArgumentException('Unsupport solidity parameter type: ' . $type);
|
||||
}
|
||||
$solidityTypes[$key] = $className;
|
||||
}
|
||||
}
|
||||
}
|
||||
$encodes = array_fill(0, $typesLength, '');
|
||||
|
||||
foreach ($solidityTypes as $key => $type) {
|
||||
|
||||
@ -63,10 +63,9 @@ class Bytes extends SolidityType implements IType
|
||||
}
|
||||
$value = Utils::stripZero($value);
|
||||
|
||||
if (mb_strlen($value) % 2 !== 0) {
|
||||
$value = "0" . $value;
|
||||
// throw new InvalidArgumentException('The value to inputFormat has invalid length. Value: ' . $value);
|
||||
}
|
||||
// if (mb_strlen($value) % 2 !== 0) {
|
||||
// throw new InvalidArgumentException('The value to inputFormat has invalid length. Value: ' . $value);
|
||||
// }
|
||||
|
||||
if (mb_strlen($value) > 64) {
|
||||
throw new InvalidArgumentException('The value to inputFormat is too long.');
|
||||
|
||||
@ -63,17 +63,12 @@ class DynamicBytes extends SolidityType implements IType
|
||||
}
|
||||
$value = Utils::stripZero($value);
|
||||
|
||||
if (mb_strlen($value) % 2 !== 0) {
|
||||
$value = "0" . $value;
|
||||
// throw new InvalidArgumentException('The value to inputFormat has invalid length.');
|
||||
}
|
||||
$bn = Utils::toBn(floor(mb_strlen($value) / 2));
|
||||
// if (mb_strlen($value) % 2 !== 0) {
|
||||
// throw new InvalidArgumentException('The value to inputFormat has invalid length.');
|
||||
// }
|
||||
$bn = Utils::toBn(mb_strlen($value) / 2);
|
||||
$bnHex = $bn->toHex(true);
|
||||
$padded = mb_substr($bnHex, 0, 1);
|
||||
|
||||
if ($padded !== '0' && $padded !== 'f') {
|
||||
$padded = '0';
|
||||
}
|
||||
$l = floor((mb_strlen($value) + 63) / 64);
|
||||
$padding = (($l * 64 - mb_strlen($value) + 1) >= 0) ? $l * 64 - mb_strlen($value) : 0;
|
||||
|
||||
@ -94,7 +89,7 @@ class DynamicBytes extends SolidityType implements IType
|
||||
if (empty($checkZero)) {
|
||||
return '0';
|
||||
}
|
||||
$size = intval(Utils::toBn('0x' . mb_substr($value, 0, 64))->toString());
|
||||
$size = intval(Utils::toBn(mb_substr($value, 0, 64))->toString());
|
||||
$length = 2 * $size;
|
||||
|
||||
return '0x' . mb_substr($value, 64, $length);
|
||||
|
||||
@ -38,7 +38,7 @@ class Eth
|
||||
* @var array
|
||||
*/
|
||||
private $allowedMethods = [
|
||||
'eth_protocolVersion', 'eth_syncing', 'eth_coinbase', 'eth_mining', 'eth_hashrate', 'eth_gasPrice', 'eth_accounts', 'eth_blockNumber', 'eth_getBalance', 'eth_getStorageAt', 'eth_getTransactionCount', 'eth_getBlockTransactionCountByHash', 'eth_getBlockTransactionCountByNumber', 'eth_getUncleCountByBlockHash', 'eth_getUncleCountByBlockNumber', 'eth_getUncleByBlockHashAndIndex', 'eth_getUncleByBlockNumberAndIndex', 'eth_getCode', 'eth_sign', 'eth_sendTransaction', 'eth_sendRawTransaction', 'eth_call', 'eth_estimateGas', 'eth_getBlockByHash', 'eth_getBlockByNumber', 'eth_getTransactionByHash', 'eth_getTransactionByBlockHashAndIndex', 'eth_getTransactionByBlockNumberAndIndex', 'eth_getTransactionReceipt', 'eth_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
|
||||
*/
|
||||
|
||||
namespace Web3\Methods\Personal;
|
||||
namespace Web3\Methods\Eth;
|
||||
|
||||
use InvalidArgumentException;
|
||||
use Web3\Methods\EthMethod;
|
||||
use Web3\Validators\AddressValidator;
|
||||
use Web3\Formatters\AddressFormatter;
|
||||
|
||||
class LockAccount extends EthMethod
|
||||
class GetCompilers extends EthMethod
|
||||
{
|
||||
/**
|
||||
* validators
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $validators = [
|
||||
AddressValidator::class
|
||||
];
|
||||
protected $validators = [];
|
||||
|
||||
/**
|
||||
* inputFormatters
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $inputFormatters = [
|
||||
AddressFormatter::class
|
||||
];
|
||||
protected $inputFormatters = [];
|
||||
|
||||
/**
|
||||
* outputFormatters
|
||||
@ -60,5 +55,4 @@ class LockAccount extends EthMethod
|
||||
// {
|
||||
// parent::__construct($method, $arguments);
|
||||
// }
|
||||
}
|
||||
|
||||
}
|
||||
@ -23,14 +23,18 @@ class NewBlockFilter extends EthMethod
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $validators = [];
|
||||
protected $validators = [
|
||||
QuantityValidator::class
|
||||
];
|
||||
|
||||
/**
|
||||
* inputFormatters
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $inputFormatters = [];
|
||||
protected $inputFormatters = [
|
||||
QuantityFormatter::class
|
||||
];
|
||||
|
||||
/**
|
||||
* outputFormatters
|
||||
@ -57,4 +61,4 @@ class NewBlockFilter extends EthMethod
|
||||
// {
|
||||
// parent::__construct($method, $arguments);
|
||||
// }
|
||||
}
|
||||
}
|
||||
@ -38,7 +38,7 @@ class Personal
|
||||
* @var array
|
||||
*/
|
||||
private $allowedMethods = [
|
||||
'personal_listAccounts', 'personal_newAccount', 'personal_unlockAccount', 'personal_lockAccount', 'personal_sendTransaction'
|
||||
'personal_listAccounts', 'personal_newAccount', 'personal_unlockAccount', 'personal_sendTransaction'
|
||||
];
|
||||
|
||||
/**
|
||||
@ -177,4 +177,4 @@ class Personal
|
||||
|
||||
$this->provider->batch($status);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2,9 +2,9 @@
|
||||
|
||||
/**
|
||||
* This file is part of web3.php package.
|
||||
*
|
||||
*
|
||||
* (c) Kuan-Cheng,Lai <alk03073135@gmail.com>
|
||||
*
|
||||
*
|
||||
* @author Peter Lai <alk03073135@gmail.com>
|
||||
* @license MIT
|
||||
*/
|
||||
@ -12,7 +12,6 @@
|
||||
namespace Web3\RequestManagers;
|
||||
|
||||
use InvalidArgumentException;
|
||||
use Psr\Http\Message\StreamInterface;
|
||||
use RuntimeException as RPCException;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use GuzzleHttp\Exception\RequestException;
|
||||
@ -24,14 +23,14 @@ class HttpRequestManager extends RequestManager implements IRequestManager
|
||||
{
|
||||
/**
|
||||
* client
|
||||
*
|
||||
*
|
||||
* @var \GuzzleHttp
|
||||
*/
|
||||
protected $client;
|
||||
|
||||
/**
|
||||
* construct
|
||||
*
|
||||
*
|
||||
* @param string $host
|
||||
* @param int $timeout
|
||||
* @return void
|
||||
@ -44,7 +43,7 @@ class HttpRequestManager extends RequestManager implements IRequestManager
|
||||
|
||||
/**
|
||||
* sendPayload
|
||||
*
|
||||
*
|
||||
* @param string $payload
|
||||
* @param callable $callback
|
||||
* @return void
|
||||
@ -54,7 +53,22 @@ class HttpRequestManager extends RequestManager implements IRequestManager
|
||||
if (!is_string($payload)) {
|
||||
throw new \InvalidArgumentException('Payload must be string.');
|
||||
}
|
||||
|
||||
// $promise = $this->client->postAsync($this->host, [
|
||||
// 'headers' => [
|
||||
// 'content-type' => 'application/json'
|
||||
// ],
|
||||
// 'body' => $payload
|
||||
// ]);
|
||||
// $promise->then(
|
||||
// function (ResponseInterface $res) use ($callback) {
|
||||
// var_dump($res->body());
|
||||
// call_user_func($callback, null, $res);
|
||||
// },
|
||||
// function (RequestException $err) use ($callback) {
|
||||
// var_dump($err->getMessage());
|
||||
// call_user_func($callback, $err, null);
|
||||
// }
|
||||
// );
|
||||
try {
|
||||
$res = $this->client->post($this->host, [
|
||||
'headers' => [
|
||||
@ -64,12 +78,7 @@ class HttpRequestManager extends RequestManager implements IRequestManager
|
||||
'timeout' => $this->timeout,
|
||||
'connect_timeout' => $this->timeout
|
||||
]);
|
||||
/**
|
||||
* @var StreamInterface $stream ;
|
||||
*/
|
||||
$stream = $res->getBody();
|
||||
$json = json_decode($stream);
|
||||
$stream->close();
|
||||
$json = json_decode($res->getBody());
|
||||
|
||||
if (JSON_ERROR_NONE !== json_last_error()) {
|
||||
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 = [];
|
||||
|
||||
foreach ($json as $result) {
|
||||
if (property_exists($result,'result')) {
|
||||
if (isset($result->result)) {
|
||||
$results[] = $result->result;
|
||||
} else {
|
||||
if (isset($json->error)) {
|
||||
@ -96,7 +105,7 @@ class HttpRequestManager extends RequestManager implements IRequestManager
|
||||
} else {
|
||||
call_user_func($callback, null, $results);
|
||||
}
|
||||
} elseif (property_exists($json,'result')) {
|
||||
} elseif (isset($json->result)) {
|
||||
call_user_func($callback, null, $json->result);
|
||||
} else {
|
||||
if (isset($json->error)) {
|
||||
|
||||
@ -189,7 +189,7 @@ class Utils
|
||||
|
||||
/**
|
||||
* isAddressChecksum
|
||||
*
|
||||
*
|
||||
* @param string $value
|
||||
* @return bool
|
||||
*/
|
||||
@ -212,31 +212,6 @@ class Utils
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* toChecksumAddress
|
||||
*
|
||||
* @param string $value
|
||||
* @return string
|
||||
*/
|
||||
public static function toChecksumAddress($value)
|
||||
{
|
||||
if (!is_string($value)) {
|
||||
throw new InvalidArgumentException('The value to toChecksumAddress function must be string.');
|
||||
}
|
||||
$value = self::stripZero(strtolower($value));
|
||||
$hash = self::stripZero(self::sha3($value));
|
||||
$ret = '0x';
|
||||
|
||||
for ($i = 0; $i < 40; $i++) {
|
||||
if (intval($hash[$i], 16) >= 8) {
|
||||
$ret .= strtoupper($value[$i]);
|
||||
} else {
|
||||
$ret .= $value[$i];
|
||||
}
|
||||
}
|
||||
return $ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* isHex
|
||||
*
|
||||
@ -291,15 +266,12 @@ class Utils
|
||||
* $wei = Utils::toWei('1', 'kwei');
|
||||
* $wei->toString(); // 1000
|
||||
*
|
||||
* @param BigNumber|string $number
|
||||
* @param BigNumber|string|int $number
|
||||
* @param string $unit
|
||||
* @return \phpseclib\Math\BigInteger
|
||||
*/
|
||||
public static function toWei($number, $unit)
|
||||
{
|
||||
if (!is_string($number) && !($number instanceof BigNumber)) {
|
||||
throw new InvalidArgumentException('toWei number must be string or bignumber.');
|
||||
}
|
||||
$bn = self::toBn($number);
|
||||
|
||||
if (!is_string($unit)) {
|
||||
@ -447,34 +419,52 @@ class Utils
|
||||
/**
|
||||
* jsonToArray
|
||||
*
|
||||
* @param stdClass|array $json
|
||||
* @param stdClass|array|string $json
|
||||
* @param int $depth
|
||||
* @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) {
|
||||
$json = (array) $json;
|
||||
$typeName = [];
|
||||
|
||||
foreach ($json as $key => $param) {
|
||||
if (is_array($param)) {
|
||||
foreach ($param as $subKey => $subParam) {
|
||||
$json[$key][$subKey] = self::jsonToArray($subParam);
|
||||
if ($depth > 1) {
|
||||
foreach ($json as $key => $param) {
|
||||
if (is_array($param)) {
|
||||
foreach ($param as $subKey => $subParam) {
|
||||
$json[$key][$subKey] = self::jsonToArray($subParam, $depth-1);
|
||||
}
|
||||
} 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)) {
|
||||
foreach ($json as $key => $param) {
|
||||
if (is_array($param)) {
|
||||
foreach ($param as $subKey => $subParam) {
|
||||
$json[$key][$subKey] = self::jsonToArray($subParam);
|
||||
if ($depth > 1) {
|
||||
foreach ($json as $key => $param) {
|
||||
if (is_array($param)) {
|
||||
foreach ($param as $subKey => $subParam) {
|
||||
$json[$key][$subKey] = self::jsonToArray($subParam, $depth-1);
|
||||
}
|
||||
} 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;
|
||||
}
|
||||
@ -529,7 +519,7 @@ class Utils
|
||||
$number = str_replace('-', '', $number, $count);
|
||||
$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);
|
||||
$bn = new BigNumber($number, 16);
|
||||
} elseif (empty($number)) {
|
||||
|
||||
@ -37,8 +37,10 @@ class TestCase extends BaseTestCase
|
||||
|
||||
/**
|
||||
* setUp
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
$web3 = new Web3($this->testHost);
|
||||
$this->web3 = $web3;
|
||||
@ -53,6 +55,8 @@ class TestCase extends BaseTestCase
|
||||
|
||||
/**
|
||||
* 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
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->formatter = new AddressFormatter;
|
||||
|
||||
@ -47,7 +47,7 @@ class AddressTypeTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->solidityType = new Address;
|
||||
|
||||
@ -19,7 +19,7 @@ class AddressValidatorTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->validator = new AddressValidator;
|
||||
|
||||
@ -20,7 +20,7 @@ class BigNumberFormatterTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->formatter = new BigNumberFormatter;
|
||||
|
||||
@ -19,7 +19,7 @@ class BlockHashValidatorTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->validator = new BlockHashValidator;
|
||||
|
||||
@ -20,7 +20,7 @@ class BooleanFormatterTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->formatter = new BooleanFormatter;
|
||||
|
||||
@ -47,7 +47,7 @@ class BooleanTypeTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->solidityType = new Boolean;
|
||||
|
||||
@ -19,7 +19,7 @@ class BooleanValidatorTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->validator = new BooleanValidator;
|
||||
|
||||
@ -53,7 +53,7 @@ class BytesTypeTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->solidityType = new Bytes;
|
||||
|
||||
@ -19,7 +19,7 @@ class CallValidatorTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->validator = new CallValidator;
|
||||
|
||||
@ -412,7 +412,7 @@ class ContractTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
@ -491,7 +491,7 @@ class ContractTest extends TestCase
|
||||
}
|
||||
if ($transaction) {
|
||||
$this->contractAddress = $transaction->contractAddress;
|
||||
echo "\nTransaction has mined:) block number: " . $transaction->blockNumber . "\n";
|
||||
echo "\nTransaction has mind:) block number: " . $transaction->blockNumber . "\n";
|
||||
}
|
||||
});
|
||||
});
|
||||
@ -535,7 +535,7 @@ class ContractTest extends TestCase
|
||||
}
|
||||
if ($transaction) {
|
||||
$this->contractAddress = $transaction->contractAddress;
|
||||
echo "\nTransaction has mined:) block number: " . $transaction->blockNumber . "\n";
|
||||
echo "\nTransaction has mind:) block number: " . $transaction->blockNumber . "\n";
|
||||
}
|
||||
});
|
||||
});
|
||||
@ -562,7 +562,7 @@ class ContractTest extends TestCase
|
||||
}
|
||||
if ($transaction) {
|
||||
$topics = $transaction->logs[0]->topics;
|
||||
echo "\nTransaction has mined:) block number: " . $transaction->blockNumber . "\n";
|
||||
echo "\nTransaction has mind:) block number: " . $transaction->blockNumber . "\n";
|
||||
|
||||
// validate topics
|
||||
$this->assertEquals($contract->ethabi->encodeEventSignature($this->contract->events['Transfer']), $topics[0]);
|
||||
@ -611,7 +611,7 @@ class ContractTest extends TestCase
|
||||
}
|
||||
if ($transaction) {
|
||||
$this->contractAddress = $transaction->contractAddress;
|
||||
echo "\nTransaction has mined:) block number: " . $transaction->blockNumber . "\n";
|
||||
echo "\nTransaction has mind:) block number: " . $transaction->blockNumber . "\n";
|
||||
}
|
||||
});
|
||||
});
|
||||
@ -631,17 +631,6 @@ class ContractTest extends TestCase
|
||||
$this->assertTrue($result !== null);
|
||||
}
|
||||
});
|
||||
// test issue 143
|
||||
$contract->at($this->contractAddress)->call('balanceOf', $fromAccount, function ($err, $result) use ($contract) {
|
||||
if ($err !== null) {
|
||||
return $this->fail($err->getMessage());
|
||||
}
|
||||
if (isset($result)) {
|
||||
// $bn = Utils::toBn($result);
|
||||
// $this->assertEquals($bn->toString(), '10000', 'Balance should be 10000.');
|
||||
$this->assertTrue($result !== null);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
@ -682,7 +671,7 @@ class ContractTest extends TestCase
|
||||
}
|
||||
if ($transaction) {
|
||||
$this->contractAddress = $transaction->contractAddress;
|
||||
echo "\nTransaction has mined:) block number: " . $transaction->blockNumber . "\n";
|
||||
echo "\nTransaction has mind:) block number: " . $transaction->blockNumber . "\n";
|
||||
}
|
||||
});
|
||||
});
|
||||
@ -755,7 +744,7 @@ class ContractTest extends TestCase
|
||||
}
|
||||
if ($transaction) {
|
||||
$this->contractAddress = $transaction->contractAddress;
|
||||
echo "\nTransaction has mined:) block number: " . $transaction->blockNumber . "\n";
|
||||
echo "\nTransaction has mind:) block number: " . $transaction->blockNumber . "\n";
|
||||
}
|
||||
});
|
||||
});
|
||||
@ -813,7 +802,7 @@ class ContractTest extends TestCase
|
||||
}
|
||||
if ($transaction) {
|
||||
$this->contractAddress = $transaction->contractAddress;
|
||||
echo "\nTransaction has mined:) block number: " . $transaction->blockNumber . "\n";
|
||||
echo "\nTransaction has mind:) block number: " . $transaction->blockNumber . "\n";
|
||||
}
|
||||
});
|
||||
});
|
||||
@ -842,7 +831,7 @@ class ContractTest extends TestCase
|
||||
}
|
||||
if ($transaction) {
|
||||
$topics = $transaction->logs[0]->topics;
|
||||
echo "\nTransaction has mined:) block number: " . $transaction->blockNumber . "\n";
|
||||
echo "\nTransaction has mind:) block number: " . $transaction->blockNumber . "\n";
|
||||
|
||||
// validate topics
|
||||
$this->assertEquals($contract->ethabi->encodeEventSignature($this->contract->events['AddUser']), $topics[0]);
|
||||
@ -1127,14 +1116,14 @@ class ContractTest extends TestCase
|
||||
}
|
||||
if ($transaction) {
|
||||
$contractAddress = $transaction->contractAddress;
|
||||
echo "\nTransaction has mined:) block number: " . $transaction->blockNumber . "\n";
|
||||
echo "\nTransaction has mind:) block number: " . $transaction->blockNumber . "\n";
|
||||
}
|
||||
});
|
||||
});
|
||||
$contract->at($contractAddress);
|
||||
|
||||
foreach ($functions as $function) {
|
||||
$contract->call($function['name'], [], 'latest', function ($err, $res) use ($function) {
|
||||
$contract->call($function['name'], [], function ($err, $res) use ($function) {
|
||||
if ($err !== null) {
|
||||
echo 'Error when call ' . $function['name'] . '. Message: ' . $err->getMessage() . "\n";
|
||||
return;
|
||||
@ -1148,370 +1137,4 @@ class ContractTest extends TestCase
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* testIssue125
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testIssue125()
|
||||
{
|
||||
$bytecode = '0x608060405234801561001057600080fd5b506103bb806100206000396000f3fe608060405260043610610046576000357c01000000000000000000000000000000000000000000000000000000009004806373d4a13a1461004b578063ab62f0e1146100db575b600080fd5b34801561005757600080fd5b506100606101a3565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100a0578082015181840152602081019050610085565b50505050905090810190601f1680156100cd5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156100e757600080fd5b506101a1600480360360208110156100fe57600080fd5b810190808035906020019064010000000081111561011b57600080fd5b82018360208201111561012d57600080fd5b8035906020019184600183028401116401000000008311171561014f57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f820116905080830192505050505050509192919290505050610241565b005b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156102395780601f1061020e57610100808354040283529160200191610239565b820191906000526020600020905b81548152906001019060200180831161021c57829003601f168201915b505050505081565b80600090805190602001906102579291906102ea565b50806040518082805190602001908083835b60208310151561028e5780518252602082019150602081019050602083039250610269565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390207fae08ae866f3211e692b7cdd30e8b6ec658a153397150437cb873f95239953a5460405160405180910390a250565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061032b57805160ff1916838001178555610359565b82800160010185558215610359579182015b8281111561035857825182559160200191906001019061033d565b5b509050610366919061036a565b5090565b61038c91905b80821115610388576000816000905550600101610370565b5090565b9056fea165627a7a72305820bb836a29a397513a3f2e2199520262ef5978d3a3d7e3d3532da41064d39177e30029';
|
||||
$abi = '[
|
||||
{
|
||||
"constant": false,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "_data",
|
||||
"type": "bytes"
|
||||
}
|
||||
],
|
||||
"name": "setData",
|
||||
"outputs": [],
|
||||
"payable": false,
|
||||
"stateMutability": "nonpayable",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"anonymous": false,
|
||||
"inputs": [
|
||||
{
|
||||
"indexed": true,
|
||||
"name": "_data",
|
||||
"type": "bytes"
|
||||
}
|
||||
],
|
||||
"name": "SetData",
|
||||
"type": "event"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "data",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "bytes"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
}
|
||||
]';
|
||||
$contractAddress = "";
|
||||
|
||||
if (!isset($this->accounts[0])) {
|
||||
$account = '0x407d73d8a49eeb85d32cf465507dd71d507100c1';
|
||||
} else {
|
||||
$account = $this->accounts[0];
|
||||
}
|
||||
$contract = new Contract($this->web3->provider, $abi);
|
||||
$contract->bytecode($bytecode)->new([
|
||||
'from' => $account,
|
||||
'gas' => '0x200b20'
|
||||
], function ($err, $result) use ($contract, &$contractAddress) {
|
||||
if ($err !== null) {
|
||||
return $this->fail($err->getMessage());
|
||||
}
|
||||
if ($result) {
|
||||
echo "\nTransaction has made:) id: " . $result . "\n";
|
||||
}
|
||||
$transactionId = $result;
|
||||
$this->assertTrue((preg_match('/^0x[a-f0-9]{64}$/', $transactionId) === 1));
|
||||
|
||||
$contract->eth->getTransactionReceipt($transactionId, function ($err, $transaction) use (&$contractAddress) {
|
||||
if ($err !== null) {
|
||||
return $this->fail($err);
|
||||
}
|
||||
if ($transaction) {
|
||||
$contractAddress = $transaction->contractAddress;
|
||||
echo "\nTransaction has mined:) block number: " . $transaction->blockNumber . "\n";
|
||||
}
|
||||
});
|
||||
});
|
||||
$contract->at($contractAddress);
|
||||
|
||||
$contract->call('data', function ($err, $res) {
|
||||
if ($err !== null) {
|
||||
echo 'Error when call ' . $function['name'] . '. Message: ' . $err->getMessage() . "\n";
|
||||
return;
|
||||
}
|
||||
$this->assertEquals('0', $res[0]);
|
||||
});
|
||||
|
||||
$contract->send('setData', '0x44aec9b900000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000021000000000000000000000000000000000000000000000000000000000000000b', [
|
||||
'from' => $account,
|
||||
'gas' => '0x200b20'
|
||||
], function ($err, $result) use ($contract) {
|
||||
if ($err !== null) {
|
||||
var_dump('Error' . $err->getMessage());
|
||||
return $this->fail($err->getMessage());
|
||||
}
|
||||
if ($result) {
|
||||
echo "\nTransaction has made:) id: " . $result . "\n";
|
||||
}
|
||||
$transactionId = $result;
|
||||
$this->assertTrue((preg_match('/^0x[a-f0-9]{64}$/', $transactionId) === 1));
|
||||
|
||||
$contract->eth->getTransactionReceipt($transactionId, function ($err, $transaction) {
|
||||
if ($err !== null) {
|
||||
return $this->fail($err);
|
||||
}
|
||||
$this->assertTrue($transaction !== null);
|
||||
});
|
||||
});
|
||||
|
||||
$contract->call('data', function ($err, $res) {
|
||||
if ($err !== null) {
|
||||
echo 'Error when call ' . $function['name'] . '. Message: ' . $err->getMessage() . "\n";
|
||||
return;
|
||||
}
|
||||
$this->assertEquals('0x44aec9b900000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000021000000000000000000000000000000000000000000000000000000000000000b', $res[0]);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* testIssue134
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testIssue134()
|
||||
{
|
||||
$bytecode = '0x608060405234801561001057600080fd5b50610487806100206000396000f3fe60806040526004361061005c576000357c01000000000000000000000000000000000000000000000000000000009004806373d4a13a146100615780638381f58a146100f15780639a73c4091461011c578063c3fad957146101ee575b600080fd5b34801561006d57600080fd5b50610076610229565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100b657808201518184015260208101905061009b565b50505050905090810190601f1680156100e35780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156100fd57600080fd5b506101066102c7565b6040518082815260200191505060405180910390f35b34801561012857600080fd5b506101ec6004803603604081101561013f57600080fd5b81019080803590602001909291908035906020019064010000000081111561016657600080fd5b82018360208201111561017857600080fd5b8035906020019184600183028401116401000000008311171561019a57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f8201169050808301925050505050505091929192905050506102cd565b005b3480156101fa57600080fd5b506102276004803603602081101561021157600080fd5b810190808035906020019092919050505061037f565b005b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156102bf5780601f10610294576101008083540402835291602001916102bf565b820191906000526020600020905b8154815290600101906020018083116102a257829003601f168201915b505050505081565b60015481565b80600090805190602001906102e39291906103b6565b5081600181905550806040518082805190602001908083835b60208310151561032157805182526020820191506020810190506020830392506102fc565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020827f95d23dc1ab7ea37e46bd697006b873f80ffecb4cb4ae085c7cc60a977ba7f2f560405160405180910390a35050565b80600181905550807f9d9c58c068c2bc9cb27d4e5c437f624ccbf4910ba8893ffd03ee311830becab160405160405180910390a250565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106103f757805160ff1916838001178555610425565b82800160010185558215610425579182015b82811115610424578251825591602001919060010190610409565b5b5090506104329190610436565b5090565b61045891905b8082111561045457600081600090555060010161043c565b5090565b9056fea165627a7a72305820830ee43c52ac89b1fbc68647e1893aea17aa8ca132532723176508a6bc4586c90029';
|
||||
$abi = '[
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "data",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "bytes"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": true,
|
||||
"inputs": [],
|
||||
"name": "number",
|
||||
"outputs": [
|
||||
{
|
||||
"name": "",
|
||||
"type": "uint256"
|
||||
}
|
||||
],
|
||||
"payable": false,
|
||||
"stateMutability": "view",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": false,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "_number",
|
||||
"type": "uint256"
|
||||
},
|
||||
{
|
||||
"name": "_data",
|
||||
"type": "bytes"
|
||||
}
|
||||
],
|
||||
"name": "say",
|
||||
"outputs": [],
|
||||
"payable": false,
|
||||
"stateMutability": "nonpayable",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"constant": false,
|
||||
"inputs": [
|
||||
{
|
||||
"name": "_number",
|
||||
"type": "uint256"
|
||||
}
|
||||
],
|
||||
"name": "say",
|
||||
"outputs": [],
|
||||
"payable": false,
|
||||
"stateMutability": "nonpayable",
|
||||
"type": "function"
|
||||
},
|
||||
{
|
||||
"anonymous": false,
|
||||
"inputs": [
|
||||
{
|
||||
"indexed": true,
|
||||
"name": "_number",
|
||||
"type": "uint256"
|
||||
}
|
||||
],
|
||||
"name": "Say",
|
||||
"type": "event"
|
||||
},
|
||||
{
|
||||
"anonymous": false,
|
||||
"inputs": [
|
||||
{
|
||||
"indexed": true,
|
||||
"name": "_number",
|
||||
"type": "uint256"
|
||||
},
|
||||
{
|
||||
"indexed": true,
|
||||
"name": "_data",
|
||||
"type": "bytes"
|
||||
}
|
||||
],
|
||||
"name": "Say",
|
||||
"type": "event"
|
||||
}
|
||||
]';
|
||||
$testNumber = 16;
|
||||
$testData = "0x01234";
|
||||
$contractAddress = "";
|
||||
$contract = new Contract($this->web3->provider, $abi);
|
||||
|
||||
if (!isset($this->accounts[0])) {
|
||||
$account = '0x407d73d8a49eeb85d32cf465507dd71d507100c1';
|
||||
} else {
|
||||
$account = $this->accounts[0];
|
||||
}
|
||||
$contract = new Contract($this->web3->provider, $abi);
|
||||
$contract->bytecode($bytecode)->new([
|
||||
'from' => $account,
|
||||
'gas' => '0x200b20'
|
||||
], function ($err, $result) use ($contract, &$contractAddress) {
|
||||
if ($err !== null) {
|
||||
return $this->fail($err->getMessage());
|
||||
}
|
||||
if ($result) {
|
||||
echo "\nTransaction has made:) id: " . $result . "\n";
|
||||
}
|
||||
$transactionId = $result;
|
||||
$this->assertTrue((preg_match('/^0x[a-f0-9]{64}$/', $transactionId) === 1));
|
||||
|
||||
$contract->eth->getTransactionReceipt($transactionId, function ($err, $transaction) use (&$contractAddress) {
|
||||
if ($err !== null) {
|
||||
return $this->fail($err);
|
||||
}
|
||||
if ($transaction) {
|
||||
$contractAddress = $transaction->contractAddress;
|
||||
echo "\nTransaction has mined:) block number: " . $transaction->blockNumber . "\n";
|
||||
}
|
||||
});
|
||||
});
|
||||
$contract->at($contractAddress);
|
||||
|
||||
// test for send transaction and get data
|
||||
$contract->send('say', $testNumber, $testData, [
|
||||
'from' => $account,
|
||||
'gas' => '0x200b20'
|
||||
], function ($err, $result) use ($contract, $testNumber, $testData) {
|
||||
if ($err !== null) {
|
||||
return $this->fail($err->getMessage());
|
||||
}
|
||||
if ($result) {
|
||||
echo "\nTransaction has made:) id: " . $result . "\n";
|
||||
}
|
||||
$transactionId = $result;
|
||||
$this->assertTrue((preg_match('/^0x[a-f0-9]{64}$/', $transactionId) === 1));
|
||||
|
||||
$contract->eth->getTransactionReceipt($transactionId, function ($err, $transaction) use ($testNumber, $testData, $contract) {
|
||||
if ($err !== null) {
|
||||
return $this->fail($err);
|
||||
}
|
||||
if ($transaction) {
|
||||
$topics = $transaction->logs[0]->topics;
|
||||
echo "\nTransaction has mined:) block number: " . $transaction->blockNumber . "\n";
|
||||
|
||||
// validate topics
|
||||
$this->assertEquals($contract->ethabi->encodeEventSignature($contract->events['Say']), $topics[0]);
|
||||
$this->assertEquals('0x' . IntegerFormatter::format($testNumber), $topics[1], $topics[2]);
|
||||
}
|
||||
$contract->call('number', function ($err, $res) use ($testNumber) {
|
||||
if ($err !== null) {
|
||||
echo 'Error when call ' . $function['name'] . '. Message: ' . $err->getMessage() . "\n";
|
||||
return;
|
||||
}
|
||||
$this->assertEquals((string) $testNumber, $res[0]->toString());
|
||||
});
|
||||
});
|
||||
});
|
||||
$testNumber++;
|
||||
|
||||
$contract->send('say', $testNumber, [
|
||||
'from' => $account,
|
||||
'gas' => '0x200b20'
|
||||
], function ($err, $result) use ($contract, $testNumber) {
|
||||
if ($err !== null) {
|
||||
return $this->fail($err->getMessage());
|
||||
}
|
||||
if ($result) {
|
||||
echo "\nTransaction has made:) id: " . $result . "\n";
|
||||
}
|
||||
$transactionId = $result;
|
||||
$this->assertTrue((preg_match('/^0x[a-f0-9]{64}$/', $transactionId) === 1));
|
||||
|
||||
$contract->eth->getTransactionReceipt($transactionId, function ($err, $transaction) use ($testNumber, $contract) {
|
||||
if ($err !== null) {
|
||||
return $this->fail($err);
|
||||
}
|
||||
if ($transaction) {
|
||||
$topics = $transaction->logs[0]->topics;
|
||||
echo "\nTransaction has mined:) block number: " . $transaction->blockNumber . "\n";
|
||||
|
||||
// validate topics
|
||||
// $this->assertEquals($contract->ethabi->encodeEventSignature($contract->events['Say']), $topics[0]);
|
||||
$this->assertEquals('0x' . IntegerFormatter::format($testNumber), $topics[1]);
|
||||
}
|
||||
$blockNumber = Utils::toBn($transaction->blockNumber);
|
||||
$contract->call('number', Utils::toHex($blockNumber, true), function ($err, $res) use ($testNumber) {
|
||||
if ($err !== null) {
|
||||
echo 'Error when call ' . $function['name'] . '. Message: ' . $err->getMessage() . "\n";
|
||||
return;
|
||||
}
|
||||
$this->assertEquals((string) $testNumber, $res[0]->toString());
|
||||
});
|
||||
$blockNumber = $blockNumber->subtract(Utils::toBn(1));
|
||||
$contract->call('number', Utils::toHex($blockNumber, true), function ($err, $res) use ($testNumber) {
|
||||
if ($err !== null) {
|
||||
echo 'Error when call ' . $function['name'] . '. Message: ' . $err->getMessage() . "\n";
|
||||
return;
|
||||
}
|
||||
$this->assertEquals((string) $testNumber-1, $res[0]->toString());
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
// test for estimate gas
|
||||
$contract->estimateGas("say", $testNumber, $testData, [
|
||||
'from' => $account,
|
||||
'gas' => '0x200b20'
|
||||
], function ($err, $result) {
|
||||
if ($err !== null) {
|
||||
return $this->fail($err->getMessage());
|
||||
}
|
||||
if (isset($result)) {
|
||||
echo "\nEstimate gas: " . $result->toString() . "\n";
|
||||
$this->assertTrue($result !== null);
|
||||
}
|
||||
});
|
||||
|
||||
$contract->estimateGas("say", $testNumber, [
|
||||
'from' => $account,
|
||||
'gas' => '0x200b20'
|
||||
], function ($err, $result) {
|
||||
if ($err !== null) {
|
||||
return $this->fail($err->getMessage());
|
||||
}
|
||||
if (isset($result)) {
|
||||
echo "\nEstimate gas: " . $result->toString() . "\n";
|
||||
$this->assertTrue($result !== null);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -53,7 +53,7 @@ class DynamicBytesTypeTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->solidityType = new DynamicBytes;
|
||||
|
||||
@ -21,7 +21,7 @@ class EthApiTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
@ -439,7 +439,7 @@ class EthApiTest extends TestCase
|
||||
if ($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);
|
||||
});
|
||||
}
|
||||
@ -457,7 +457,7 @@ class EthApiTest extends TestCase
|
||||
if ($err !== null) {
|
||||
return $this->assertTrue($err !== null);
|
||||
}
|
||||
$this->assertTrue($transaction == null);
|
||||
$this->assertTrue($transaction !== null);
|
||||
});
|
||||
}
|
||||
|
||||
@ -474,7 +474,7 @@ class EthApiTest extends TestCase
|
||||
if ($err !== null) {
|
||||
return $this->assertTrue($err !== null);
|
||||
}
|
||||
$this->assertTrue($transaction == null);
|
||||
$this->assertTrue($transaction !== null);
|
||||
});
|
||||
}
|
||||
|
||||
@ -508,7 +508,7 @@ class EthApiTest extends TestCase
|
||||
if ($err !== null) {
|
||||
return $this->assertTrue($err !== null);
|
||||
}
|
||||
$this->assertTrue($transaction == null);
|
||||
$this->assertTrue($transaction !== null);
|
||||
});
|
||||
}
|
||||
|
||||
@ -546,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
|
||||
*
|
||||
@ -629,7 +647,7 @@ class EthApiTest extends TestCase
|
||||
{
|
||||
$eth = $this->eth;
|
||||
|
||||
$eth->newBlockFilter(function ($err, $filter) {
|
||||
$eth->newBlockFilter('0x01', function ($err, $filter) {
|
||||
if ($err !== null) {
|
||||
// infura banned us to new block filter
|
||||
return $this->assertTrue($err !== null);
|
||||
|
||||
@ -20,7 +20,7 @@ class EthBatchTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ class EthTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
||||
@ -163,7 +163,7 @@ class EthabiTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
// Error: Using $this when not in object context
|
||||
@ -298,7 +298,7 @@ class EthabiTest extends TestCase
|
||||
|
||||
/**
|
||||
* 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/
|
||||
*
|
||||
* @return void
|
||||
|
||||
@ -19,7 +19,7 @@ class FilterValidatorTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->validator = new FilterValidator;
|
||||
|
||||
@ -19,7 +19,7 @@ class HexFormatterTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->formatter = new HexFormatter;
|
||||
|
||||
@ -19,7 +19,7 @@ class HexValidatorTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->validator = new HexValidator;
|
||||
|
||||
@ -19,7 +19,7 @@ class IdentityValidatorTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->validator = new IdentityValidator;
|
||||
|
||||
@ -19,7 +19,7 @@ class IntegerFormatterTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->formatter = new IntegerFormatter;
|
||||
|
||||
@ -53,7 +53,7 @@ class IntegerTypeTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->solidityType = new Integer;
|
||||
|
||||
@ -21,7 +21,7 @@ class NetApiTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ class NetBatchTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ class NetTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ class NonceValidatorTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->validator = new NonceValidator;
|
||||
|
||||
@ -19,7 +19,7 @@ class NumberFormatterTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->formatter = new NumberFormatter;
|
||||
|
||||
@ -19,7 +19,7 @@ class OptionalQuantityFormatterTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->formatter = new OptionalQuantityFormatter;
|
||||
@ -55,8 +55,6 @@ class OptionalQuantityFormatterTest extends TestCase
|
||||
$this->assertEquals('latest', $formatter->format('latest'));
|
||||
$this->assertEquals('earliest', $formatter->format('earliest'));
|
||||
$this->assertEquals('pending', $formatter->format('pending'));
|
||||
|
||||
$this->expectExceptionMessage('toBn number must be valid hex string.');
|
||||
$formatter->format('hello');
|
||||
$this->assertEquals('0x0', $formatter->format('hello'));
|
||||
}
|
||||
}
|
||||
@ -27,7 +27,7 @@ class PersonalApiTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function 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
|
||||
*
|
||||
|
||||
@ -19,7 +19,7 @@ class PersonalBatchTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ class PersonalTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ class PostFormatterTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->formatter = new PostFormatter;
|
||||
|
||||
@ -19,7 +19,7 @@ class PostValidatorTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->validator = new PostValidator;
|
||||
|
||||
@ -19,7 +19,7 @@ class QuantityFormatterTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->formatter = new QuantityFormatter;
|
||||
|
||||
@ -19,7 +19,7 @@ class QuantityValidatorTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->validator = new QuantityValidator;
|
||||
|
||||
@ -21,7 +21,7 @@ class ShhApiTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ class ShhBatchTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ class ShhFilterValidatorTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->validator = new ShhFilterValidator;
|
||||
|
||||
@ -23,7 +23,7 @@ class ShhTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ class SolidityTypeTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->type = new SolidityType();
|
||||
|
||||
@ -47,7 +47,7 @@ class StrTypeTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->solidityType = new Str;
|
||||
|
||||
@ -19,7 +19,7 @@ class StringFormatterTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->formatter = new StringFormatter;
|
||||
|
||||
@ -19,7 +19,7 @@ class StringValidatorTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->validator = new StringValidator;
|
||||
|
||||
@ -19,7 +19,7 @@ class TagValidatorTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->validator = new TagValidator;
|
||||
|
||||
@ -19,7 +19,7 @@ class TransactionFormatterTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->formatter = new TransactionFormatter;
|
||||
|
||||
@ -19,7 +19,7 @@ class TransactionValidatorTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->validator = new TransactionValidator;
|
||||
|
||||
@ -53,7 +53,7 @@ class UintegerTypeTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->solidityType = new Uinteger;
|
||||
|
||||
@ -7,7 +7,6 @@ use stdClass;
|
||||
use Test\TestCase;
|
||||
use phpseclib\Math\BigInteger as BigNumber;
|
||||
use Web3\Utils;
|
||||
use Web3\Contract;
|
||||
|
||||
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
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
}
|
||||
@ -249,7 +169,7 @@ class UtilsTest extends TestCase
|
||||
|
||||
/**
|
||||
* testIsAddressChecksum
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testIsAddressChecksum()
|
||||
@ -291,36 +211,9 @@ class UtilsTest extends TestCase
|
||||
$isAddressChecksum = Utils::isAddressChecksum(new stdClass);
|
||||
}
|
||||
|
||||
/**
|
||||
* testToChecksumAddress
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testToChecksumAddress()
|
||||
{
|
||||
$checksumAddressTest = [
|
||||
// All caps
|
||||
'0x52908400098527886E0F7030069857D2E4169EE7',
|
||||
'0x8617E340B3D01FA5F11F306F4090FD50E238070D',
|
||||
// All Lower
|
||||
'0xde709f2102306220921060314715629080e2fb77',
|
||||
'0x27b1fdb04752bbc536007a920d24acb045561c26',
|
||||
// Normal
|
||||
'0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed',
|
||||
'0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359',
|
||||
'0xdbF03B407c01E7cD3CBea99509d93f8DDDC8C6FB',
|
||||
'0xD1220A0cf47c7B9Be7A2E6BA89F429762e7b9aDb'
|
||||
];
|
||||
|
||||
for ($i=0; $i<count($checksumAddressTest); $i++) {
|
||||
$checksumAddress = Utils::toChecksumAddress(strtolower($checksumAddressTest[$i]));
|
||||
$this->assertEquals($checksumAddressTest[$i], $checksumAddress);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* testStripZero
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testStripZero()
|
||||
@ -359,58 +252,82 @@ class UtilsTest extends TestCase
|
||||
public function testToWei()
|
||||
{
|
||||
$bn = Utils::toWei('0x1', 'wei');
|
||||
$this->assertEquals('1', $bn->toString());
|
||||
$this->assertEquals($bn->toString(), '1');
|
||||
|
||||
$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');
|
||||
$this->assertEquals('1000000000000000000', $bn->toString());
|
||||
$this->assertEquals($bn->toString(), '1000000000000000000');
|
||||
|
||||
$bn = Utils::toWei('0x5218', 'wei');
|
||||
$this->assertEquals('21016', $bn->toString());
|
||||
|
||||
$bn = Utils::toWei('0.000012', 'ether');
|
||||
$this->assertEquals('12000000000000', $bn->toString());
|
||||
$this->assertEquals($bn->toString(), '21016');
|
||||
|
||||
$bn = Utils::toWei('0.1', 'ether');
|
||||
$this->assertEquals('100000000000000000', $bn->toString());
|
||||
$this->assertEquals($bn->toString(), '100000000000000000');
|
||||
|
||||
$bn = Utils::toWei('1.69', 'ether');
|
||||
$this->assertEquals('1690000000000000000', $bn->toString());
|
||||
$this->assertEquals($bn->toString(), '1690000000000000000');
|
||||
|
||||
$bn = Utils::toWei('0.01', 'ether');
|
||||
$this->assertEquals('10000000000000000', $bn->toString());
|
||||
$this->assertEquals($bn->toString(), '10000000000000000');
|
||||
|
||||
$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');
|
||||
$this->assertEquals('-100000000000000000', $bn->toString());
|
||||
$this->assertEquals($bn->toString(), '-100000000000000000');
|
||||
|
||||
$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');
|
||||
$this->assertEquals('0', $bn->toString());
|
||||
$this->assertEquals($bn->toString(), '0');
|
||||
|
||||
$bn = Utils::toWei(-1.697, 'kwei');
|
||||
$this->assertEquals($bn->toString(), '-1697');
|
||||
|
||||
try {
|
||||
$bn = Utils::toWei('0x5218', new stdClass);
|
||||
} catch (InvalidArgumentException $e) {
|
||||
$this->assertEquals('toWei unit must be string.', $e->getMessage());
|
||||
$this->assertTrue($e !== null);
|
||||
}
|
||||
|
||||
try {
|
||||
$bn = Utils::toWei('0x5218', 'test');
|
||||
} catch (InvalidArgumentException $e) {
|
||||
$this->assertEquals('toWei doesn\'t support test unit.', $e->getMessage());
|
||||
$this->assertTrue($e !== null);
|
||||
}
|
||||
|
||||
try {
|
||||
// out of limit
|
||||
$bn = Utils::toWei(-1.6977, 'kwei');
|
||||
} 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($bnr->toString(), '18');
|
||||
|
||||
list($bnq, $bnr) = Utils::toEther(1, 'wei');
|
||||
|
||||
$this->assertEquals($bnq->toString(), '0');
|
||||
$this->assertEquals($bnr->toString(), '1');
|
||||
|
||||
list($bnq, $bnr) = Utils::toEther(0x11, 'wei');
|
||||
|
||||
$this->assertEquals($bnq->toString(), '0');
|
||||
$this->assertEquals($bnr->toString(), '17');
|
||||
|
||||
list($bnq, $bnr) = Utils::toEther('1', 'kether');
|
||||
|
||||
$this->assertEquals($bnq->toString(), '1000');
|
||||
@ -525,16 +452,39 @@ class UtilsTest extends TestCase
|
||||
*/
|
||||
public function testJsonToArray()
|
||||
{
|
||||
$decodedJson = json_decode($this->testJsonMethodString);
|
||||
$jsonArray = Utils::jsonToArray($decodedJson);
|
||||
$jsonAssoc = json_decode($this->testJsonMethodString, true);
|
||||
$jsonArray2 = Utils::jsonToArray($jsonAssoc);
|
||||
$this->assertEquals($jsonAssoc, $jsonArray);
|
||||
$this->assertEquals($jsonAssoc, $jsonArray2);
|
||||
$json = json_decode($this->testJsonMethodString);
|
||||
$jsonArrayDepth1 = Utils::jsonToArray($json);
|
||||
|
||||
$jsonAssoc = json_decode($this->testIssue112Json, true);
|
||||
$jsonArray = Utils::jsonToArray($jsonAssoc);
|
||||
$this->assertEquals($jsonAssoc, $jsonArray);
|
||||
$this->assertEquals($jsonArrayDepth1, (array) $json);
|
||||
|
||||
$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
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
}
|
||||
|
||||
@ -28,7 +28,7 @@ class Web3BatchTest extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
}
|
||||
|
||||
@ -37,7 +37,7 @@ class Web3Test extends TestCase
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUp(): void
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user