bitcoinrb 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa485194b6a1f5ea2ba0a4ed3355cae8cc8cdd4252475a78dc811ec54a93dfa4
-  data.tar.gz: 5c2c91ab2041b88e0ada77a1099df5e4d564f2d1da0a2963e3ff1beec0b63172
+  metadata.gz: ffa8f8b7dbf104190628e7ff38dbb950aa14927ab208377c821ad7f5aeaab862
+  data.tar.gz: f24e89dd6de49e066fae37fe5c4118d955f31a9a751af5901d6cde32528aa8fa
 SHA512:
-  metadata.gz: c84550004b92167af33a7832c69cafeb44e24a98d491865976194614eed2ea6c831f5ac47a716ec989d1f759786741a26cb81fa6b5da33850a2e2b4dc0fa331b
-  data.tar.gz: fb8bdfea37eb452b565f826cb2a12c56865fd80410376f0d444cddf339a1e4eb423988ef617a1dc84b573bb114db3ddae89ae49f60afd882349e92169bac6031
+  metadata.gz: 306f65243198a07403c785b212d5d86f5a6eb27b189aa9454d27d280f4d93500b967e93fb7f995e8c998ce7f8f9ff4ba40a838c7f4f430b8e2fef0c04cb11206
+  data.tar.gz: 9e4d92cc79249f5027f105a8c7f69320f35b06b3bc3e9b5cc0416f74e7698f47910f4b63afba1821ec49e647671b1b67d4955acb80fe587d79bb34d0507ae98e

data/.github/workflows/ruby.yml

@@ -0,0 +1,37 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install leveldb
+      run: sudo apt-get install libleveldb-dev
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake spec

data/.rspec_parallel

@@ -0,0 +1,2 @@
+--format ParallelTests::RSpec::RuntimeLogger --out tmp/parallel_runtime_rspec.log
+--format ParallelTests::RSpec::SummaryLogger --out tmp/spec_summary.log

data/.ruby-version

@@ -1 +1 @@
-ruby-3.0.0
+ruby-3.0.2

data/README.md

@@ -1,4 +1,4 @@
-# Bitcoinrb [![Build Status](https://travis-ci.org/chaintope/bitcoinrb.svg?branch=master)](https://travis-ci.org/chaintope/bitcoinrb) [![Gem Version](https://badge.fury.io/rb/bitcoinrb.svg)](https://badge.fury.io/rb/bitcoinrb) [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE) <img src="http://segwit.co/static/public/images/logo.png" width="100">
+# Bitcoinrb [![Build Status](https://github.com/chaintope/bitcoinrb/actions/workflows/ruby.yml/badge.svg?branch=master)](https://github.com/chaintope/bitcoinrb/actions/workflows/ruby.yml) [![Gem Version](https://badge.fury.io/rb/bitcoinrb.svg)](https://badge.fury.io/rb/bitcoinrb) [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE) <img src="http://segwit.co/static/public/images/logo.png" width="100">
 
 
 Bitcoinrb is a Ruby implementation of Bitcoin Protocol.

data/bitcoinrb.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'ecdsa'
   spec.add_runtime_dependency 'eventmachine'
   spec.add_runtime_dependency 'murmurhash3'
-  spec.add_runtime_dependency 'bech32', '~> 1.0.3'
+  spec.add_runtime_dependency 'bech32', '~> 1.1.0'
   spec.add_runtime_dependency 'daemon-spawn'
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'ffi'
@@ -33,7 +33,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'siphash'
   spec.add_runtime_dependency 'protobuf', '3.8.5'
   spec.add_runtime_dependency 'json_pure', '>= 2.3.1'
-  spec.add_runtime_dependency 'bip-schnorr', '>= 0.3.2'
+  spec.add_runtime_dependency 'bip-schnorr', '>= 0.4.0'
+  spec.add_runtime_dependency 'base32', '>= 0.3.4'
 
   # for options
   spec.add_development_dependency 'leveldb-native'
@@ -43,5 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'webmock', '>= 3.11.1'
-
+  spec.add_development_dependency 'parallel', '>= 1.20.1'
 end

data/lib/bitcoin/constants.rb

