devp2p 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6ddcb762858bc073f1b5394c9294dff6a391756
-  data.tar.gz: 8e11801858eff23d391df93214520a47ea31f8c4
+  metadata.gz: 2a9119de12a32ac914f74a103d5544358404a241
+  data.tar.gz: 1f7107a8432d2a9b7a74c676623eeeceec717f42
 SHA512:
-  metadata.gz: 7a2cb995431e8db5e5a34f8b9368844fcea25e53cb8519931c04678b88f3c420d89b8191cba17c0ad5967c911011427023b11286b7e4d0f00d49104dd3c77644
-  data.tar.gz: 9b0c03fcaa6a819e20f1a1c516f176c240a75351c5e4dde05087b4dc902d2d39e6a9a36b2072ed1fcf4e8f8ef65debbb0d12768afd75d0996f7d9dda2766626f
+  metadata.gz: 869067f4897deb649c694a535eedc8d5cee3a725625c3760a6a069f933cdb08c93d5d16141b9a10cdabba60238c472476e5f98c2a32dea4cddafeadd3d65046f
+  data.tar.gz: 8340dc9d8f31803e250ecfc859a9397f9f84e70ad80513fc6874e6a4b825c78d8b777689bb286bbceb8ea934b97b0f037e53933483e8fdbc18ae16f032fa95de

data/lib/devp2p/app_helper.rb

@@ -10,7 +10,7 @@ module DEVp2p
       bootstrap_node_pubkey = Crypto.privtopub bootstrap_node_privkey
       enode = Utils.host_port_pubkey_to_uri "0.0.0.0", base_port, bootstrap_node_pubkey
 
-      services = [Discovery::Transport, PeerManager]#, service_class]
+      services = [Discovery::Service, PeerManager]#, service_class]
 
       base_config = {}
       services.each {|s| Utils.update_config_with_defaults base_config, s.default_config }

data/lib/devp2p/base_app.rb

@@ -31,7 +31,7 @@ module DEVp2p
 
       logger.info "registering service", service: klass.name
       @container.add type: klass, as: get_actor_name(klass.name), args: args
-      services[klass.name] = nil
+      services[klass.name] = actor(klass.name)
 
       klass
     end
@@ -51,18 +51,14 @@ module DEVp2p
     end
 
     def start
-      services.keys.each do |n|
-        next if services[n]
-
-        services[n] = actor(n)
-        services[n].start
+      services.each_value do |service|
+        service.start if service.stopped?
       end
     end
 
     def stop
-      services.keys.each do |n|
-        services[n].stop if services[n].alive?
-        services[n] = nil
+      services.each_value do |service|
+        service.stop if service.alive?
       end
 
       #@container.shutdown

data/lib/devp2p/base_protocol.rb

@@ -55,7 +55,10 @@ module DEVp2p
     def stop
       logger.debug 'stopping', proto: Actor.current
       service.on_wire_protocol_stop Actor.current
+
       super
+
+      terminate
     end
 
     def _run
@@ -119,7 +122,7 @@ module DEVp2p
           send_packet packet
         end
 
-        name = klass.name.split('::').last.downcase
+        name = Utils.class_to_cmd_name(klass)
         singleton_class.send(:define_method, "receive_#{name}", &receive)
         singleton_class.send(:define_method, "create_#{name}", &create)
         singleton_class.send(:define_method, "send_#{name}", &send_packet)
@@ -128,7 +131,7 @@ module DEVp2p
         end
       end
 
-      @cmd_by_id = klasses.map {|k| [k.cmd_id, Utils.underscore(k.name)] }.to_h
+      @cmd_by_id = klasses.map {|k| [k.cmd_id, Utils.class_to_cmd_name(k)] }.to_h
     end
 
   end

data/lib/devp2p/command.rb

@@ -20,7 +20,7 @@ module DEVp2p
 
         case structure
         when RLP::Sedes::CountableList
-          RLP.encode data, structure
+          RLP.encode data, sedes: structure
         when Hash
           raise ArgumentError, 'structure and data length mismatch' unless data.size == structure.size
           RLP.encode data, sedes: RLP::Sedes::List.new(elements: sedes)

data/lib/devp2p/control.rb

@@ -2,7 +2,7 @@ module DEVp2p
   module Control
 
     def initialize_control
-      @stopped = false
+      @stopped = true
       @killed = false
     end
 

data/lib/devp2p/discovery.rb

