ethereum.rb 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 118a182e1fe6df35ead4dd24f452ab8dbe163f1b
-  data.tar.gz: 95b4a183b908e5c835f95af4772069603c08fb38
+  metadata.gz: 9c3d499f0acb7794b25b60c3caec8f728ce1212e
+  data.tar.gz: e3a239e91d23154acb7bbbc2ba4a528e7754b1eb
 SHA512:
-  metadata.gz: b6353836a9589c7517beacb7bb29c402c08cc942e774954653eaf4f69d4202002f4cd67edc8c458cd29a4479bf4528fcb38b326ce16bb9b3838bfeab739a616f
-  data.tar.gz: 1bcf61ed8af8111c10045e3a17e07011a8892f5db6d523d9a9863fc95078eee9856a398b82b3a6d1ec840d4ba22ea4af30a3f30ed4355e7ad75b0bfd30ca7d9a
+  metadata.gz: 5b91b2eeb93f071839e1f7985915c4ec1ca47a98d58741e6e314b374a7c3aed13db7e2da53672b2075f3783a8508050aa5830404b79755cba04cf91ebf69a453
+  data.tar.gz: c82e52904d885da8073c8a1af9f33a9f70610d2dd12e1acbeb35c937e9dffdb73e8a707b1025f2527c5b914881c4b2bfb43d96ce993a54388ccd90bb880f08ef

data/.travis.yml

@@ -3,11 +3,7 @@ language: ruby
 rvm:
   - 2.3.1
 env:
-  - PARITY="1.4.8"
   - PARITY="1.5.0"
-matrix:
-  allow_failures:
-  - env: PARITY="1.5.0"
 cache:
   bundler: true
   directories:
@@ -16,10 +12,10 @@ before_install:
   - sudo bin/install_parity
   - gem install bundler -v 1.11.2
 before_script:
-  - parity --chain ~/.parity/ropsten.json --warp --password ~/.parity/pass --unlock 3089630d06fD90Ef48a0c43f000971587c1F3247 --author 3089630d06fD90Ef48a0c43f000971587c1F3247 daemon ~/.parity.pid --log-file ~/.parity.log
+  - parity --chain testnet -d ~/.parity --password ~/.parity/pass --unlock 3089630d06fD90Ef48a0c43f000971587c1F3247 --author 3089630d06fD90Ef48a0c43f000971587c1F3247 daemon ~/.parity.pid --log-file ~/.parity.log
   - cat ~/.parity.log
   - sleep 5
