web3-eth 0.2.24 → 0.2.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 349ba2e58a5171bb47c408e03e48ae0bb412d9df
-  data.tar.gz: edd6d4cb343b3b9a6fa2517f8b2c3e22c2f2699c
+  metadata.gz: 33bd4cdb2606f3062e84ccbc4429052a3dce2def
+  data.tar.gz: 1fa19d0bcfde6f6d467f295940353f7250a3c99b
 SHA512:
-  metadata.gz: 122feca9cb6d36847433c515955535662b0d0906818d12c158fa3d7e15cbfb45e8cd6b59d9a87d8311a9d6f65f42797c4bc661f9166607d924c2efbfae4f5f06
-  data.tar.gz: d4bff9d38361237b2b64ef7dabac296edad63badb7197c2a59a3648c73bc37a1b9a356dd5374f0ded4dbc22c1558cf68c1c5bdbad99ffa55e8f5323033b848fd
+  metadata.gz: dae87035bfeeaa1b67978281030a052a23f0caf52db741d2b387effff6543dd2d31d99a6bb8155c93ac602457e4d5cbd84c8e35d756364b3b7c28c2463575655
+  data.tar.gz: b3fb6aab3c77c4b3362e688b64ef846e08c735fdb50d16842a0c10ac30f931716f94f0caf311a7ccdfe6cc0d4a06d73c451b1fc4609282c8a213f0d84a77bc3a

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

@@ -192,10 +192,15 @@ module Web3::Eth::Abi
       end
     end
 
+
+    def min_data_size types
+      types.size*32
+    end
+    
     ##
     # Decodes multiple arguments using the head/tail mechanism.
     #
-    def decode_abi(types, data)
+    def decode_abi types, data, raise_errors = false
       parsed_types = types.map {|t| Type.parse(t) }
 
       outputs = [nil] * types.size
@@ -207,8 +212,17 @@ module Web3::Eth::Abi
         # If a type is static, grab the data directly, otherwise record its
         # start position
         if t.dynamic?
+
+          if raise_errors && pos>data.size-1
+            raise DecodingError, "Position out of bounds #{pos}>#{data.size-1}"
+          end
+
           start_positions[i] = Utils.big_endian_to_int(data[pos, 32])
 
+          if raise_errors && start_positions[i]>data.size-1
+            raise DecodingError, "Start position out of bounds #{start_positions[i]}>#{data.size-1}"
+          end
+
           j = i - 1
           while j >= 0 && start_positions[j].nil?
             start_positions[j] = start_positions[i]
@@ -230,7 +244,10 @@ module Web3::Eth::Abi
         j -= 1
       end
 
-#      raise DecodingError, "Not enough data for head" unless pos <= data.size
+      if raise_errors && pos > data.size
+        raise DecodingError, "Not enough data for head"
+      end
+
 
       parsed_types.each_with_index do |t, i|
         if t.dynamic?
@@ -241,6 +258,10 @@ module Web3::Eth::Abi
         end
       end
 
+      if raise_errors && outputs.include?(nil)
+        raise DecodingError, "Not all data can be parsed"
+      end
+
       parsed_types.zip(outputs).map {|(type, out)| decode_type(type, out) }
     end
     alias :decode :decode_abi

data/lib/web3/eth/contract.rb

@@ -103,6 +103,52 @@ module Web3
 
       end
 
+      class ContractConstructor < ContractMethod
+
+        def initialize abi
+          super abi
+        end
+
+        def parse_method_args transaction
+          return [] if input_types.empty?
+
+          input = transaction.input
+
+          d = fetch_constructor_data input
+          result = (d && !d.empty? && try_parse(d))
+
+          unless result
+            start = input.length-1-min_data_size(input_types)
+            while start>=0 && !result
+              result = try_parse input, start
+              start -= 1
+            end
+          end
+
+          result
+        end
+
+        private
+
+        CONSTRUCTOR_SEQ = /a165627a7a72305820\w{64}0029(\w*)$/
+        def fetch_constructor_data input
+          data = input[CONSTRUCTOR_SEQ,1]
+          while data && (d = data[CONSTRUCTOR_SEQ,1])
+            data = d
+          end
+          data
+        end
+
+        def try_parse input, start = 0
+          d = start==0  ? input : input.slice(start, input.length-start-1)
+          decode_abi input_types, [d].pack('H*'), true
+        rescue Exception => err
+          nil
+        end
+
+      end
+
+
       attr_reader :web3_rpc, :abi, :functions, :events, :constructor, :functions_by_hash, :events_by_hash
 
       def initialize abi, web_rpc = nil
@@ -168,8 +214,7 @@ module Web3
               @events[method.name] = method
               @events_by_hash[method.signature_hash] = method
             when 'constructor'
-              method = ContractMethod.new(a)
-              @constructor = method
+              @constructor = ContractConstructor.new(a)
           end
         }
       end

data/lib/web3/eth/transaction.rb

@@ -26,9 +26,7 @@ module Web3
       # suffix # 0xa1 0x65 'b' 'z' 'z' 'r' '0' 0x58 0x20 <32 bytes swarm hash> 0x00 0x29
       # look http://solidity.readthedocs.io/en/latest/metadata.html for details
       def call_input_data
-        if raw_data['creates'] && input
-          fetch_constructor_data input
-        elsif input && input.length>10
+        if input && input.length>10
           input[10..input.length]
         else
           []
@@ -57,16 +55,6 @@ module Web3
         wei_to_ether from_hex gasPrice
       end
 
-      private
-
-      CONSTRUCTOR_SEQ = /a165627a7a72305820\w{64}0029(\w*)$/
-      def fetch_constructor_data input
-        data = input[CONSTRUCTOR_SEQ,1]
-        while data && (d = data[CONSTRUCTOR_SEQ,1])
-          data = d
-        end
-        data
-      end
 
     end
   end

data/lib/web3/eth/version.rb

@@ -1,5 +1,5 @@
 module Web3
   module Eth
-    VERSION = "0.2.24"
+    VERSION = "0.2.25"
   end
 end

metadata

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