Merge pull request #7 from sc0Vu/master

Add string as param in __construct
web3p · May 25, 2018 · 063108a · 063108a
2 parents f1ff3c4 + 5eb6706
commit 063108a
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -38,6 +38,9 @@ $transaction = new Transaction([
     'chainId' => 1,
     'data' => '0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675'
 ]);
+
+// hex encoded transaction
+$transaction = new Transaction('0xf86c098504a817c800825208943535353535353535353535353535353535353535880de0b6b3a76400008025a028ef61340bd939bc2195fe537567866003e1a15d3c71ff63e1590620aa636276a067cbe9d8997f761aecb703304b3800ccf555c9f3dc64214b297fb1966a3b6d83');
 ```
 
 Sign a transaction:

diff --git a/src/Transaction.php b/src/Transaction.php
@@ -79,20 +79,41 @@ class Transaction implements ArrayAccess
     /**
      * construct
      * 
-     * @param array $txData
+     * @param array|string $txData
      * @return void
      */
-    public function __construct(array $txData=[])
+    public function __construct($txData=[])
     {
-        foreach ($txData as $key => $data) {
-            $txKey = isset($this->map[$key]) ? $this->map[$key] : null;
-
-            if (is_int($txKey)) {
-                $this->txData[$txKey] = $data;
-            }
-        }
         $this->rlp = new RLP;
         $this->secp256k1 = new EC('secp256k1');
+        $tx = [];
+
+        if (is_array($txData)) {
+            foreach ($txData as $key => $data) {
+                $txKey = isset($this->map[$key]) ? $this->map[$key] : null;
+
+                if (is_int($txKey)) {
+                    $tx[$txKey] = $data;
+                }
+            }
+        } elseif (is_string($txData)) {
+            if (strpos($txData, '0x') === 0) {
+                $txData = $this->rlp->decode($txData);
+
+                foreach ($txData as $txKey => $data) {
+                    if (is_int($txKey)) {
+                        $hexData = $data->toString('hex');
+
+                        if (strlen($hexData) > 0) {
+                            $tx[$txKey] = '0x' . $hexData;
+                        } else {
+                            $tx[$txKey] = $hexData;
+                        }
+                    }
+                }
+            }
+        }
+        $this->txData = $tx;
     }
 
     /**

diff --git a/test/unit/TransactionTest.php b/test/unit/TransactionTest.php
@@ -217,6 +217,9 @@ public function testEIP155()
         ]);
         $this->assertEquals('daf5a779ae972f972197303d7b574746c7ef83eadac0f2791ad23db92e4c8e53', $transaction->hash(false));
         $this->assertEquals('f86c098504a817c800825208943535353535353535353535353535353535353535880de0b6b3a76400008025a028ef61340bd939bc2195fe537567866003e1a15d3c71ff63e1590620aa636276a067cbe9d8997f761aecb703304b3800ccf555c9f3dc64214b297fb1966a3b6d83', $transaction->sign('0x4646464646464646464646464646464646464646464646464646464646464646'));
+
+        $transaction = new Transaction('0xf86c098504a817c800825208943535353535353535353535353535353535353535880de0b6b3a76400008025a028ef61340bd939bc2195fe537567866003e1a15d3c71ff63e1590620aa636276a067cbe9d8997f761aecb703304b3800ccf555c9f3dc64214b297fb1966a3b6d83');
+        $this->assertEquals('f86c098504a817c800825208943535353535353535353535353535353535353535880de0b6b3a76400008025a028ef61340bd939bc2195fe537567866003e1a15d3c71ff63e1590620aa636276a067cbe9d8997f761aecb703304b3800ccf555c9f3dc64214b297fb1966a3b6d83', $transaction->serialize()->toString('hex'));
     }
 
     /**