etheruby 0.1.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62e7a1ef2415572fb35e1617898576247fabeccb
-  data.tar.gz: 9f6747ff369f23fe11f3a67c0b815b6a53bbfd72
+  metadata.gz: dfed46cee6fdea612e7c4c0c08b0cd634d8746a4
+  data.tar.gz: 77c90af3d066a14055b39297c5092705dd22b3e0
 SHA512:
-  metadata.gz: b5deae709916778cfd2e39217f22edb24929da0a57054cd5020a0882e8bf222d3b1928d90140a21ce99f9aaeb0eb103f4172031f1d9b857f05aee62ea39e9648
-  data.tar.gz: f725746f91570b71d37d89b62c241945688603fedaf17f0fb56db178511eb73206edd72d9d45fba75b88ebdb16458765e242166222d81765b7c03649e99b9051
+  metadata.gz: 72a01c07b209b5124207a196adb86d9d5207cf9a461265a62822ff74bd55caa6aed3f67ab53b6c33ebe67822bad5beca3ba684db8dbb44141c2aef53856a2ec8
+  data.tar.gz: b2960aeab3cb037b99b139aecbef3f350fbc06b8add6ec0ed5aac8c5e3d713d2863ad54dd7d3fc5de81f02162ee549828e25797a5e74756857b9d55aa5109dce

data/lib/etheruby.rb

@@ -1,76 +1,4 @@
 require 'logger'
-
 require_relative 'etheruby/client'
-require_relative 'etheruby/contract_method_dsl'
-require_relative 'etheruby/arguments_generator'
-require_relative 'etheruby/response_parser'
-
-module Etheruby
-  class NoContractMethodError < StandardError; end
-
-  def contract
-    Class.new do
-      def self.inherited(subclass)
-        @@c_methods = {}
-        @@logger = ::Logger.new(STDOUT)
-        @@logger.level = if ENV.has_key? 'ETHERUBY_DEBUG'
-          ::Logger::DEBUG
-        else
-          ::Logger::WARN
-        end
-        @@logger.progname = "Etheruby Contract '#{subclass.name}'"
-      end
-
-      def self.at_address(address)
-        @@address = address
-      end
-
-      def self.method(name, &blk)
-        cmd = ContractMethodDSL.new(name)
-        cmd.instance_exec &blk if blk
-        @@c_methods[name] = cmd.validate!
-        @@logger.debug("Registred method #{name}")
-      end
-
-      def self.method_missing(sym, *args)
-        raise NoContractMethodError.new (
-          "The method #{sym} does not exist in the #{self.class.to_s} contract."
-        ) unless @@c_methods.include? sym
-        execute_contract_method(@@c_methods[sym], args)
-      end
-
-      def self.execute_contract_method(method_info, args)
-        arguments = ArgumentsGenerator.new(method_info[:params], args).to_s
-        data = "#{method_info[:signature]}#{arguments}"
-        composed_body = { to: self.address, data: data }
-        [ :gas, :gasPrice, :value, :from ].each { |kw|
-          composed_body[kw] = method_info[kw] if method_info.has_key? kw
-        }
-        @@logger.debug("Calling #{method_info[:name]} with parameters #{composed_body.inspect}")
-        response = call_api composed_body
-        if response.has_key? 'error'
-          @@logger.error("Failed contract execution #{response['error']['message']}")
-        else
-          @@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
-        else
-          response['result']
-        end
-      end
-
-      def self.call_api(composed_body)
-        Client.eth.call composed_body, "latest"
-      end
-
-      def self.address
-        "0x#{@@address.to_s(16)}"
-      end
-    end
-  end
-
-  module_function :contract
-
-  Contract = Etheruby::contract
-end
+require_relative 'etheruby/contract'
+require_relative 'etheruby/railtie' if defined?(Rails)

data/lib/etheruby/arguments_generator.rb

@@ -18,21 +18,35 @@ module Etheruby
 
     def to_s
       raise ArgumentsCountError.new("Bad number of arguments") unless args.count == params.count
-      head = ''
+      head = []
       tail = ''
-      current_tail_position = (params.count*32)
+      current_tail_position = 0
       (0..params.count-1).each do |i|
         param, arg = params[i], args[i]
         if Etheruby.is_static_type? param
-          head += Etheruby.treat_variable(param, arg, :encode).to_s
+          head << {final: Etheruby.treat_variable(param, arg, :encode).to_s}
         else
-          head += Etheruby::Encoders::Uint.new(current_tail_position).encode
+          head << {pointer: current_tail_position}
           content = Etheruby.treat_variable(param, arg, :encode).to_s
           current_tail_position += content.length/2
           tail += content
         end
       end
-      return head + tail
+      head_size = head.map { |x|
+        if x.has_key?(:pointer)
+          32
+        else
+          x[:final].length/2
+        end
+      }.inject(0){|sum,x| sum + x }
+      final_head = head.map { |x|
+        if x.has_key?(:pointer)
+          Etheruby::Encoders::Uint.new(head_size + x[:pointer]).encode
+        else
+          x[:final]
+        end
+      }.join
+      return final_head + tail
     end
 
   end

data/lib/etheruby/contract.rb

