etherlite 0.2.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 848bca20f9303df82ddefac854e462dd61838ab0
-  data.tar.gz: f30e0a8490fdd72badbab0caa190321a397a429b
+SHA256:
+  metadata.gz: 3e2219e30428821c5866a33aa415a4ab4217b3b6f66eaa20f4bd701f64070cdc
+  data.tar.gz: df7c5c3d51712a08cd3aabc203ebfc4a0daa853610666d0d111f166e1607cf73
 SHA512:
-  metadata.gz: 65bec2a78a37311d4adee177678c20c08e933c1163d16a0868fc9c3e7b00db5c7e4ae209c27b9e25cb0b64f931bc443349d9ccf1204ab7ca9347b589ae2edbd0
-  data.tar.gz: 713b2626113744451c59d535ce5aa7ee72f8040afc3e1dde5f409bd869e4443158ec20f0c135d68ad89d95585cd494750957f1eaaf9eb4b354a69e538263f051
+  metadata.gz: ba8e3b442d736af75785838a131a02c02a6075c67fe1126f4ba60bc0ae24df2fb37924bf253fd9bf846f71fb91f6ebff35edb6fa6bc7fd322824bd2ea593122a
+  data.tar.gz: 9d6c0edd407d09be73e90a2ad3bd53d323f7297073bfff84fd22f6a0f6a4a844ff3c11080b6a142ccb17d1e2823123d71abaa5f6f91c079fb320fe5b9a9e1fd7

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

@@ -9,6 +9,15 @@ module Etherlite::Account
       @normalized_address = _normalized_address
     end
 
+    def next_nonce
+      if @connection.use_parity
+        @connection.parity_next_nonce(address)
+      else
+        # https://github.com/ethereum/go-ethereum/issues/2736
+        @connection.eth_get_transaction_count(address, 'pending')
+      end
+    end
+
     def transfer_to(_target, _options = {})
       send_transaction _options.merge(to: _target, value: _options.fetch(:amount, 0))
     end
@@ -30,7 +39,7 @@ module Etherlite::Account
     end
 
     def send_transaction(_options = {})
-      raise NotSupportedError, 'transactions are not supported by this kind of account'
+      raise Etherlite::NotSupportedError, 'transactions are not supported by this kind of account'
     end
 
     def ==(_other)
@@ -41,7 +50,6 @@ module Etherlite::Account
 
     def call_constant(_target, _function, _params, _options)
       params = {
-        from: json_encoded_address,
         to: Etherlite::Utils.encode_address_param(_target),
         data: _function.encode(_params)
       }

data/lib/etherlite/account/private_key.rb

@@ -8,21 +8,27 @@ module Etherlite
         super _connection, Etherlite::Utils.normalize_address(@key.address)
       end
 
+      def build_raw_transaction(_options = {})
+        nonce = nonce_manager.next_nonce_for(normalized_address, _options.slice(:replace, :nonce))
+
+        tx = Eth::Tx.new(
+          value: _options.fetch(:value, 0),
+          data: _options.fetch(:data, ''),
+          gas_limit: _options.fetch(:gas, 90_000),
+          gas_price: _options.fetch(:gas_price, gas_price),
+          to: (Etherlite::Utils.encode_address_param(_options[:to]) if _options.key?(:to)),
+          nonce: nonce
+        )
+
+        sign_with_connection_chain tx
+
+        tx
+      end
+
       def send_transaction(_options = {})
-        nonce_manager.with_next_nonce_for(normalized_address) do |nonce|
-          tx = Eth::Tx.new(
-            value: _options.fetch(:value, 0),
-            data: _options.fetch(:data, ''),
-            gas_limit: _options.fetch(:gas, 90_000),
-            gas_price: _options.fetch(:gas_price, gas_price),
-            to: (Etherlite::Utils.encode_address_param(_options[:to]) if _options.key?(:to)),
-            nonce: nonce
-          )
-
-          # Since eth gem does not allow configuration of chains for every tx, we need
-          # to globally configure it before signing. This is not thread safe so a mutex is needed.
-          sign_with_connection_chain tx
+        tx = build_raw_transaction(_options)
 
+        nonce_manager.with_next_nonce_for(normalized_address, nonce: tx.nonce) do |nonce|
           Etherlite::Transaction.new @connection, @connection.eth_send_raw_transaction(tx.hex)
         end
       end

data/lib/etherlite/api/node.rb

@@ -53,7 +53,11 @@ module Etherlite
       end
 
       def default_account
-        @default_account ||= load_default_account
+        @default_account ||= (accounts.first || anonymous_account)
+      end
+
+      def anonymous_account
+        @anonymous_account ||= Etherlite::Account::Anonymous.new(connection)
       end
 
       def account_from_pk(_pk)
@@ -66,13 +70,6 @@ use 'load_account' instead"
       end
 
       def_delegators :default_account, :unlock, :lock, :normalized_address, :transfer_to, :call
-
-      private
-
-      def load_default_account
-        # TODO: consider configuring a global PK and allow the default account to use it
-        accounts.first || Etherlite::Account::Anonymous.new(connection)
-      end
     end
   end
 end

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

@@ -81,9 +81,21 @@ module Etherlite::Abi
           )
         end,
         (_definition['outputs'] || []).map { |input| LoadType.for signature: input['type'] },
-        _definition.fetch('payable', false),
-        _definition.fetch('constant', false)
+        function_payable?(_definition),
+        function_constant?(_definition)
       )
     end
+
+    def function_payable?(_definition)
+      return _definition['payable'] if _definition.key? 'payable'
+
+      _definition['stateMutability'] == 'payable'
+    end
+
+    def function_constant?(_definition)
+      return _definition['constant'] if _definition.key? 'constant'
+
+      _definition['stateMutability'] == 'pure' || _definition['stateMutability'] == 'view'
+    end
   end
 end

data/lib/etherlite/nonce_manager.rb

@@ -17,13 +17,22 @@ module Etherlite
       last_nonce
     end
 
-    def with_next_nonce_for(_normalized_address)
+    def next_nonce_for(_normalized_address, replace: false, nonce: nil)
+      if nonce.nil?
+        nonce = last_nonce_for(_normalized_address)
+        nonce += 1 if nonce.negative? || !replace # if first tx, don't replace
+      end
+
+      nonce
+    end
+
+    def with_next_nonce_for(_normalized_address, _options = {})
       @@nonce_mutex.synchronize do
-        next_nonce = last_nonce_for(_normalized_address) + 1
+        nonce = next_nonce_for(_normalized_address, _options)
 
         begin
-          result = yield next_nonce
-          @@nonce_cache[_normalized_address] = next_nonce if caching_enabled?
+          result = yield nonce
+          @@nonce_cache[_normalized_address] = nonce if caching_enabled?
           return result
         rescue
           # if yield fails, cant be sure about transaction status so must rely again on observing.

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.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etherlite
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.5.0
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2021-06-09 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