@@ -53,27 +53,34 @@ module Bitcoin
   MANDATORY_SCRIPT_VERIFY_FLAGS = SCRIPT_VERIFY_P2SH
 
   # Standard script verification flags that standard transactions will comply with.
-  STANDARD_SCRIPT_VERIFY_FLAGS = [MANDATORY_SCRIPT_VERIFY_FLAGS,
-                                  SCRIPT_VERIFY_DERSIG,
-                                  SCRIPT_VERIFY_STRICTENC,
-                                  SCRIPT_VERIFY_MINIMALDATA,
-                                  SCRIPT_VERIFY_NULLDUMMY,
-                                  SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS,
-                                  SCRIPT_VERIFY_CLEANSTACK,
-                                  SCRIPT_VERIFY_MINIMALIF,
-                                  SCRIPT_VERIFY_NULLFAIL,
-                                  SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY,
-                                  SCRIPT_VERIFY_CHECKSEQUENCEVERIFY,
-                                  SCRIPT_VERIFY_LOW_S,
-                                  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}
+  STANDARD_SCRIPT_VERIFY_FLAGS = [
+    MANDATORY_SCRIPT_VERIFY_FLAGS,
+    SCRIPT_VERIFY_DERSIG,
+    SCRIPT_VERIFY_STRICTENC,
+    SCRIPT_VERIFY_MINIMALDATA,
+    SCRIPT_VERIFY_NULLDUMMY,
+    SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS,
+    SCRIPT_VERIFY_CLEANSTACK,
+    SCRIPT_VERIFY_MINIMALIF,
+    SCRIPT_VERIFY_NULLFAIL,
+    SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY,
+    SCRIPT_VERIFY_CHECKSEQUENCEVERIFY,
+    SCRIPT_VERIFY_LOW_S,
+    SCRIPT_VERIFY_WITNESS,
+    SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM,
+    SCRIPT_VERIFY_WITNESS_PUBKEYTYPE,
+    SCRIPT_VERIFY_CONST_SCRIPTCODE,
+    SCRIPT_VERIFY_TAPROOT |
+    SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_TAPROOT_VERSION |
+    SCRIPT_VERIFY_DISCOURAGE_OP_SUCCESS |
+    SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_PUBKEYTYPE
+  ].inject(SCRIPT_VERIFY_NONE){|flags, f| flags |= f}
 
   # for script
 
   # witness version
-  WITNESS_VERSION = 0x00
+  WITNESS_VERSION_V0 = 0x00
+  WITNESS_VERSION_V1 = Bitcoin::Opcodes::OP_1
 
   # Maximum script length in bytes
   MAX_SCRIPT_SIZE = 10000

data/lib/bitcoin/ext/array_ext.rb

@@ -0,0 +1,22 @@
+module Bitcoin
+  module Ext
+    module ArrayExt
+
+      refine Array do
+
+        # resize array content with +initial_value+.
+        # expect to behave like vec#resize in c++.
+        def resize!(new_size, initial_value = 0)
+          if size < new_size
+            (new_size - size).times{self.<< initial_value}
+          elsif size > new_size
+            (size - new_size).times{delete_at(-1)}
+          end
+          self
+        end
+
+      end
+
+    end
+  end
+end

data/lib/bitcoin/ext/ecdsa.rb

@@ -3,6 +3,11 @@ class ::ECDSA::Signature
   def to_der
     ECDSA::Format::SignatureDerString.encode(self)
   end
+
+  def ==(other)
+    return false unless other.is_a?(ECDSA::Signature)
+    r == other.r && s == other.s
+  end
 end
 
 class ::ECDSA::Point

data/lib/bitcoin/ext.rb

@@ -1,5 +1,6 @@
 module Bitcoin
   module Ext
     autoload :JsonParser, 'bitcoin/ext/json_parser'
+    autoload :ArrayExt, 'bitcoin/ext/array_ext'
   end
 end

data/lib/bitcoin/ext_key.rb

@@ -280,7 +280,7 @@ module Bitcoin
       l = Bitcoin.hmac_sha512(chain_code, data)
       left = l[0..31].bth.to_i(16)
       raise 'invalid key' if left >= CURVE_ORDER