@@ -115,4 +115,4 @@ require 'devp2p/discovery/address'
 require 'devp2p/discovery/node'
 require 'devp2p/discovery/kademlia_protocol_adapter'
 require 'devp2p/discovery/protocol'
-require 'devp2p/discovery/transport'
+require 'devp2p/discovery/service'

data/lib/devp2p/discovery/protocol.rb

@@ -28,15 +28,15 @@ module DEVp2p
 
       attr :pubkey, :kademlia
 
-      def initialize(app, transport)
+      def initialize(app, service)
         @app = app
-        @transport = transport
+        @service = service
 
         @privkey = Utils.decode_hex app.config[:node][:privkey_hex]
         @pubkey = Crypto.privtopub @privkey
 
         @nodes = {} # nodeid => Node
-        @node = Node.new(pubkey, @transport.address)
+        @node = Node.new(pubkey, @service.address)
 
         @kademlia = KademliaProtocolAdapter.new @node, self
 
@@ -172,12 +172,14 @@ module DEVp2p
 
         get_node(nodeid, address) unless @nodes.has_key?(nodeid)
         send cmd, nodeid, payload, mdc
+      rescue
+        logger.error 'invalid message', error: $!
       end
 
       def send_message(node, message)
         raise ArgumentError, 'node must have address' unless node.address
         logger.debug ">>> message", address: node.address
-        @transport.send_message node.address, message
+        @service.async.send_message node.address, message
       end
 
       def send_ping(node)

data/lib/devp2p/discovery/{transport.rb → service.rb}

@@ -6,7 +6,7 @@ module DEVp2p
     ##
     # Persist the list of known nodes with their reputation.
     #
-    class Transport < BaseService
+    class Service < BaseService
       include Celluloid::IO
 
       name 'discovery'
@@ -69,9 +69,8 @@ module DEVp2p
 
         super
 
-        @protocol.bootstrap(
-          @app.config[:discovery][:bootstrap_nodes].map {|x| Node.from_uri(x) }
-        )
+        nodes = @app.config[:discovery][:bootstrap_nodes] || []
+        @protocol.bootstrap( nodes.map {|x| Node.from_uri(x) } )
       end
 
       def stop

data/lib/devp2p/p2p_protocol.rb

@@ -122,16 +122,8 @@ module DEVp2p
 
     class <<self
       # special: we need this packet before the protocol can be initialized
-      def get_hello_packet(peer)
-        res = {
-          version: 55,
-          client_version_string: peer.config[:client_version_string],
-          capabilities: peer.capabilities,
-          listen_port: peer.config[:p2p][:listen_port],
-          remote_pubkey: peer.config[:node][:id]
-        }
-
-        payload = Hello.encode_payload(res)
+      def get_hello_packet(data)
+        payload = Hello.encode_payload(data.merge(version: 55))
         Packet.new protocol_id, Hello.cmd_id, payload
       end
     end

data/lib/devp2p/peer.rb

@@ -7,7 +7,7 @@ module DEVp2p
 
     DUMB_REMOTE_TIMEOUT = 10.0
 
-    attr :config, :protocols, :safe_to_read
+    attr :config, :protocols, :remote_client_version, :remote_pubkey
 
     def initialize(peermanager, socket, remote_pubkey=nil)
       @peermanager = peermanager
@@ -19,11 +19,12 @@ module DEVp2p
       @stopped = true
       @hello_received = false
 
+      _, @port, _, @ip = @socket.peeraddr
       @remote_client_version = ''
       logger.debug "peer init", peer: Actor.current
 
       privkey = Utils.decode_hex @config[:node][:privkey_hex]
-      hello_packet = P2PProtocol.get_hello_packet Actor.current
+      hello_packet = P2PProtocol.get_hello_packet hello_data
 
       @mux = MultiplexedSession.new privkey, hello_packet, remote_pubkey
       @remote_pubkey = remote_pubkey
@@ -35,12 +36,14 @@ module DEVp2p
       @safe_to_read = true
       @safe_to_read_cond = Celluloid::Condition.new
 
-      _, @port, _, @ip = @socket.peeraddr
-
       # stop peer if hello not received in DUMB_REMOTE_TIMEOUT
       after(DUMB_REMOTE_TIMEOUT) { check_if_dumb_remote }
     end
 
+    def wait_to_read
+      @safe_to_read_cond.wait unless @safe_to_read
+    end
+
     ##
     # if peer is responder, then the remote_pubkey will not be available before
     # the first packet is received
@@ -188,7 +191,7 @@ module DEVp2p
       async.run_egress_message
 
       while !stopped?
-        @safe_to_read_cond.wait unless safe_to_read
+        wait_to_read
 
         begin
           @socket.wait_readable
@@ -236,6 +239,10 @@ module DEVp2p
       logger.debug "multiplexer error", peer: Actor.current, error: e
       report_error "multiplexer error"
       stop
+    rescue
+      logger.debug "ingress message error", peer: Actor.current, error: $!
+      report_error "ingress message error"
+      stop
     end
     alias run run_ingress_message
 
@@ -247,10 +254,11 @@ module DEVp2p
     def stop
       if !stopped?
         @stopped = true
-        logger.debug "stopped", peer: Actor.current
 
         @protocols.each_value {|proto| proto.stop }
         @peermanager.delete Actor.current
+
+        logger.info "peer stopped", peer: Actor.current
         terminate
       end
     end
@@ -265,6 +273,14 @@ module DEVp2p
       @logger ||= Logger.new "#{@config[:p2p][:listen_port]}.p2p.peer"
     end
 
+    def hello_data
+      { client_version_string: config[:client_version_string],
+        capabilities: capabilities,
+        listen_port: config[:p2p][:listen_port],
+        remote_pubkey: config[:node][:id]
+      }
+    end
+
     def handle_packet(packet)
       raise ArgumentError, 'packet must be Packet' unless packet.is_a?(Packet)
 
@@ -273,7 +289,7 @@ module DEVp2p
 
       packet.cmd_id = cmd_id # rewrite
       protocol.receive_packet packet
-    rescue UnknownCommandError
+    rescue UnknownCommandError => e
       logger.error 'received unknown cmd', error: e, packet: packet
     end
 
@@ -285,8 +301,8 @@ module DEVp2p
         @protocols.each_value do |protocol|
           if packet.cmd_id < max_id + protocol.max_cmd_id + 1
             return protocol, packet.cmd_id - (max_id == 0 ? 0 : max_id + 1)
-            max_id += protocol.max_cmd_id
           end
+          max_id += protocol.max_cmd_id
         end
         raise UnknownCommandError, "no protocol for id #{packet.cmd_id}"
       end

data/lib/devp2p/peer_manager.rb

@@ -13,7 +13,7 @@ module DEVp2p
   #
   class PeerManager < WiredService
     include Celluloid::IO
-    finalizer :cleanup
+    finalizer :finalize
 
     name 'peermanager'
     required_services []
@@ -36,6 +36,7 @@ module DEVp2p
       logger.info "PeerManager init"
 
       @peers = []
+      @excluded = []
       @errors = @config[:log_disconnects] ? PeerErrors.new : PeerErrorsBase.new
 
       @wire_protocol = P2PProtocol
@@ -46,7 +47,7 @@ module DEVp2p
       end
 
       @connect_timeout = 2.0
-      @connect_loop_delay = 0.1
+      @connect_loop_delay = 0.5
       @discovery_delay = 0.5
 
       @host = @config[:p2p][:listen_host]
@@ -85,13 +86,17 @@ module DEVp2p
 
     def add(peer)
       @peers.push peer
-      #link peer
     end
 
     def delete(peer)
       @peers.delete peer
     end
 
+    def exclude(peer)
+      @excluded.push peer.remote_pubkey
+      peer.stop
+    end
+
     def on_hello_received(proto, version, client_version_string, capabilities, listen_port, remote_pubkey)
       logger.debug 'hello_received', listen_port: listen_port, peer: proto.peer, num_peers: @peers.size
 
@@ -114,7 +119,7 @@ module DEVp2p
     end
 
     def broadcast(protocol, command_name, args=[], kwargs={}, num_peers=nil, exclude_peers=[])
-      logger.debug "broadcasting", protocol: protocol, command: command_name, num_peers: num_peers, exclude_peers: exclude_peers
+      logger.debug "broadcasting", protocol: protocol, command: command_name, num_peers: num_peers, exclude_peers: exclude_peers.map(&:to_s)
       raise ArgumentError, 'invalid num_peers' unless num_peers.nil? || num_peers > 0
 
       peers_with_proto = @peers.select {|p| p.protocols.include?(protocol) && !exclude_peers.include?(p) }
@@ -129,7 +134,7 @@ module DEVp2p
         args.push kwargs
         peer.protocols[protocol].send "send_#{command_name}", *args
 
