etherlite 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb97370a946be81259847d2b1f3c7a6da33593e2
-  data.tar.gz: 373696bf36bcf5b5b7889ffe7eadfd0bf3544881
+  metadata.gz: c69db28d5eaaf5cb965fedd9cbe71f1aec362d7b
+  data.tar.gz: 9cf45824a5b10fa8462ac11580111f69e7c9d18d
 SHA512:
-  metadata.gz: f45918243e835c01d28c6beb7f3c42ffb77fa35047aab3051aba1f555eb4a65c6e6d7dc0b218a4efbdcb1efef3b3fd3b0b2a1e79f4bd22f202e43085169fc5f7
-  data.tar.gz: 22a6b1e87b0b9778de84607fd2d7d6cc59e35b14c14928ef984d4bfa32901f82d549f7c90ee018071847c69c1ba887e6ec4216989456b5d98efd8c278679d362
+  metadata.gz: f53a236a303da24b8fa4871b375ad84f2f70f44ad9b0aa14a9cf893159a218ac75ab38ef5299a2a6affa85ac1ee1b02b1bc8f7d0dd89e2bdf1ffe6d9acd1c1f1
+  data.tar.gz: bc975a810c245c95f7eabbb9e671556d4ffd6a085b45afc48a2b7516f11b92a7bc8bff71e75b78079f7d99bc8840a1d1d5cf3db8a8d153cfa7dedc0c979fd511

data/lib/etherlite.rb

@@ -1,6 +1,7 @@
 require "digest/sha3"
 require "active_support/all"
 require "forwardable"
+require "net/http"
 require "power-types"
 
 require "etherlite/version"
@@ -8,6 +9,7 @@ require "etherlite/version"
 require "etherlite/api/address"
 require "etherlite/api/node"
 require "etherlite/api/rpc"
+require "etherlite/api/parity_rpc"
 
 require "etherlite/support/array"
 
@@ -52,7 +54,10 @@ module Etherlite
   def self.connect(_url, _options = {})
     _url = URI(_url) unless _url.is_a? URI
 
-    Client.new Connection.new(_url, _options.fetch(:chain_id, config.chain_id))
+    options = config.default_connection_options
+    options = options.merge _options.slice options.keys
+
+    Client.new Connection.new(_url, options)
   end
 
   def self.config
@@ -69,7 +74,7 @@ module Etherlite
   end
 
   def self.connection
-    @connection ||= Connection.new(URI(config.url), config.chain_id)
+    @connection ||= Connection.new(URI(config.url), config.default_connection_options)
   end
 end
 

data/lib/etherlite/api/parity_rpc.rb

@@ -0,0 +1,9 @@
+module Etherlite
+  module Api
+    module ParityRpc
+      def parity_next_nonce(_address)
+        Etherlite::Utils.hex_to_uint ipc_call(:parity_nextNonce, _address)
+      end
+    end
+  end
+end

data/lib/etherlite/configuration.rb

@@ -3,11 +3,19 @@ module Etherlite
     DEFAULTS = {
       url: 'http://127.0.0.1:8545',
       enable_nonce_cache: false,
+      use_parity: false,
       chain_id: nil, # any chain
       logger: nil # set by method
     }
 
-    attr_accessor :url, :chain_id, :logger, :enable_nonce_cache
+    attr_accessor :url, :chain_id, :logger, :use_parity, :enable_nonce_cache
+
+    def default_connection_options
+      {
+        chain_id: chain_id,
+        use_parity: use_parity
+      }
+    end
 
     def initialize
       assign_attributes DEFAULTS

data/lib/etherlite/connection.rb

@@ -1,12 +1,14 @@
 module Etherlite
   class Connection
     include Api::Rpc
+    include Api::ParityRpc
 
-    attr_reader :chain_id
+    attr_reader :chain_id, :use_parity
 
-    def initialize(_uri, _chain_id = nil)
+    def initialize(_uri, _options = {})
       @uri = _uri
-      @chain_id = _chain_id
+      @chain_id = _options[:chain_id]
+      @use_parity = _options[:use_parity]
     end
 
     def ipc_call(_method, *_params)

data/lib/etherlite/nonce_manager.rb

@@ -36,8 +36,12 @@ module Etherlite
     private
 
     def last_observed_nonce_for(_normalized_address)
-      # https://github.com/ethereum/go-ethereum/issues/2736
-      @connection.eth_get_transaction_count('0x' + _normalized_address, 'pending') - 1
+      if @connection.use_parity
+        @connection.parity_next_nonce('0x' + _normalized_address) - 1
+      else
+        # https://github.com/ethereum/go-ethereum/issues/2736
+        @connection.eth_get_transaction_count('0x' + _normalized_address, 'pending') - 1
+      end
     end
 
     def caching_enabled?

data/lib/etherlite/version.rb

@@ -1,3 +1,3 @@
 module Etherlite
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/generators/etherlite/templates/etherlite.yml

@@ -1,4 +1,5 @@
 defaults:
+  use_parity: false
   contract_path: 'contracts'
 
 development: &defaults

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etherlite
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-sha3
@@ -192,6 +192,7 @@ files:
 - lib/etherlite/address.rb
 - lib/etherlite/api/address.rb
 - lib/etherlite/api/node.rb
+- lib/etherlite/api/parity_rpc.rb
 - lib/etherlite/api/rpc.rb
 - lib/etherlite/client.rb
 - lib/etherlite/commands/abi/load_contract.rb