tapyrus 0.2.7 → 0.2.8

data/lib/tapyrus/network/peer.rb

@@ -1,9 +1,7 @@
 module Tapyrus
   module Network
-
     # remote peer class.
     class Peer
-
       # Interval for pinging peers.
       PING_INTERVAL = 2 * 60
 
@@ -22,13 +20,16 @@ module Tapyrus
       attr_accessor :outbound # TODO need implements to accept inbound connection
       attr_accessor :best_hash
       attr_accessor :best_height
+
       # remote peer info
       attr_reader :host
       attr_reader :port
+
       # remote peer connection
       attr_accessor :conn
       attr_accessor :connected
       attr_accessor :primary
+
       # parent pool
       attr_reader :pool
       attr_reader :chain
@@ -51,7 +52,8 @@ module Tapyrus
         @relay = configuration.conf[:relay]
         current_height = @chain.latest_block.height
         remote_addr = Tapyrus::Message::NetworkAddr.new(ip: host, port: port, time: nil)
-        @local_version = Tapyrus::Message::Version.new(remote_addr: remote_addr, start_height: current_height, relay: @relay)
+        @local_version =
+          Tapyrus::Message::Version.new(remote_addr: remote_addr, start_height: current_height, relay: @relay)
       end
 
       def connect
@@ -84,16 +86,17 @@ module Tapyrus
       def post_handshake
         @connected = true
         pool.handle_new_peer(self)
+
         # require remote peer to use headers message instead fo inv message.
         conn.send_message(Tapyrus::Message::SendHeaders.new)
-        EM.add_periodic_timer(PING_INTERVAL) {send_ping}
+        EM.add_periodic_timer(PING_INTERVAL) { send_ping }
       end
 
       # start block header download
       def start_block_header_download
         logger.info("[#{addr}] start block header download.")
-        get_headers = Tapyrus::Message::GetHeaders.new(
-            Tapyrus.chain_params.protocol_version, [chain.latest_block.block_hash])
+        get_headers =
+          Tapyrus::Message::GetHeaders.new(Tapyrus.chain_params.protocol_version, [chain.latest_block.block_hash])
         conn.send_message(get_headers)
       end
 
@@ -129,7 +132,7 @@ module Tapyrus
           @best_height = entry.height
         end
         pool.changed
-        pool.notify_observers(:header, {hash: @best_hash, height: @best_height})
+        pool.notify_observers(:header, { hash: @best_hash, height: @best_height })
         start_block_header_download if headers.headers.size > 0 # next header download
       end
 
@@ -156,14 +159,13 @@ module Tapyrus
 
       # send +addr+ message to remote peer
       def send_addrs
-        addrs = pool.peers.select{|p|p != self}.map(&:to_network_addr)
+        addrs = pool.peers.select { |p| p != self }.map(&:to_network_addr)
         conn.send_message(Tapyrus::Message::Addr.new(addrs))
       end
 
       # handle block inv message.
       def handle_block_inv(hashes)
-        getdata = Tapyrus::Message::GetData.new(
-            hashes.map{|h|Tapyrus::Message::Inventory.new(block_type, h)})
+        getdata = Tapyrus::Message::GetData.new(hashes.map { |h| Tapyrus::Message::Inventory.new(block_type, h) })
         conn.send_message(getdata)
       end
 
@@ -188,8 +190,7 @@ module Tapyrus
 
       # send filterload message.
       def send_filter_load(bloom)
-        filter_load = Tapyrus::Message::FilterLoad.new(
-            bloom, Tapyrus::Message::FilterLoad::BLOOM_UPDATE_ALL)
+        filter_load = Tapyrus::Message::FilterLoad.new(bloom, Tapyrus::Message::FilterLoad::BLOOM_UPDATE_ALL)
         conn.send_message(filter_load)
       end
 

data/lib/tapyrus/network/peer_discovery.rb

@@ -1,8 +1,6 @@
 module Tapyrus
   module Network
-
     class PeerDiscovery
-
       attr_reader :logger, :configuration
 
       def initialize(configuration)
@@ -28,14 +26,14 @@ module Tapyrus
 
       def find_from_dns_seeds
         logger.debug 'discover peer address from DNS seeds.'
