From 591e88d4cfbd7adcbadd8cfa1a278c843131e8dc Mon Sep 17 00:00:00 2001
From: sc0Vu <alk03073135@gmail.com>
Date: Tue, 2 Jan 2018 14:08:01 +0800
Subject: [PATCH] Add bytecode.

---
 src/Contract.php                        | 75 ++++++++++++++++++++++++-
 src/Validators/TransactionValidator.php | 14 ++---
 test/unit/ContractTest.php              | 15 ++++-
 3 files changed, 92 insertions(+), 12 deletions(-)

diff --git a/src/Contract.php b/src/Contract.php
index 993180c..60af651 100644
--- a/src/Contract.php
+++ b/src/Contract.php
@@ -26,6 +26,7 @@ use Web3\Contracts\Types\Integer;
 use Web3\Contracts\Types\Str;
 use Web3\Contracts\Types\Uinteger;
 use Web3\Validators\AddressValidator;
+use Web3\Validators\HexValidator;
 use Web3\Formatters\Address as AddressFormatter;
 
 class Contract
@@ -72,6 +73,13 @@ class Contract
      */
     protected $toAddress;
 
+    /**
+     * bytecode
+     * 
+     * @var string
+     */
+    protected $bytecode;
+
     /**
      * eth
      * 
@@ -268,7 +276,6 @@ class Contract
     public function at($address)
     {
         if (AddressValidator::validate($address) === false) {
-            var_dump($address);
             throw new InvalidArgumentException('Please make sure address is valid.');
         }
         $this->toAddress = AddressFormatter::format($address);
@@ -276,6 +283,22 @@ class Contract
         return $this;
     }
 
+    /**
+     * bytecode
+     * 
+     * @param string $bytecode
+     * @return $this
+     */
+    public function bytecode($bytecode)
+    {
+        if (HexValidator::validate($bytecode) === false) {
+            throw new InvalidArgumentException('Please make sure bytecode is valid.');
+        }
+        $this->bytecode = Utils::stripZero($bytecode);
+
+        return $this;
+    }
+
     /**
      * new
      * Deploy a contruct with params.
@@ -296,6 +319,9 @@ class Contract
             if (is_callable($callback) !== true) {
                 throw new \InvalidArgumentException('The last param must be callback function.');
             }
+            if (!isset($this->bytecode)) {
+                throw new \InvalidArgumentException('Please call bytecode($bytecode) before new().');
+            }
             $params = array_splice($arguments, 0, count($constructor['inputs']));
             $data = $this->ethabi->encodeParameters($constructor, $params);
             $transaction = [];
@@ -304,7 +330,7 @@ class Contract
                 $transaction = $arguments[0];
             }
             $transaction['to'] = '';
-            $transaction['data'] = $data;
+            $transaction['data'] = '0x' . $this->bytecode . Utils::stripZero($data);
 
             $this->eth->sendTransaction($transaction, function ($err, $transaction) use ($callback){
                 if ($err !== null) {
@@ -359,4 +385,49 @@ class Contract
             });
         }
     }
+
+    /**
+     * call
+     * Call function method.
+     * 
+     * @param mixed
+     * @return void
+     */
+    public function call()
+    {
+        if (isset($this->functions)) {
+            $arguments = func_get_args();
+            $method = array_splice($arguments, 0, 1)[0];
+            $callback = array_pop($arguments);
+
+            if (!is_string($method) && !isset($this->functions[$method])) {
+                throw new InvalidArgumentException('Please make sure the method is existed.');
+            }
+            $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.');
+            }
+            $params = array_splice($arguments, 0, count($function['inputs']));
+            $data = $this->ethabi->encodeParameters($function, $params);
+            $functionSignature = $this->ethabi->encodeFunctionSignature($function['name']);
+            $transaction = [];
+
+            if (count($arguments) > 0) {
+                $transaction = $arguments[0];
+            }
+            $transaction['to'] = $this->toAddress;
+            $transaction['data'] = $functionSignature . Utils::stripZero($data);
+
+            $this->eth->call($transaction, function ($err, $transaction) use ($callback){
+                if ($err !== null) {
+                    return call_user_func($callback, $err, null);
+                }
+                return call_user_func($callback, null, $transaction);
+            });
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/Validators/TransactionValidator.php b/src/Validators/TransactionValidator.php
index d5fa2e6..4fd7b67 100644
--- a/src/Validators/TransactionValidator.php
+++ b/src/Validators/TransactionValidator.php
@@ -33,25 +33,25 @@ class TransactionValidator
             return false;
         }
         if (AddressValidator::validate($value['from']) === false) {
-             return false;
+            return false;
         }
         if (isset($value['to']) && AddressValidator::validate($value['to']) === false && $value['to'] !== '') {
-             return false;
+            return false;
         }
         if (isset($value['gas']) && QuantityValidator::validate($value['gas']) === false) {
-             return false;
+            return false;
         }
         if (isset($value['gasPrice']) && QuantityValidator::validate($value['gasPrice']) === false) {
-             return false;
+            return false;
         }
         if (isset($value['value']) && QuantityValidator::validate($value['value']) === false) {
-             return false;
+            return false;
         }
         if (isset($value['data']) && HexValidator::validate($value['data']) === false) {
-             return false;
+            return false;
         }
         if (isset($value['nonce']) && QuantityValidator::validate($value['nonce']) === false) {
-             return false;
+            return false;
         }
         return true;
     }
