ethereum 0.4.85 → 0.4.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a875891af2a24286d61a1afc6aeecfa7ef4ed34
-  data.tar.gz: bffe66081bcee30660c07f1a9fe8fe3e818628ee
+  metadata.gz: c273633c818965bad5e94bb13d522d2d63d7fbbd
+  data.tar.gz: 6c2f39e4f2fb95bf6cfc233e8bd89557abb2469f
 SHA512:
-  metadata.gz: 0718eb47a13d68852b5a9295d78e3afee399af8e8d024f5faf6e8f9e16118481f39797aecf0a3819f29c6ef49f7b9beff08b063e358674acd0030fe80de1fbf6
-  data.tar.gz: 5af94959fdda42e7746d880b3dea6bf5d2045af4d9e5288158d4e9c9ef65b4aa9ffbfebce13451bc463f676c263a4f605fd1abcbe081c4f465ee8184e42046ed
+  metadata.gz: bfce182b248aadf1555669cbfbb4b609809a732b5e9f1ab5748d11d9c83a89ee45aefe8317570550d9103538a83fcfc4079dccc88f165daeb9f72340bb78560a
+  data.tar.gz: 74d467614918ff44d5411a52c06531bd51d28f60e7eedbba4f7c5581714a4ec1861cec86794db4203ee77f67035bae864ac194a4262f15433c2cf1f9c0561f4c

data/README.md

@@ -12,6 +12,7 @@ A simple library for Ethereum.
 * Expose deployed contracts as Ruby classes
 * Test solidity contracts with a Ruby testing framework of your choice
 * Call and wait for the result of Solidity function calls.
+* Contract events 
 
 ## Ruby Compatibility
 

data/lib/ethereum/contract.rb

@@ -23,6 +23,7 @@ module Ethereum
       functions = @functions
       constructor_inputs = @constructor_inputs
       binary = @code
+      events = @events
 
       class_methods = Class.new do
 
@@ -46,6 +47,10 @@ module Ethereum
           instance_variable_set("@deployment", Ethereum::Deployment.new(deploytx, connection))
         end
 
+        define_method :events do
+          return events
+        end
+
         define_method :deployment do
           instance_variable_get("@deployment")
         end
@@ -54,10 +59,18 @@ module Ethereum
           self.deploy(*params)
           self.deployment.wait_for_deployment(time)
           instance_variable_set("@address", self.deployment.contract_address)
+          self.events.each do |event|
+            event.set_address(self.deployment.contract_address)
+            event.set_client(connection)
+          end
         end
 
         define_method :at do |addr|
           instance_variable_set("@address", addr) 
+          self.events.each do |event|
+            event.set_address(addr)
+            event.set_client(connection)
+          end
         end
 
         define_method :address do
@@ -88,6 +101,51 @@ module Ethereum
           instance_variable_get("@gas") || 3000000
         end
 
+        events.each do |evt|
+          define_method "nf_#{evt.name.underscore}".to_sym do |params = {}|
+            params[:to_block] ||= "latest"
+            params[:from_block] ||= "0x0"
+            params[:address] ||=  instance_variable_get("@address")
+            params[:topics] = evt.signature
+            payload = {topics: [params[:topics]], fromBlock: params[:from_block], toBlock: params[:to_block], address: params[:address]}
+            filter_id = connection.new_filter(payload)
+            return filter_id["result"]
+          end
+
+          define_method "gfl_#{evt.name.underscore}".to_sym do |filter_id|
+            formatter = Ethereum::Formatter.new
+            logs = connection.get_filter_logs(filter_id)
+            collection = []
+            logs["result"].each do |result|
+              inputs = evt.input_types
+              outputs = inputs.zip(result["topics"][1..-1])
+              data = {blockNumber: result["blockNumber"].hex, transactionHash: result["transactionHash"], blockHash: result["blockHash"], transactionIndex: result["transactionIndex"].hex, topics: []} 
+              outputs.each do |output|
+                data[:topics] << formatter.from_payload(output)
+              end
+              collection << data 
+            end
+            return collection
+          end
+
+          define_method "gfc_#{evt.name.underscore}".to_sym do |filter_id|
+            formatter = Ethereum::Formatter.new
+            logs = connection.get_filter_changes(filter_id)
+            collection = []
+            logs["result"].each do |result|
+              inputs = evt.input_types
+              outputs = inputs.zip(result["topics"][1..-1])
+              data = {blockNumber: result["blockNumber"].hex, transactionHash: result["transactionHash"], blockHash: result["blockHash"], transactionIndex: result["transactionIndex"].hex, topics: []} 
+              outputs.each do |output|
+                data[:topics] << formatter.from_payload(output)
+              end
+              collection << data 
+            end
+            return collection
+          end
+
+        end
+
         functions.each do |fun|
 
           fun_count = functions.select {|x| x.name == fun.name }.count

data/lib/ethereum/contract_event.rb

@@ -1,8 +1,7 @@
-require 'pry'
 module Ethereum
   class ContractEvent
 
-    attr_accessor :name, :signature, :input_types, :inputs, :event_string 
+    attr_accessor :name, :signature, :input_types, :inputs, :event_string, :address, :client
 
     def initialize(data)
       @name = data["name"]
@@ -12,6 +11,18 @@ module Ethereum
       @signature = Digest::SHA3.hexdigest(@event_string, 256)
     end
 
+    def set_address(address)
+      @address = address
+    end
+
+    def register_filter(*args)
+      @client. 
+    end
+
+    def set_client(client)
+      @client = client
+    end
+
   end
 end
 

data/lib/ethereum/contract_initializer.rb

@@ -2,7 +2,7 @@ module Ethereum
 
   class ContractInitializer
 
-    attr_accessor :abi, :binary, :name, :libraries, :needs_linking, :project_initializer
+    attr_accessor :abi, :binary, :name, :libraries, :needs_linking, :project_initializer, :contract
 
     def initialize(contract_name, contract, project_initializer)
       @abi = JSON.parse(contract["abi"]) unless contract.nil?
@@ -40,8 +40,8 @@ module Ethereum
     end
 
     def build(connection)
-      contract = Ethereum::Contract.new(@name, @binary, @abi) 
-      contract.build(connection)
+      @contract = Ethereum::Contract.new(@name, @binary, @abi) 
+      @contract.build(connection)
     end
 
     def generate_javascripts(path)

data/lib/ethereum/version.rb

@@ -1,3 +1,3 @@
 module Ethereum
-  VERSION = "0.4.85"
+  VERSION = "0.4.90"
 end

metadata

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