etherlite 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ca6ccaaf22a1079aa68d7d157900b271bed5e1db
-  data.tar.gz: 1d208e7063d99de949f7b80a3eefdffb799ee840
+SHA256:
+  metadata.gz: fe14df0fc898d4e298d57704e8a7f2acf0cb3dcace02b94903b8f295f94e971c
+  data.tar.gz: 87c4bc2dca3fb92d8a1eca54080cbfa50107defe48d0007cc5e6c3910bdfaa4e
 SHA512:
-  metadata.gz: 18451599c309267ee0fe65da4d04ff653ada9673ed9a21381bd27c7d5aa1333cdaed95a1d7d21d3e911d743490cf7f7728fb5fd7d4e6ccbc03ea02ff08578609
-  data.tar.gz: a6bf702b4f531e738651060de080ae097e67328783164c6509117fb49c3c76727e9b8c1784eec283f34c5586b3cde2d88cb24643d00ae32feb31bebfbce66313
+  metadata.gz: c1e16e2460b1e67948efd91921b1e03e6805c114fdba9a375c4b83695baa6d01ca80b46fc3530be5ac923c641d47190cc7fc466cdf6daef793f55cb54993be0a
+  data.tar.gz: 76cb54b21dd785777fcd474f0bbf85e374b9a6aad8bd64d1ddfed73f195c51a736b339045b09056be8da32c34e7d272abcf7393b4bc1bd187efe2fb2186adc57

data/etherlite.gemspec

@@ -24,11 +24,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "eth", "~> 0.4.4"
   spec.add_dependency "activesupport"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "webmock", "~> 3.0.1"
+  spec.add_development_dependency "webmock", "~> 3.7.5"
   spec.add_development_dependency "pry"
 end

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/account/private_key.rb

@@ -9,7 +9,11 @@ module Etherlite
       end
 
       def send_transaction(_options = {})
-        nonce_manager.with_next_nonce_for(normalized_address) do |nonce|
+        nonce_options = {
+          replace: _options.fetch(:replace, false)
+        }
+
+        nonce_manager.with_next_nonce_for(normalized_address, nonce_options) do |nonce|
           tx = Eth::Tx.new(
             value: _options.fetch(:value, 0),
             data: _options.fetch(:data, ''),

data/lib/etherlite/api/node.rb

@@ -12,8 +12,21 @@ 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 get_logs(events: nil, address: nil, from_block: :earliest, to_block: :latest)
+        params = {
+          fromBlock: Etherlite::Utils.encode_block_param(from_block),
+          toBlock: Etherlite::Utils.encode_block_param(to_block)
+        }
+
+        params[:topics] = [Array(events).map(&:topic)] unless events.nil?
+        params[:address] = Etherlite::Utils.encode_address_param(address) unless address.nil?
+
+        logs = connection.ipc_call(:eth_getLogs, params)
+        ::Etherlite::EventProvider.parse_raw_logs(connection, logs)
       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

@@ -3,7 +3,7 @@ module Etherlite::Abi
     def perform
       klass = Class.new(Etherlite::Contract::Base)
 
-      define_class_getter klass, 'unlinked_binary', unlinked_binary
+      define_class_getter klass, 'unlinked_bytecode', unlinked_bytecode
 
       abi_definitions.each do |definition|
         case definition['type']
@@ -18,12 +18,13 @@ module Etherlite::Abi
 
       klass.functions.freeze
       klass.events.freeze
+      ::Etherlite::EventProvider.register_contract_events klass
       klass
     end
 
     private
 
-    def unlinked_binary
+    def unlinked_bytecode
       @artifact['unlinked_binary'] || @artifact['bytecode'] || ''
     end
 

data/lib/etherlite/contract/base.rb

@@ -10,7 +10,7 @@ module Etherlite::Contract
       @events ||= []
     end
 
-    def self.unlinked_binary
+    def self.unlinked_bytecode
       '0x0'
     end
 
@@ -18,13 +18,13 @@ module Etherlite::Contract
       nil
     end
 
-    def self.binary
-      @binary ||= begin
-        if /__[^_]+_+/ === unlinked_binary
+    def self.bytecode
+      @bytecode ||= begin
+        if /__[^_]+_+/.match? unlinked_bytecode
           raise UnlinkedContractError, 'compiled contract contains unresolved library references'
         end
 
-        unlinked_binary
+        unlinked_bytecode
       end
     end
 
@@ -32,7 +32,7 @@ module Etherlite::Contract
       options = _args.last.is_a?(Hash) ? _args.pop : {}
       as = options[:as] || options[:client].try(:default_account) || Etherlite.default_account
 
-      tx_data = binary
+      tx_data = options.fetch(:bytecode, bytecode)
       tx_data += constructor.encode(_args) unless constructor.nil?
 
       as.send_transaction({ data: tx_data }.merge(options))
@@ -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,19 +17,25 @@ 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']),
         _json['transactionHash'],
+        Etherlite::Address.new(_connection, Etherlite::Utils.normalize_address(_json['address'])),
         DecodeLogInputs.for(connection: _connection, inputs: inputs, json: _json)
       )
     end
 
