Added specs for fully indexsed Transfer event and fixed a decoding bug

Author: tzumby

lib/eth_contract.ex

@@ -231,7 +231,6 @@ defmodule EthContract do
     types_signature   = Enum.join(["(", Enum.join(output_types_no_index, ","), ")"])
     output_signature  = "#{method}(#{types_signature})"
 
-    # grab last two topics, first one is the event signature
     [ _ | topics ] = topics
 
     decoded_data = trimmed_data
@@ -249,25 +248,31 @@ defmodule EthContract do
       |> Enum.map(fn x ->
         { map, data } = x
         type = String.to_atom(map["type"])
-        decoded = data
-                  |> trim_data
-                  |> ABI.TypeDecoder.decode_raw([type])
-                  |> List.first
-                  |> Base.encode16(case: :lower)
-
-decoded = case type do
-  :address -> "0x" <> decoded
-end
 
-{map["name"], decoded}
+        decoded = case type do
+          :address -> 
+            result = data
+                     |> trim_data
+                     |> ABI.TypeDecoder.decode_raw([type])
+                     |> List.first
+                     |> Base.encode16(case: :lower)
+            "0x" <> result
+          :uint256 ->
+            data
+            |> trim_data
+            |> :binary.decode_unsigned
+        end
+
+        {map["name"], decoded}
       end)
 
-      indexed_result = res
-                       |> Enum.into(%{})
+    indexed_result = 
+      res
+      |> Enum.into(%{})
 
-                       {:ok, Map.merge(indexed_result, non_indexed_result) }
+    {:ok, Map.merge(indexed_result, non_indexed_result) }
   end
-
+    
   @doc """
   Decodes events with no indexes.
 

mix.exs

@@ -4,7 +4,7 @@ defmodule EthContract.MixProject do
   def project do
     [
       app: :eth_contract,
-      version: "0.2.8",
+      version: "0.2.9",
       elixir: "~> 1.6",
       start_permanent: Mix.env() == :prod,
       name: "ETHContract",

test/eth_contract_test.exs

@@ -7,6 +7,38 @@ defmodule EthContractTest do
   end
 
   describe "decode_log/4" do
+    test "it decodes fully indexed Transfer event" do
+      abi = %{
+        "Transfer" => %{
+          "anonymous" => false,
+          "inputs" => [
+            %{
+              "indexed" => true,
+              "name" => "from",
+              "type" => "address"
+            },
+            %{
+              "indexed" => true,
+              "name" => "to",
+              "type" => "address"
+            },
+            %{
+              "indexed" => true,
+              "name" => "tokenId",
+              "type" => "uint256"
+            }
+          ],
+          "name" => "Transfer",
+          "type" => "event"
+        }
+      }
+
+      {:ok, log_data } = EthContract.decode_log("0x", ["0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", "0x000000000000000000000000b7282d0d208f1fc533ba60a4a3dc03adc2aab8e7", "0x0000000000000000000000007192bb75777dab47ef6fbf6f6c0e4bcbb2294f38", "0x000000000000000000000000000000000000000000000000000000000000048f"], abi, "Transfer")
+
+      assert log_data === %{"tokenId" => 1167, "from" => "0xb7282d0d208f1fc533ba60a4a3dc03adc2aab8e7", "to" => "0x7192bb75777dab47ef6fbf6f6c0e4bcbb2294f38"}
+
+    end
+
     test "it decodes coin Transfer event" do
       abi = %{
         "Transfer" => %{