diff --git a/test/unit/ContractTest.php b/test/unit/ContractTest.php
index e1aa678..48205c6 100644
--- a/test/unit/ContractTest.php
+++ b/test/unit/ContractTest.php
@@ -4,6 +4,7 @@ namespace Test\Unit;
 
 use Test\TestCase;
 use Web3\Contract;
+use Web3\Utils;
 
 class ContractTest extends TestCase
 {
@@ -18,7 +19,7 @@ class ContractTest extends TestCase
      * testAbi
      * GameToken abi from https://github.com/sc0Vu/GameToken
      *
-     * @var \Web3\Contract
+     * @var string
      */
     protected $testAbi = '[
         {
@@ -270,6 +271,14 @@ class ContractTest extends TestCase
         }
     ]';
 
+    /**
+     * testBytecode
+     * GameToken abi from https://github.com/sc0Vu/GameToken
+     *
+     * @var string
+     */
+    protected $testBytecode = '0x60606040526040805190810160405280600581526020017f45524332300000000000000000000000000000000000000000000000000000008152506000908051906020019061004f92919061012f565b50341561005b57600080fd5b604051610ec5380380610ec58339810160405280805190602001909190805182019190602001805190602001909190805182019190505083600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508360048190555082600190805190602001906100f392919061012f565b50806002908051906020019061010a92919061012f565b5081600360006101000a81548160ff021916908360ff160217905550505050506101d4565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017057805160ff191683800117855561019e565b8280016001018555821561019e579182015b8281111561019d578251825591602001919060010190610182565b5b5090506101ab91906101af565b5090565b6101d191905b808211156101cd5760008160009055506001016101b5565b5090565b90565b610ce2806101e36000396000f3006060604052600436106100a4576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100a9578063095ea7b31461013757806318160ddd1461019157806323b872dd146101ba578063313ce567146102335780635a3b7e421461026257806370a08231146102f057806395d89b411461033d578063a9059cbb146103cb578063dd62ed3e1461040d575b600080fd5b34156100b457600080fd5b6100bc610479565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100fc5780820151818401526020810190506100e1565b50505050905090810190601f1680156101295780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561014257600080fd5b610177600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610517565b604051808215151515815260200191505060405180910390f35b341561019c57600080fd5b6101a4610609565b6040518082815260200191505060405180910390f35b34156101c557600080fd5b610219600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061060f565b604051808215151515815260200191505060405180910390f35b341561023e57600080fd5b61024661092a565b604051808260ff1660ff16815260200191505060405180910390f35b341561026d57600080fd5b61027561093d565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156102b557808201518184015260208101905061029a565b50505050905090810190601f1680156102e25780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156102fb57600080fd5b610327600480803573ffffffffffffffffffffffffffffffffffffffff169060200190919050506109db565b6040518082815260200191505060405180910390f35b341561034857600080fd5b6103506109f3565b6040518080602001828103825283818151815260200191508051906020019080838360005b83811015610390578082015181840152602081019050610375565b50505050905090810190601f1680156103bd5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156103d657600080fd5b61040b600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610a91565b005b341561041857600080fd5b610463600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610c91565b6040518082815260200191505060405180910390f35b60018054600181600116156101000203166002900480601f01602080910402602001604051908101604052809291908181526020018280546001816001161561010002031660029004801561050f5780601f106104e45761010080835404028352916020019161050f565b820191906000526020600020905b8154815290600101906020018083116104f257829003601f168201915b505050505081565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a36001905092915050565b60045481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561063457600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561068057600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205401101561070d57600080fd5b600660008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561079657600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254039250508190555081600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254019250508190555081600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190509392505050565b600360009054906101000a900460ff1681565b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156109d35780601f106109a8576101008083540402835291602001916109d3565b820191906000526020600020905b8154815290600101906020018083116109b657829003601f168201915b505050505081565b60056020528060005260406000206000915090505481565b60028054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610a895780601f10610a5e57610100808354040283529160200191610a89565b820191906000526020600020905b815481529060010190602001808311610a6c57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ab557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610b0157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054011015610b8e57600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254039250508190555080600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35050565b60066020528160005260406000206020528060005260406000206000915091505054815600a165627a7a723058203eb700b31f6d7723be3f4a0dd07fc4ba166a17279e26a437227679b92bacb5a20029';
+
     /**
      * accounts
      * 
@@ -319,7 +328,7 @@ class ContractTest extends TestCase
         } else {
             $account = $this->accounts[0];
         }
-        $contract->new(10000, 'Game Token', 1, 'GT', [
+        $contract->bytecode($this->testBytecode)->new(10000, 'Game Token', 1, 'GT', [
             'from' => $account,
             'gas' => '0x200b20'
         ], function ($err, $result) use ($contract) {
@@ -364,7 +373,7 @@ class ContractTest extends TestCase
         } else {
             $toAccount = $this->accounts[1];
         }
-        $contract->new(10000, 'Game Token', 1, 'GT', [
+        $contract->bytecode($this->testBytecode)->new(10000, 'Game Token', 1, 'GT', [
             'from' => $fromAccount,
             'gas' => '0x200b20'
         ], function ($err, $result) use ($contract) {