ethereum.rb 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e53cfb3e0ec04452936380a3efe4959598ee1551
-  data.tar.gz: 86a0d4366ca9796e9d9efa1b1f5bb90c89728522
+  metadata.gz: afa7f2461a4f8f594fc3e8d57cf53d92e8540a55
+  data.tar.gz: 88e3b4d2066800644e8f1b82a6afaf8eb876fa47
 SHA512:
-  metadata.gz: e9d8cc30f9d56fec26463ba96040f687db1872e69c8c343c6e6d25aecc6d8e8289cb7ce5207e8d0eade0d70a07889955a92777f41cc0daf4580d1d67e7c0009d
-  data.tar.gz: 402a8b9741e1700b2561b76c1217c6a22e7b53c2340665bdf469895381303c94168e836801f9d74e0ab406aad53ed5d38770475f8345fe82066581260c74e796
+  metadata.gz: 1caa864078b37ff71e1e48e779a6f595a42a31e8bd839bf8cd886a397ab90efd6dbee68f4f22e858df89aa227497450ef5a3d04c62a2aec48a0a85fc2d3a3294
+  data.tar.gz: 28eaa1419c7cde34d3daadc452178d03baa92fd24b49a85b1768896c2b678438105ce4e0f4289ec828603d7c7f8fa5320d4cb6c29ebb11324ae161ce19b261dd

data/PREREQUISITES.md

@@ -52,7 +52,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install ethereum.eb
+    $ gem install ethereum.rb
 
 ### Running a node
 

data/README.md

@@ -37,7 +37,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install ethereum.eb
+    $ gem install ethereum.rb
 
 ## Basic Usage
 