-      p1 = Bitcoin::Secp256k1::GROUP.generator.multiply_by_scalar(left)
+      p1 = Bitcoin::Key.new(priv_key: left.to_s(16), key_type: Bitcoin::Key::TYPES[:uncompressed]).to_point
       p2 = Bitcoin::Key.new(pubkey: pubkey, key_type: key_type).to_point
       new_key.pubkey = (p1 + p2).to_hex
       new_key.chain_code = l[32..-1]

data/lib/bitcoin/key.rb

@@ -10,6 +10,7 @@ module Bitcoin
     COMPRESSED_PUBLIC_KEY_SIZE = 33
     SIGNATURE_SIZE = 72
     COMPACT_SIGNATURE_SIZE = 65
+    COMPACT_SIG_HEADER_BYTE = 0x1b
 
     attr_accessor :priv_key
     attr_accessor :pubkey
@@ -29,7 +30,6 @@ module Bitcoin
     # @param [Boolean] compressed [Deprecated] whether public key is compressed.
     # @return [Bitcoin::Key] a key object.
     def initialize(priv_key: nil, pubkey: nil, key_type: nil, compressed: true, allow_hybrid: false)
-      puts "[Warning] Use key_type parameter instead of compressed. compressed parameter removed in the future." if key_type.nil? && !compressed.nil? && pubkey.nil?
       if key_type
         @key_type = key_type
         compressed = @key_type != TYPES[:uncompressed]
@@ -77,6 +77,23 @@ module Bitcoin
       new(priv_key: data.bth, key_type: key_type)
     end
 
+    # Generate from xonly public key.
+    # @param [String] xonly_pubkey xonly public key with hex format.
+    # @return [Bitcoin::Key] key object has public key.
+    def self.from_xonly_pubkey(xonly_pubkey)
+      raise ArgumentError, 'xonly_pubkey must be 32 bytes' unless xonly_pubkey.htb.bytesize == 32
+      Bitcoin::Key.new(pubkey: "02#{xonly_pubkey}", key_type: TYPES[:compressed])
+    end
+
+    # Generate from public key point.
+    # @param [ECDSA::Point] point Public key point.
+    # @param [Boolean] compressed whether compressed or not.
+    # @return [Bitcoin::Key]
+    def self.from_point(point, compressed: true)
+      pubkey = ECDSA::Format::PointOctetString.encode(point, compression: compressed).bth
+      Bitcoin::Key.new(pubkey: pubkey, key_type: TYPES[:compressed])
+    end
+
     # export private key with wif format
     def to_wif
       version = Bitcoin.chain_params.privkey_version
@@ -112,6 +129,29 @@ module Bitcoin
       end
     end
 
+    # Sign compact signature.
+    # @param [String] data message digest to be signed.
+    # @return [String] compact signature with binary format.
+    def sign_compact(data)
+      signature, rec = secp256k1_module.sign_compact(data, priv_key)
+      rec = Bitcoin::Key::COMPACT_SIG_HEADER_BYTE + rec + (compressed? ? 4 : 0)
+      [rec].pack('C') + ECDSA::Format::IntegerOctetString.encode(signature.r, 32) +
+        ECDSA::Format::IntegerOctetString.encode(signature.s, 32)
+    end
+
+    # Recover public key from compact signature.
+    # @param [String] data message digest using signature.
+    # @param [String] signature signature with binary format.
+    # @return [Bitcoin::Key] Recovered public key.
+    def self.recover_compact(data, signature)
+      rec_id = signature.unpack1('C')
+      rec = rec_id - Bitcoin::Key::COMPACT_SIG_HEADER_BYTE
+      raise ArgumentError, 'Invalid signature parameter' if rec < 0 || rec > 15
+      rec = rec & 3
+      compressed = (rec_id - Bitcoin::Key::COMPACT_SIG_HEADER_BYTE) & 4 != 0
+      Bitcoin.secp_impl.recover_compact(data, signature, rec, compressed)
+    end
+
     # verify signature using public key
     # @param [String] sig signature data with binary format
     # @param [String] data original message
@@ -165,7 +205,7 @@ module Bitcoin
     # @return [ECDSA::Point]
     def to_point
       p = pubkey
-      p ||= generate_pubkey(priv_key, compressed: compressed)
+      p ||= generate_pubkey(priv_key, compressed: compressed?)
       ECDSA::Format::PointOctetString.decode(p.htb, Bitcoin::Secp256k1::GROUP)
     end
 

