ethereum.rb 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af8be90237dd21308f3aea4f6be1df684d245eab
-  data.tar.gz: 16006aa3e05782c5fa07450bea706c6d9fb78c11
+  metadata.gz: 49c6da26b64e4d9ca2cc696c67a455eaed8e3b48
+  data.tar.gz: 7eb88a934534f292fd05930270f157f1c17a299c
 SHA512:
-  metadata.gz: 994be4aec69fcb7430a87f95ed89fe4577de21cd2884ea3aa46169cd00b64a6032cd23daac13b26b438194344fb1c6a0a9113587be1c35c696eaaf0b0dcd3565
-  data.tar.gz: 534a8e2c925b76463c53fc1b09401c309e7842e6560beaabc5fb697efff39aff6eaf9799d948bd9f731fdd753c2886beb4c19e8f9a02f9878ed063f16bd86e2f
+  metadata.gz: 7f2bda6848455535558e18ecc9fde467fba0f685e36bc8befeec29e2bbc083cdd317aeb8ffa3d207cbb96f29004dd0061183a3f5e85544d13aa20fb359bc6b5e
+  data.tar.gz: 9356203de304aca16fd53a60b04c83da5de78b7427d080e2e87920a8909bdd92fdfb3a9039a5ce8472b6709bcd3a38eead1d31df098fd02222e95779de00481c

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 2.3.1
 env:
   - PARITY="1.5.0"
+  - PARITY="1.5.7"
 cache:
   bundler: true
   directories:
@@ -18,7 +19,6 @@ before_script:
   - parity --chain testnet account list
   - cat ~/.parity.log
   - bundle exec rake ethereum:node:waitforsync
-  - bundle exec rake ethereum:test:setup
 script:
   - bundle exec rspec --tag ~blockchain && bundle exec rspec --tag blockchain
 before_cache:

data/lib/ethereum/client.rb

@@ -62,7 +62,6 @@ module Ethereum
       end
 
       payload = {jsonrpc: "2.0", method: command, params: encode_params(args), id: get_id}
-
       @logger.info("Sending #{payload.to_json}") if @log
 
       if @batch

data/lib/ethereum/contract.rb

@@ -2,6 +2,7 @@ module Ethereum
   class Contract
 
     attr_reader :address
+    attr_accessor :gas, :gas_price
     attr_accessor :code, :name, :abi, :class_object, :sender, :deployment, :client
     attr_accessor :events, :functions, :constructor_inputs
     attr_accessor :call_raw_proxy, :call_proxy, :transact_proxy, :transact_and_wait_proxy
@@ -35,7 +36,6 @@ module Ethereum
       contract
     end
 
-
     def address=(addr)
       @address = addr
       @events.each do |event|
@@ -93,9 +93,16 @@ module Ethereum
       end
     end
 
+    def add_gas_options_args(args)
+      args[:gas] = @client.int_to_hex(@gas) if @gas.present?
+      args[:gasPrice] = @client.int_to_hex(@gas_price) if @gas_price.present?
+      args
+    end
+
     def transact(fun, *args)
       payload = fun.signature + @encoder.encode_arguments(fun.inputs, args)
-      txid = @client.eth_send_transaction({to: @address, from: @sender, data: "0x" + payload})["result"]
+      args = {to: @address, from: @sender, data: "0x" + payload}
+      txid = @client.eth_send_transaction(add_gas_options_args(args))["result"]
       return Ethereum::Transaction.new(txid, @client, payload, args)
     end
 
@@ -151,6 +158,7 @@ module Ethereum
       create_event_proxies
       class_methods = Class.new do
         extend Forwardable
+        def_delegators :parent, :gas, :gas_price, :gas=, :gas_price=
         def_delegators :parent, :abi, :deployment, :events
         def_delegators :parent, :estimate, :deploy, :deploy_and_wait
         def_delegators :parent, :address, :address=, :sender, :sender=

data/lib/ethereum/version.rb

@@ -1,3 +1,3 @@
 module Ethereum
-  VERSION = "2.0.6"
+  VERSION = "2.0.7"
 end

metadata

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