etherlite 0.3.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe14df0fc898d4e298d57704e8a7f2acf0cb3dcace02b94903b8f295f94e971c
-  data.tar.gz: 87c4bc2dca3fb92d8a1eca54080cbfa50107defe48d0007cc5e6c3910bdfaa4e
+  metadata.gz: a8beb990ec1fa4fabecb75a9162645a53eef721e5893d1514d4b31ba79879fbd
+  data.tar.gz: b6614af7c2af90feaac3bbc20cc5b7b72bdb67cf6c3be4191a4264cab76fa4ae
 SHA512:
-  metadata.gz: c1e16e2460b1e67948efd91921b1e03e6805c114fdba9a375c4b83695baa6d01ca80b46fc3530be5ac923c641d47190cc7fc466cdf6daef793f55cb54993be0a
-  data.tar.gz: 76cb54b21dd785777fcd474f0bbf85e374b9a6aad8bd64d1ddfed73f195c51a736b339045b09056be8da32c34e7d272abcf7393b4bc1bd187efe2fb2186adc57
+  metadata.gz: b6aa631ed700987f27da859c7f68781c6ee4d148be34b1bc192af5ac5e223c96b446f4002c598e4f516ed469eeae313ffb9d2658a6dead638544ad03f2e796a2
+  data.tar.gz: 4349906dba722c8bdaa6a2de6e4d6a33555bf15cb15d90ac292709b4350c9a94d3128b2522d270105e6dedaec8d19e10fff06eae3f68e0750257bbfbb0046c99

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,25 +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_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, ''),
-            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,14 +17,22 @@ module Etherlite
       last_nonce
     end
 
-    def with_next_nonce_for(_normalized_address, replace: false)
+    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)
-        next_nonce += 1 if next_nonce.negative? || !replace # if first tx, don't replace
+        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

@@ -45,6 +45,12 @@ module Etherlite
       Utils.hex_to_uint(original['blockNumber'])
     end
 
+    def block_hash
+      return nil unless mined?
+
+      original['blockHash']
+    end
+
     def confirmations
       return 0 unless mined?
 

data/lib/etherlite/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etherlite
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-sha3