etheruby 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69a49c095a9ddcee44a49105c2f212329520e0e7
-  data.tar.gz: 44d3ffb4f1a9bc0c12e3fbb48d7c2284c14b7c33
+  metadata.gz: af7e8f1646fb49e6c917b515320bc07b9f9413a8
+  data.tar.gz: 799fc6b8aefea6413ae6d664db3620788ea625ac
 SHA512:
-  metadata.gz: 64bee06d5c9bd73351cca313b7ac428c9e46d267f5838c88b91f8583cfd6bc5d6afea8ae6fb97918b358a92a356c4e912dd0e6ab55fb94467489706765cc1ee3
-  data.tar.gz: 7b7739089daacb4b704ad68ea03098058821661e6849d8d3a9be2d90bb12c6da98619f7d862355e5aaaffabf8ee351427c9ba3926722812735a917dc98f65c85
+  metadata.gz: 2c997b1010710a80a3e28f28511cb4de3518cbca6d9ee1a186f484b89021dca5078029d11903deacff7280768ddcd0c3eca10307e04b66507726b8fff54b1a88
+  data.tar.gz: 158181e1ed668c808d58ab4cbc82bd8e86c4e6ca001e0a39754f571153e6a928e487194855339f1bbacd87241e124bc3f8d7dfb40fae6a7154388904d1a423bc

data/lib/etheruby/contract.rb

@@ -5,6 +5,22 @@ require_relative 'response_parser'
 
 module Etheruby
   class NoContractMethodError < StandardError; end
+  class NoPasswordForAddress < StandardError; end
+
+  class TransactionInformation
+    @@info = nil
+    def self.information=(_info)
+      @@info = _info
+    end
+    def self.set?() @@set end
+    def self.default_from() @@info[:default_from] end
+    def self.address_password(address)
+      unless @@info
+        raise NoPasswordForAddress.new("No password for address #{address}")
+      end
+      @@info[:addresses][address]
+    end
+  end
 
   def contract
     Class.new do
@@ -46,20 +62,36 @@ module Etheruby
         }
         @@logger.debug("Calling #{method_info[:name]} with parameters #{composed_body.inspect}")
         response = call_api composed_body
-        if response.has_key? 'error'
+        if response.is_a? Hash and response.has_key? 'error'
           @@logger.error("Failed contract execution #{response['error']['message']}")
-        else
+        elsif response.is_a? Hash and response.has_key? 'result'
           @@logger.debug("Response from API for #{method_info[:name]} : #{response.inspect}")
-        end
-        if method_info.has_key? :returns
-          ResponseParser.new(method_info[:returns], response['result']).parse
+          if method_info.has_key? :returns
+            ResponseParser.new(method_info[:returns], response['result']).parse
+          else
+            response['result']
+          end
         else
-          response['result']
+          @@logger.error("Failed contract execution response : #{response.inspect}")
         end
       end
 
       def self.call_api(composed_body)
-        Client.eth.call composed_body, "latest"
+        if composed_body.has_key? :gas or composed_body.has_key? :value
+          return do_eth_transaction(composed_body)
+        else
+          return do_eth_call(composed_body)
+        end
+      end
+
+      def self.do_eth_call(composed_body)
+        Client.eth.call(composed_body, "latest")
+      end
+
+      def self.do_eth_transaction(composed_body)
+        from_address = composed_body[:from] || TransactionInformation.default_from
+        pwd = TransactionInformation.address_password(from_address)
+        return Client.personal.sendTransaction(composed_body.merge({from: from_address}), pwd)
       end
 
       def self.address

data/lib/etheruby/railtie.rb

@@ -3,9 +3,15 @@ Dir["./app/contracts/**/*.rb"].each { |f| require f }
 module Etheruby
 
   class Railtie < Rails::Railtie
-
     initializer "etheruby.configure" do |app|
-      Etheruby::Client.uri = app.config.etheruby_uri if app.config.respond_to? :etheruby_uri
+      if app.config.respond_to? :etheruby_uri
+        Etheruby::Client.uri = app.config.etheruby_uri
+      end
+
+      if app.config.respond_to? :etheruby_enable_transactions
+        Etheruby::TransactionInformation.information = \
+          app.config.etheruby_enable_transactions
+      end
     end
   end
 

data/lib/etheruby/response_parser.rb

@@ -14,32 +14,32 @@ module Etheruby
     end
 
     def parse
-      if returns.count == 1
-        v, s = Etheruby::treat_variable(returns[0], response, :decode)
-        v = v.decode if v.is_a? Etheruby::Encoders::DynamicArray or v.is_a? Etheruby::Encoders::StaticArray
-        v
-      else
-        real_response = @response
-        values = []
-        i = 0
-        loop do
-          return_type = returns[i]
-          if Etheruby::is_static_type?(return_type)
-            v, s = Etheruby::treat_variable(return_type, real_response, :decode)
-          else
-            value_position, s = Etheruby::Encoders::Uint.new(real_response).decode
-            v, take_size = Etheruby::treat_variable(
-              return_type,
-              @response[(value_position*2)..response.length],
-              :decode
-            )
-          end
-          v = v.decode if v.is_a? Etheruby::Encoders::DynamicArray or v.is_a? Etheruby::Encoders::StaticArray
-          values << v
-          break if values.count == returns.count
-          real_response = real_response[s*2..real_response.length]
-          i += 1
+      real_response = @response
+      values = []
+      i = 0
+      loop do
+        return_type = returns[i]
+        if Etheruby::is_static_type?(return_type)
+          v, s = Etheruby::treat_variable(return_type, real_response, :decode)
+        else
+          value_position, s = Etheruby::Encoders::Uint.new(real_response).decode
+          v, take_size = Etheruby::treat_variable(
+            return_type,
+            @response[(value_position*2)..response.length],
+            :decode
+          )
+        end
+        if v.is_a? Etheruby::Encoders::DynamicArray or v.is_a? Etheruby::Encoders::StaticArray
+          v, s = v.decode
         end
+        values << v
+        break if values.count == returns.count
+        real_response = real_response[s*2..real_response.length]
+        i += 1
+      end
+      if values.count == 1
+        values[0]
+      else
         values
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etheruby
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Jérémy SEBAN