-        dns_seeds.map { |seed|
+        dns_seeds.map do |seed|
           begin
-            Socket.getaddrinfo(seed, Tapyrus.chain_params.default_port).map{|a|a[2]}.uniq
+            Socket.getaddrinfo(seed, Tapyrus.chain_params.default_port).map { |a| a[2] }.uniq
           rescue SocketError => e
             logger.error "SocketError occurred when load DNS seed: #{seed}, error: #{e.message}"
             nil
           end
-        }.flatten.compact
+        end.flatten.compact
       end
     end
   end

data/lib/tapyrus/network/pool.rb

@@ -1,11 +1,11 @@
 module Tapyrus
-
   module Network
-
     # Time between pings automatically sent out for latency probing and keepalive (in seconds).
     PING_INTERVAL = 2 * 60
+
     # Time after which to disconnect, after waiting for a ping response (or inactivity).
     TIMEOUT_INTERVAL = 20 * 60
+
     # Maximum number of automatic outgoing nodes
     MAX_OUTBOUND_CONNECTIONS = 4
 
@@ -112,23 +112,23 @@ module Tapyrus
       # allocate new peer id
       def allocate_peer_id
         id = 0
-        until peers.empty? || peers.find{|p|p.id == id}.nil?
-          id += 1
-        end
+        id += 1 until peers.empty? || peers.find { |p| p.id == id }.nil?
         id
       end
 
       def connect(addr_list)
         port = Tapyrus.chain_params.default_port
 
-        EM::Iterator.new(addr_list, Tapyrus::PARALLEL_THREAD).each do |ip, iter|
-          if pending_peers.size + peers.size < MAX_OUTBOUND_CONNECTIONS
-            peer = Peer.new(ip, port, self, @configuration)
-            pending_peers << peer
-            peer.connect
-            iter.next
+        EM::Iterator
+          .new(addr_list, Tapyrus::PARALLEL_THREAD)
+          .each do |ip, iter|
+            if pending_peers.size + peers.size < MAX_OUTBOUND_CONNECTIONS
+              peer = Peer.new(ip, port, self, @configuration)
+              pending_peers << peer
+              peer.connect
+              iter.next
+            end
           end
-        end
       end
     end
   end

data/lib/tapyrus/node.rb

@@ -4,4 +4,4 @@ module Tapyrus
     autoload :CLI, 'tapyrus/node/cli'
     autoload :Configuration, 'tapyrus/node/configuration'
   end
-end
+end

data/lib/tapyrus/node/cli.rb

@@ -4,9 +4,7 @@ require 'json'
 
 module Tapyrus
   module Node
-
     class CLI < Thor
-
       class_option :network, aliases: '-n', default: :prod
 
       desc 'getblockchaininfo', 'Returns an object containing various state info regarding blockchain processing.'
@@ -19,7 +17,8 @@ module Tapyrus
         request('stop')
       end
 
-      desc 'getblockheader "hash" ( verbose )', 'If verbose is false, returns a string that is serialized, hex-encoded data for blockheader "hash". If verbose is true, returns an Object with information about blockheader <hash>.'
+      desc 'getblockheader "hash" ( verbose )',
+           'If verbose is false, returns a string that is serialized, hex-encoded data for blockheader "hash". If verbose is true, returns an Object with information about blockheader <hash>.'
       def getblockheader(hash, verbose = true)
         verbose = verbose.is_a?(String) ? (verbose == 'true') : verbose
         request('getblockheader', hash, verbose)
@@ -30,7 +29,8 @@ module Tapyrus
         request('getpeerinfo')
       end
 
-      desc 'decoderawtransaction "hexstring"', 'Return a JSON object representing the serialized, hex-encoded transaction.'
+      desc 'decoderawtransaction "hexstring"',
+           'Return a JSON object representing the serialized, hex-encoded transaction.'
       def decoderawtransaction(hexstring)
         request('decoderawtransaction', hexstring)
       end
@@ -47,12 +47,14 @@ module Tapyrus
         request('sendrawtransaction', hex_tx)
       end
 