-  - parity --chain ~/.parity/ropsten.json account list
+  - parity --chain testnet account list
   - cat ~/.parity.log
   - bundle exec rake ethereum:node:waitforsync
   - bundle exec rake ethereum:test:setup

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/marekkirejczyk/ethereum.rb.svg?branch=master)](https://travis-ci.org/marekkirejczyk/ethereum.rb) [![security](https://hakiri.io/github/NullVoxPopuli/MetaHash/master.svg)](https://hakiri.io/github/NullVoxPopuli/MetaHash/master) [![Dependency Status](https://gemnasium.com/marekkirejczyk/ethereum.rb.svg)](https://gemnasium.com/marekkirejczyk/ethereum.rb) [![Code Climate](https://codeclimate.com/github/marekkirejczyk/ethereum.rb/badges/gpa.svg)](https://codeclimate.com/github/marekkirejczyk/ethereum.rb)
 
-A ruby gem for interacting with Ethereum.
+The goal of ethereum.rb is to make interacting with ethereum blockchain from ruby as easy as possible (but not easier).
 
 ## Highlights
 
@@ -14,8 +14,8 @@ A ruby gem for interacting with Ethereum.
 
 ## Compatibility and requirements
 
-* Tested with parity 1.4.8, might work with geth
-* Tested with solc 0.4.8
+* Tested with parity 1.5.0, might work with geth (but was not tested)
+* Tested with solc 0.4.9
 * Ruby 2.x
 * UNIX/Linux or OS X environment
 

data/lib/ethereum/contract.rb

@@ -77,16 +77,11 @@ module Ethereum
     end
 
     def call_raw(fun, *args)
-      arg_types = fun.inputs.collect(&:type)
-      return {result: :error, message: "missing parameters for #{fun.function_string}" } if arg_types.length != args.length
-      payload = [fun.signature]
-      arg_types.zip(args).each do |arg|
-        payload << @formatter.to_payload(arg)
-      end
-      raw_result = @client.eth_call({to: @address, from: @sender, data: "0x" + payload.join()})
+      payload = fun.signature + @encoder.encode_arguments(fun.inputs, args)
+      raw_result = @client.eth_call({to: @address, from: @sender, data: "0x" + payload})
       raw_result = raw_result["result"]
       output = @decoder.decode_arguments(fun.outputs, raw_result)
-      return {data: "0x" + payload.join(), raw: raw_result, formatted: output}
+      return {data: "0x" + payload, raw: raw_result, formatted: output}
     end
 
     def call(fun, *args)
@@ -99,15 +94,9 @@ module Ethereum
     end
 
     def transact(fun, *args)
-      arg_types = fun.inputs.collect(&:type)
-      return {result: :error, message: "missing parameters for #{fun.function_string}" } if arg_types.length != args.length
-      payload = []
-      payload << fun.signature
-      arg_types.zip(args).each do |arg|
-        payload << @formatter.to_payload(arg)
-      end
-      txid = @client.eth_send_transaction({to: @address, from: @sender, data: "0x" + payload.join()})["result"]
-      return Ethereum::Transaction.new(txid, @client, payload.join(), args)
+      payload = fun.signature + @encoder.encode_arguments(fun.inputs, args)
+      txid = @client.eth_send_transaction({to: @address, from: @sender, data: "0x" + payload})["result"]
+      return Ethereum::Transaction.new(txid, @client, payload, args)
     end
 
     def transact_and_wait(fun, *args)

data/lib/ethereum/decoder.rb

@@ -9,18 +9,25 @@ module Ethereum
         decode_dynamic_bytes(value, start)
       elsif "string" == core
         self.send(method_name, value, start)
+      elsif "int" == core
+        size = subtype.present? ? subtype.to_i : 256
+        self.send(method_name, value[start+63-(size/4-1)..start+63], size)
       else
         self.send(method_name, value[start..start+63])
       end
     end
 
+    def decode_fixed(value, n = 128)
+      decode_int(value).to_f / 2**n
+    end
+
     def decode_uint(value)
       value.hex
     end
 
-    def decode_int(value)
+    def decode_int(value, size = 256)
       raise ArgumentError if value.nil?
-      (value[0..1] == "ff") ? (value.hex - (2 ** 256)) : value.hex
+      (value[0..1] == "ff") ? (value.hex - (2 ** size)) : value.hex
     end
 
     def decode_bool(value)

data/lib/ethereum/encoder.rb

@@ -4,54 +4,59 @@ module Ethereum
 
     def encode(type, value)
       core, subtype = Abi::parse_type(type)
-      if core == "bytes" and subtype.nil?
-        encode_dynamic_bytes(value)
-      else
-        method_name = "encode_#{core}".to_sym
-        self.send(method_name, value)
-      end
+      method_name = "encode_#{core}".to_sym
+      self.send(method_name, value, subtype)
     end
 
-    def encode_int(value)
+    def encode_int(value, _ = nil)
       to_twos_complement(value).to_s(16).rjust(64, '0')
     end
 
-    def encode_uint(value)
+    def encode_uint(value, _ = nil)
       raise ArgumentError if value < 0
       encode_int(value)
     end
 
-    def encode_bool(value)
+    def encode_bool(value, _)
       (value ? "1" : "0").rjust(64, '0')
     end
 
-    def encode_fixed(_value)
-      raise NotImplementedError
+    def encode_fixed(value, subtype)
+      n = subtype.nil? ? 128 : /(\d+)x(\d+)/.match(subtype)[2].to_i
+      do_encode_fixed(value, n)
     end
 
-    def encode_ufixed(_value)
+    def do_encode_fixed(value, n)
+      encode_uint((value * 2**n).to_i)
+    end
+
+    def encode_ufixed(_value, _)
       raise NotImplementedError
     end
 
-    def encode_bytes(value)
+    def encode_bytes(value, subtype)
+      subtype.nil? ? encode_dynamic_bytes(value) : encode_static_bytes(value)
+    end
+    
+    def encode_static_bytes(value)
       value.each_char.map {|x| x.ord.to_s(16)}.join("").ljust(64, '0')
     end
 
     def encode_dynamic_bytes(value)
       location = encode_uint(@inputs ? @inputs.size * 32 : 32)
       size = encode_uint(value.size)
-      content = encode_bytes(value)
+      content = encode_static_bytes(value)
       [location, size + content]
     end
 
-    def encode_string(value)
+    def encode_string(value, _)
       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]
     end
 
-    def encode_address(value)
+    def encode_address(value, _)
       value = value.gsub(/^0x/,'')
       raise ArgumentError if value.size != 40
       value
@@ -62,6 +67,7 @@ module Ethereum
     end
 
     def encode_arguments(inputs, args)
