web3-eth 0.2.21 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27869236d216cf8a0cbeb2c1102cc3e9d3505ba6
-  data.tar.gz: d2e4948dcdc6b237acebe86da9bb6bb9a2908aef
+  metadata.gz: 367f280dbfd454078088f84b5285554facb4c0ef
+  data.tar.gz: 46b237bcdfa35281333e08a7e75b30b25a2f021b
 SHA512:
-  metadata.gz: ce86e2db9a40f52e0376427d5976cdd67c8cadba1d2829d3e80c7cc12b806d99c85cc2056ccf604db24f5fd25f2a8bcbab2520df1533d598ffded5e514888c64
-  data.tar.gz: 0ba1c2c31b35929922dea30d49cc547386ba784805694c599a388c82829692f8b0caf8af6a9300b2288f2e8d1d7d8c4605b15a764c83ae8b4e01d9e8a126dbb4
+  metadata.gz: 9fd72406fee7ec39e1e0301083c67cc43b2515f8946d00a4cc6143018a1119f9eed4e4248c3d9275a16da3796173cf628f93f7ee99ab0cbdbe3bf771da696273
+  data.tar.gz: fb1a3ddc4178a0e0163bebed295baca51bc350682ec4da3ba746bfca38d4482b95b876c8a6afa369a06dd81f9580a90d12ecc2787021b4f864a97333020b29b0

data/lib/web3/eth/abi/abi_coder.rb

@@ -248,7 +248,7 @@ module Web3::Eth::Abi
     end
 
     def decode_type(type, arg)
-      return nil if arg.nil?
+      return nil if arg.nil? || arg.empty?
       if type.kind_of?(Tuple) && type.dims.empty?
         arg ? decode_abi(type.types, arg) : []
       elsif %w(string bytes).include?(type.base) && type.sub.empty?

data/lib/web3/eth/abi/type.rb

@@ -14,7 +14,7 @@ module Web3::Eth::Abi
       def parse(type)
 
         if type =~ /^\((.*)\)((\[[0-9]*\])*)/
-          return Tuple.new $1.split(','), $2.scan(/\[[0-9]*\]/)
+          return Tuple.parse $1, $2.scan(/\[[0-9]*\]/)
         end
 
         _, base, sub, dimension = /([a-z]*)([0-9]*x?[0-9]*)((\[[0-9]*\])*)/.match(type).to_a
@@ -123,10 +123,43 @@ module Web3::Eth::Abi
 
   class Tuple < Type
 
-    attr_reader :types
+    def self.parse types, dims
+
+      depth = 0
+      collected = []
+      current = ''
+
+      types.split('').each do |c|
+        case c
+          when ',' then
+            if depth==0
+              collected << current
+              current = ''
+            else
+              current += c
+            end
+          when '(' then
+            depth += 1
+            current += c
+          when ')' then
+            depth -= 1
+            current += c
+          else
+            current += c
+        end
+
+      end
+      collected << current unless current.empty?
+
+      Tuple.new collected, dims
+
+    end
+
+    attr_reader :types, :parsed_types
     def initialize types, dims
-      super('tuple', '', dims)
+      super('tuple', '', dims.map {|x| x[1...-1].to_i})
       @types = types
+      @parsed_types = types.map{|t| Type.parse t}
     end
 
     def ==(another_type)
@@ -136,7 +169,27 @@ module Web3::Eth::Abi
     end
 
     def size
-      nil
+      @size ||= calculate_size
+    end
+
+    def calculate_size
+      if dims.empty?
+        s = 0
+        parsed_types.each do |type|
+          ts = type.size
+          return nil if ts.nil?
+          s += ts
+        end
+        s
+      else
+        if dims.last == 0 # 0 for dynamic array []
+          nil
+        else
+          subtype.dynamic? ? nil : dims.last * subtype.size
+        end
+      end
+
+
     end
 
     def subtype

data/lib/web3/eth/version.rb

@@ -1,5 +1,5 @@
 module Web3
   module Eth
-    VERSION = "0.2.21"
+    VERSION = "0.2.23"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web3-eth
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.2.23
 platform: ruby
 authors:
 - studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rlp