ethereum 0.3.8 → 0.3.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a374154be8bb1dac7fe3073b4ca7e92ace6b8991
-  data.tar.gz: 7b21a87aa5d0a754f6abe50ee3eabbdf82dd7c50
+  metadata.gz: 619380b40d2004b955dc3053487b95bab5d7ad86
+  data.tar.gz: 97ffe5537e9127401fae43449c22caaf0c7340bc
 SHA512:
-  metadata.gz: 51e40edef7d4ede819c2ab3e7b3dbce2bc69488ba5b807db0dbcc1b57055611893b5e6c2fb6b782341d67ea22a2216c9287896fa826317faf7c646d8709709ae
-  data.tar.gz: 8982b0e349cacf5dc63ff700f73afbc2797da4bf070294c039da744851536ce9c034920b3bd5cff2147ff22f18678f23fbce6a7a022dda50ed06e05673f9311a
+  metadata.gz: ca884f158d3fd4463d1b066bae6fb208988d395a6c89378bfd11153c6418bfe62805927e69d3e6c799b9604a216e3aee08a60e67ee53723c8bdd299f995e7024
+  data.tar.gz: 983f6e6cb8b8f16c0e9839435aa4aa82ac09943cee4e9c5cc7ae67ce4b3b1a8e87fb23e585bd5b99492190347246dec2291fe696b0e5ef112518ba428bde7bbb

data/README.md

@@ -6,7 +6,6 @@ A simple library for Ethereum.
 
 * Pure Ruby implementation
 * IPC Client with batch calls support
-* HTTP Client with batch calls support
 * Compile and deploy Solidity contracts
 * Expose deployed contracts as Ruby classes
 * Test solidity contracts with a Ruby testing framework of your choice
@@ -62,34 +61,11 @@ simple_name_registry_instance.deploy_and_wait
 
 ### Transacting and Calling Solidity Functions
 
-Solidity functions are exposed using the following conventions: 
-
-```
-transact_[function_name](params) 
-transact_and_wait_[function_name](params)  
-call_[function_name](params)
-```
-
-**Example Contract in Solidity**
-```
-contract SimpleNameRegistry {
-
-  mapping (address => bool) public myMapping;
-
-  function register(address _a, bytes32 _b) {
-  }
-
-  function getSomeValue(address _x) public constant returns(bool b, address b) {
-  }
-
-}
-```
+Solidity functions are exposed as transact_<underscore_function_name>(params) (or transact_and_wait_<underscore_function_name>(params))  and call_<underscore_function_name>(params) e.g.:
 
 ```ruby
 simple_name_registry_instance.transact_and_wait_register("0x5b6cb65d40b0e27fab87a2180abcab22174a2d45", "minter.contract.dgx")
 simple_name_registry_instance.transact_register("0x385acafdb80b71ae001f1dbd0d65e62ec2fff055", "anthony@eufemio.dgx")
-simple_name_registry_instance.call_get_some_value("0x385acafdb80b71ae001f1dbd0d65e62ec2fff055")
-simple_name_registry_instance.call_my_mapping("0x385acafdb80b71ae001f1dbd0d65e62ec2fff055")
 ```
 
 ### Run contracts using a different address
@@ -106,12 +82,10 @@ simple_name_registry_instance.at("0x734533083b5fc0cd14b7cb8c8eb6ed0c9bd184d3")
 
 ## Roadmap
 
+* Add JSON RPC Client support
 * Add Windows IPC Client (named pipes)
-* Add support for creating and sending of raw transactions
-* Offline account creation
 * Solidity constant function output should be properly formatted according to the ouput data type
-* Unit testing and contract testing examples.  Use [web3.js](https://github.com/ethereum/web3.js) tests as a baseline.
-* ContractTransaction class
+* Unit testing and contract testing examples
 * Add more examples
 * API documentation
 

data/lib/ethereum.rb

@@ -1,12 +1,9 @@
 require "ethereum/version"
 require 'active_support'
 require 'active_support/core_ext'
-require 'sha3-pure-ruby'
 
 module Ethereum
-  require 'ethereum/client'
   require 'ethereum/ipc_client'
-  require 'ethereum/http_client'
   require 'ethereum/initializer'
   require 'ethereum/contract'
   require 'ethereum/function'

data/lib/ethereum/contract.rb

@@ -71,44 +71,41 @@ module Ethereum
         end
 
         functions.each do |fun|
-
-          define_method "call_#{fun.name.underscore}".to_sym do |*args|
-            formatter = Ethereum::Formatter.new
-            arg_types = fun.inputs.collect(&:type)
-            #out_types = fun.outputs.collect(&:type)
-            connection = self.connection
-            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)
+          if fun.constant
+            define_method "call_#{fun.name.underscore}".to_sym do |*args|
+              formatter = Ethereum::Formatter.new
+              arg_types = fun.inputs.collect(&:type)
+              #out_types = fun.outputs.collect(&:type)
+              connection = self.connection
+              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
+              return {result: connection.call({to: self.address, from: self.sender, data: payload.join()})["result"].gsub(/^0x/,'').scan(/.{64}/)}
             end