data/lib/bitcoin/message/addr_v2.rb

@@ -0,0 +1,34 @@
+module Bitcoin
+  module Message
+
+    # addrv2 message class.
+    # https://github.com/bitcoin/bips/blob/master/bip-0155.mediawiki
+    class AddrV2 < Base
+
+      COMMAND = 'addrv2'
+
+      attr_reader :addrs
+
+      def initialize(addrs = [])
+        @addrs = addrs
+      end
+
+      def self.parse_from_payload(payload)
+        buf = StringIO.new(payload)
+        addr_count = Bitcoin.unpack_var_int_from_io(buf)
+        v2 = new
+        addr_count.times do
+          v2.addrs << NetworkAddr.parse_from_payload(buf, type: NetworkAddr::TYPE[:addr_v2])
+        end
+        v2
+      end
+
+      def to_payload
+        buf = Bitcoin.pack_var_int(addrs.size)
+        buf << (addrs.map { |a| a.to_payload(type: NetworkAddr::TYPE[:addr_v2])}.join)
+      end
+
+    end
+
+  end
+end

data/lib/bitcoin/message/base.rb

@@ -23,6 +23,22 @@ module Bitcoin
         raise 'to_payload must be implemented in a child class.'
       end
 
+      # Decode message data to message object.
+      # @param [String] message with binary format.
+      # @return [Bitcoin::Message::XXX] An instance of a class that inherits Bitcoin::Message::Base
+      # @raise [ArgumentError] Occurs for data that cannot be decoded.
+      def self.from_pkt(message)
+        buf = StringIO.new(message)
+        magic = buf.read(4)
+        raise ArgumentError, 'Invalid magic.' unless magic == Bitcoin.chain_params.magic_head.htb
+        command = buf.read(12).delete("\x00")
+        length = buf.read(4).unpack1('V')
+        checksum = buf.read(4)
+        payload = buf.read(length)
+        raise ArgumentError, 'Checksum do not match.' unless checksum == Bitcoin.double_sha256(payload)[0...4]
+        Bitcoin::Message.decode(command, payload&.bth)
+      end
+
     end
 
   end

data/lib/bitcoin/message/network_addr.rb

@@ -1,10 +1,16 @@
 require 'ipaddr'
+require 'base32'
 
 module Bitcoin
   module Message
 
+    NETWORK_ID = {ipv4: 0x01, ipv6: 0x02, tor_v2: 0x03, tor_v3: 0x04, i2p: 0x05, cjdns: 0x06}
+    INTERNAL_IN_IPV6_PREFIX = "fd6b:88c0:8724"
+
     class NetworkAddr
 
+      TYPE = {legacy: 0x01, addr_v2: 0x02}
+
       # unix time.
       # Nodes advertising their own IP address set this to the current time.
       # Nodes advertising IP addresses they’ve connected to set this to the last time they connected to that node.
@@ -14,47 +20,164 @@ module Bitcoin
       # The services the node advertised in its version message.
       attr_accessor :services
 
-      attr_accessor :ip_addr # IPAddr
+      attr_accessor :net # network ID that defined by BIP-155
+
+      # Network address. The interpretation depends on networkID.
+      # If ipv4 or ipv6 this field is a IPAddr object, otherwise hex string.
+      attr_accessor :addr
 
       attr_accessor :port
 
       attr_reader :skip_time
 
-      def initialize(ip: '127.0.0.1', port: Bitcoin.chain_params.default_port, services: DEFAULT_SERVICE_FLAGS, time: Time.now.to_i)
+      def initialize(ip: '127.0.0.1', port: Bitcoin.chain_params.default_port,
+                     services: DEFAULT_SERVICE_FLAGS, time: Time.now.to_i, net: NETWORK_ID[:ipv4])
         @time = time
-        @ip_addr = IPAddr.new(ip)
         @port = port
         @services = services
+        @net = net
+        case net
+        when NETWORK_ID[:ipv4], NETWORK_ID[:ipv6]
+          @addr = IPAddr.new(ip) if ip
+        end
       end
 