-      desc 'createwallet "wallet_id"', 'Create new HD wallet. It returns an error if an existing wallet_id is specified. '
+      desc 'createwallet "wallet_id"',
+           'Create new HD wallet. It returns an error if an existing wallet_id is specified. '
       def createwallet(wallet_id)
         request('createwallet', wallet_id)
       end
 
-      desc 'listwallets', 'Returns a list of currently loaded wallets. For full information on the wallet, use "getwalletinfo"'
+      desc 'listwallets',
+           'Returns a list of currently loaded wallets. For full information on the wallet, use "getwalletinfo"'
       def listwallets
         request('listwallets')
       end
@@ -67,7 +69,8 @@ module Tapyrus
         request('listaccounts')
       end
 
-      desc 'encryptwallet "passphrase"', 'Encrypts the wallet with "passphrase". This is for first time encryption.After this, any calls that interact with private keys such as sending or signing will require the passphrase to be set prior the making these calls.'
+      desc 'encryptwallet "passphrase"',
+           'Encrypts the wallet with "passphrase". This is for first time encryption.After this, any calls that interact with private keys such as sending or signing will require the passphrase to be set prior the making these calls.'
       def encryptwallet(passhphrase)
         request('encryptwallet', passhphrase)
       end
@@ -86,15 +89,11 @@ module Tapyrus
       end
 
       def request(command, *params)
-        data = {
-            :method => command,
-            :params => params,
-            :id => 'jsonrpc'
-        }
+        data = { method: command, params: params, id: 'jsonrpc' }
         begin
           uri = URI.parse(config.server_url)
           http = Net::HTTP.new(uri.hostname, uri.port)
-          http.use_ssl = uri.scheme === "https"
+          http.use_ssl = uri.scheme === 'https'
           request = Net::HTTP::Post.new('/')
           request.content_type = 'application/json'
           request.body = data.to_json
@@ -110,7 +109,6 @@ module Tapyrus
           puts e.message
         end
       end
-
     end
   end
 end

data/lib/tapyrus/node/configuration.rb

@@ -3,7 +3,6 @@ require 'iniparse'
 module Tapyrus
   module Node
     class Configuration
-
       attr_reader :conf
 
       def initialize(opts = {})
@@ -14,7 +13,7 @@ module Tapyrus
 
         begin
           ini_file = IniParse.parse(File.read("#{Tapyrus.base_dir}/tapyrusrb.conf"))
-          @conf = Hash[ ini_file.to_h['__anonymous__'].map{|k,v| [k.to_sym, v] } ]
+          @conf = Hash[ini_file.to_h['__anonymous__'].map { |k, v| [k.to_sym, v] }]
         rescue => e
           @conf = {}
         end
@@ -32,7 +31,6 @@ module Tapyrus
       def server_url
         "http://#{host}:#{port}"
       end
-
     end
   end
 end

data/lib/tapyrus/node/spv.rb

@@ -1,9 +1,7 @@
 module Tapyrus
   module Node
-
     # SPV class
     class SPV
-
       attr_reader :chain
       attr_reader :pool
       attr_reader :logger
@@ -20,6 +18,7 @@ module Tapyrus
         @logger = Tapyrus::Logger.create(:debug)
         @running = false
         @wallet = Tapyrus::Wallet::Base.current_wallet
+
         # TODO : optimize bloom filter parameters
         setup_filter
       end
@@ -72,7 +71,7 @@ module Tapyrus
 
       def setup_filter
         @bloom = Tapyrus::BloomFilter.create_filter(512, 0.01)
-        wallet.watch_targets.each{|t|bloom.add(t.htb)} if wallet
+        wallet.watch_targets.each { |t| bloom.add(t.htb) } if wallet
       end
     end
   end

data/lib/tapyrus/opcodes.rb

@@ -1,8 +1,6 @@
 module Tapyrus
-
   # https://bitcoin.org/en/developer-reference#opcodes
   module Opcodes
-
     module_function
 
     # https://en.bitcoin.it/wiki/Script#Constants
@@ -111,7 +109,7 @@ module Tapyrus
     OP_HASH256 = 0xaa
     OP_CODESEPARATOR = 0xab
     OP_CHECKSIG = 0xac