@@ -70,7 +70,7 @@ contract2 = MyContract2.new
 contract2 = contract.deploy_and_wait
 ```
 
-All names used to name contract in solidity source will transalte to name of classes in ruby (camelized).
+All names used to name contract in solidity source will translate to name of classes in ruby (camelized).
 
 Note: If class of given name exist it will be undefined first to avoid name collision.
 

data/lib/ethereum/client.rb

@@ -73,7 +73,7 @@ module Ethereum
     end
 
     def get_nonce(address)
-      eth_get_transaction_count(address)["result"].to_i(16)
+      eth_get_transaction_count(address, "latest")["result"].to_i(16)
     end
     
 

data/lib/ethereum/contract.rb

@@ -25,12 +25,16 @@ module Ethereum
       @gas_price = @client.gas_price
     end
 
-    def self.create(file: nil, client: Ethereum::Singleton.instance, code: nil, abi: nil, address: nil, name: nil)
+    def self.create(file: nil, client: Ethereum::Singleton.instance, code: nil, abi: nil, address: nil, name: nil, contract_index: nil)
       contract = nil
       if file.present?
         contracts = Ethereum::Initializer.new(file, client).build_all
-        raise "No contracts complied" if contracts.empty?
-        contract = contracts.first.class_object.new
+        raise "No contracts compiled" if contracts.empty?
+        if contract_index
+          contract = contracts[contract_index].class_object.new
+        else
+          contract = contracts.first.class_object.new
+        end
       else
         abi = JSON.parse(abi) if abi.is_a? String
         contract = Ethereum::Contract.new(name, code, abi, client)
@@ -69,7 +73,7 @@ module Ethereum
       Eth.configure { |c| c.chain_id = @client.net_version["result"].to_i }
       @nonce ||= @client.get_nonce(key.address) - 1
       @nonce += 1
-      args = { 
+      args = {
         from: key.address,
         value: 0,
         data: payload,
@@ -163,11 +167,11 @@ module Ethereum
       logs["result"].each do |result|
         inputs = evt.input_types
         outputs = inputs.zip(result["topics"][1..-1])
-        data = {blockNumber: result["blockNumber"].hex, transactionHash: result["transactionHash"], blockHash: result["blockHash"], transactionIndex: result["transactionIndex"].hex, topics: []} 
+        data = {blockNumber: result["blockNumber"].hex, transactionHash: result["transactionHash"], blockHash: result["blockHash"], transactionIndex: result["transactionIndex"].hex, topics: []}
         outputs.each do |output|
           data[:topics] << formatter.from_payload(output)
         end
-        collection << data 
+        collection << data
       end
       return collection
     end

data/lib/ethereum/deployment.rb

@@ -18,7 +18,7 @@ module Ethereum
 
     def mined?
       return true if @mined
-      @mined = @connection.get_transaction_by_hash(@id)["result"]["blockNumber"].present? rescue nil
+      @mined = @connection.eth_get_transaction_by_hash(@id)["result"]["blockNumber"].present?
       @mined ||= false
     end
 
@@ -39,9 +39,9 @@ module Ethereum
       start_time = Time.now
       loop do
         raise "Transaction #{@id} timed out." if ((Time.now - start_time) > timeout) 
-        sleep step
         yield if block_given?
         return true if deployed?
+        sleep step
       end
     end
 

data/lib/ethereum/encoder.rb

@@ -56,9 +56,9 @@ module Ethereum
     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')
+      value.bytes.map {|x| x.to_s(16).rjust(2, '0')}.join("").ljust(64, '0')
     end
 
     def encode_dynamic_bytes(value)
@@ -71,7 +71,7 @@ module Ethereum
     def encode_string(value, _)
       location = encode_uint(@inputs ? size_of_inputs(@inputs) + @tail.size/2 : 32)
       size = encode_uint(value.bytes.size)
-      content = value.bytes.map {|x| x.to_s(16)}.join("").ljust(64, '0')
+      content = value.bytes.map {|x| x.to_s(16).rjust(2, '0')}.join("").ljust(64, '0')
       [location, size + content]
     end
 

data/lib/ethereum/formatter.rb

@@ -50,7 +50,7 @@ module Ethereum
       return nil if hexstring.nil?
       hexstring.gsub(/^0x/,'').scan(/.{2}/).collect {|x| x.hex}.pack("c*")
     end
-    
+
     def to_utf8(hexstring)
       return nil if hexstring.nil?
       hexstring.gsub(/^0x/,'').scan(/.{2}/).collect {|x| x.hex}.pack("U*").delete("\u0000")
@@ -63,7 +63,7 @@ module Ethereum
 
     def from_utf8(utf8_string)
       return nil if utf8_string.nil?
-      utf8_string.force_encoding('UTF-8').split("").collect {|x| x.ord.to_s(16)}.join("")
+      utf8_string.force_encoding('UTF-8').split("").collect {|x| x.ord.to_s(16).rjust(2, '0')}.join("")
     end
 
     def to_address(hexstring)
@@ -144,4 +144,3 @@ module Ethereum
   end
 
 end
-

data/lib/ethereum/http_client.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'json'
 module Ethereum
   class HttpClient < Client
     attr_accessor :host, :port, :uri, :ssl
@@ -30,8 +31,10 @@ module Ethereum
       return response.body
     end
 
-    def send_batch(_batch)
-      raise NotImplementedError
+    def send_batch(batch)
+      result = send_single(batch.to_json)
+      result = JSON.parse(result)
+      return result.sort_by! { |c| c['id'] }
     end
   end
 

data/lib/ethereum/transaction.rb

@@ -1,6 +1,10 @@
 module Ethereum
 
   class Transaction
+
+    DEFAULT_TIMEOUT = 300.seconds
+    DEFAULT_STEP = 5.seconds
+
     attr_accessor :id, :mined, :connection, :input, :input_parameters
 
     def initialize(id, connection, data, input_parameters = [])
@@ -20,12 +24,12 @@ module Ethereum
       @mined = @connection.eth_get_transaction_by_hash(@id)["result"]["blockNumber"].present?
     end
 
-    def wait_for_miner(timeout = 1500.seconds)
+    def wait_for_miner(timeout: DEFAULT_TIMEOUT, step: DEFAULT_STEP)
       start_time = Time.now
-      while self.mined? == false
+      loop do
         raise Timeout::Error if ((Time.now - start_time) > timeout)
-        sleep 5
         return true if self.mined?
+        sleep step
       end
     end
 

data/lib/ethereum/version.rb

@@ -1,3 +1,3 @@
 module Ethereum
-  VERSION = "2.1.7"
+  VERSION = "2.1.8"
 end

metadata

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