etherlite 0.2.5 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7bf8a9190a5d68f31c167f12420cb5cfe001948a
-  data.tar.gz: eefb160572438cce6b6b8102fe99dbf07b10e75c
+SHA256:
+  metadata.gz: 7d5972b71c09d1bb9d1a3f732b8c1b5fe0057ad46c0159c1c93e5fbe690ef695
+  data.tar.gz: 3b4fc972adac1ecbf23b7188040e8ba729d136ef89f51a4045d9c2339725ff34
 SHA512:
-  metadata.gz: 0ba2cd039eaa83fd38530121c84f67410274f0bd5942ccf72f146731f9669fef510b6fd1bc26d9dcc969468c56dfdc13930744ce3b8e13494a6bd064947a06cd
-  data.tar.gz: fc0c14e3706e38cc03d223731d673c133e6b5f7688da1dfd202683000c334e17deabac7366ffa2ff7a00f4178137f8eab3b5e5c09096a68561935b1b8d052787
+  metadata.gz: 6b594fc27d066ecd3ee27025f990996d9badc2bc37efc9b770bfad55cf8a96b2779fb61a59d1dbb214de5905bff3863fa7b9975b145f94a9e88521e9055838d0
+  data.tar.gz: 416610c6eb6f4466c5aee182147ee8bc456b8aaaf851cf5a1644bde4583df980a3dcaa822c92617e25393bdf145386200366f284c0310fcb13b283032f7a4a94

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

@@ -9,7 +9,9 @@ module Etherlite
       end
 
       def send_transaction(_options = {})
-        nonce_manager.with_next_nonce_for(normalized_address) do |nonce|
+        nonce_options = _options.slice(:replace, :nonce)
+        
+        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

@@ -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,9 +17,12 @@ module Etherlite
       last_nonce
     end
 
-    def with_next_nonce_for(_normalized_address)
+    def with_next_nonce_for(_normalized_address, replace: false, nonce: nil)
       @@nonce_mutex.synchronize do
-        next_nonce = last_nonce_for(_normalized_address) + 1
+        return yield nonce if nonce.present?
+
+        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 = {}
+      @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
 
-    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.5"
+  VERSION = "0.4.2"
 end

metadata

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