ethereum 0.4.61 → 0.4.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7beb51d137130932441fc4bc67546dc9f3af464
-  data.tar.gz: 628409d7b7168db426e6be1899f0865c462e51a8
+  metadata.gz: 7167e08de3db947aa03d0552b7ba34921124411a
+  data.tar.gz: c5ebedb054a9f7bd457601ab695609512269b6c9
 SHA512:
-  metadata.gz: 456cba06bd329c4aebbda4c3f993512ea38f7bc90921acafd95213c005672ea5861ab243651353e162a4d84015a0dce93769eb984435df05a7355672f99fa190
-  data.tar.gz: 59b48d04f86198c287bbce053132bb1359288e84d851b6ba266a9ff37d6c6d1d94ab2ae46bcbdaac93b2ca231cfd116851b33291d13027da381b636dbc7f20de
+  metadata.gz: ca9324dbc0687a680fd8502c45ed5705fb9acfea004be6e776ca5b8c6b1749ad7dcb581ffedbd8c6dcab7931f504973b5150dc4562c60dc21768e11560d50c21
+  data.tar.gz: 902db7a87860f4e962ad7857cabccbd48109a168d12f4a6dc8cf6dc483ec81ffb133057a9839e2cfd1b671d0a3a6adfc9973207cf5c9f0b9d9472e81a9604b7d

data/lib/ethereum/contract.rb

@@ -23,6 +23,7 @@ module Ethereum
       functions = @functions
       constructor_inputs = @constructor_inputs
       code = @code
+
       class_methods = Class.new do
 
         define_method "connection".to_sym do
@@ -88,8 +89,16 @@ module Ethereum
 
           fun_count = functions.select {|x| x.name == fun.name }.count
           derived_function_name = (fun_count == 1) ? "#{fun.name.underscore}" : "#{fun.name.underscore}__#{fun.inputs.collect {|x| x.type}.join("__")}"
-
-          define_method "call_#{derived_function_name}".to_sym do |*args|
+          call_function_name = "call_#{derived_function_name}".to_sym
+          call_function_name_alias = "c_#{derived_function_name}".to_sym
+          call_raw_function_name = "call_raw_#{derived_function_name}".to_sym
+          call_raw_function_name_alias = "cr_#{derived_function_name}".to_sym
+          transact_function_name = "transact_#{derived_function_name}".to_sym
+          transact_function_name_alias = "t_#{derived_function_name}".to_sym
+          transact_and_wait_function_name = "transact_and_wait_#{derived_function_name}".to_sym
+          transact_and_wait_function_name_alias = "tw_#{derived_function_name}".to_sym
+
+          define_method call_raw_function_name do |*args|
             formatter = Ethereum::Formatter.new
             arg_types = fun.inputs.collect(&:type)
             connection = self.connection
@@ -102,15 +111,20 @@ module Ethereum
             raw_result = connection.call({to: self.address, from: self.sender, data: payload.join()})["result"]
             formatted_result = fun.outputs.collect {|x| x.type }.zip(raw_result.gsub(/^0x/,'').scan(/.{64}/))
             output = formatted_result.collect {|x| formatter.from_payload(x) }
-            #return {data: payload.join(), raw: raw_result, formatted: output}
-            if output.length == 0
+            return {data: payload.join(), raw: raw_result, formatted: output}
+          end
+
+          define_method call_function_name do |*args|
+            data = self.send(call_raw_function_name, *args)
+            output = data[:formatted]
+            if output.length == 1 
               return output[0]
             else 
               return output
             end
           end
 
-          define_method "transact_#{derived_function_name}".to_sym do |*args|
+          define_method transact_function_name do |*args|
             formatter = Ethereum::Formatter.new
             arg_types = fun.inputs.collect(&:type)
             connection = self.connection
@@ -124,13 +138,18 @@ module Ethereum
             return Ethereum::Transaction.new(txid, self.connection, payload.join(), args)
           end
 
-          define_method "transact_and_wait_#{derived_function_name}".to_sym do |*args|
+          define_method transact_and_wait_function_name do |*args|
             function_name = "transact_#{derived_function_name}".to_sym
             tx = self.send(function_name, *args)
             tx.wait_for_miner
             return tx
           end
 
+          alias_method call_function_name_alias, call_function_name
+          alias_method call_raw_function_name_alias, call_raw_function_name
+          alias_method transact_function_name_alias, transact_function_name
+          alias_method transact_and_wait_function_name_alias, transact_and_wait_function_name
+
         end
       end
       Object.const_set(class_name, class_methods) unless Object.const_defined?(class_name)

data/lib/ethereum/version.rb

@@ -1,3 +1,3 @@
 module Ethereum
-  VERSION = "0.4.61"
+  VERSION = "0.4.62"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ethereum
 version: !ruby/object:Gem::Version
-  version: 0.4.61
+  version: 0.4.62
 platform: ruby
 authors:
 - DigixGlobal Pte Ltd (https://dgx.io)