ethereum.rb 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4bfce795e5c0ba5c86e8731f2f7c04504b53000
-  data.tar.gz: 52feb089966aabb77b7a1002d5a8aff8433049dd
+  metadata.gz: 118a182e1fe6df35ead4dd24f452ab8dbe163f1b
+  data.tar.gz: 95b4a183b908e5c835f95af4772069603c08fb38
 SHA512:
-  metadata.gz: 40ff1fe3ac72b9f4676eb5350c1ada0e31ebcf9778eeab3b5d80036f5d4a8c0cc854d3988f4a11d044788ffadee6482ca5d0bf2e7c31e600521de045f9d93902
-  data.tar.gz: 69eb7f4a2a31e04a883d0b266211fd13e411790afc9105e884494464e508db60fd4363e9f970aef9afb26b153501e1f35c89e4bf8dc456951c5f2da569d31b6b
+  metadata.gz: b6353836a9589c7517beacb7bb29c402c08cc942e774954653eaf4f69d4202002f4cd67edc8c458cd29a4479bf4528fcb38b326ce16bb9b3838bfeab739a616f
+  data.tar.gz: 1bcf61ed8af8111c10045e3a17e07011a8892f5db6d523d9a9863fc95078eee9856a398b82b3a6d1ec840d4ba22ea4af30a3f30ed4355e7ad75b0bfd30ca7d9a

data/lib/ethereum/abi.rb

@@ -2,7 +2,12 @@ module Ethereum
   class Abi
 
     def self.parse_abi(abi)
-      constructor_inputs = abi.detect {|x| x["type"] == "constructor"}["inputs"] rescue nil
+      constructor = abi.detect {|x| x["type"] == "constructor"}
+      if constructor.present?
+        constructor_inputs = constructor["inputs"].map { |input| Ethereum::FunctionInput.new(input) }
+      else
+        constructor_inputs = []
+      end
       functions = abi.select {|x| x["type"] == "function" }.map { |fun| Ethereum::Function.new(fun) }
       events = abi.select {|x| x["type"] == "event" }.map { |evt| Ethereum::ContractEvent.new(evt) }
       [constructor_inputs, functions, events]

data/lib/ethereum/contract.rb

@@ -48,7 +48,7 @@ module Ethereum
       if @constructor_inputs.present?
         raise "Missing constructor parameter" and return if params.length != @constructor_inputs.length
       end
-      deploy_arguments = @formatter.construtor_params_to_payload(@constructor_inputs, params)
+      deploy_arguments = @encoder.encode_arguments(@constructor_inputs, params)
       payload = "0x" + @code + deploy_arguments
       tx = @client.eth_send_transaction({from: sender, data: payload})["result"]
       raise "Failed to deploy, did you unlock #{sender} account? Transaction hash: #{deploytx}" if tx.nil? || tx == "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -69,10 +69,7 @@ module Ethereum
       deploy_arguments = ""
       if @constructor_inputs.present?
         raise "Wrong number of arguments in a constructor" and return if params.length != @constructor_inputs.length
-        @constructor_inputs.each_index do |i|
-          args = [@constructor_inputs[i]["type"], params[i]]
-          deploy_arguments << @formatter.to_payload(args)
-        end
+        deploy_arguments = @encoder.encode_arguments(@constructor_inputs, params)
       end
       deploy_payload = @code + deploy_arguments
       result = @client.eth_estimate_gas({from: @sender, data: "0x" + deploy_payload})

data/lib/ethereum/encoder.rb

@@ -38,17 +38,17 @@ module Ethereum
     end
 
     def encode_dynamic_bytes(value)
-      location = encode_uint(32)
+      location = encode_uint(@inputs ? @inputs.size * 32 : 32)
       size = encode_uint(value.size)
       content = encode_bytes(value)
-      location + size + content
+      [location, size + content]
     end
 
     def encode_string(value)
-      location = encode_uint(32)
+      location = encode_uint(@inputs ? @inputs.size * 32 : 32)
       size = encode_uint(value.bytes.size)
       content = value.bytes.map {|x| x.to_s(16)}.join("").ljust(64, '0')
-      location + size + content
+      [location, size + content]
     end
 
     def encode_address(value)
@@ -61,6 +61,22 @@ module Ethereum
       value.start_with?("0x") ? value : ("0x" + value)
     end
 
+    def encode_arguments(inputs, args)
+      @head = ""
+      @tail = ""
+      @inputs = inputs
+      inputs.each.with_index do |input, index|
+        encoded = encode(input.type, args[index])
+        if encoded.is_a? Array
+          @head << encoded[0]
+          @tail << encoded[1]
+        else
+          @head << encoded
+        end
+      end
+      @head + @tail
+    end
+
     private
       def to_twos_complement(number)
         (number & ((1 << 256) - 1))

data/lib/ethereum/function.rb

@@ -6,7 +6,7 @@ module Ethereum
     def initialize(data)
       @name = data["name"]
       @constant = data["constant"]
-      @inputs = data["inputs"].collect do |input|
+      @inputs = data["inputs"].map do |input|
         Ethereum::FunctionInput.new(input)
       end
       @outputs = data["outputs"].collect do |output|

data/lib/ethereum/version.rb

@@ -1,3 +1,3 @@
 module Ethereum
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ethereum.rb
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Marek Kirejczyk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2017-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler