Fix toHex for string number

web3p · Jan 19, 2024 · 6c3a335 · 6c3a335
1 parent 7aba28a
commit 6c3a335
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/src/Formatters/HexFormatter.php b/src/Formatters/HexFormatter.php
@@ -25,10 +25,8 @@ class HexFormatter implements IFormatter
      */
     public static function format($value)
     {
-        $value = Utils::toString($value);
-        $value = mb_strtolower($value);
-
-        if (Utils::isZeroPrefixed($value)) {
+        if (is_string($value) && Utils::isZeroPrefixed($value)) {
+            $value = mb_strtolower($value);
             return $value;
         } else {
             $value = Utils::toHex($value, true);

diff --git a/src/Utils.php b/src/Utils.php
@@ -87,7 +87,7 @@ class Utils
      */
     public static function toHex($value, $isPrefix=false)
     {
-        if (is_numeric($value)) {
+        if (is_int($value) || is_float($value)) {
             // turn to hex number
             $bn = self::toBn($value);
             $hex = $bn->toHex(true);

diff --git a/test/unit/HexFormatterTest.php b/test/unit/HexFormatterTest.php
@@ -41,7 +41,7 @@ public function testFormat()
         $this->assertEquals($hex, '0xabce');
 
         $hex = $formatter->format('123');
-        $this->assertEquals($hex, '0x7b');
+        $this->assertEquals($hex, '0x313233');
 
         $hex = $formatter->format(12);
         $this->assertEquals($hex, '0xc');

diff --git a/test/unit/UtilsTest.php b/test/unit/UtilsTest.php
@@ -153,24 +153,24 @@ public function testToHex()
         $this->assertEquals('0x' . $this->testHex, Utils::toHex('hello world', true));
 
         $this->assertEquals('0x927c0', Utils::toHex(0x0927c0, true));
-        $this->assertEquals('0x927c0', Utils::toHex('600000', true));
+        $this->assertEquals('0x363030303030', Utils::toHex('600000', true));
         $this->assertEquals('0x927c0', Utils::toHex(600000, true));
         $this->assertEquals('0x927c0', Utils::toHex(new BigNumber(600000), true));
 
         $this->assertEquals('0xea60', Utils::toHex(0x0ea60, true));
-        $this->assertEquals('0xea60', Utils::toHex('60000', true));
+        $this->assertEquals('0x3630303030', Utils::toHex('60000', true));
         $this->assertEquals('0xea60', Utils::toHex(60000, true));
         $this->assertEquals('0xea60', Utils::toHex(new BigNumber(60000), true));
 
         $this->assertEquals('0x', Utils::toHex(0x00, true));
-        $this->assertEquals('0x', Utils::toHex('0', true));
+        $this->assertEquals('0x30', Utils::toHex('0', true));
         $this->assertEquals('0x', Utils::toHex(0, true));
         $this->assertEquals('0x', Utils::toHex(new BigNumber(0), true));
 
         $this->assertEquals('0x30', Utils::toHex(48, true));
-        $this->assertEquals('0x30', Utils::toHex('48', true));
+        $this->assertEquals('0x3438', Utils::toHex('48', true));
         $this->assertEquals('30', Utils::toHex(48));
-        $this->assertEquals('30', Utils::toHex('48'));
+        $this->assertEquals('3438', Utils::toHex('48'));
 
         $this->assertEquals('0x30', Utils::toHex(new BigNumber(48), true));
         $this->assertEquals('0x30', Utils::toHex(new BigNumber('48'), true));