Update TypedDataEncoder

web3p · Jan 19, 2024 · f689aab · f689aab
1 parent 6c3a335
commit f689aab
Showing 1 changed file with 34 additions and 11 deletions.
diff --git a/src/Contracts/TypedDataEncoder.php b/src/Contracts/TypedDataEncoder.php
@@ -101,8 +101,7 @@ public function __set($name, $value)
      * @param array $arguments
      * @return void
      */
-    public static function __callStatic($name, $arguments)
-    {}
+    // public static function __callStatic($name, $arguments) {}
 
     /**
      * encodeField
@@ -117,7 +116,7 @@ function encodeField(array $types, string $name, string $type, mixed $value)
     {
         if (array_key_exists($type, $types)) {
             if (is_null($value)) {
-                return ['bytes32', str_repeat('0', 64)];
+                return ['bytes32', '0x' . str_repeat('0', 64)];
             } else {
                 return ['bytes32', Utils::sha3($this->encodeData($type, $types, $value))];
             }
@@ -135,7 +134,26 @@ function encodeField(array $types, string $name, string $type, mixed $value)
                     'Invalid value for field ' . $name . ' of type ' . $type . ': expected array'
                 );
             }
-            // TODO: array stuff
+            $pos = strpos($type, '[');
+            if ($pos === false) {
+                // should not happen
+                throw new InvalidArgumentException(
+                    'Invalid value for field ' . $name . ' of type ' . $type . ': expected array'
+                );
+            }
+            $parsedType = substr($type, 0, $pos);
+            $dataTypes = [];
+            $dataValues = [];
+            foreach ($value as $item) {
+                list($dataType, $dataValue) = $this->encodeField($types, $name, $parsedType, $item);
+                $dataTypes[] = $dataType;
+                $dataValues[] = $dataValue;
+            }
+            if (count($dataTypes) == 0) {
+                # the keccak hash of `encode((), ())`
+                return ['bytes32', '0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470'];
+            }
+            return ["bytes32", Utils::sha3($this->ethabi->encode($dataTypes, $dataValues))];
         } else if ($type === 'bool') {
             return [$type, bool($value)];
         } else if (substr($type, 0, 5) === 'bytes') {
@@ -144,9 +162,11 @@ function encodeField(array $types, string $name, string $type, mixed $value)
             }
             return [$type, $value];
         } else if ($type === 'string') {
-            return ['bytes32', Utils::sha3($value)];
+            return ['bytes32', Utils::sha3('0x' . Utils::toHex($value))];
+        } else if (is_string($value) && preg_match('/^u?int/', $type) === 1) {
+            $bn = Utils::toBn($value);
+            return [$type, $bn->toString()];
         }
-        // TODO: allow string uint and int?
         return [$type, $value];
     }
 
@@ -252,7 +272,7 @@ protected function encodeData(string $type, array $types, array $data)
             $encodedTypes[] = $type;
             $encodedValues[] = $value;
         }
-        
+
         return $this->ethabi->encodeParameters($encodedTypes, $encodedValues);
     }
 
@@ -310,13 +330,16 @@ public function hashDomain(array $domainData)
                 'type' => 'bytes32'
             ]
         ];
+        foreach ($domainData as $key => $data) {
+            if (!array_key_exists($key, $eip721Domain)) {
+                throw new InvalidArgumentException('Invalid domain key: ' . $key);
+            }
+        }
         $domainTypes = [
             'EIP712Domain' => []
         ];
-        foreach ($domainData as $key => $data) {
-            if (!array_key_exists($key, $eip721Domain)) {
-                throw new InvalidArgumentException('Invalid domain key: ' + $key);
-            } else {
+        foreach ($eip721Domain as $key => $data) {
+            if (array_key_exists($key, $domainData)) {
                 $domainTypes['EIP712Domain'][] = $eip721Domain[$key];
             }
         }