-      def self.parse_from_payload(payload)
-        buf = payload.is_a?(String) ? StringIO.new(payload) : payload
-        has_time = buf.size > 26
-        addr = new(time: nil)
-        addr.time = buf.read(4).unpack1('V') if has_time
-        addr.services = buf.read(8).unpack1('Q')
-        addr.ip_addr = IPAddr::new_ntoh(buf.read(16))
-        addr.port = buf.read(2).unpack1('n')
-        addr
+      # Parse addr payload
+      # @param [String] payload payload of addr
+      # @param [Integer] type Address format type
+      # @return [NetworkAddr]
+      def self.parse_from_payload(payload, type: TYPE[:legacy])
+        case type
+        when TYPE[:legacy]
+          load_legacy_payload(payload)
+        when TYPE[:addr_v2]
+          load_addr_v2_payload(payload)
+        else
+          raise Bitcoin::Message::Error, "Unknown type: #{type}."
+        end
       end
 
       def self.local_addr
         addr = new
-        addr.ip_addr = IPAddr.new('127.0.0.1')
+        addr.addr = IPAddr.new('127.0.0.1')
         addr.port = Bitcoin.chain_params.default_port
         addr.services = DEFAULT_SERVICE_FLAGS
         addr
       end
 
-      def ip
-        ip_addr.ipv4_mapped? ? ip_addr.native : ip_addr.to_s
+      # Show addr string. e.g 127.0.0.1
+      def addr_string
+        case net
+        when NETWORK_ID[:ipv4]
+          addr.native
+        when NETWORK_ID[:ipv6]
+          if addr.to_s.start_with?(INTERNAL_IN_IPV6_PREFIX)
+            Base32.encode(addr.hton[6..-1]).downcase.delete('=') + ".internal"
+          else
+            addr.to_s
+          end
+        when NETWORK_ID[:tor_v2]
+          Base32.encode(addr.htb).downcase + ".onion"
+        when NETWORK_ID[:tor_v3]
+          # TORv3 onion_address = base32(PUBKEY | CHECKSUM | VERSION) + ".onion"
+          pubkey = addr.htb
+          checksum = OpenSSL::Digest.new('SHA3-256').digest('.onion checksum' + pubkey + "\x03")
+          Base32.encode(pubkey + checksum[0...2] + "\x03").downcase + ".onion"
+        when NETWORK_ID[:i2p]
+          Base32.encode(addr.htb).downcase.delete('=') + ".b32.i2p"
+        when NETWORK_ID[:cjdns]
+          addr.to_s
+        end
+      end
+
+      def to_payload(skip_time = false, type: TYPE[:legacy])
+        case type
+        when TYPE[:legacy]
+          legacy_payload(skip_time)
+        when TYPE[:addr_v2]
+          v2_payload
+        else
+          raise Bitcoin::Message::Error, "Unknown type: #{type}."
+        end
+      end
+
+      # Load addr payload with legacy format.
+      def self.load_legacy_payload(payload)
+        buf = payload.is_a?(String) ? StringIO.new(payload) : payload
+        has_time = buf.size > 26
+        addr = NetworkAddr.new(time: nil)
+        addr.time = buf.read(4).unpack1('V') if has_time
+        addr.services = buf.read(8).unpack1('Q')
+        addr.addr = IPAddr::new_ntoh(buf.read(16))
+        addr.port = buf.read(2).unpack1('n')
+        addr
+      end
+
+      # Load addr payload with addr v2 format.
+      def self.load_addr_v2_payload(payload)
+        buf = payload.is_a?(String) ? StringIO.new(payload) : payload
+        addr = NetworkAddr.new(time: buf.read(4).unpack1('V'))
+        addr.services = Bitcoin.unpack_var_int_from_io(buf)
+        addr.net = buf.read(1).unpack1('C')
+        raise Bitcoin::Message::Error, "Unknown network id: #{addr.net}" unless NETWORK_ID.value?(addr.net)
+        addr_len = Bitcoin.unpack_var_int_from_io(buf)
+        addr.addr = case addr.net 
+                    when NETWORK_ID[:ipv4]
+                      raise Bitcoin::Message::Error, "Invalid IPv4 address." unless addr_len == 4
+                      IPAddr::new_ntoh(buf.read(addr_len))
+                    when NETWORK_ID[:ipv6]
+                      raise Bitcoin::Message::Error, "Invalid IPv6 address." unless addr_len == 16
+                      a = IPAddr::new_ntoh(buf.read(addr_len))
+                      raise Bitcoin::Message::Error, "Invalid IPv6 address." if a.ipv4_mapped?
+                      a
+                    when NETWORK_ID[:tor_v2]
+                      raise Bitcoin::Message::Error, "Invalid Tor v2 address." unless addr_len == 10
+                      buf.read(addr_len).bth
+                    when NETWORK_ID[:tor_v3]
+                      raise Bitcoin::Message::Error, "Invalid Tor v3 address." unless addr_len == 32
+                      buf.read(addr_len).bth
+                    when NETWORK_ID[:i2p]
+                      raise Bitcoin::Message::Error, "Invalid I2P address." unless addr_len == 32
+                      buf.read(addr_len).bth
+                    when NETWORK_ID[:cjdns]
+                      raise Bitcoin::Message::Error, "Invalid CJDNS address." unless addr_len == 16
+                      a = IPAddr::new_ntoh(buf.read(addr_len))
+                      raise Bitcoin::Message::Error, "Invalid CJDNS address." unless a.to_s.start_with?('fc00:')
+                      a
+                    end
+        addr.port = buf.read(2).unpack1('n')
+        addr
       end
 
