ethereum 0.3.51 → 0.3.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0df371ccbd446a91c3611ad41457a748a09decf6
-  data.tar.gz: 15c535ac0052c1ec2ba9117821ea27088726e3e4
+  metadata.gz: b0cf154121a5ae6d12378544b2dad1217f2e24bc
+  data.tar.gz: 743c549360845c8b40d0474638527b90d17a7a53
 SHA512:
-  metadata.gz: 64b556b00a089a4275a306793459b689ca674750e25612184082652e3ee76c76321eb9127da55098608784b35c872a6b979e1bf2631b09efeb3f91472f58b77f
-  data.tar.gz: 24330886788203c870c9bc16b5b32c2066b3145e80921676a1374c5c232ec56079e899064853da567aa062b69f946631c2bb9e887319507a983e01aa368ad89c
+  metadata.gz: 2f3f04caee524040a9a7446681dfc6dc28d255f98f182a8dd0e911f52693430a336f6147cffa573957ec4389c334b461f857de3db3025477024b897083f8ef92
+  data.tar.gz: 927aaf371ff6606ccb33996d4fa5f9c48912aa09fe74ae7d6d27aaa3c8b5767d8cc80e0a1a01736ed1c02df345ea3bb3adbbcea689aaa098d75bfe136ced141b

data/README.md

@@ -106,11 +106,12 @@ 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
-* Add Windows IPC Client (named pipes)
 * Solidity constant function output should be properly formatted according to the ouput data type
-* Unit testing and contract testing examples
+* Unit testing and contract testing examples.  Use [web3.js](https://github.com/ethereum/web3.js) tests as a baseline.
+* ContractTransaction class
 * Add more examples
 * API documentation
 

data/lib/ethereum/contract.rb

@@ -71,41 +71,44 @@ module Ethereum
         end
 
         functions.each do |fun|
-          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
-          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)
+
+          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
-            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
+            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)
             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/formatter.rb

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

data/lib/ethereum/transaction.rb

@@ -1,12 +1,14 @@
 module Ethereum
 
   class Transaction
-    attr_accessor :id, :mined, :connection
+    attr_accessor :id, :mined, :connection, :input, :input_parameters
 
-    def initialize(id, connection)
+    def initialize(id, connection, data, input_parameters = [])
       @mined = false
       @connection = connection
       @id = id
+      @input = data
+      @input_parameters = input_parameters
     end
 
     def mined?

data/lib/ethereum/version.rb

@@ -1,3 +1,3 @@
 module Ethereum
-  VERSION = "0.3.51"
+  VERSION = "0.3.60"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ethereum
 version: !ruby/object:Gem::Version
-  version: 0.3.51
+  version: 0.3.60
 platform: ruby
 authors:
 - DigixGlobal Pte Ltd (https://dgx.io)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler