bitcoinrb 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d66a90af2b70a6494a6b38d0602a4442a0173e27294cec5b389149b77bc7360
-  data.tar.gz: 1b830903242397fece09064f51a150b9716ef1d06409f597ca60c6ee76e80ebc
+  metadata.gz: 369e8ba42e13931c345e3ebf13023a0b45433d647ea42849028557bfb9036aad
+  data.tar.gz: 460030a26c3cd367706ebb374efda4ad6c7acc3994daa61fd261195076838079
 SHA512:
-  metadata.gz: 397ecea38a38e72c3a66d6ca18461a41af2ecfa747eb71c9193c9c7a1629c96e49a8338348a2bd88f3be0e01184bb5148dd6e53e968c83dae8c3da4d2105e253
-  data.tar.gz: bf3fca048c69f4939f1c4cae0da6c9be03e0650dd18f271d5cac045d4a30528ef3e3268e3290c6f03cadb6d2dbd06cd6ac0405e11e4400359085bfbd36d55f46
+  metadata.gz: c741a2415026b02e1760fcd47586fbb8df7219502fbf4223bc6d560b313e765bc916871a4ed87d98f343c48e25f72d9bf49910df17073490a2a96db63304ef43
+  data.tar.gz: 13b72574c4413556d9522bd3825ab818beadf956673f5a3c1ff0d027e736d126176825a7a04bdc4be3d333b96aedb9e9580339a8219937844bd5fd0b9b9d3ba2

data/README.md

@@ -19,9 +19,11 @@ Bitcoinrb supports following feature:
 
 ## Requirements
 
-bitcoinrb requires a `leveldb` library.
+### use Node implementation
 
-### install LevelDB
+If you use node features, please install level DB as follows.
+
+#### install LevelDB
 
 * for Ubuntu
 
@@ -31,6 +33,12 @@ bitcoinrb requires a `leveldb` library.
 
     $ brew install leveldb
 
+and put `leveldb-ruby` in your Gemfile and run bundle install.
+
+```
+gem leveldb-ruby
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/bitcoinrb.gemspec

@@ -28,11 +28,14 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'ffi'
   spec.add_runtime_dependency 'leb128', '~> 1.0.0'
-  spec.add_runtime_dependency 'leveldb-ruby'
   spec.add_runtime_dependency 'eventmachine_httpserver'
   spec.add_runtime_dependency 'rest-client'
   spec.add_runtime_dependency 'iniparse'
   spec.add_runtime_dependency 'siphash'
+  spec.add_runtime_dependency 'protobuf'
+
+  # for options
+  spec.add_development_dependency 'leveldb-ruby'
 
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/bitcoin/block.rb

@@ -9,6 +9,14 @@ module Bitcoin
       @transactions = transactions
     end
 
+    def self.parse_from_payload(payload)
+      Bitcoin::Message::Block.parse_from_payload(payload).to_block
+    end
+
+    def hash
+      header.hash
+    end
+
     # calculate block weight
     def weight
       stripped_size * (WITNESS_SCALE_FACTOR - 1) + size

data/lib/bitcoin/constants.rb

@@ -40,6 +40,7 @@ module Bitcoin
   SCRIPT_VERIFY_MINIMALIF = (1 << 13) # Segwit script only: Require the argument of OP_IF/NOTIF to be exactly 0x01 or empty vector
   SCRIPT_VERIFY_NULLFAIL = (1 << 14) # Signature(s) must be empty vector if an CHECK(MULTI)SIG operation failed
   SCRIPT_VERIFY_WITNESS_PUBKEYTYPE = (1 << 15) # Public keys in segregated witness scripts must be compressed
+  SCRIPT_VERIFY_CONST_SCRIPTCODE = (1 << 16) # Making OP_CODESEPARATOR and FindAndDelete fail any non-segwit scripts
 
   MANDATORY_SCRIPT_VERIFY_FLAGS = SCRIPT_VERIFY_P2SH
 
@@ -56,7 +57,10 @@ module Bitcoin
                                   SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY,
                                   SCRIPT_VERIFY_CHECKSEQUENCEVERIFY,
                                   SCRIPT_VERIFY_LOW_S,
-                                  SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM].inject(SCRIPT_VERIFY_NONE){|flags, f| flags |= f}
+                                  SCRIPT_VERIFY_WITNESS,
+                                  SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM,
+                                  SCRIPT_VERIFY_WITNESS_PUBKEYTYPE,
+                                  SCRIPT_VERIFY_CONST_SCRIPTCODE].inject(SCRIPT_VERIFY_NONE){|flags, f| flags |= f}
 
   # for script
 
@@ -156,6 +160,10 @@ module Bitcoin
   SCRIPT_ERR_WITNESS_UNEXPECTED = 75
   SCRIPT_ERR_WITNESS_PUBKEYTYPE = 76
 
+  # Constant scriptCode
+  SCRIPT_ERR_OP_CODESEPARATOR = 77
+  SCRIPT_ERR_SIG_FINDANDDELETE = 78
+
   SCRIPT_ERR_ERROR_COUNT = 80
 
   ERRCODES_MAP = Hash[*constants.grep(/^SCRIPT_ERR_/).map { |c| [const_get(c), c.to_s] }.flatten]

data/lib/bitcoin/ext_key.rb

@@ -1,7 +1,7 @@
 module Bitcoin
 
   # Integers modulo the order of the curve(secp256k1)
-  CURVE_ORDER = 115792089237316195423570985008687907852837564279074904382605163141518161494337
+  CURVE_ORDER = ECDSA::Group::Secp256k1.order
 
   # BIP32 Extended private key
   class ExtKey
@@ -87,7 +87,11 @@ module Bitcoin
     end
 
     # derive new key
-    def derive(number)
+    # @param [Integer] number a child index
+    # @param [Boolean] harden whether hardened key or not. If true, 2^31 is added to +number+.
+    # @return [Bitcoin::ExtKey] derived new key.
+    def derive(number, harden = false)
+      number += 2**31 if harden
       new_key = ExtKey.new
       new_key.depth = depth + 1
       new_key.number = number
@@ -102,7 +106,7 @@ module Bitcoin
       raise 'invalid key' if left >= CURVE_ORDER
       child_priv = (left + key.priv_key.to_i(16)) % CURVE_ORDER
       raise 'invalid key ' if child_priv >= CURVE_ORDER
-      new_key.key = Bitcoin::Key.new(priv_key: child_priv.to_s(16).rjust(64, '0'))
+      new_key.key = Bitcoin::Key.new(priv_key: child_priv.to_even_length_hex.rjust(64, '0'))
       new_key.chain_code = l[32..-1]
       new_key.ver = version
       new_key

data/lib/bitcoin/key.rb

@@ -13,7 +13,7 @@ module Bitcoin
 
     MIN_PRIV_KEy_MOD_ORDER = 0x01
     # Order of secp256k1's generator minus 1.
-    MAX_PRIV_KEY_MOD_ORDER = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364140
+    MAX_PRIV_KEY_MOD_ORDER = ECDSA::Group::Secp256k1.order - 1
 
     def initialize(priv_key: nil, pubkey: nil, compressed: true)
       @secp256k1_module =  Bitcoin.secp_impl
@@ -94,17 +94,17 @@ module Bitcoin
 
     # get pay to pubkey hash address
     def to_p2pkh
-      Bitcoin::Script.to_p2pkh(hash160).to_addr
+      Bitcoin::Script.to_p2pkh(hash160).addresses.first
     end
 
     # get pay to witness pubkey hash address
     def to_p2wpkh
-      Bitcoin::Script.to_p2wpkh(hash160).to_addr
+      Bitcoin::Script.to_p2wpkh(hash160).addresses.first
     end
 
     # get p2wpkh address nested in p2sh.
     def to_nested_p2wpkh
-      Bitcoin::Script.to_p2wpkh(hash160).to_p2sh.to_addr
+      Bitcoin::Script.to_p2wpkh(hash160).to_p2sh.addresses.first
     end
 
     def compressed?
@@ -236,7 +236,7 @@ module Bitcoin
       r = sig_array[4...(len_r+4)].pack('C*').bth
       len_s = sig_array[len_r + 5]
       s = sig_array[(len_r + 6)...(len_r + 6 + len_s)].pack('C*').bth
-      ECDSA::Format::SignatureDerString.encode(ECDSA::Signature.new(r.to_i(16), s.to_i(16)))
+      ECDSA::Signature.new(r.to_i(16), s.to_i(16)).to_der
     end
 
     def valid_pubkey?

data/lib/bitcoin/message/headers_parser.rb

@@ -10,13 +10,13 @@ module Bitcoin
         hashes = []
         buf = StringIO.new(payload)
         size.times do
-          hashes << buf.read(32).reverse.bth
+          hashes << buf.read(32).bth
         end
-        new(ver, hashes, buf.read(32).reverse.bth)
+        new(ver, hashes, buf.read(32).bth)
       end
 
       def to_payload
-        [version].pack('V') << Bitcoin.pack_var_int(hashes.length) << hashes.map{|h|h.htb.reverse}.join << stop_hash.htb.reverse
+        [version].pack('V') << Bitcoin.pack_var_int(hashes.length) << hashes.map{|h|h.htb}.join << stop_hash.htb
       end
 
     end

data/lib/bitcoin/message/inventory.rb

@@ -27,12 +27,12 @@ module Bitcoin
       def self.parse_from_payload(payload)
         raise Error, 'invalid inventory size.' if payload.bytesize != 36
         identifier = payload[0..4].unpack('V').first
-        hash = payload[4..-1].reverse.bth # internal byte order
+        hash = payload[4..-1].bth # internal byte order
         new(identifier, hash)
       end
 
       def to_payload
-        [identifier].pack('V') << hash.htb.reverse
+        [identifier].pack('V') << hash.htb
       end
 
       def block?

data/lib/bitcoin/message/merkle_block.rb

@@ -23,7 +23,7 @@ module Bitcoin
         m.tx_count = buf.read(4).unpack('V').first
         hash_count = Bitcoin.unpack_var_int_from_io(buf)
         hash_count.times do
-          m.hashes << buf.read(32).reverse.bth
+          m.hashes << buf.read(32).bth
         end
         flag_count = Bitcoin.unpack_var_int_from_io(buf)
         # A sequence of bits packed eight in a byte with the least significant bit first.
@@ -33,7 +33,7 @@ module Bitcoin
 
       def to_payload
         header.to_payload << [tx_count].pack('V') << Bitcoin.pack_var_int(hashes.size) <<
-            hashes.map{|h|h.htb.reverse}.join << Bitcoin.pack_var_int(flags.htb.bytesize) << flags.htb
+            hashes.map(&:htb).join << Bitcoin.pack_var_int(flags.htb.bytesize) << flags.htb
       end
 
     end

data/lib/bitcoin/message/reject.rb

@@ -32,12 +32,12 @@ module Bitcoin
         message, payload = Bitcoin.unpack_var_string(payload)
         code, payload = payload.unpack('Ca*')
         reason, payload = Bitcoin.unpack_var_string(payload)
-        extra = ['tx', 'block'].include?(message) ? payload.reverse.bth : payload
+        extra = ['tx', 'block'].include?(message) ? payload.bth : payload
         new(message, code, reason, extra)
       end
 
       def to_payload
-        e = ['tx', 'block'].include?(message) ? extra.htb.reverse : extra
+        e = ['tx', 'block'].include?(message) ? extra.htb : extra
         Bitcoin.pack_var_string(message) << [code].pack('C') << Bitcoin.pack_var_string(reason) << e
       end
 

data/lib/bitcoin/mnemonic.rb

@@ -52,6 +52,7 @@ module Bitcoin
     # @param [String] passphrase a passphrase which protects mnemonic. the default value is an empty string.
     # @return [String] seed
     def to_seed(mnemonic, passphrase: '')
+      to_entropy(mnemonic)
       OpenSSL::PKCS5.pbkdf2_hmac(mnemonic.join(' ').downcase,
                                  'mnemonic' + passphrase, 2048, 64, OpenSSL::Digest::SHA512.new).bth
     end

data/lib/bitcoin/network/connection.rb

@@ -24,6 +24,7 @@ module Bitcoin
         @sendheaders = false
         @attr_accessor = 0
         @message = ''
+        self.pending_connect_timeout = 5.0
       end
 
       def post_init
@@ -56,6 +57,11 @@ module Bitcoin
         peer.handle_error(e)
       end
 
+      def unbind
+        logger.info "unbind. #{addr}"
+        peer.unbind
+      end
+
       private
 
       # start handshake
@@ -63,9 +69,6 @@ module Bitcoin
         logger.info "begin handshake with #{addr}"
         send_message(peer.local_version)
       end
-
     end
-
   end
-
 end

data/lib/bitcoin/network/message_handler.rb

@@ -180,8 +180,8 @@ module Bitcoin
       end
 
       def on_tx(tx)
-        logger.info('receive tx message.')
-        # TODO
+        logger.info("receive tx message. #{tx.build_json}")
+        peer.handle_tx(tx)
       end
 
       def on_not_found(not_found)
@@ -232,4 +232,4 @@ module Bitcoin
 
     end
   end
-end
+end

data/lib/bitcoin/network/peer.rb

@@ -137,9 +137,12 @@ module Bitcoin
         headers.headers.each do |header|
           break unless header.valid?
           entry = chain.append_header(header)
+          next unless entry
           @best_hash = entry.hash
           @best_height = entry.height
         end
+        pool.changed
+        pool.notify_observers(:header, {hash: @best_hash, height: @best_height})
         start_block_header_download if headers.headers.size > 0 # next header download
       end
 
@@ -148,6 +151,10 @@ module Bitcoin
         pool.handle_error(e)
       end
 
+      def unbind
+        pool.handle_close_peer(self)
+      end
+
       # close peer connection.
       def close(msg = '')
         conn.close(msg)
@@ -178,6 +185,11 @@ module Bitcoin
         conn.send_message(getdata)
       end
 
+      def handle_tx(tx)
+        pool.changed
+        pool.notify_observers(:tx, tx)
+      end
+
       # send ping message.
       def send_ping
         ping = Bitcoin::Message::Ping.new

data/lib/bitcoin/network/pool.rb

@@ -11,6 +11,7 @@ module Bitcoin
 
     # peer pool class.
     class Pool
+      include Observable
 
       attr_reader :peers # active peers
       attr_reader :pending_peers # currently connecting peer
@@ -39,15 +40,8 @@ module Bitcoin
         logger.debug 'Start connecting other pears.'
         addr_list = peer_discovery.peers
 
-        port = Bitcoin.chain_params.default_port
-        EM::Iterator.new(addr_list, Bitcoin::PARALLEL_THREAD).each do |ip, iter|
-          if pending_peers.size < MAX_OUTBOUND_CONNECTIONS
-            peer = Peer.new(ip, port, self, @configuration)
-            pending_peers << peer
-            peer.connect
-            iter.next
-          end
-        end
+        connect(addr_list)
+
         @started = true
       end
 
@@ -64,6 +58,14 @@ module Bitcoin
         filter_load(peer) if node.wallet
       end
 
+      def handle_close_peer(peer)
+        return unless started
+        peers.delete(peer)
+        pending_peers.delete(peer)
+        addr_list = peer_discovery.peers - peers.map(&:host) - pending_peers.map(&:host) - [peer.host]
+        connect(addr_list)
+      end
+
       # terminate peers.
       def terminate
         peers.each { |peer| peer.close('terminate') }
@@ -112,7 +114,18 @@ module Bitcoin
         id
       end
 
-    end
+      def connect(addr_list)
+        port = Bitcoin.chain_params.default_port
 
+        EM::Iterator.new(addr_list, Bitcoin::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/bitcoin/node/cli.rb

@@ -30,6 +30,18 @@ module Bitcoin
         request('getpeerinfo')
       end
 
+      desc 'decoderawtransaction "hexstring"', 'Return a JSON object representing the serialized, hex-encoded transaction.'
+      def decoderawtransaction(hexstring)
+        request('decoderawtransaction', hexstring)
+      end
+
+      desc 'decodescript "hexstring"', 'Decode a hex-encoded script.'
+      def decodescript(hexstring)
+        request('decodescript', hexstring)
+      end
+
+      # wallet cli
+
       desc 'sendrawtransaction', 'Submits raw transaction (serialized, hex-encoded) to local node and network.'
       def sendrawtransaction(hex_tx)
         request('sendrawtransaction', hex_tx)

data/lib/bitcoin/node/spv.rb

@@ -60,13 +60,20 @@ module Bitcoin
         pool.filter_clear
       end
 
+      def add_observer(observer)
+        pool.add_observer(observer)
+      end
+
+      def delete_observer(observer)
+        pool.delete_observer(observer)
+      end
+
       private
 
       def setup_filter
         @bloom = Bitcoin::BloomFilter.create_filter(512, 0.01)
-        wallet.watch_targets.each{|t|bloom.add(t.htb.reverse)} if wallet
+        wallet.watch_targets.each{|t|bloom.add(t.htb)} if wallet
       end
-
     end
   end
 end

data/lib/bitcoin/opcodes.rb

@@ -116,8 +116,8 @@ module Bitcoin
     OP_CHECKMULTISIGVERIFY = 0xaf
 
     # https://en.bitcoin.it/wiki/Script#Locktime
-    OP_NOP2 = OP_CHECKLOCKTIMEVERIFY = 0xb1
-    OP_NOP3 = OP_CHECKSEQUENCEVERIFY = 0xb2
+    OP_NOP2 = OP_CHECKLOCKTIMEVERIFY = OP_CLTV = 0xb1
+    OP_NOP3 = OP_CHECKSEQUENCEVERIFY = OP_CSV = 0xb2
 
     # https://en.bitcoin.it/wiki/Script#Reserved_words
     OP_RESERVED = 0x50
@@ -136,7 +136,13 @@ module Bitcoin
     OP_NOP9 = 0xb8
     OP_NOP10 = 0xb9
 
-    OPCODES_MAP = Hash[*constants.grep(/^OP_/).map { |c| [const_get(c), c.to_s] }.flatten]
+    # https://en.bitcoin.it/wiki/Script#Pseudo-words
+    OP_PUBKEYHASH = 0xfd
+    OP_PUBKEY = 0xfe
+    OP_INVALIDOPCODE = 0xff
+
+    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]
     NAME_MAP = Hash[*constants.grep(/^OP_/).map { |c| [c.to_s, const_get(c)] }.flatten]
 
     def opcode_to_name(opcode)

data/lib/bitcoin/out_point.rb

@@ -14,12 +14,16 @@ module Bitcoin
       @index = index
     end
 
+    def self.from_txid(txid, index)
+      self.new(txid.rhex, index)
+    end
+
     def coinbase?
       hash == COINBASE_HASH && index == COINBASE_INDEX
     end
 
     def to_payload
-      [hash.htb.reverse, index].pack('a32V')
+      [hash.htb, index].pack('a32V')
     end
 
     def self.create_coinbase_outpoint
@@ -30,6 +34,11 @@ module Bitcoin
       index >= 0 && (!coinbase? && hash != COINBASE_HASH)
     end
 
+    # convert hash to txid
+    def txid
+      hash.rhex
+    end
+
   end
 
 end

data/lib/bitcoin/payments/output.pb.rb

@@ -0,0 +1,20 @@
+module Bitcoin
+  module Payments
+
+    # https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki#Output
+    class Output < Protobuf::Message
+
+      optional :uint64, :amount, 1, {default: 0}
+
+      required :bytes, :script, 2
+
+      # convert to TxOut object.
+      # @return [Bitcoin::TxOut]
+      def to_tx_out
+        Bitcoin::TxOut.new(value: amount, script_pubkey: Bitcoin::Script.parse_from_payload(script))
+      end
+
+    end
+
+  end
+end

data/lib/bitcoin/payments/payment.pb.rb

@@ -0,0 +1,26 @@
+module Bitcoin
+  module Payments
+
+    # https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki#Payment
+    class Payment < Protobuf::Message
+
+      optional :bytes, :merchant_data, 1
+
+      repeated :bytes, :transactions, 2
+
+      repeated Bitcoin::Payments::Output, :refund_to, 3
+
+      optional :string, :memo, 4
+
+      def self.parse_from_payload(payload)
+        decode(payload)
+      end
+
+      def transactions
+        @values[:transactions].map{|raw_tx|Bitcoin::Tx.parse_from_payload(raw_tx)}
+      end
+
+    end
+
+  end
+end

data/lib/bitcoin/payments/payment_ack.pb.rb

@@ -0,0 +1,17 @@
+module Bitcoin
+  module Payments
+
+    # https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki#PaymentACK
+    class PaymentACK < Protobuf::Message
+
+      required Bitcoin::Payments::Payment, :payment, 1
+
+      optional :string, :memo, 2
+
+      def self.parse_from_payload(payload)
+        decode(payload)
+      end
+    end
+
+  end
+end

data/lib/bitcoin/payments/payment_details.pb.rb

@@ -0,0 +1,24 @@
+module Bitcoin
+  module Payments
+
+    # https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki#PaymentDetailsPaymentRequest
+    class PaymentDetails < Protobuf::Message
+
+      optional :string, :network, 1, {default: 'main'}
+
+      repeated Bitcoin::Payments::Output, :outputs, 2
+
+      required :uint64, :time, 3
+
+      optional :uint64, :expires, 4
+
+      optional :string, :memo, 5
+
+      optional :string, :payment_url, 6
+
+      optional :bytes, :merchant_data, 7
+
+    end
+
+  end
+end

data/lib/bitcoin/payments/payment_request.pb.rb

@@ -0,0 +1,79 @@
+module Bitcoin
+  module Payments
+
+    # https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki#PaymentDetailsPaymentRequest
+    class PaymentRequest < Protobuf::Message
+
+      optional :uint32, :payment_details_version, 1, {default: 1}
+
+      optional :string, :pki_type, 2, {default: 'none'}
+
+      optional :bytes, :pki_data, 3
+
+      required :bytes, :serialized_payment_details, 4
+
+      optional :bytes, :signature, 5
+
+      def self.parse_from_payload(payload)
+        self.decode(payload)
+      end
+
+      # verify +pki_data+.
+      # @return [Struct] pki information.
+      def verify_pki_data
+        d = Struct.new(:display_name, :merchant_sign_key, :root_auth, :root_auth_name)
+        d
+      end
+
+      # get payment details
+      # @return [Bitcoin::Payments:PaymentDetails]
+      def details
+        PaymentDetails.decode(serialized_payment_details)
+      end
+
+      # get certificates
+      # @return [Array[OpenSSL::X509::Certificate]]
+      def certs
+        return [] unless has_pki?
+        X509Certificates.decode(pki_data).certs
+      end
+
+      # whether exist +pki_data+.
+      def has_pki?
+        pki_type != 'none'
+      end
+
+      # verify signature.
+      def valid_sig?
+        return false unless has_pki?
+        digest = case pki_type
+                   when 'x509+sha256'
+                     OpenSSL::Digest::SHA256.new
+                   when 'x509+sha1'
+                     OpenSSL::Digest::SHA1.new
+                   else
+                     raise "pki_type: #{pki_type} is invalid type."
+                 end
+        certs.first.public_key.verify(digest, signature, sig_message)
+      end
+
+      # verify expire time for payment request.
+      def valid_time?
+        expires = details.expires
+        return true if expires == 0
+        Time.now.to_i <= expires
+      end
+
+      private
+
+      # Generate data to be signed
+      def sig_message
+        PaymentRequest.new(payment_details_version: payment_details_version,
+                           pki_type: pki_type, pki_data: pki_data, signature: '',
+                           serialized_payment_details: serialized_payment_details).encode
+      end
+
+    end
+
+  end
+end

data/lib/bitcoin/payments/x509_certificates.pb.rb

@@ -0,0 +1,18 @@
+module Bitcoin
+  module Payments
+
+    # https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki#Certificates
+    class X509Certificates < Protobuf::Message
+
+      repeated :bytes, :certificate, 1
+
+      # get certificates
+      # @return [Array[OpenSSL::X509::Certificate]]
+      def certs
+        certificate.map{|v|OpenSSL::X509::Certificate.new(v)}
+      end
+
+    end
+
+  end
+end

data/lib/bitcoin/payments.rb

@@ -0,0 +1,14 @@
+require 'protobuf'
+
+module Bitcoin
+  module Payments
+
+    autoload :Output, 'bitcoin/payments/output.pb'
+    autoload :Payment, 'bitcoin/payments/payment.pb'
+    autoload :PaymentACK, 'bitcoin/payments/payment_ack.pb'
+    autoload :PaymentDetails, 'bitcoin/payments/payment_details.pb'
+    autoload :PaymentRequest, 'bitcoin/payments/payment_request.pb'
+    autoload :X509Certificates, 'bitcoin/payments/x509_certificates.pb'
+
+  end
+end

data/lib/bitcoin/rpc/request_handler.rb

@@ -31,12 +31,12 @@ module Bitcoin
               hash: block_id,
               height: entry.height,
               version: entry.header.version,
-              versionHex: entry.header.version.to_s(16),
+              versionHex: entry.header.version.to_even_length_hex,
               merkleroot: entry.header.merkle_root.rhex,
               time: entry.header.time,
               mediantime: node.chain.mtp(block_hash),
               nonce: entry.header.nonce,
-              bits: entry.header.bits.to_s(16),
+              bits: entry.header.bits.to_even_length_hex,
               previousblockhash: entry.prev_hash.rhex,
               nextblockhash: node.chain.next_hash(block_hash).rhex
           }
@@ -53,7 +53,7 @@ module Bitcoin
             id: peer.id,
             addr: "#{peer.host}:#{peer.port}",
             addrlocal: local_addr,
-            services: peer.remote_version.services.to_s(16).rjust(16, '0'),
+            services: peer.remote_version.services.to_even_length_hex.rjust(16, '0'),
             relaytxes: peer.remote_version.relay,
             lastsend: peer.last_send,
             lastrecv: peer.last_recv,
@@ -80,6 +80,28 @@ module Bitcoin
         tx.txid
       end
 
+      # decode tx data.
+      def decoderawtransaction(hex_tx)
+        begin
+          Bitcoin::Tx.parse_from_payload(hex_tx.htb).to_h
+        rescue Exception
+          raise ArgumentError.new('TX decode failed')
+        end
+      end
+
+      # decode script data.
+      def decodescript(hex_script)
+        begin
+          script = Bitcoin::Script.parse_from_payload(hex_script.htb)
+          h = script.to_h
+          h.delete(:hex)
+          h[:p2sh] = script.to_p2sh.addresses.first unless script.p2sh?
+          h
+        rescue Exception
+          raise ArgumentError.new('Script decode failed')
+        end
+      end
+
       # wallet api
 
       # create wallet

data/lib/bitcoin/script/script.rb

@@ -67,7 +67,7 @@ module Bitcoin
         if opcode
           script << (v =~ /^\d/ && Opcodes.small_int_to_opcode(v.ord) ? v.ord : opcode)
         else
-          script << v
+          script << (v =~ /^[0-9]+$/ ? v.to_i : v)
         end
       end
       script
@@ -116,10 +116,12 @@ module Bitcoin
       to_payload.bth
     end
 
-    def to_addr
-      return p2pkh_addr if p2pkh?
-      return p2sh_addr if p2sh?
-      return bech32_addr if witness_program?
+    def addresses
+      return [p2pkh_addr] if p2pkh?
+      return [p2sh_addr] if p2sh?
+      return [bech32_addr] if witness_program?
+      return get_multisig_pubkeys.map{|pubkey| Bitcoin::Key.new(pubkey: pubkey.bth).to_p2pkh} if multisig?
+      []
     end
 
     # check whether standard script.
@@ -272,7 +274,16 @@ module Bitcoin
         when String
           if c.pushdata?
             v = Opcodes.opcode_to_small_int(c.ord)
-            v ? v : c.pushed_data.bth
+            if v
+              v
+            else
+              data = c.pushed_data
+              if data.bytesize <= 4
+                Script.decode_number(data.bth) # for scriptnum
+              else
+                data.bth
+              end
+            end
           else
             Opcodes.opcode_to_name(c.ord)
           end
@@ -409,6 +420,25 @@ module Bitcoin
       chunks == other.chunks
     end
 
+    def type
+      return 'pubkeyhash' if p2pkh?
+      return 'scripthash' if p2sh?
+      return 'multisig' if multisig?
+      return 'witness_v0_keyhash' if p2wpkh?
+      return 'witness_v0_scripthash' if p2wsh?
+      'nonstandard'
+    end
+
+    def to_h
+      h = {asm: to_s, hex: to_payload.bth, type: type}
+      addrs = addresses
+      unless addrs.empty?
+        h[:req_sigs] = multisig? ? Bitcoin::Opcodes.opcode_to_small_int(chunks[0].bth.to_i(16)) :addrs.size
+        h[:addresses] = addrs
+      end
+      h
+    end
+
     private
 
     # generate p2pkh address. if script dose not p2pkh, return nil.

data/lib/bitcoin/script/script_error.rb

@@ -92,6 +92,10 @@ module Bitcoin
         'Witness provided for non-witness script'
       when SCRIPT_ERR_WITNESS_PUBKEYTYPE
         'Using non-compressed keys in segwit'
+      when SCRIPT_ERR_OP_CODESEPARATOR
+        'Using OP_CODESEPARATOR in non-witness scrip'
+      when SCRIPT_ERR_SIG_FINDANDDELETE
+        'Signature is found in scriptCode'
       when SCRIPT_ERR_UNKNOWN_ERROR, SCRIPT_ERR_ERROR_COUNT
         'unknown error'
       else

data/lib/bitcoin/script/script_interpreter.rb

@@ -156,6 +156,7 @@ module Bitcoin
               return set_error(SCRIPT_ERR_OP_COUNT)
             end
             return set_error(SCRIPT_ERR_DISABLED_OPCODE) if DISABLE_OPCODES.include?(opcode)
+            return set_error(SCRIPT_ERR_OP_CODESEPARATOR) if opcode == OP_CODESEPARATOR && sig_version == :base && flag?(SCRIPT_VERIFY_CONST_SCRIPTCODE)
             next unless (need_exec || (OP_IF <= opcode && opcode <= OP_ENDIF))
             small_int = Opcodes.opcode_to_small_int(opcode)
             if small_int && opcode != OP_0
@@ -396,7 +397,9 @@ module Bitcoin
 
                   subscript = script.subscript(last_code_separator_index..-1)
                   if sig_version == :base
-                    subscript = subscript.find_and_delete(Script.new << sig)
+                    tmp = subscript.find_and_delete(Script.new << sig)
+                    return set_error(SCRIPT_ERR_SIG_FINDANDDELETE) if flag?(SCRIPT_VERIFY_CONST_SCRIPTCODE) && tmp != subscript
+                    subscript = tmp
                   end
 
                   return false if !check_pubkey_encoding(pubkey, sig_version) || !check_signature_encoding(sig) # error already set.
@@ -445,7 +448,9 @@ module Bitcoin
 
                   if sig_version == :base
                     sigs.each do |sig|
-                      subscript = subscript.find_and_delete(Script.new << sig)
+                      tmp = subscript.find_and_delete(Script.new << sig)
+                      return set_error(SCRIPT_ERR_SIG_FINDANDDELETE) if flag?(SCRIPT_VERIFY_CONST_SCRIPTCODE) && tmp != subscript
+                      subscript = tmp
                     end
                   end
 

data/lib/bitcoin/secp256k1/ruby.rb

@@ -47,9 +47,8 @@ module Bitcoin
 
         return nil if s.zero?
 
-        signature = ECDSA::Signature.new(r, s)
+        signature = ECDSA::Signature.new(r, s).to_der
         public_key = Bitcoin::Key.new(priv_key: privkey.bth).pubkey
-        signature = ECDSA::Format::SignatureDerString.encode(signature) # signature with DER format
         raise 'Creation of signature failed.' unless Bitcoin::Secp256k1::Ruby.verify_sig(data, signature, public_key)
         signature
       end

data/lib/bitcoin/store/spv_chain.rb

@@ -43,7 +43,7 @@ module Bitcoin
       # @param [Bitcoin::BlockHeader] header a block header.
       # @return [Bitcoin::Store::ChainEntry] appended block header entry.
       def append_header(header)
-        logger.info("append header #{header.hash}")
+        logger.info("append header #{header.block_id}")
         raise "this header is invalid. #{header.hash}" unless header.valid?
         best_block = latest_block
         current_height = best_block.height

data/lib/bitcoin/tx.rb

@@ -109,6 +109,10 @@ module Bitcoin
       !inputs.find { |i| !i.script_witness.empty? }.nil?
     end
 
+    def ==(other)
+      hash == other.hash
+    end
+
     # serialize tx with old tx format
     def serialize_old_format
       buf = [version].pack('V')
@@ -219,6 +223,13 @@ module Bitcoin
       end
     end
 
+    def to_h
+      {
+          txid: txid, hash: witness_hash.rhex, version: version, size: size, vsize: vsize, locktime: lock_time,
+          vin: inputs.map(&:to_h), vout: outputs.map.with_index{|tx_out, index| tx_out.to_h.merge({n: index})}
+      }
+    end
+
     private
 
     # generate sighash with legacy format

data/lib/bitcoin/tx_in.rb

@@ -35,7 +35,7 @@ module Bitcoin
       buf = payload.is_a?(String) ? StringIO.new(payload) : payload
       i = new
       hash, index = buf.read(36).unpack('a32V')
-      i.out_point = OutPoint.new(hash.reverse.bth, index)
+      i.out_point = OutPoint.new(hash.bth, index)
       sig_length = Bitcoin.unpack_var_int_from_io(buf)
       sig = buf.read(sig_length)
       if i.coinbase?
@@ -62,6 +62,15 @@ module Bitcoin
       !script_witness.empty?
     end
 
+    def to_h
+      sig = script_sig.to_h
+      sig.delete(:type)
+      h = {txid: out_point.txid, vout: out_point.index,  script_sig: sig }
+      h[:txinwitness] = script_witness.stack.map(&:bth) if has_witness?
+      h[:sequence] = sequence
+      h
+    end
+
   end
 
 end

data/lib/bitcoin/tx_out.rb

@@ -32,6 +32,15 @@ module Bitcoin
       'ffffffffffffffff00'.htb
     end
 
+    # convert satoshi to btc
+    def value_to_btc
+      value / 100000000.0
+    end
+
+    def to_h
+      {value: value_to_btc, script_pubkey: script_pubkey.to_h}
+    end
+
   end
 
 end

data/lib/bitcoin/version.rb

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

data/lib/bitcoin/wallet/account.rb

@@ -53,7 +53,7 @@ module Bitcoin
       end
 
       # create new receive key
-      # @return [Bitcoin::ExtKey]
+      # @return [Bitcoin::ExtPubkey]
       def create_receive
         @receive_depth += 1
         save
@@ -61,7 +61,7 @@ module Bitcoin
       end
 
       # create new change key
-      # # @return [Bitcoin::ExtKey]
+      # @return [Bitcoin::ExtPubkey]
       def create_change
         @change_depth += 1
         save

data/lib/bitcoin.rb

@@ -8,6 +8,7 @@ require 'securerandom'
 require 'json'
 require 'bech32'
 require 'ffi'
+require 'observer'
 require 'tmpdir'
 require_relative 'openassets'
 
@@ -44,6 +45,7 @@ module Bitcoin
   autoload :RPC, 'bitcoin/rpc'
   autoload :Wallet, 'bitcoin/wallet'
   autoload :BloomFilter, 'bitcoin/bloom_filter'
+  autoload :Payments, 'bitcoin/payments'
 
   require_relative 'bitcoin/constants'
 
@@ -180,4 +182,12 @@ module Bitcoin
       hex.rjust((hex.length / 2.0).ceil * 2, '0')
     end
   end
+
+  class ::ECDSA::Signature
+    # convert signature to der string.
+    def to_der
+      ECDSA::Format::SignatureDerString.encode(self)
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoinrb
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecdsa
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: leveldb-ruby
+  name: eventmachine_httpserver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: eventmachine_httpserver
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: iniparse
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: iniparse
+  name: siphash
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: siphash
+  name: protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: leveldb-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -344,6 +358,13 @@ files:
 - lib/bitcoin/node/spv.rb
 - lib/bitcoin/opcodes.rb
 - lib/bitcoin/out_point.rb
+- lib/bitcoin/payments.rb
+- lib/bitcoin/payments/output.pb.rb
+- lib/bitcoin/payments/payment.pb.rb
+- lib/bitcoin/payments/payment_ack.pb.rb
+- lib/bitcoin/payments/payment_details.pb.rb
+- lib/bitcoin/payments/payment_request.pb.rb
+- lib/bitcoin/payments/x509_certificates.pb.rb
 - lib/bitcoin/rpc.rb
 - lib/bitcoin/rpc/http_server.rb
 - lib/bitcoin/rpc/request_handler.rb