-      def to_payload(skip_time = false)
+      def legacy_payload(skip_time)
         p = ''
         p << [time].pack('V') unless skip_time
-        addr = ip_addr.ipv4? ? ip_addr.ipv4_mapped : ip_addr
-        p << [services].pack('Q') << addr.hton << [port].pack('n')
+        ip = addr.ipv4? ? addr.ipv4_mapped : addr
+        p << [services].pack('Q') << ip.hton << [port].pack('n')
+      end
+
+      def v2_payload
+        p = [time].pack('V')
+        p << Bitcoin.pack_var_int(services)
+        p << [net].pack('C')
+        case net
+        when NETWORK_ID[:ipv4]
+          p << Bitcoin.pack_var_int(4)
+          p << addr.to_i.to_s(16).htb
+        when NETWORK_ID[:ipv6]
+          p << Bitcoin.pack_var_int(16)
+          p << addr.hton
+        when NETWORK_ID[:tor_v2]
+          p << Bitcoin.pack_var_int(10)
+        when NETWORK_ID[:tor_v3]
+          p << Bitcoin.pack_var_int(32)
+        when NETWORK_ID[:i2p]
+          p << Bitcoin.pack_var_int(32)
+        when NETWORK_ID[:cjdns]
+          p << Bitcoin.pack_var_int(16)
+        end
+        p << [port].pack('n')
+        p
       end
 
     end

data/lib/bitcoin/message/send_addr_v2.rb

@@ -0,0 +1,13 @@
+module Bitcoin
+  module Message
+    class SendAddrV2 < Base
+
+      COMMAND = 'sendaddrv2'
+
+      def to_payload
+        ''
+      end
+
+    end
+  end
+end

data/lib/bitcoin/message/tx.rb

@@ -16,7 +16,7 @@ module Bitcoin
       end
 
       def self.parse_from_payload(payload)
-        tx = Bitcoin::Tx.parse_from_payload(payload)
+        tx = Bitcoin::Tx.parse_from_payload(payload, strict: true)
         new(tx, tx.witness?)
       end
 

data/lib/bitcoin/message.rb

@@ -1,6 +1,8 @@
 module Bitcoin
   module Message
 
+    class Error < StandardError; end
+
     autoload :Base, 'bitcoin/message/base'
     autoload :Inventory, 'bitcoin/message/inventory'
     autoload :InventoriesParser, 'bitcoin/message/inventories_parser'
@@ -44,6 +46,8 @@ module Bitcoin
     autoload :CFCheckpt, 'bitcoin/message/cfcheckpt'
     autoload :CFilter, 'bitcoin/message/cfilter'
     autoload :CFHeaders, 'bitcoin/message/cfheaders'
+    autoload :SendAddrV2, 'bitcoin/message/send_addr_v2'
+    autoload :AddrV2, 'bitcoin/message/addr_v2'
 
     USER_AGENT = "/bitcoinrb:#{Bitcoin::VERSION}/"
 
