ethereum 0.4.62 → 0.4.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7167e08de3db947aa03d0552b7ba34921124411a
-  data.tar.gz: c5ebedb054a9f7bd457601ab695609512269b6c9
+  metadata.gz: dccc79e9ed08f479e0b29a23b118219cc6a4279e
+  data.tar.gz: 6698a12c7b695fa55e5cbfef02cfe659e0bdf4a9
 SHA512:
-  metadata.gz: ca9324dbc0687a680fd8502c45ed5705fb9acfea004be6e776ca5b8c6b1749ad7dcb581ffedbd8c6dcab7931f504973b5150dc4562c60dc21768e11560d50c21
-  data.tar.gz: 902db7a87860f4e962ad7857cabccbd48109a168d12f4a6dc8cf6dc483ec81ffb133057a9839e2cfd1b671d0a3a6adfc9973207cf5c9f0b9d9472e81a9604b7d
+  metadata.gz: dc37866485be2014731cc2e909c013a02f3c0f6765fb2a1650644f3c4062f998de0775e579278538e721d674a05d5129cb6ea9c238bb2f1ee97a31a2b87d928e
+  data.tar.gz: 2a7370d6d0fba1ec25987e3dfb130dd081803b61b409cb207c7ca21c3d8720ec3cf1b5fd052ff3d0c1f0c1941f96190ea7d87a265773d34e574265df2043f9e1

data/lib/ethereum/contract.rb

@@ -22,7 +22,7 @@ module Ethereum
       class_name = @name
       functions = @functions
       constructor_inputs = @constructor_inputs
-      code = @code
+      binary = @code
 
       class_methods = Class.new do
 
@@ -32,57 +32,61 @@ module Ethereum
 
         define_method :deploy do |*params|
           formatter = Ethereum::Formatter.new
+          deploy_code = binary
+          deploy_arguments = ""
           if constructor_inputs.present?
             raise "Missing constructor parameter" and return if params.length != constructor_inputs.length
             constructor_inputs.each_index do |i|
               args = [constructor_inputs[i]["type"], params[i]]
-              code << formatter.to_payload(args)
+              deploy_arguments << formatter.to_payload(args)
             end
           end
-          deploytx = connection.send_transaction({from: self.sender, gas: 2000000, gasPrice: 60000000000, data: code})["result"]
-          self.instance_variable_set("@deployment", Ethereum::Deployment.new(deploytx, connection))
+          deploy_payload = deploy_code + deploy_arguments
+          puts "sending payload #{deploy_payload}"
+          deploytx = connection.send_transaction({from: self.sender, gas: 2000000, gasPrice: 60000000000, data: deploy_payload})["result"]
+          instance_variable_set("@deployment", Ethereum::Deployment.new(deploytx, connection))
         end
 
         define_method :deployment do
-          self.instance_variable_get("@deployment")
+          instance_variable_get("@deployment")
         end
 
         define_method :deploy_and_wait do |time = 60.seconds, *params|
           self.deploy(*params)
           self.deployment.wait_for_deployment(time)
-          self.instance_variable_set("@address", self.deployment.contract_address)
+          instance_variable_set("@address", self.deployment.contract_address)
         end
 
         define_method :at do |addr|
-          self.instance_variable_set("@address", addr) 
+          instance_variable_set("@address", addr) 
         end
 
         define_method :address do
-          self.instance_variable_get("@address")
+          instance_variable_get("@address")
         end
 
         define_method :as do |addr|
-          self.instance_variable_set("@sender", addr)
+          instance_variable_set("@sender", addr)
         end
 
         define_method :sender do
-          self.instance_variable_get("@sender") || connection.coinbase["result"]
+          instance_variable_get("@sender") || connection.coinbase["result"]
         end
 
         define_method :set_gas_price do |gp|
-          self.instance_variable_set("@gas_price", gp)
+          instance_variable_set("@gas_price", gp)
         end
 
         define_method :gas_price do
-          self.instance_variable_get("@gas_price") || 60000000000
+          instance_variable_get("@gas_price") || 60000000000
         end
 
         define_method :set_gas do |gas|
-          self.instance_variable_set("@gas", gas)
+          instance_variable_set("@gas", gas)
         end
 
         define_method :gas do 
-          self.instance_variable_get("@gas") || 2000000
+          instance_variable_get("@gas") || 2000000
         end
 
         functions.each do |fun|
@@ -152,7 +156,10 @@ module Ethereum
 
         end
       end
-      Object.const_set(class_name, class_methods) unless Object.const_defined?(class_name)
+      if Object.const_defined?(class_name)
+        Object.send(:remove_const, class_name)
+      end
+      Object.const_set(class_name, class_methods)
     end
 
   end

data/lib/ethereum/version.rb

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

metadata

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