etherlite 0.4.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbd613d95d4aaec97652278de22e3599754a18979185f8a0eeaea0ef6db3e3c4
-  data.tar.gz: c21fe17680a4b4cc82eceedbd413df822da0c9475b9ee4c58f9ba124a481d82e
+  metadata.gz: 6bd7c04f60e0b06abbc63f817737ef0deea013791b885151d41f1789d57092a5
+  data.tar.gz: dbd6bf87f3e54a7e7c855e6e6bcf14226f5b708c5d8789c7b80b52e931f0dffc
 SHA512:
-  metadata.gz: 202253e8cea38ae5b51977e130e442cdcc5fb4563f93dd5da802e6dbc8e86e154e08a4b13fc50f05b17c17ba4541d8a9adb6406aee7fb05f79e90fde8e8da594
-  data.tar.gz: 1cbca94d66686e94db2ff819f4d21f6c64035a6004ab56d9d641ab02895ea8dbdb00495a120f4813c75cf00a9d1e0d4efe8e1655f2d23cb907615c0cf60102f6
+  metadata.gz: 2afa891466239576519823c40b146196ecd64f1ec9ff2afb20bac2b3b5010f2d4fe79dbc2811c83e461d3005b917dc405163f2e06556126f9af3644aea22a50f
+  data.tar.gz: cd7ce4b0800fe121a0ba5b9ed0e7c86de252101f3186d9504c4f69df0d0dde6300ba885762feb4f76f41ccd2981e1dacc75f1234ae01876324be8ffb6527d492

data/lib/etherlite/account/base.rb

@@ -39,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)
@@ -50,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,23 +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 = _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, ''),
-            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/contract/event_base.rb

@@ -23,6 +23,7 @@ module Etherlite::Contract
 
     def self.decode(_connection, _json)
       new(
+        _json['blockHash'],
         _json['blockNumber'].nil? ? nil : Etherlite::Utils.hex_to_uint(_json['blockNumber']),
         _json['transactionHash'],
         Etherlite::Address.new(_connection, Etherlite::Utils.normalize_address(_json['address'])),
@@ -30,9 +31,10 @@ module Etherlite::Contract
       )
     end
 
-    attr_reader :block_number, :tx_hash, :address, :attributes
+    attr_reader :block_hash, :block_number, :tx_hash, :address, :attributes
 
-    def initialize(_block_number, _tx_hash, _address, _attributes)
+    def initialize(_block_hash, _block_number, _tx_hash, _address, _attributes)
+      @block_hash = _block_hash
       @block_number = _block_number
       @tx_hash = _tx_hash
       @address = _address

data/lib/etherlite/nonce_manager.rb

@@ -17,16 +17,22 @@ module Etherlite
       last_nonce
     end
 
-    def with_next_nonce_for(_normalized_address, replace: false, nonce: nil)
-      @@nonce_mutex.synchronize do
-        return yield nonce if nonce.present?
+    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
 
-        next_nonce = last_nonce_for(_normalized_address)
-        next_nonce += 1 if next_nonce.negative? || !replace # if first tx, don't replace
+      nonce
+    end
+
+    def with_next_nonce_for(_normalized_address, _options = {})
+      @@nonce_mutex.synchronize do
+        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.4.0"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etherlite
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-sha3