Merge pull request #16 from sc0Vu/fix-15

Fix #15

src/Transaction.php

@@ -37,25 +37,25 @@ class Transaction implements ArrayAccess
  'key' => 0,
  'length' => 32,
  'allowLess' => true,
- 'allowZero' => true
+ 'allowZero' => false
  ],
  'gasPrice' => [
  'key' => 1,
  'length' => 32,
  'allowLess' => true,
- 'allowZero' => true
+ 'allowZero' => false
  ],
  'gasLimit' => [
  'key' => 2,
  'length' => 32,
  'allowLess' => true,
- 'allowZero' => true
+ 'allowZero' => false
  ],
  'gas' => [
  'key' => 2,
  'length' => 32,
  'allowLess' => true,
- 'allowZero' => true
+ 'allowZero' => false
  ],
  'to' => [
  'key' => 3,
@@ -236,8 +236,8 @@ public function offsetSet($offset, $value)
  }
  }
  if (!isset($txKey['allowZero']) || (isset($txKey['allowZero']) && $txKey['allowZero'] === false)) {
- // check zero, 0x0
- if ($checkedValue === '0' && ($value === 0 || $value === '0x0' || $value === '0x')){
+ // check zero
+ if (preg_match('/^0*$/', $checkedValue) === 1) {
  // set value to empty string
  $value = '';
  }

test/unit/TransactionTest.php

@@ -286,4 +286,36 @@ public function testGetFromAddress()
  $this->assertEquals($fromA, $fromB);
  $this->assertEquals($fromB, $fromC);
  }
+
+ /**
+ * testIssue15
+ * 
+ * @return void
+ */
+ public function testIssue15()
+ {
+ $signedTransactions = [];
+ $nonces = [
+ '0x00', '0x0', 0, '0x000', '0'
+ ];
+
+ // push signed transaction
+ for ($i=0; $i<count($nonces); $i++) {
+ $transaction = new Transaction([
+ 'nonce' => $nonces[$i],
+ 'to' => '0x3535353535353535353535353535353535353535',
+ 'gas' => '0x5208',
+ 'gasPrice' => '0x4a817c800',
+ 'value' => '0x0',
+ 'chainId' => 1,
+ 'data' => ''
+ ]);
+ $signedTransactions[] = $transaction->sign('0x4646464646464646464646464646464646464646464646464646464646464646');
+ }
+
+ // compare each signed transaction
+ for ($i=1; $i<count($signedTransactions); $i++) {
+ $this->assertEquals($signedTransactions[0], $signedTransactions[$i]);
+ }
+ }
 }