@@ -73,5 +77,73 @@ module Bitcoin
         compact_witness: 70015
     }
 
+    module_function
+
+    # Decode P2P message.
+    # @param [String] command P2P message command string.
+    # @param [String] payload P2P message payload with hex format..
+    # @return [Bitcoin::Message::]
+    def decode(command, payload = nil)
+      payload = payload.htb if payload
+      case command
+      when Bitcoin::Message::Version::COMMAND
+        Bitcoin::Message::Version.parse_from_payload(payload)
+      when Bitcoin::Message::VerAck::COMMAND
+        Bitcoin::Message::VerAck.new
+      when Bitcoin::Message::GetAddr::COMMAND
+        Bitcoin::Message::GetAddr.new
+      when Bitcoin::Message::Addr::COMMAND
+        Bitcoin::Message::Addr.parse_from_payload(payload)
+      when Bitcoin::Message::SendHeaders::COMMAND
+        Bitcoin::Message::SendHeaders.new
+      when Bitcoin::Message::FeeFilter::COMMAND
+        Bitcoin::Message::FeeFilter.parse_from_payload(payload)
+      when Bitcoin::Message::Ping::COMMAND
+        Bitcoin::Message::Ping.parse_from_payload(payload)
+      when Bitcoin::Message::Pong::COMMAND
+        Bitcoin::Message::Pong.parse_from_payload(payload)
+      when Bitcoin::Message::GetHeaders::COMMAND
+        Bitcoin::Message::GetHeaders.parse_from_payload(payload)
+      when Bitcoin::Message::Headers::COMMAND
+        Bitcoin::Message::Headers.parse_from_payload(payload)
+      when Bitcoin::Message::Block::COMMAND
+        Bitcoin::Message::Block.parse_from_payload(payload)
+      when Bitcoin::Message::Tx::COMMAND
+        Bitcoin::Message::Tx.parse_from_payload(payload)
+      when Bitcoin::Message::NotFound::COMMAND
+        Bitcoin::Message::NotFound.parse_from_payload(payload)
+      when Bitcoin::Message::MemPool::COMMAND
+        Bitcoin::Message::MemPool.new
+      when Bitcoin::Message::Reject::COMMAND
+        Bitcoin::Message::Reject.parse_from_payload(payload)
+      when Bitcoin::Message::SendCmpct::COMMAND
+        Bitcoin::Message::SendCmpct.parse_from_payload(payload)
+      when Bitcoin::Message::Inv::COMMAND
+        Bitcoin::Message::Inv.parse_from_payload(payload)
+      when Bitcoin::Message::MerkleBlock::COMMAND
+        Bitcoin::Message::MerkleBlock.parse_from_payload(payload)
+      when Bitcoin::Message::CmpctBlock::COMMAND
+        Bitcoin::Message::CmpctBlock.parse_from_payload(payload)
+      when Bitcoin::Message::GetData::COMMAND
+        Bitcoin::Message::GetData.parse_from_payload(payload)
+      when Bitcoin::Message::GetCFHeaders::COMMAND
+        Bitcoin::Message::GetCFHeaders.parse_from_payload(payload)
+      when Bitcoin::Message::GetCFilters::COMMAND
+        Bitcoin::Message::GetCFilters.parse_from_payload(payload)
+      when Bitcoin::Message::GetCFCheckpt::COMMAND
+        Bitcoin::Message::GetCFCheckpt.parse_from_payload(payload)
+      when Bitcoin::Message::CFCheckpt::COMMAND
+        Bitcoin::Message::CFCheckpt.parse_from_payload(payload)
+      when Bitcoin::Message::CFHeaders::COMMAND
+        Bitcoin::Message::CFHeaders.parse_from_payload(payload)
+      when Bitcoin::Message::CFilter::COMMAND
+        Bitcoin::Message::CFilter.parse_from_payload(payload)
+      when Bitcoin::Message::SendAddrV2::COMMAND
+        Bitcoin::Message::SendAddrV2.new
+      when Bitcoin::Message::AddrV2::COMMAND
+        Bitcoin::Message::AddrV2.parse_from_payload(payload)
+      end
+    end
+
   end
 end