Merge pull request #329 from web3p/feature/integrate-async-react-php

feature: integrate async react php
web3p · Sep 1, 2023 · 31101fe · 31101fe
2 parents cede0cc + 116659e
commit 31101fe
Show file tree

Hide file tree

Showing 29 changed files with 564 additions and 341 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -7,7 +7,7 @@ jobs:
     name: Build and test web3.php with ${{ matrix.php-version }}
     strategy:
       matrix:
-        php-version: ["7.3", "7.4", "8.0"]
+        php-version: ["7.3", "7.4", "8.0", "8.1", "8.2"]
 
     runs-on: ubuntu-latest
 

diff --git a/composer.json b/composer.json
@@ -14,7 +14,12 @@
         "PHP": "^7.2|^8.0",
         "kornrunner/keccak": "~1.0",
         "phpseclib/phpseclib": "~2.0.30",
-        "ext-mbstring": "*"
+        "ext-mbstring": "*",
+        "react/http": "^1.6.0",
+        "react/async": "^4.0.0|^3.1.0",
+        "react/promise": "^2.9.0",
+        "react/event-loop": "^1.2",
+        "react/socket": "^1.13"
     },
     "require-dev": {
         "phpunit/phpunit": "~8.0|~9.0"

diff --git a/docker/ganache/Dockerfile b/docker/ganache/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:9.11.1-alpine
+FROM node:12.11.1-alpine
 
 MAINTAINER Peter Lai <[email protected]>
 

diff --git a/docker/php/Dockerfile-71 → docker/php/Dockerfile-81 b/docker/php/Dockerfile-71 → docker/php/Dockerfile-81
@@ -1,4 +1,4 @@
-FROM php:7.1-alpine
+FROM php:8.1-alpine
 
 MAINTAINER Peter Lai <[email protected]>
 
@@ -20,4 +20,4 @@ RUN php composer-setup.php && \
     php composer-setup.php --install-dir=/usr/bin --filename=composer && \
     php -r "unlink('composer-setup.php');"
 
-WORKDIR /app
+WORKDIR /app
diff --git a/docker/php/Dockerfile-82 b/docker/php/Dockerfile-82
@@ -0,0 +1,23 @@
+FROM php:8.2-alpine
+
+MAINTAINER Peter Lai <[email protected]>
+
+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
diff --git a/src/Contract.php b/src/Contract.php
@@ -441,7 +441,7 @@ public function abi($abi)
      * Deploy a contruct with params.
      * 
      * @param mixed
-     * @return void
+     * @return void|\React\Promise\PromiseInterface
      */
     public function new()
     {
@@ -469,7 +469,7 @@ public function new()
             }
             $transaction['data'] = '0x' . $this->bytecode . Utils::stripZero($data);
 
-            $this->eth->sendTransaction($transaction, function ($err, $transaction) use ($callback){
+            return $this->eth->sendTransaction($transaction, function ($err, $transaction) use ($callback){
                 if ($err !== null) {
                     return call_user_func($callback, $err, null);
                 }
@@ -483,7 +483,7 @@ public function new()
      * Send function method.
      * 
      * @param mixed
-     * @return void
+     * @return void|\React\Promise\PromiseInterface
      */
     public function send()
     {
@@ -564,7 +564,7 @@ public function send()
             $transaction['to'] = $this->toAddress;
             $transaction['data'] = $functionSignature . Utils::stripZero($data);
 
-            $this->eth->sendTransaction($transaction, function ($err, $transaction) use ($callback){
+            return $this->eth->sendTransaction($transaction, function ($err, $transaction) use ($callback){
                 if ($err !== null) {
                     return call_user_func($callback, $err, null);
                 }
@@ -578,7 +578,7 @@ public function send()
      * Call function method.
      *
      * @param mixed
-     * @return void
+     * @return void|\React\Promise\PromiseInterface
      */
     public function call()
     {
@@ -658,7 +658,7 @@ public function call()
             $transaction['to'] = $this->toAddress;
             $transaction['data'] = $functionSignature . Utils::stripZero($data);
 
-            $this->eth->call($transaction, $defaultBlock, function ($err, $transaction) use ($callback, $function){
+            return $this->eth->call($transaction, $defaultBlock, function ($err, $transaction) use ($callback, $function){
                 if ($err !== null) {
                     return call_user_func($callback, $err, null);
                 }
@@ -674,7 +674,7 @@ public function call()
      * Estimate function gas.
      * 
      * @param mixed
-     * @return void
+     * @return void|\React\Promise\PromiseInterface
      */
     public function estimateGas()
     {
@@ -778,7 +778,7 @@ public function estimateGas()
                 $transaction['data'] = $functionSignature . Utils::stripZero($data);
             }
 
-            $this->eth->estimateGas($transaction, function ($err, $gas) use ($callback) {
+            return $this->eth->estimateGas($transaction, function ($err, $gas) use ($callback) {
                 if ($err !== null) {
                     return call_user_func($callback, $err, null);
                 }

diff --git a/src/Eth.php b/src/Eth.php
@@ -66,7 +66,7 @@ public function __construct($provider)
      * 
      * @param string $name
      * @param array $arguments
-     * @return void
+     * @return void|\React\Promise\PromiseInterface
      */
     public function __call($name, $arguments)
     {
@@ -102,7 +102,7 @@ public function __call($name, $arguments)
             if ($methodObject->validate($arguments)) {
                 $inputs = $methodObject->transform($arguments, $methodObject->inputFormatters);
                 $methodObject->arguments = $inputs;
-                $this->provider->send($methodObject, $callback);
+                return $this->provider->send($methodObject, $callback);
             }
         }
     }

diff --git a/src/Methods/Eth/CompileLLL.php b/src/Methods/Eth/CompileLLL.php
diff --git a/src/Methods/Eth/CompileSerpent.php b/src/Methods/Eth/CompileSerpent.php
diff --git a/src/Methods/Eth/CompileSolidity.php b/src/Methods/Eth/CompileSolidity.php
diff --git a/src/Net.php b/src/Net.php
@@ -66,7 +66,7 @@ public function __construct($provider)
      * 
      * @param string $name
      * @param array $arguments
-     * @return void
+     * @return void|\React\Promise\PromiseInterface
      */
     public function __call($name, $arguments)
     {
@@ -102,7 +102,7 @@ public function __call($name, $arguments)
             if ($methodObject->validate($arguments)) {
                 $inputs = $methodObject->transform($arguments, $methodObject->inputFormatters);
                 $methodObject->arguments = $inputs;
-                $this->provider->send($methodObject, $callback);
+                return $this->provider->send($methodObject, $callback);
             }
         }
     }

diff --git a/src/Personal.php b/src/Personal.php
@@ -66,7 +66,7 @@ public function __construct($provider)
      * 
      * @param string $name
      * @param array $arguments
-     * @return void
+     * @return void|\React\Promise\PromiseInterface
      */
     public function __call($name, $arguments)
     {
@@ -102,7 +102,7 @@ public function __call($name, $arguments)
             if ($methodObject->validate($arguments)) {
                 $inputs = $methodObject->transform($arguments, $methodObject->inputFormatters);
                 $methodObject->arguments = $inputs;
-                $this->provider->send($methodObject, $callback);
+                return $this->provider->send($methodObject, $callback);
             }
         }
     }