-            raw_result = connection.call({to: self.address, from: self.sender, data: payload.join()})["result"]
-            formatted_result = raw_result.gsub(/^0x/,'').scan(/.{64}/)
-            return {data: payload.join(), raw: raw_result, formatted: formatted_result}
-          end
-
-          define_method "transact_#{fun.name.underscore}".to_sym do |*args|
-            formatter = Ethereum::Formatter.new
-            arg_types = fun.inputs.collect(&:type)
-            connection = self.connection
-            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)
+          else
+            define_method "transact_#{fun.name.underscore}".to_sym do |*args|
+              formatter = Ethereum::Formatter.new
+              arg_types = fun.inputs.collect(&:type)
+              connection = self.connection
+              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 = connection.send_transaction({to: self.address, from: self.sender, data: payload.join(), gas: self.gas, gasPrice: self.gas_price})["result"]
+              return Ethereum::Transaction.new(txid, self.connection)
+            end
+            define_method "transact_and_wait_#{fun.name.underscore}".to_sym do |*args|
+              function_name = "transact_#{fun.name.underscore}".to_sym
+              tx = self.send(function_name, *args)
+              tx.wait_for_miner
+              return tx
             end
-            txid = connection.send_transaction({to: self.address, from: self.sender, data: payload.join(), gas: self.gas, gasPrice: self.gas_price})["result"]
-            return Ethereum::Transaction.new(txid, self.connection, payload.join(), args)
-          end
-
-          define_method "transact_and_wait_#{fun.name.underscore}".to_sym do |*args|
-            function_name = "transact_#{fun.name.underscore}".to_sym
-            tx = self.send(function_name, *args)
-            tx.wait_for_miner
-            return tx
           end
-
         end
       end
       Object.const_set(class_name, class_methods)

data/lib/ethereum/deployment.rb

@@ -31,10 +31,10 @@ module Ethereum
       @valid_deployment = @connection.get_code(@contract_address)["result"] != "0x"
     end
 
-    def wait_for_deployment(timeout = 1500.seconds)
+    def wait_for_deployment(timeout = 60.seconds)
       start_time = Time.now
       while self.deployed? == false
-        raise "Transaction #{@id} timed out." if ((Time.now - start_time) > timeout) 
+        raise Timeout::Error if ((Time.now - start_time) > timeout) 
         sleep 5 
         return true if self.deployed? 
       end

data/lib/ethereum/formatter.rb

@@ -54,11 +54,11 @@ module Ethereum
     end
 
     def uint_to_payload(uint)
-      self.to_twos_complement(uint).rjust(64, '0')
+      self.to_twos_complement(uint)
     end
 
     def int_to_payload(int)
-      self.to_twos_complement(uint).rjust(64, '0')
+      self.to_twos_complement(uint)
     end
 
     def bytes_to_payload(bytes)

data/lib/ethereum/ipc_client.rb

@@ -1,6 +1,6 @@
 require 'socket'
 module Ethereum
-  class IpcClient < Client
+  class IpcClient
     attr_accessor :command, :id, :ipcpath, :batch, :converted_transactions
 
     def initialize(ipcpath = "#{ENV['HOME']}/.ethereum/geth.ipc")
@@ -9,6 +9,13 @@ module Ethereum
       @batch = []
     end
 
+    def get_id
+      @id = @id + 1
+      return @id
+    end
+
+    RPC_COMMANDS = %w(eth_accounts eth_blockNumber eth_getBalance eth_protocolVersion eth_coinbase eth_mining eth_gasPrice eth_getStorage eth_storageAt eth_getStorageAt eth_getTransactionCount eth_getBlockTransactionCountByHash eth_getBlockTransactionCountByNumber eth_getUncleCountByBlockHash eth_getUncleCountByBlockNumber eth_getData eth_getCode eth_sign eth_sendRawTransaction eth_sendTransaction eth_transact eth_estimateGas eth_call eth_flush eth_getBlockByHash eth_getBlockByNumber eth_getTransactionByHash eth_getTransactionByBlockNumberAndIndex eth_getTransactionByBlockHashAndIndex eth_getUncleByBlockHashAndIndex eth_getUncleByBlockNumberAndIndex eth_getCompilers eth_compileSolidity eth_newFilter eth_newBlockFilter eth_newPendingTransactionFilter eth_uninstallFilter eth_getFilterChanges eth_getFilterLogs eth_getLogs eth_hashrate eth_getWork eth_submitWork eth_resend eth_pendingTransactions eth_getTransactionReceipt)
+
     RPC_COMMANDS.each do |rpc_command|
       method_name = "#{rpc_command.split("_")[1].underscore}"
       define_method method_name do |*args|
