etherlite 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca6ccaaf22a1079aa68d7d157900b271bed5e1db
-  data.tar.gz: 1d208e7063d99de949f7b80a3eefdffb799ee840
+  metadata.gz: 3d9836bec35f181ec6d32abafcd7a3a5dde485e4
+  data.tar.gz: 98977ede760cfcb7dcf32910d79acffef187b89e
 SHA512:
-  metadata.gz: 18451599c309267ee0fe65da4d04ff653ada9673ed9a21381bd27c7d5aa1333cdaed95a1d7d21d3e911d743490cf7f7728fb5fd7d4e6ccbc03ea02ff08578609
-  data.tar.gz: a6bf702b4f531e738651060de080ae097e67328783164c6509117fb49c3c76727e9b8c1784eec283f34c5586b3cde2d88cb24643d00ae32feb31bebfbce66313
+  metadata.gz: 12c60f7ad8b8a4556171db68c495a49ac4f72a8f10a0a3a64321db3170bbf05ea992a5bcbf40c89b1ee9054092eef7818aa3bf49fa6349c9e872720e9e9f3f2a
+  data.tar.gz: b36ebbd7fb4d09d33bad6129eb1d42ffe6b1588a20fbe90cf7ffe193d0cf4d20c1fb49d388897741ad3ad93d08e55948fc51e95a1c5b8c046d99bf3f741c7017

data/lib/etherlite.rb

@@ -32,6 +32,7 @@ require "etherlite/contract/function_input"
 
 require "etherlite/errors"
 require "etherlite/configuration"
+require "etherlite/event_provider"
 require "etherlite/abi"
 require "etherlite/utils"
 require "etherlite/connection"

data/lib/etherlite/api/node.rb

@@ -12,8 +12,8 @@ module Etherlite
         connection.eth_gas_price
       end
 
-      def get_transaction(_hash)
-        load_transaction(_hash).refresh
+      def get_transaction(*_args)
+        load_transaction(*_args).refresh
       end
 
       def load_transaction(_hash)

data/lib/etherlite/api/rpc.rb

@@ -9,6 +9,10 @@ module Etherlite
         Etherlite::Utils.hex_to_uint ipc_call(:eth_gasPrice)
       end
 
+      def eth_get_transaction_by_hash(_tx_hash)
+        ipc_call(:eth_getTransactionByHash, _tx_hash)
+      end
+
       def eth_get_transaction_receipt(_tx_hash)
         ipc_call(:eth_getTransactionReceipt, _tx_hash)
       end

data/lib/etherlite/commands/abi/load_contract.rb

@@ -18,6 +18,7 @@ module Etherlite::Abi
 
       klass.functions.freeze
       klass.events.freeze
+      ::Etherlite::EventProvider.register_contract_events klass
       klass
     end
 

data/lib/etherlite/contract/base.rb

@@ -64,24 +64,14 @@ module Etherlite::Contract
         toBlock: Etherlite::Utils.encode_block_param(to_block)
       }
 
-      params[:topics] = [events.map { |e| event_topic e }] unless events.nil?
-
-      event_map = Hash[(events || self.class.events).map { |e| [event_topic(e), e] }]
+      params[:topics] = [events.map(&:topic)] unless events.nil?
 
       logs = @connection.ipc_call(:eth_getLogs, params)
-      logs.map do |log|
-        event = event_map[log["topics"].first]
-        # TODO: support anonymous events!
-        event.decode(@connection, log) unless event.nil?
-      end
+      ::Etherlite::EventProvider.parse_raw_logs(@connection, logs)
     end
 
     private
 
     attr_reader :default_account, :normalized_address
-
-    def event_topic(_event)
-      '0x' + Etherlite::Utils.sha3(_event.signature)
-    end
   end
 end

data/lib/etherlite/contract/event_base.rb

@@ -17,6 +17,10 @@ module Etherlite::Contract
       end
     end
 
+    def self.topic
+      '0x' + Etherlite::Utils.sha3(signature)
+    end
+
     def self.decode(_connection, _json)
       new(
         _json['blockNumber'].nil? ? nil : Etherlite::Utils.hex_to_uint(_json['blockNumber']),

data/lib/etherlite/event_provider.rb

@@ -0,0 +1,29 @@
+module Etherlite
+  module EventProvider
+    extend self
+
+    def register_contract_events(_contract_class)
+      _contract_class.events.each { |e| register_event e }
+    end
+
+    def register_event(_event)
+      event_by_topic[_event.topic] = _event
+    end
+
+    def parse_raw_log(_connection, _raw_log)
+      event = event_by_topic[_raw_log["topics"].first]
+      return nil if event.nil?
+      event.decode(_connection, _raw_log)
+    end
+
+    def parse_raw_logs(_connection, _raw_logs)
+      _raw_logs.map { |e| parse_raw_log(_connection, e) }.reject &:nil?
+    end
+
+    private
+
+    def event_by_topic
+      @event_by_topic ||= {}
+    end
+  end
+end

data/lib/etherlite/transaction.rb

@@ -37,10 +37,30 @@ module Etherlite
       @connection.eth_block_number - block_number
     end
 
+    def gas
+      Utils.hex_to_uint original['gas']
+    end
+
     def gas_used
       Utils.hex_to_uint @receipt['gasUsed']
     end
 
+    def gas_price
+      Utils.hex_to_uint original['gasPrice']
+    end
+
+    def value
+      Utils.hex_to_uint original['value']
+    end
+
+    def logs
+      @receipt['logs'] || []
+    end
+
+    def events
+      ::Etherlite::EventProvider.parse_raw_logs(@connection, logs)
+    end
+
     def block_number
       Utils.hex_to_uint @receipt['blockNumber']
     end
@@ -59,5 +79,11 @@ module Etherlite
 
       true
     end
+
+    private
+
+    def original
+      @original ||= @connection.eth_get_transaction_by_hash(@tx_hash)
+    end
   end
 end

data/lib/etherlite/version.rb

@@ -1,3 +1,3 @@
 module Etherlite
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etherlite
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-19 00:00:00.000000000 Z
+date: 2018-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-sha3
@@ -208,6 +208,7 @@ files:
 - lib/etherlite/contract/function.rb
 - lib/etherlite/contract/function_input.rb
 - lib/etherlite/errors.rb
+- lib/etherlite/event_provider.rb
 - lib/etherlite/nonce_manager.rb
 - lib/etherlite/railtie.rb
 - lib/etherlite/railties/configuration_extensions.rb