etherlite 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 848bca20f9303df82ddefac854e462dd61838ab0
-  data.tar.gz: f30e0a8490fdd72badbab0caa190321a397a429b
+SHA256:
+  metadata.gz: fe14df0fc898d4e298d57704e8a7f2acf0cb3dcace02b94903b8f295f94e971c
+  data.tar.gz: 87c4bc2dca3fb92d8a1eca54080cbfa50107defe48d0007cc5e6c3910bdfaa4e
 SHA512:
-  metadata.gz: 65bec2a78a37311d4adee177678c20c08e933c1163d16a0868fc9c3e7b00db5c7e4ae209c27b9e25cb0b64f931bc443349d9ccf1204ab7ca9347b589ae2edbd0
-  data.tar.gz: 713b2626113744451c59d535ce5aa7ee72f8040afc3e1dde5f409bd869e4443158ec20f0c135d68ad89d95585cd494750957f1eaaf9eb4b354a69e538263f051
+  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/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/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,72 +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 = nil
+      @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.empty?
+      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
 
-    def gas
-      Utils.hex_to_uint original['gas']
+    # receipt attributes
+
+    def receipt
+      return nil unless mined?
+      
+      @receipt ||= @connection.eth_get_transaction_receipt(@tx_hash)
     end
 
-    def gas_used
-      Utils.hex_to_uint @receipt['gasUsed']
+    def status
+      return nil if receipt.nil?
+
+      receipt['status'].is_a?(String) ? Utils.hex_to_uint(receipt['status']) : receipt['status']
     end
 
-    def gas_price
-      Utils.hex_to_uint original['gasPrice']
+    def succeeded?
+      status == 1
     end
 
-    def value
-      Utils.hex_to_uint original['value']
+    def failed?
+      status == 0
     end
 
-    def logs
-      @receipt['logs'] || []
+    def gas_used
+      receipt && Utils.hex_to_uint(receipt['gasUsed'])
     end
 
-    def events
-      ::Etherlite::EventProvider.parse_raw_logs(@connection, logs)
+    def logs
+      receipt && (receipt['logs'] || [])
     end
 
-    def block_number
-      Utils.hex_to_uint @receipt['blockNumber']
+    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)
@@ -79,11 +99,5 @@ 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.6"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etherlite
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-22 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
@@ -248,8 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ethereum integration for ruby on rails