@@ -45,6 +52,10 @@ module Ethereum
       return collection
     end
 
+    def clear_batch
+      @batch = []
+    end
+
   end
 end
 

data/lib/ethereum/transaction.rb

@@ -1,14 +1,12 @@
 module Ethereum
 
   class Transaction
-    attr_accessor :id, :mined, :connection, :input, :input_parameters
+    attr_accessor :id, :mined, :connection
 
-    def initialize(id, connection, data, input_parameters = [])
+    def initialize(id, connection)
       @mined = false
       @connection = connection
       @id = id
-      @input = data
-      @input_parameters = input_parameters
     end
 
     def mined?
@@ -16,7 +14,7 @@ module Ethereum
       @mined = @connection.get_transaction_by_hash(@id)["result"]["blockNumber"].present?
     end
 
-    def wait_for_miner(timeout = 1500.seconds)
+    def wait_for_miner(timeout = 60.seconds)
       start_time = Time.now
       while self.mined? == false
         raise Timeout::Error if ((Time.now - start_time) > timeout)

data/lib/ethereum/version.rb

@@ -1,3 +1,3 @@
 module Ethereum
-  VERSION = "0.3.8"
+  VERSION = "0.3.47"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ethereum
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.47
 platform: ruby
 authors:
 - DigixGlobal Pte Ltd (https://dgx.io)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,14 +116,12 @@ files:
 - bin/setup
 - ethereum.gemspec
 - lib/ethereum.rb
-- lib/ethereum/client.rb
 - lib/ethereum/contract.rb
 - lib/ethereum/deployment.rb
 - lib/ethereum/formatter.rb
 - lib/ethereum/function.rb
 - lib/ethereum/function_input.rb
 - lib/ethereum/function_output.rb
-- lib/ethereum/http_client.rb
 - lib/ethereum/initializer.rb
 - lib/ethereum/ipc_client.rb
 - lib/ethereum/transaction.rb

data/lib/ethereum/client.rb

@@ -1,18 +0,0 @@
-module Ethereum
-  class Client
-
-    RPC_COMMANDS = %w(eth_accounts eth_blockNumber eth_getBalance eth_protocolVersion eth_coinbase eth_mining eth_gasPrice eth_getStorage eth_storageAt eth_getStorageAt eth_getTransactionCount eth_getBlockTransactionCountByHash eth_getBlockTransactionCountByNumber eth_getUncleCountByBlockHash eth_getUncleCountByBlockNumber eth_getData eth_getCode eth_sign eth_sendRawTransaction eth_sendTransaction eth_transact eth_estimateGas eth_call eth_flush eth_getBlockByHash eth_getBlockByNumber eth_getTransactionByHash eth_getTransactionByBlockNumberAndIndex eth_getTransactionByBlockHashAndIndex eth_getUncleByBlockHashAndIndex eth_getUncleByBlockNumberAndIndex eth_getCompilers eth_compileSolidity eth_newFilter eth_newBlockFilter eth_newPendingTransactionFilter eth_uninstallFilter eth_getFilterChanges eth_getFilterLogs eth_getLogs eth_hashrate eth_getWork eth_submitWork eth_resend eth_pendingTransactions eth_getTransactionReceipt)
-
-    def get_id
-      @id = @id + 1
-      return @id
-    end
-
-    def clear_batch
-      @batch = []
-    end
-
-  end
-
-end
-

data/lib/ethereum/http_client.rb

@@ -1,40 +0,0 @@
-require 'pry'
-module Ethereum
-  class HttpClient < Client
-    attr_accessor :command, :id, :host, :port, :batch, :converted_transactions, :uri
-
-    def initialize(host, port)
-      @host = host
-      @port = port
-      @id = 1
-      @uri = URI("http://#{@host}:#{@port}")
-      @batch = []
-    end
-
-    RPC_COMMANDS.each do |rpc_command|
-      method_name = "#{rpc_command.split("_")[1].underscore}"
-      define_method method_name do |*args|
-        command = rpc_command
-        payload = {jsonrpc: "2.0", method: command, params: args, id: get_id}
-        http = Net::HTTP.new(@host, @port)
-        header = {'Content-Type' => 'application/json'}
-        request = Net::HTTP::Post.new(uri, header)
-        request.body = payload.to_json
-        response =  http.request(request)
-        return JSON.parse(response.body)
-      end
-
-      define_method "#{method_name}_batch" do |*args|
-        command = rpc_command
-        payload = {jsonrpc: "2.0", method: command, params: args, id: get_id}
-        @batch << payload.to_json
-      end
-    end
-
-    def send_batch
-
-    end
-
-  end
-
-end