-    OP_CHECKSIGVERIFY= 0xad
+    OP_CHECKSIGVERIFY = 0xad
     OP_CHECKMULTISIG = 0xae
     OP_CHECKMULTISIGVERIFY = 0xaf
 
@@ -124,7 +122,7 @@ module Tapyrus
     OP_VER = 0x62
     OP_VERIF = 0x65
     OP_VERNOTIF = 0x66
-    OP_RESERVED1= 0x89
+    OP_RESERVED1 = 0x89
     OP_RESERVED2 = 0x8a
 
     OP_NOP1 = 0xb0
@@ -147,7 +145,12 @@ module Tapyrus
     OP_COLOR = 0xbc
 
     DUPLICATE_KEY = [:OP_NOP2, :OP_NOP3]
-    OPCODES_MAP = Hash[*(constants.grep(/^OP_/) - [:OP_NOP2, :OP_NOP3, :OP_CHECKLOCKTIMEVERIFY, :OP_CHECKSEQUENCEVERIFY]).map { |c| [const_get(c), c.to_s] }.flatten]
+    OPCODES_MAP =
+      Hash[
+        *(constants.grep(/^OP_/) - [:OP_NOP2, :OP_NOP3, :OP_CHECKLOCKTIMEVERIFY, :OP_CHECKSEQUENCEVERIFY]).map do |c|
+          [const_get(c), c.to_s]
+        end.flatten
+      ]
     NAME_MAP = Hash[*constants.grep(/^OP_/).map { |c| [c.to_s, const_get(c)] }.flatten]
 
     def opcode_to_name(opcode)
@@ -178,6 +181,5 @@ module Tapyrus
       return opcode - (OP_1 - 1) if opcode >= OP_1 && opcode <= OP_16
       nil
     end
-
   end
-end
+end

data/lib/tapyrus/out_point.rb

@@ -1,10 +1,8 @@
 module Tapyrus
-
   # outpoint class
   class OutPoint
-
     COINBASE_HASH = '0000000000000000000000000000000000000000000000000000000000000000'
-    COINBASE_INDEX = 4294967295
+    COINBASE_INDEX = 4_294_967_295
 
     attr_reader :tx_hash
     attr_reader :index
@@ -34,11 +32,13 @@ module Tapyrus
       index >= 0 && (!coinbase? && tx_hash != COINBASE_HASH)
     end
 
+    def ==(other)
+      to_payload == other&.to_payload
+    end
+
     # convert hash to txid
     def txid
       tx_hash.rhex
     end
-
   end
-
 end

data/lib/tapyrus/rpc/http_server.rb

@@ -3,7 +3,6 @@ require 'json'
 
 module Tapyrus
   module RPC
-
     # Tapyrusrb RPC server.
     class HttpServer < EM::Connection
       include EM::HttpServer
@@ -28,27 +27,29 @@ module Tapyrus
 
       # process http request.
       def process_http_request
-        operation = proc {
-          command, args = parse_json_params
-          logger.debug("process http request. command = #{command}")
-          begin
-            send(command, *args).to_json
-          rescue Exception => e
-            e
+        operation =
+          proc do
+            command, args = parse_json_params
+            logger.debug("process http request. command = #{command}")
+            begin
+              send(command, *args).to_json
+            rescue Exception => e
+              e
+            end
           end
-        }
-        callback = proc{ |result|
-          response = EM::DelegatedHttpResponse.new(self)
-          if result.is_a?(Exception)
-            response.status = 500
-            response.content = result.message
-          else
-            response.status = 200
-            response.content = result
+        callback =
+          proc do |result|
+            response = EM::DelegatedHttpResponse.new(self)
+            if result.is_a?(Exception)
+              response.status = 500
+              response.content = result.message
+            else
+              response.status = 200
+              response.content = result
+            end
+            response.content_type 'application/json'
+            response.send_response
           end
-          response.content_type 'application/json'
-          response.send_response
-        }
         EM.defer(operation, callback)
       end
 
@@ -58,8 +59,6 @@ module Tapyrus
         params = JSON.parse(@http_post_content)
         [params['method'], params['params']]
       end
-
     end
-
   end
 end