ethereum.rb 2.0.8 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d44fa6975ccab8a2bdf50c15d4ee88740bd8c95
-  data.tar.gz: 9e49ac4b565a4dc53ab0e0230a3e5efc80ef0dd0
+  metadata.gz: 6b37350a4448636d876aaeb83825c01b2903b4e8
+  data.tar.gz: ec8e0b741ce6d4f3a7b4ed1125d5e34ebb0f522a
 SHA512:
-  metadata.gz: 5ba25561adbf97eb5f446701baa37f494fdfceb7e66e585205b1e638a0fa9b45a45b32a23f84200690311b058eb28f839e28f1256d59a0fab7060f4bbfe45171
-  data.tar.gz: 1fac810a2532aacbca80928b9022778b2646c637b0ba669094df6a65f7640d01c72469e2c76a432b0a37f7b4a02288030bb3ce6ba939ad04ee7c253aefc40379
+  metadata.gz: 7cfdc7e200941bf4876eb809f7929e9cd8a110f75eec933660814027891c3e56e2c024571587720be515e8549c90bfa6fb3d52e0bfd27c277c3bfb999b76b7f1
+  data.tar.gz: 53b4188861d6f9f901bbcdcce2f7d9c7f22525633b42281ad4ff5ea047d2ac7e802892f8ce2a5af0f7834f20c0257a6fa75760b990fba632b1293901b5b636af

data/lib/ethereum/contract.rb

@@ -2,6 +2,7 @@ module Ethereum
   class Contract
 
     attr_reader :address
+    attr_accessor :key
     attr_accessor :gas, :gas_price
     attr_accessor :code, :name, :abi, :class_object, :sender, :deployment, :client
     attr_accessor :events, :functions, :constructor_inputs
@@ -44,15 +45,32 @@ module Ethereum
       end
     end
 
-    def deploy(*params)
+    def deploy_payload(params)
       if @constructor_inputs.present?
-        raise "Missing constructor parameter" and return if params.length != @constructor_inputs.length
+        raise ArgumentError, "Wrong number of arguments in a constructor" and return if params.length != @constructor_inputs.length
       end
       deploy_arguments = @encoder.encode_arguments(@constructor_inputs, params)
-      payload = "0x" + @code + deploy_arguments
-      args = add_gas_options_args({from: sender, data: payload})
-      tx = @client.eth_send_transaction(args)["result"]
-      raise IOError, "Failed to deploy, did you unlock #{sender} account? Transaction hash: #{tx}" if tx.nil? || tx == "0x0000000000000000000000000000000000000000000000000000000000000000"
+      "0x" + @code + deploy_arguments
+    end
+
+    def deploy_args(params)
+      add_gas_options_args({from: sender, data: deploy_payload(params)})
+    end
+
+    def send_transaction(tx_args)
+      if key
+        Eth.configure { |c| c.chain_id = @client.net_version["result"].to_i }
+        tx = Eth::Tx.new({ from: key.address, to: main_address, value: value, data: data, nonce: 0, gas_limit: 1_000_000, gas_price: gas_price})
+        tx.sign key
+      else
+        @client.eth_send_transaction(tx_args)["result"]
+      end
+    end
+
+    def deploy(*params)
+      tx = send_transaction(deploy_args(params))
+      tx_failed = tx.nil? || tx == "0x0000000000000000000000000000000000000000000000000000000000000000"
+      raise IOError, "Failed to deploy, did you unlock #{sender} account? Transaction hash: #{tx}" if tx_failed
       @deployment = Ethereum::Deployment.new(tx, @client)
     end
 
@@ -67,22 +85,22 @@ module Ethereum
     end
 
     def estimate(*params)
-      deploy_arguments = ""
-      if @constructor_inputs.present?
-        raise "Wrong number of arguments in a constructor" and return if params.length != @constructor_inputs.length
-        deploy_arguments = @encoder.encode_arguments(@constructor_inputs, params)
-      end
-      deploy_payload = @code + deploy_arguments
-      result = @client.eth_estimate_gas({from: @sender, data: "0x" + deploy_payload})
+      result = @client.eth_estimate_gas(deploy_args(params))
       @decoder.decode_int(result["result"])
     end
 
+    def call_payload(fun, args)
+      "0x" + fun.signature + @encoder.encode_arguments(fun.inputs, args)
+    end
+
+    def call_args(fun, args)
+      add_gas_options_args({to: @address, from: @sender, data: call_payload(fun, args)})
+    end
+
     def call_raw(fun, *args)
-      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"]
+      raw_result = @client.eth_call(call_args(fun, args))["result"]
       output = @decoder.decode_arguments(fun.outputs, raw_result)
-      return {data: "0x" + payload, raw: raw_result, formatted: output}
+      return {data: call_payload(fun, args), raw: raw_result, formatted: output}
     end
 
     def call(fun, *args)
@@ -95,10 +113,8 @@ module Ethereum
     end
 
     def transact(fun, *args)
-      payload = fun.signature + @encoder.encode_arguments(fun.inputs, args)
-      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)
+      tx = send_transaction(call_args(fun, args))
+      return Ethereum::Transaction.new(tx, @client, call_payload(fun, args), args)
     end
 
     def transact_and_wait(fun, *args)
@@ -153,6 +169,7 @@ module Ethereum
       create_event_proxies
       class_methods = Class.new do
         extend Forwardable
+        def_delegators :parent, :deploy_payload, :deploy_args, :call_payload, :call_args
         def_delegators :parent, :gas, :gas_price, :gas=, :gas_price=
         def_delegators :parent, :abi, :deployment, :events
         def_delegators :parent, :estimate, :deploy, :deploy_and_wait

data/lib/ethereum/version.rb

@@ -1,3 +1,3 @@
 module Ethereum
-  VERSION = "2.0.8"
+  VERSION = "2.0.10"
 end

metadata

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