-    attr_reader :block_number, :tx_hash, :attributes
+    attr_reader :block_number, :tx_hash, :address, :attributes
 
-    def initialize(_block_number, _tx_hash, _attributes)
+    def initialize(_block_number, _tx_hash, _address, _attributes)
       @block_number = _block_number
       @tx_hash = _tx_hash
+      @address = _address
       @attributes = _attributes
     end
   end

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/nonce_manager.rb

@@ -17,9 +17,10 @@ module Etherlite
       last_nonce
     end
 
-    def with_next_nonce_for(_normalized_address)
+    def with_next_nonce_for(_normalized_address, replace: false)
       @@nonce_mutex.synchronize do
-        next_nonce = last_nonce_for(_normalized_address) + 1
+        next_nonce = last_nonce_for(_normalized_address)
+        next_nonce += 1 if next_nonce.negative? || !replace # if first tx, don't replace
 
         begin
           result = yield next_nonce

data/lib/etherlite/transaction.rb

@@ -1,52 +1,92 @@
 module Etherlite
   class Transaction
-    attr_reader :tx_hash, :receipt
+    attr_reader :tx_hash
 
     def initialize(_connection, _tx_hash)
       @connection = _connection
       @tx_hash = _tx_hash
-      @receipt = {}
+      @loaded = false
     end
 
     def refresh
-      @receipt = @connection.eth_get_transaction_receipt(@tx_hash) || {}
+      @original = @connection.eth_get_transaction_by_hash(@tx_hash)
+      @loaded = true
       self
     end
 
+    def original
+      refresh unless @loaded
+      @original
+    end
+
     def removed?
-      @receipt.nil?
+      original.nil?
     end
 
-    def succeeded?
-      status == 1
+    def mined?
+      original.present? && !original['blockNumber'].nil?
     end
 
-    def status
-      return nil if removed?
-      status = @receipt['status']
-      status.is_a?(String) ? Utils.hex_to_uint(status) : status
+    def gas
+      original && Utils.hex_to_uint(original['gas'])
     end
 
-    def mined?
-      !removed? && @receipt.key?('blockNumber')
+    def gas_price
+      original && Utils.hex_to_uint(original['gasPrice'])
+    end
+
+    def value
+      original && Utils.hex_to_uint(original['value'])
+    end
+
+    def block_number
+      return nil unless mined?
+
+      Utils.hex_to_uint(original['blockNumber'])
     end
 
     def confirmations
       return 0 unless mined?
 
-      @connection.eth_block_number - block_number
+      (@connection.eth_block_number - block_number) + 1
+    end
+
+    # receipt attributes
+
+    def receipt
+      return nil unless mined?
+      
+      @receipt ||= @connection.eth_get_transaction_receipt(@tx_hash)
+    end
+
+    def status
+      return nil if receipt.nil?
+
+      receipt['status'].is_a?(String) ? Utils.hex_to_uint(receipt['status']) : receipt['status']
+    end
+
+    def succeeded?
+      status == 1
+    end
+
+    def failed?
+      status == 0
     end
 
     def gas_used
-      Utils.hex_to_uint @receipt['gasUsed']
+      receipt && Utils.hex_to_uint(receipt['gasUsed'])
     end
 
-    def block_number
-      Utils.hex_to_uint @receipt['blockNumber']
+    def logs
+      receipt && (receipt['logs'] || [])
+    end
+
+    def events
+      receipt && ::Etherlite::EventProvider.parse_raw_logs(@connection, logs)
     end
 
     def contract_address
-      @receipt['contractAddress']
+      receipt && receipt['contractAddress']
     end
 
     def wait_for_block(timeout: 120)

data/lib/etherlite/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etherlite
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-19 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-sha3
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.7.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.7.5
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -247,8 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ethereum integration for ruby on rails