Merge pull request #7 from androzd/master

Improve decoder

Author: codeator

src/Coder.php

@@ -40,12 +40,12 @@ public function __construct(string $connection, string $contractAddress)
      * @param array $logs
      * @return array
      */
-    public function decodeLogs(array $logs): array
+    public function decodeLog(array $log): array
     {
         $eventInputs = [];
-        $data        = Arr::get($logs, '0.data');
-        $topics      = array_slice(Arr::get($logs, '0.topics', []), 1);
-        $topicId     = substr(Arr::first(Arr::get($logs, '0.topics', [])), 2);
+        $data        = Arr::get($log, 'data');
+        $topics      = array_slice(Arr::get($log, 'topics', []), 1);
+        $topicId     = substr(Arr::first(Arr::get($log, 'topics', [])), 2);
 
         if (empty($topics) || is_null($data))
         {
@@ -62,11 +62,30 @@ public function decodeLogs(array $logs): array
         {
             $inputs      = Arr::get($eventInputs[$topicId], 'inputs');
             $parsedEvent = $this->decodeEvent($inputs, $topics, $data);
+            $parsedEvent['eventName'] = $eventInputs[$topicId]['name'];
         }
 
         return $parsedEvent ?? [];
     }
 
+    /**
+     * @param array $logs
+     * @return array
+     */
+    public function decodeLogs(array $logs): array
+    {
+        $parsedEvents = [];
+        foreach ($logs as $log) {
+            $decodedLog = $this->decodeLog($log);
+            if (empty($decodedLog)) {
+                continue;
+            }
+            $parsedEvents[] = $decodedLog;
+        }
+
+        return $parsedEvents;
+    }
+
     /**
      * @param array $event
      * @return bool|string