Fixes for event log and event handling

src/Abi.php

@@ -109,7 +109,7 @@ public static function decode(array $params, string $msgData)
             }
             elseif ($lengthType === 'dynamic') {
                 // Dynamic length type.
-                $offsetInChars = 2 * Rlp::getByteValueAtOffsetPos($msgData, $pos);
+                $offsetInChars = 2 * Rlp::getByteValueAt($msgData, $pos);
                 $rlpDecoded = Rlp::decode(substr($msgData, $offsetInChars));
 
                 if (count($rlpDecoded) === 1) {

src/DataType/EthBytes.php

@@ -32,7 +32,7 @@ class EthBytes extends EthD
      */
     public function validate($val, array $params)
     {
-        if (!ctype_xdigit($this->removeHexPrefix($val))) {
+        if (!ctype_xdigit($this->removeHexPrefix($val)) && $this->removeHexPrefix($val) != '') {
             throw new \InvalidArgumentException(
               'Value of dynamic ABI type is not a valid hex string.'
             );

src/Ethereum.php

@@ -7,6 +7,7 @@
 use Exception;
 use Ethereum\DataType\EthD;
 use Ethereum\DataType\EthD32;
+use Ethereum\DataType\EthB;
 use Ethereum\EcRecover;
 use Ethereum\DataType\FilterChange;
 
@@ -286,7 +287,7 @@ private function createReturnValue($value, string $return_type_class, string $me
         elseif (!$is_primitive) {
 
             if ($array_val) {
-                if ($method === 'eth_getFilterChanges') {
+                if ($method === 'eth_getFilterChanges' || $method === 'eth_getLogs') {
                     // Only be [FilterChange| D32]
                     $return = $this->handleFilterChangeValues($value);
                 }
@@ -428,7 +429,7 @@ protected static function handleFilterChangeValues(array $values) {
 
                     if (substr($type, 0, 1) === '[') {
                         // param is an array. E.g topics.
-                        $className = '\Ethereum\Datatype\\' . str_replace(['[', ']'], '', $type);
+                        $className = '\Ethereum\DataType\\' . str_replace(['[', ']'], '', $type);
                         $sub = [];
                         foreach ($val[$key] as $subVal) {
                             $sub[] = new $className($subVal);
@@ -438,7 +439,7 @@ protected static function handleFilterChangeValues(array $values) {
                         // @todo We'll need to decode the ABI of the values too!
                     }
                     else {
-                        $className = '\Ethereum\Datatype\\' . $type;
+                        $className = '\Ethereum\DataType\\' . $type;
                         $processed[] = isset($val[$key]) ? new $className($val[$key]) : null;
                     }
                 }

src/Event.php

@@ -39,13 +39,15 @@ public function decode(FilterChange $filterChange) {
 
         // Removing topic[0]. Topic[1-n] are indexed values.
         $indexedValues = array_slice($filterChange->topics, 1);
+        $offset = 0;
 
         foreach ($this->inputs as $i => $param) {
             if ($param->indexed) {
-                $values[$param->name] = $indexedValues[$i]->convertByAbi($param->type);
+                $values[$param->name] = $indexedValues[$i - $offset]->convertByAbi($param->type);
             }
             else {
                 $abiDecode[] = $param;
+                $offset++;
             }
         }
 

src/RLP/Rlp.php

@@ -282,7 +282,7 @@ private static function charLength(string $hex)
         return 2 * hexdec($hex);
     }
 
-    protected static function getByteValueAt(string $msgData, int $pos)
+    public static function getByteValueAt(string $msgData, int $pos)
     {
         return self::byteLength(substr($msgData, $pos, 64));
     }

src/SmartContract.php

@@ -97,11 +97,14 @@ public function __call(string $method, array $args)
 
     /**
      * @param \Ethereum\DataType\FilterChange $filterChange
+     *
+     * @param boolean $eventHandle
+     * 
      * @throws \Exception
      *
      * @return \Ethereum\EmittedEvent with emitted Data.
      */
-    public function processLog(FilterChange $filterChange) {
+    public function processLog(FilterChange $filterChange, $eventHandle = true) {
 
         if ($filterChange->address->hexVal() !== $this->contractAddress) {
             return null;
@@ -114,8 +117,10 @@ public function processLog(FilterChange $filterChange) {
                 // We have a relevant event.
                 $event = new EmittedEvent($this->events[$topic], $filterChange, $transaction);
                 // Process onEventName handler.
-                if (method_exists($this, $event->getHandler())) {
-                    call_user_func([$this, $event->getHandler()], $event);
+                if ($eventHandle) {
+                    if (method_exists($this, $event->getHandler())) {
+                        call_user_func([$this, $event->getHandler()], $event);
+                    }
                 }
                 return $event;
             }