+      raise "Wrong number of arguments" if inputs.length != args.length
       @head = ""
       @tail = ""
       @inputs = inputs

data/lib/ethereum/formatter.rb

@@ -103,43 +103,10 @@ module Ethereum
       (hexstring.gsub(/^0x/,'')[0..1] == "ff") ? (hexstring.hex - (2 ** 256)) : hexstring.hex
     end
 
-    def bool_to_payload(bool)
-      int_to_payload(bool ? 1 : 0)
-    end
-
-    def address_to_payload(address)
-      from_address(address)
-    end
-
-    def uint_to_payload(uint)
-      self.to_twos_complement(uint).rjust(64, '0')
-    end
-
-    def int_to_payload(int)
-      self.to_twos_complement(int).rjust(64, '0')
-    end
-
-    def bytes_to_payload(bytes)
-      self.from_utf8(bytes).ljust(64, '0')
-    end
-
-    def string_to_payload(bytes)
-      self.bytes_to_payload(bytes)
-    end
-
-    def construtor_params_to_payload(abi, params)
-      abi.map.with_index { |var, i| to_payload([var["type"], params[i]]) }.join
-    end
-
     def get_base_type(typename)
       typename.gsub(/\d+/,'')
     end
 
-    def to_payload(args)
-      converter = "#{self.get_base_type(args[0])}_to_payload".to_sym
-      self.send(converter, args[1]) 
-    end
-
     def from_payload(args)
       converter = "output_to_#{self.get_base_type(args[0])}".to_sym
       self.send(converter, args[1])

data/lib/ethereum/solidity.rb

@@ -10,38 +10,31 @@ module Ethereum
 
   class Solidity
 
+    OUTPUT_REGEXP = /======= (\S*):(\S*) =======\s*Binary:\s*(\S*)\sContract JSON ABI\s(\S*)/
+
     def initialize(bin_path = "solc")
       @bin_path = bin_path
-      @args = "--bin --abi --userdoc --devdoc --add-std --optimize -o"      
+      @args = "--bin --abi --add-std --optimize"
     end
 
     def compile(filename)
-      {}.tap do |result|
-        Dir.mktmpdir do |dir|
-          execute_solc(dir, filename)
-          Dir.foreach(dir) do |file|
-            process_file(dir, file, result)
-          end
-        end
+      result = {}
+      execute_solc(nil, filename).scan(OUTPUT_REGEXP).each do |match|
+        file, name, bin, abi = match
+        result[name] = {}
+        result[name]["abi"] = abi
+        result[name]["bin"] = bin
       end
+      result
     end
-    
+
     private    
-      def process_file(dir, file, result)
-        extension = File.extname(file)
-        path = "#{dir}/#{file}"
-        basename = File.basename(path, extension)
-        unless File.directory?(path)
-          result[basename] ||= {}
-          result[basename][extension[1..-1]] = File.read(path) 
-        end
-      end
-      
       def execute_solc(dir, filename)
-        cmd = "#{@bin_path} #{@args} '#{dir}' '#{filename}'"
-        _, stderr, status = Open3.capture3(cmd)
+        cmd = "#{@bin_path} #{@args} '#{filename}'"
+        out, stderr, status = Open3.capture3(cmd)
         raise SystemCallError, "Unanable to run solc compliers" if status.exitstatus == 127
         raise CompilationError, stderr unless status.exitstatus == 0
+        out
       end    
   end 
 end

data/lib/ethereum/version.rb

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

data/lib/tasks/ethereum_node.rake

@@ -3,16 +3,17 @@ require 'open3'
 namespace :ethereum do
   namespace :node do
 
-    desc "Run testnet node "
+    desc "Run testnet (ropsten) node"
     task :test do
-      _, out, _ = Open3.capture3("parity --chain ~/.parity/ropsten.json account list")
+      args = "--chain testnet -d ~/.parity"
+      out, _, _ = Open3.capture3("parity #{args} account list")
       account = out.split(/[\[,\]]/)[1]
-      cmd = "parity --chain ~/.parity/ropsten.json --password ~/.parity/pass --unlock #{account} --author #{account}"
+      cmd = "parity #{args} --password ~/.parity/pass --unlock #{account} --author #{account}"
       puts cmd
       system cmd
     end
 
-    desc "Run morden (production) node"
+    desc "Run production node"
     task :run do
       _, out, _ = Open3.capture3("parity account list")
       account = out.split(/[\[,\]]/)[1]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ethereum.rb
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Marek Kirejczyk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby Ethereum client using the JSON-RPC interface