web3-eth 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1a1dffc7e7cb171bcd55633ad913b208abfa4c9
-  data.tar.gz: d80a5fd8df22cf65211d827a5b125e841274d9f4
+  metadata.gz: ef7c29f56dd299e95ab99030916ab74f49c8ab64
+  data.tar.gz: 37e532f820f44111b24985cb98821fb7e5773cfb
 SHA512:
-  metadata.gz: 26e26cca29110c636b17a05924fdacd9ff6a96950ca8c42da6d0128fc2d77d1a94de8b11519bf9abda66f4a7f0dd74850b4161298be6e508ba4388a275f2c13d
-  data.tar.gz: a6af3fd9cd9d3d33ffbf5504b73da451bf736be6784a19ccc155beb5f6b0fb1b568e276d3a9c7fba3698dcdd1063c7ec89f9f5d5df1b5dac7a37fe3ccff481c1
+  metadata.gz: 73178ab1c8530fbdbce1ad4fa8c489316e37e614b27f989c224d9a05e35ebf642340ea6d529532b025ee6ae43d1c802315cd0352f55c8a8faeb19da860e127e3
+  data.tar.gz: 3ab2344cff8b9b00cf7e06be974f5f89682bbbbfa5f126c2a5a1b7b913c3e6ce9d03d7b06bc8cd14d1188f2593b4a2ab9acf30095e0e3345018accf6b42c730f

data/lib/web3/eth/contract.rb

@@ -95,7 +95,7 @@ module Web3
 
       end
 
-      attr_reader :web3_rpc, :abi, :functions, :events, :constructor
+      attr_reader :web3_rpc, :abi, :functions, :events, :constructor, :functions_by_hash, :events_by_hash
 
       def initialize abi, web_rpc = nil
         @web3_rpc = web_rpc
@@ -115,11 +115,11 @@ module Web3
       end
 
       def find_event_by_hash method_hash
-        events.values.detect{|e| e.signature_hash==method_hash}
+        @events_by_hash[method_hash]
       end
 
       def find_function_by_hash method_hash
-        functions.values.detect{|e| e.signature_hash==method_hash}
+        @functions_by_hash[method_hash]
       end
 
       def parse_log_args log
@@ -142,9 +142,25 @@ module Web3
       private
 
       def parse_abi abi
-        @functions = Hash[abi.select{|a| a['type']=='function'}.map{|a| [a['name'], ContractMethod.new(a)]}]
-        @events = Hash[abi.select{|a| a['type']=='event'}.map{|a| [a['name'], ContractMethod.new(a)]}]
-        @constructor = (constructor = abi.detect{|a| a['type']=='constructor'}) && ContractMethod.new(constructor)
+        @functions = {}
+        @events = {}
+
+        @functions_by_hash = {}
+        @events_by_hash = {}
+
+        abi.each{|a|
+          method = ContractMethod.new(a)
+          case a['type']
+            when 'function'
+              @functions[method.name] = method
+              @functions_by_hash[method.signature_hash] = method
+            when 'event'
+              @events[method.name] = method
+              @events_by_hash[method.signature_hash] = method
+            when 'constructor'
+              @constructor = method
+          end
+        }
       end
 
     end

data/lib/web3/eth/transaction.rb

@@ -36,7 +36,9 @@ module Web3
       end
 
       def block_number
-        from_hex blockNumber
+        # if transaction is less than 12 seconds old, blockNumber will be nil
+        # :. nil check before calling `to_hex` to avoid argument error
+        blockNumber && from_hex(blockNumber)
       end
 
       def value_wei
@@ -68,4 +70,4 @@ module Web3
 
     end
   end
-end
+end

data/lib/web3/eth/version.rb

@@ -1,5 +1,5 @@
 module Web3
   module Eth
-    VERSION = "0.2.13"
+    VERSION = "0.2.14"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web3-eth
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rlp