-        peer.safe_to_read.wait
+        peer.wait_to_read
         logger.debug "broadcasting done", ts: Time.now
       end
     end
@@ -248,12 +253,22 @@ module DEVp2p
           end
 
           node = neighbours.sample
-          logger.debug 'connecting random neighbour', node: node
 
           local_pubkey = Crypto.privtopub Utils.decode_hex(@config[:node][:privkey_hex])
-          next if node.pubkey == local_pubkey
-          next if @peers.any? {|p| p.remote_pubkey == node.pubkey }
+          if node.pubkey == local_pubkey
+            logger.debug 'connecting random neighbour', node: node, skipped: true, reason: 'myself'
+            next
+          end
+          if @peers.any? {|p| node.pubkey == p.remote_pubkey }
+            logger.debug 'connecting random neighbour', node: node, skipped: true, reason: 'already connected'
+            next
+          end
+          if @excluded.any? {|pubkey| node.pubkey == pubkey }
+            logger.debug 'connecting random neighbour', node: node, skipped: true, reason: 'excluded peer'
+            next
+          end
 
+          logger.debug 'connecting random neighbour', node: node, skipped: false
           connect node.address.ip, node.address.tcp_port, node.pubkey
         end
 
@@ -265,7 +280,7 @@ module DEVp2p
       cond.wait
     end
 
-    def cleanup
+    def finalize
       @server.close if @server && !@server.closed?
     end
 

data/lib/devp2p/sync_queue.rb

@@ -5,33 +5,56 @@
 #
 class SyncQueue
 
-  def initialize
+  attr :queue, :max_size
+
+  def initialize(max_size=nil)
     @queue = []
     @num_waiting = 0
-    @cond = Celluloid::Condition.new
+
+    @max_size = max_size
+    @cond_full = Celluloid::Condition.new
+    @cond_empty = Celluloid::Condition.new
   end
 
-  def enq(obj)
-    @queue.push obj
-    @cond.signal
+  def enq(obj, non_block=false)
+    loop do
+      if full?
+        if non_block
+          raise ThreadError, 'queue full'
+        else
+          begin
+            @num_waiting += 1
+            @cond_full.wait
+          ensure
+            @num_waiting -= 1
+          end
+        end
+      else
+        @queue.push obj
+        @cond_empty.signal
+        return obj
+      end
+    end
   end
   alias << enq
 
   def deq(non_block=false)
     loop do
-      if @queue.empty?
+      if empty?
         if non_block
           raise ThreadError, 'queue empty'
         else
           begin
             @num_waiting += 1
-            @cond.wait
+            @cond_empty.wait
           ensure
             @num_waiting -= 1
           end
         end
       else
-        return @queue.shift
+        obj = @queue.shift
+        @cond_full.signal
+        return obj
       end
     end
   end
@@ -39,13 +62,13 @@ class SyncQueue
   # Same as pop except it will not remove the element from queue, just peek.
   def peek(non_block=false)
     loop do
-      if @queue.empty?
+      if empty?
         if non_block
           raise ThreadError, 'queue empty'
         else
           begin
             @num_waiting += 1
-            @cond.wait
+            @cond_empty.wait
           ensure
             @num_waiting -= 1
           end
@@ -56,6 +79,10 @@ class SyncQueue
     end
   end
 
+  def full?
+    @max_size && @queue.size >= @max_size
+  end
+
   def empty?
     @queue.empty?
   end

data/lib/devp2p/utils.rb

@@ -102,5 +102,9 @@ module DEVp2p
       word
     end
 
+    def class_to_cmd_name(klass)
+      klass.name.split(DOUBLE_COLON).last.downcase
+    end
+
   end
 end

data/lib/devp2p/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding : ascii-8bit -*-
 module DEVp2p
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 
   VersionString = begin
                     git_describe_re = /^(?<version>v\d+\.\d+\.\d+)-(?<git>\d+-g[a-fA-F0-9]+(?:-dirty)?)$/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devp2p
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jan Xie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-08 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -84,16 +84,16 @@ dependencies:
   name: bitcoin-secp256k1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rlp
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ files:
 - lib/devp2p/discovery/kademlia_protocol_adapter.rb
 - lib/devp2p/discovery/node.rb
 - lib/devp2p/discovery/protocol.rb
-- lib/devp2p/discovery/transport.rb
+- lib/devp2p/discovery/service.rb
 - lib/devp2p/exception.rb
 - lib/devp2p/frame.rb
 - lib/devp2p/kademlia.rb