ethereum.rb 2.0.10 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b37350a4448636d876aaeb83825c01b2903b4e8
-  data.tar.gz: ec8e0b741ce6d4f3a7b4ed1125d5e34ebb0f522a
+  metadata.gz: 26d401a1321c2035fc258764f3806ccc20fe6eba
+  data.tar.gz: 99b9fe1ffbe16b5f4a93640979f1ecbf823c2dc5
 SHA512:
-  metadata.gz: 7cfdc7e200941bf4876eb809f7929e9cd8a110f75eec933660814027891c3e56e2c024571587720be515e8549c90bfa6fb3d52e0bfd27c277c3bfb999b76b7f1
-  data.tar.gz: 53b4188861d6f9f901bbcdcce2f7d9c7f22525633b42281ad4ff5ea047d2ac7e802892f8ce2a5af0f7834f20c0257a6fa75760b990fba632b1293901b5b636af
+  metadata.gz: ee49b13d4f24d61a4448e9b94ce3e2607781d554b345ad02c6b9a094e8f98a9d16f81079a1f73fc3488878c20389f5f7ef4b8e3bba10e29d7445db9e708790e4
+  data.tar.gz: 59eb35fc5add5ea192dcf0d632c6b7494fdad783364e117e5815ccefb9d2fd48a1843b461135173d798e7d391ce90acb92f27779768de37a5387cf9461eaad33

data/ethereum.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.5"
   spec.add_development_dependency "pry", "~> 0.10"
+  spec.add_development_dependency "eth", "~> 0.4"
 
   spec.add_dependency "activesupport", "~> 5.0"
   spec.add_dependency "digest-sha3", "~> 1.1"

data/lib/ethereum/client.rb

@@ -1,17 +1,25 @@
 module Ethereum
   class Client
+
+    DEFAULT_GAS_LIMIT = 4_000_000
+
+    DEFAULT_GAS_PRICE = 22_000_000_000
+
     # https://github.com/ethereum/wiki/wiki/JSON-RPC
     RPC_COMMANDS = %w(web3_clientVersion web3_sha3 net_version net_peerCount net_listening eth_protocolVersion eth_syncing eth_coinbase eth_mining eth_hashrate eth_gasPrice eth_accounts eth_blockNumber eth_getBalance eth_getStorageAt eth_getTransactionCount eth_getBlockTransactionCountByHash eth_getBlockTransactionCountByNumber eth_getUncleCountByBlockHash eth_getUncleCountByBlockNumber eth_getCode eth_sign eth_sendTransaction eth_sendRawTransaction eth_call eth_estimateGas eth_getBlockByHash eth_getBlockByNumber eth_getTransactionByHash eth_getTransactionByBlockHashAndIndex eth_getTransactionByBlockNumberAndIndex eth_getTransactionReceipt eth_getUncleByBlockHashAndIndex eth_getUncleByBlockNumberAndIndex eth_getCompilers eth_compileLLL eth_compileSolidity eth_compileSerpent eth_newFilter eth_newBlockFilter eth_newPendingTransactionFilter eth_uninstallFilter eth_getFilterChanges eth_getFilterLogs eth_getLogs eth_getWork eth_submitWork eth_submitHashrate db_putString db_getString db_putHex db_getHex shh_post shh_version shh_newIdentity shh_hasIdentity shh_newGroup shh_addToGroup shh_newFilter shh_uninstallFilter shh_getFilterChanges shh_getMessages)
+
     # https://github.com/ethereum/go-ethereum/wiki/Management-APIs
     RPC_MANAGEMENT_COMMANDS = %w(admin_addPeer admin_datadir admin_nodeInfo admin_peers admin_setSolc admin_startRPC admin_startWS admin_stopRPC admin_stopWS debug_backtraceAt debug_blockProfile debug_cpuProfile debug_dumpBlock debug_gcStats debug_getBlockRlp debug_goTrace debug_memStats debug_seedHash debug_setHead debug_setBlockProfileRate debug_stacks debug_startCPUProfile debug_startGoTrace debug_stopCPUProfile debug_stopGoTrace debug_traceBlock debug_traceBlockByNumber debug_traceBlockByHash debug_traceBlockFromFile debug_traceTransaction debug_verbosity debug_vmodule debug_writeBlockProfile debug_writeMemProfile miner_hashrate miner_makeDAG miner_setExtra miner_setGasPrice miner_start miner_startAutoDAG miner_stop miner_stopAutoDAG personal_importRawKey personal_listAccounts personal_lockAccount personal_newAccount personal_unlockAccount personal_sendTransaction txpool_content txpool_inspect txpool_status)
 
