abi_coder_rb 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35ffe301040ab5e55279be3bb020ba62d5ba3488f94217b055aeca82a403f229
-  data.tar.gz: 5a2926ad367ec5fb5e4c9600dd67fd9a9550148bfdd53beb7b3d85e8b960ebff
+  metadata.gz: 8dc7ba678a03f7f7ba489622979497fb52912b3732dcb27890c270c3b7713e0b
+  data.tar.gz: 7280e400c63ba3b901e5240710673aa8d857db86197d784a19c26f7220bc5ead
 SHA512:
-  metadata.gz: 40b222a5fbebb49b769f49ce10c0d1ec808d6c966a42338374e1a5faae5bd27378d15498f09e87de8ba3db12b724748524deba3ca02bedb5e2c6fd58a1ad724b
-  data.tar.gz: 05b4d4f66357980d6cef05c187790374ee4c8f23b7479c90faa3c2ac84c9cf5bb5833867e2cf8ebd8cfefaceff260e042e7fdacbf81d6cd8997e738c9794d793
+  metadata.gz: f361c6f8d5eb3321f0f2630b7fbfa3c3e3f962ba5bb0174e9cbf99869c55838a2d15c8a6e94c929916d737b3f8960fc37b0bcec23ae9f100ca5775d5f4a98f4c
+  data.tar.gz: 655bc2ba8c29fa3754dca9affba12f9a0cf5625bd354abbede018a6ea21ce74ad495564237ff4c95ef448bd98b0eccc41bc6951959bdee4226e78e8ac204edb9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    abi_coder_rb (0.2.3)
+    abi_coder_rb (0.2.5)
       activesupport
 
 GEM

data/lib/abi_coder_rb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AbiCoderRb
-  VERSION = "0.2.3"
+  VERSION = "0.2.5"
 end

data/lib/periphery/event_decoder.rb

@@ -6,26 +6,22 @@ class EventDecoder
 
   attr_reader :event_abi,
               # indexed_topic_inputs
-              :indexed_topic_inputs, :indexed_topic_types,
+              :indexed_topic_inputs, :indexed_topic_fields,
               # data_inputs
-              :data_inputs, :data_type_str, :data_field_names, :data_field_names_flattened
+              :data_inputs, :data_fields, :data_type_str
 
   # flatten_sep: separator for flattening event name if it is nested
-  def initialize(event_abi, flatten_sep = ".")
+  def initialize(event_abi)
     @event_abi = event_abi
     @indexed_topic_inputs, @data_inputs = event_abi["inputs"].partition { |input| input["indexed"] }
 
     # indexed_topic_inputs:
-    @indexed_topic_types = @indexed_topic_inputs.map { |input| input["type"] }
+    @indexed_topic_fields = fields_of(@indexed_topic_inputs)
 
     # data_inputs:
     @data_fields = fields_of(@data_inputs)
-
     @data_type_str = fields_type_str(@data_fields)
 
-    @data_field_names = fields_names(@data_fields)
-    @data_field_names_flattened = fields_names_flatten(@data_fields, sep: flatten_sep)
-
     # add after_decoding action
     after_decoding lambda { |type, value|
       if type == "address"
@@ -38,13 +34,19 @@ class EventDecoder
     }
   end
 
+  def data_fields_flatten(sep: ".")
+    flat_fields(@data_fields, sep: sep)
+  end
+
   def decode_topics(topics, with_names: false)
     topics = topics[1..] if topics.count == @indexed_topic_inputs.count + 1 && @event_abi["anonymous"] == false
 
     raise "topics count not match" if topics.count != @indexed_topic_inputs.count
 
+    indexed_topic_types = @indexed_topic_inputs.map { |input| input["type"] }
+
     values = topics.each_with_index.map do |topic, i|
-      indexed_topic_type = @indexed_topic_types[i]
+      indexed_topic_type = indexed_topic_types[i]
       decode(indexed_topic_type, hex_to_bin(topic))
     end
 
@@ -55,7 +57,7 @@ class EventDecoder
     end
   end
 
-  def decode_data(data, flatten: true, with_names: false)
+  def decode_data(data, flatten: true, sep: ".", with_names: false)
     return with_names ? {} : [] if @data_type_str == "()"
 
     data_values = decode(@data_type_str, hex_to_bin(data))
@@ -63,13 +65,13 @@ class EventDecoder
     case flatten
     when true
       if with_names
-        combine(@data_field_names_flattened, data_values.flatten)
+        combine(data_field_names(flatten: true, sep: sep), data_values.flatten)
       else
         data_values.flatten
       end
     when false
       if with_names
-        combine(@data_field_names, data_values)
+        combine(data_field_names, data_values)
       else
         data_values
       end
@@ -78,6 +80,23 @@ class EventDecoder
 
   private
 
+  # returns:
+  #   [
+  #     ["root", "bytes32"],
+  #     ["message", [["channel", "address"], ["index", "uint256"], ["fromChainId", "uint256"], ["from", "address"], ["toChainId", "uint256"], ["to", "address"], ["encoded", "bytes"]]]
+  #   ]
+  def fields_of(inputs)
+    inputs.map do |input|
+      if input["type"] == "tuple"
+        [input["name"].underscore, fields_of(input["components"])]
+      elsif input["type"] == "enum"
+        [input["name"].underscore, "uint8"]
+      else
+        [input["name"].underscore, input["type"]]
+      end
+    end
+  end
+
   # fields:
   #   [
   #     ["root", "bytes32"],
@@ -103,12 +122,30 @@ class EventDecoder
   #     ["root", "bytes32"],
   #     ["message", [["channel", "address"], ["index", "uint256"], ["fromChainId", "uint256"], ["from", "address"], ["toChainId", "uint256"], ["to", "address"], ["encoded", "bytes"]]]
   #   ]
-  #
+  # returns:
+  #   [["root", "bytes32"], ["message.channel", "address"], ["message.index", "uint256"], ["message.from_chain_id", "uint256"], ["message.from", "address"], ["message.to_chain_id", "uint256"], ["message.to", "address"], ["message.gas_limit", "uint256"], ["message.encoded", "bytes"]]
+
+  def flat_fields(fields, sep: ".")
+    fields.map do |name, type|
+      if type.is_a?(::Array)
+        flat_fields(type, sep: sep).map do |n, t|
+          ["#{name}#{sep}#{n}", t]
+        end
+      else
+        [[name, type]]
+      end
+    end.flatten(1)
+  end
+
+  # fields:
+  #   [
+  #     ["root", "bytes32"],
+  #     ["message", [["channel", "address"], ["index", "uint256"], ["fromChainId", "uint256"], ["from", "address"], ["toChainId", "uint256"], ["to", "address"], ["encoded", "bytes"]]]
+  #   ]
   # returns:
   #   ["root", {"message" => ["channel", "index", "fromChainId", "from", "toChainId", "to", "gasLimit", "encoded"]}
   def fields_names(fields)
     fields.map do |name, type|
-      name = name.underscore
       if type.is_a?(::Array)
         { name => fields_names(type) }
       elsif type.is_a?(::String)
@@ -125,9 +162,8 @@ class EventDecoder
   #
   # returns:
   #   ["root", "message_channel", "message_index", "message_fromChainId", "message_from", "message_toChainId", "message_to", "message_gasLimit", "message_encoded"]
-  def fields_names_flatten(fields, prefix: nil, sep: "_")
+  def fields_names_flatten(fields, prefix: nil, sep: ".")
     fields.map do |name, type|
-      name = name.underscore
       if type.is_a?(::Array)
         fields_names_flatten(
           type,
@@ -140,20 +176,11 @@ class EventDecoder
     end.flatten
   end
 
-  # returns:
-  #   [
-  #     ["root", "bytes32"],
-  #     ["message", [["channel", "address"], ["index", "uint256"], ["fromChainId", "uint256"], ["from", "address"], ["toChainId", "uint256"], ["to", "address"], ["encoded", "bytes"]]]
-  #   ]
-  def fields_of(inputs)
-    inputs.map do |input|
-      if input["type"] == "tuple"
-        [input["name"], fields_of(input["components"])]
-      elsif input["type"] == "enum"
-        [input["name"], "uint8"]
-      else
-        [input["name"], input["type"]]
-      end
+  def data_field_names(flatten: false, sep: ".")
+    if flatten
+      fields_names_flatten(@data_fields, sep: sep)
+    else
+      fields_names(@data_fields)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abi_coder_rb
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Aki Wu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-21 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport