web3-eth 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de95829830c0a0696d4c9c908c0a39addc9d2b19
-  data.tar.gz: 189703e994df7b14129b1e2e4b3a3d91be0ad6a0
+  metadata.gz: 4758d5a4540a14b447eb213e16092e860146af3f
+  data.tar.gz: 3a1ac8621164a3c9b89e87c70453bb2025d20222
 SHA512:
-  metadata.gz: d35616136d1d6e347ccca1f77fdafbd7ff27feddd37ffffd55f0c6207b6ba951ff7a742d1db829f7f254f69de81cf7a379a89b49c94666bf642a68f19785173e
-  data.tar.gz: da1329d8c379331f1a1a1ffdf0fee2664e71064aad11e6f57a6c26a3887eee9c99a3dbe6ec68339976804a7c50201040d31c1e46e53399d5a4556a71d94f60df
+  metadata.gz: ae81f830cab286398b126134345614421417b3ac279fed512403344f431192251faaacef0a85fc0bd3a89f4f5c2b48deb8ed095a9febef2744bca7ec9c79bb1f
+  data.tar.gz: 1102a1c92255349f489f4568b609df283e6e77ed97a866f23524cd6fd76ad3bed641304219a732f0634ec2d9472880bb28609fb8b49005bfeda59814fb69f8c3

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

@@ -248,7 +248,9 @@ module Web3::Eth::Abi
     end
 
     def decode_type(type, arg)
-      if %w(string bytes).include?(type.base) && type.sub.empty?
+      if type.kind_of?(Tuple)
+        decode_abi(type.types, arg)
+      elsif %w(string bytes).include?(type.base) && type.sub.empty?
         l = Utils.big_endian_to_int arg[0,32]
         data = arg[32..-1]
         data[0, l]

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

@@ -12,6 +12,11 @@ module Web3::Eth::Abi
       # 256, 128x128, nil), array component (eg. [], [45], nil)
       #
       def parse(type)
+
+        if type =~ /^\((.*)\)((\[[0-9]*\])*)/
+          return Tuple.new $1.split(','), $2.scan(/\[[0-9]*\]/)
+        end
+
         _, base, sub, dimension = /([a-z]*)([0-9]*x?[0-9]*)((\[[0-9]*\])*)/.match(type).to_a
 
         dims = dimension.scan(/\[[0-9]*\]/)
@@ -115,4 +120,26 @@ module Web3::Eth::Abi
     end
 
   end
+
+  class Tuple < Type
+
+    attr_reader :types
+    def initialize types, dims
+      super('tuple', '', dims)
+      @types = types
+    end
+
+    def ==(another_type)
+      another_type.kind_of?(Tuple) &&
+          another_type.types == types &&
+          another_type.dims == dims
+    end
+
+    def size
+      nil
+    end
+
+
+  end
+
 end

data/lib/web3/eth/contract.rb

@@ -35,12 +35,20 @@ module Web3
           @abi = abi
           @name = abi['name']
           @constant = !!abi['constant']
-          @input_types = abi['inputs'].map{|a| a['type']}
-          @output_types = abi['outputs'].map{|a| a['type']} if abi['outputs']
+          @input_types = abi['inputs'].map{|a| parse_component_type a }
+          @output_types = abi['outputs'].map{|a| parse_component_type a } if abi['outputs']
           @signature = Abi::Utils.function_signature @name, @input_types
           @signature_hash = Abi::Utils.signature_hash @signature, (abi['type']=='event' ? 64 : 8)
         end
 
+        def parse_component_type argument
+          if argument['type']=='tuple'
+            argument['components'] ? "(#{argument['components'].collect{|c| c['type'] }.join(',')})" : '()'
+          else
+            argument['type']
+          end
+        end
+
         def parse_event_args log
 
           log_data = remove_0x_head log.raw_data['data']

data/lib/web3/eth/version.rb

@@ -1,5 +1,5 @@
 module Web3
   module Eth
-    VERSION = "0.2.16"
+    VERSION = "0.2.17"
   end
 end

data/web3-eth.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "web3-eth"
   spec.version       = Web3::Eth::VERSION
   spec.authors       = ["studnev"]
-  spec.email         = ["studnev@izx.io"]
+  spec.email         = ["aleksey@bloxy.info"]
 
   spec.summary       = %q{Web3 client to connect to Ethereum node by RPC.}
   spec.description   = %q{Calling RPC methods of Ethereum node with Ruby.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web3-eth
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rlp
@@ -82,7 +82,7 @@ dependencies:
         version: '5.0'
 description: Calling RPC methods of Ethereum node with Ruby.
 email:
-- studnev@izx.io
+- aleksey@bloxy.info
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Web3 client to connect to Ethereum node by RPC.