@@ -0,0 +1,74 @@
+require_relative 'client'
+require_relative 'contract_method_dsl'
+require_relative 'arguments_generator'
+require_relative 'response_parser'
+
+module Etheruby
+  class NoContractMethodError < StandardError; end
+
+  def contract
+    Class.new do
+      def self.inherited(subclass)
+        @@c_methods = {}
+        @@logger = ::Logger.new(STDOUT)
+        @@logger.level = if ENV.has_key? 'ETHERUBY_DEBUG'
+          ::Logger::DEBUG
+        else
+          ::Logger::WARN
+        end
+        @@logger.progname = "Etheruby Contract '#{subclass.name}'"
+      end
+
+      def self.at_address(address)
+        @@address = address
+      end
+
+      def self.method(name, &blk)
+        cmd = ContractMethodDSL.new(name)
+        cmd.instance_exec &blk if blk
+        @@c_methods[name] = cmd.validate!
+        @@logger.debug("Registred method #{name}")
+      end
+
+      def self.method_missing(sym, *args)
+        raise NoContractMethodError.new (
+          "The method #{sym} does not exist in the #{self.class.to_s} contract."
+        ) unless @@c_methods.include? sym
+        execute_contract_method(@@c_methods[sym], args)
+      end
+
+      def self.execute_contract_method(method_info, args)
+        arguments = ArgumentsGenerator.new(method_info[:params], args).to_s
+        data = "#{method_info[:signature]}#{arguments}"
+        composed_body = { to: self.address, data: data }
+        [ :gas, :gasPrice, :value, :from ].each { |kw|
+          composed_body[kw] = method_info[kw] if method_info.has_key? kw
+        }
+        @@logger.debug("Calling #{method_info[:name]} with parameters #{composed_body.inspect}")
+        response = call_api composed_body
+        if response.has_key? 'error'
+          @@logger.error("Failed contract execution #{response['error']['message']}")
+        else
+          @@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
+        else
+          response['result']
+        end
+      end
+
+      def self.call_api(composed_body)
+        Client.eth.call composed_body, "latest"
+      end
+
+      def self.address
+        "0x#{@@address.to_s(16)}"
+      end
+    end
+  end
+
+  module_function :contract
+
+  Contract = Etheruby::contract
+end

data/lib/etheruby/encoders/bool.rb

@@ -9,7 +9,7 @@ module Etheruby::Encoders
     end
 
     def decode
-      Uint.new(data).decode[0] == 1
+      return Uint.new(data).decode[0] == 1, 32
     end
   end
 

data/lib/etheruby/encoders/function.rb

@@ -0,0 +1,26 @@
+require_relative 'base'
+require_relative 'address'
+
+module Etheruby::Encoders
+
+  class Function < Base
+
+    def encode
+      (data[:address].to_s(16) + data[:selector].to_s(16)).ljust(64, '0')
+    end
+
+    def decode
+      address, selector = data[0..39], data[40..47]
+      return {
+        address: Address.new(address).decode[0],
+        selector: "0x#{selector}"
+      }, 32
+    end
+
+    def to_s
+      encode
+    end
+
+  end
+
+end

data/lib/etheruby/railtie.rb

@@ -0,0 +1,9 @@
+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
+    end
+  end
+
+end

data/lib/etheruby/response_parser.rb

@@ -1,4 +1,6 @@
 require_relative 'type_matchers'
+require_relative 'treat_variable'
+require_relative 'encoders/int'
 
 module Etheruby
 
@@ -13,11 +15,32 @@ module Etheruby
 
     def parse
       if returns.count == 1
-        Etheruby::treat_variable(returns[0], response, :decode)
+        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
-        returns.each do |type|
-          
+        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
         end
+        values
       end
     end
 

data/lib/etheruby/treat_variable.rb

@@ -19,11 +19,9 @@ module Etheruby
 
   def treat_variable(param, arg, direction)
     if match = TypeMatchers.is_sized_type(param)
-      # Parameter is a sized type, e.g. uint256, byte32 ...
       klass = Etheruby::Encoders.const_get(match[1].capitalize)
-      return case klass
-      when Encoders::Bytes
-        Byte.new(match[2].to_i, arg)
+      if match[1] == 'bytes'
+        Encoders::Byte.new(match[2].to_i, arg)
       else
         klass.new(arg)
       end.send(direction)
@@ -42,7 +40,7 @@ module Etheruby
       Etheruby::Encoders::DynamicArray.new(match[1], arg).send(direction)
 
     else
-      # Parameter is a single-word type : string, bytes, address etc...
+      # Parameter is a single-word type : string, bytes, address, function etc...
       Etheruby::Encoders.const_get(param.capitalize).new(arg).send(direction)
 
     end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: etheruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Jérémy SEBAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: digest-sha3
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: digest-sha3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '1.1'
 description: Etheruby is a library including a client for the JSON-RPC API and a Object-Contract
   Mapper to interact with smart-contracts.
 email: jeremy@seban.eu
@@ -90,6 +90,7 @@ files:
 - lib/etheruby.rb
 - lib/etheruby/arguments_generator.rb
 - lib/etheruby/client.rb
+- lib/etheruby/contract.rb
 - lib/etheruby/contract_method_dsl.rb
 - lib/etheruby/encoders/address.rb
 - lib/etheruby/encoders/arrays.rb
@@ -97,8 +98,10 @@ files:
 - lib/etheruby/encoders/bool.rb
 - lib/etheruby/encoders/bytes.rb
 - lib/etheruby/encoders/fixed.rb
+- lib/etheruby/encoders/function.rb
 - lib/etheruby/encoders/int.rb
 - lib/etheruby/encoders/string.rb
+- lib/etheruby/railtie.rb
 - lib/etheruby/response_parser.rb
 - lib/etheruby/treat_variable.rb
 - lib/etheruby/type_matchers.rb
@@ -125,5 +128,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: 'Etheruby : Ethereum smart-contract classy-describer for Ruby.'
+summary: 'Etheruby : The Ethereum Object-Contract Mapper (OCM) for Ruby.'
 test_files: []