-    attr_accessor :command, :id, :log, :logger, :default_account
+    attr_accessor :command, :id, :log, :logger, :default_account, :gas_price, :gas_limit
 
     def initialize(log = false)
       @id = 0
       @log = log
       @batch = nil
-
+      @formatter = Ethereum::Formatter.new
+      @gas_price = DEFAULT_GAS_PRICE
+      @gas_limit = DEFAULT_GAS_LIMIT
       if @log == true
         @logger = Logger.new("/tmp/ethereum_ruby_http.log")
       end
@@ -56,6 +64,41 @@ module Ethereum
       params.map(&method(:int_to_hex))
     end
 
+    def get_balance(address)
+      eth_get_balance(address)["result"].to_i(16)
+    end
+
+    def get_chain
+      net_version["result"].to_i(16)
+    end
+
+    def get_nonce(address)
+      eth_get_transaction_count(address)["result"].to_i(16)
+    end
+    
+    def transfer(key, address, amount)
+      Eth.configure { |c| c.chain_id = get_chain }
+      args = { 
+        from: key.address,
+        to: address,
+        value: amount,
+        data: "",
+        nonce: get_nonce(key.address),
+        gas_limit: gas_limit,
+        gas_price: gas_price
+      }
+      tx = Eth::Tx.new(args)
+      tx.sign key
+      eth_send_raw_transaction(tx.hex)["result"]
+    end
+    
+    def transfer_and_wait(key, address, amount)
+      tx = transfer(key, address, amount)
+      transaction = Ethereum::Transaction.new(tx, self, "", [])
+      transaction.wait_for_miner
+      return transaction
+    end
+
     def send_command(command,args)
       if ["eth_getBalance", "eth_call"].include?(command)
         args << "latest"

data/lib/ethereum/contract.rb

@@ -3,7 +3,7 @@ module Ethereum
 
     attr_reader :address
     attr_accessor :key
-    attr_accessor :gas, :gas_price
+    attr_accessor :gas_limit, :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
@@ -19,6 +19,8 @@ module Ethereum
       @sender = client.default_account
       @encoder = Encoder.new
       @decoder = Decoder.new
+      @gas_limit = @client.gas_limit
+      @gas_price = @client.gas_price
     end
 
     def self.create(file: nil, client: Ethereum::Singleton.instance, code: nil, abi: nil, address: nil, name: nil)
@@ -58,17 +60,31 @@ module Ethereum
     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 send_raw_transaction(payload, to = nil)
+      Eth.configure { |c| c.chain_id = @client.get_chain }
+      args = { 
+        from: key.address,
+        value: 0,
+        data: payload,
+        nonce: @client.get_nonce(key.address),
+        gas_limit: gas_limit,
+        gas_price: gas_price
+      }
+      args[:to] = to if to
+      tx = Eth::Tx.new(args)
+      tx.sign key
+      @client.eth_send_raw_transaction(tx.hex)["result"]
     end
 
     def deploy(*params)
-      tx = send_transaction(deploy_args(params))
+      if key
+        tx = send_raw_transaction(deploy_payload(params))
+      else
+        tx = send_transaction(deploy_args(params))
+      end
       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)
@@ -113,7 +129,11 @@ module Ethereum
     end
 
     def transact(fun, *args)
-      tx = send_transaction(call_args(fun, args))
+      if key
+        tx = send_raw_transaction(call_payload(fun, args), address)
+      else
+        tx = send_transaction(call_args(fun, args))
+      end
       return Ethereum::Transaction.new(tx, @client, call_payload(fun, args), args)
     end
 
@@ -170,7 +190,8 @@ module Ethereum
       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, :signed_deploy, :key, :key=
+        def_delegators :parent, :gas_limit, :gas_price, :gas_limit=, :gas_price=
         def_delegators :parent, :abi, :deployment, :events
         def_delegators :parent, :estimate, :deploy, :deploy_and_wait
         def_delegators :parent, :address, :address=, :sender, :sender=
@@ -192,8 +213,8 @@ module Ethereum
 
     private
       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[:gas] = @client.int_to_hex(gas_limit) if gas_limit.present?
+        args[:gasPrice] = @client.int_to_hex(gas_price) if gas_price.present?
         args
       end
 

data/lib/ethereum/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ethereum.rb
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.1.0
 platform: ruby
 authors:
 - Marek Kirejczyk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: eth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement