mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-01-19 05:43:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Require CJDNS starts with 0xFC (#2356)

Browse Source
This commit is contained in:
Ben Carman 2020-12-15 14:18:52 -06:00 committed by GitHub
parent ec6e568845
commit 3a7cded566
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core-test/src/test/scala/org/bitcoins/core/serializers/p2p/messages/RawAddrV2MessageSerializerTest.scala
View File

@ -6,7 +6,7 @@ import org.bitcoins.core.protocol.CompactSizeUInt
import org.bitcoins.testkit.core.gen.NumberGenerator
import org.bitcoins.testkit.util.BitcoinSUnitTest
import org.scalacheck.Gen
import scodec.bits.HexStringSyntax
import scodec.bits.{ByteVector, HexStringSyntax}
import java.net.InetAddress
@ -67,9 +67,13 @@ class RawAddrV2MessageSerializerTest extends BitcoinSUnitTest {
for {
time <- NumberGenerator.uInt32s
services <- NumberGenerator.compactSizeUInts
addrBytes <- NumberGenerator.bytevector(AddrV2Message.CJDNS_ADDR_LENGTH)
addrBytes <-
NumberGenerator.bytevector(AddrV2Message.CJDNS_ADDR_LENGTH - 1)
port <- NumberGenerator.uInt16
} yield CJDNSAddrV2Message(time, services, addrBytes, port)
} yield CJDNSAddrV2Message(time,
services,
ByteVector.fromByte(0xfc.toByte) ++ addrBytes,
port)
}
def unknownAddrV2MessageGen: Gen[UnknownNetworkAddrV2Message] = {
@ -177,11 +181,11 @@ class RawAddrV2MessageSerializerTest extends BitcoinSUnitTest {
it must "parse a CJDNSAddrV2Message" in {
val msg = CJDNSAddrV2Message(UInt32(4523),
CompactSizeUInt(UInt64(53453453L)),
hex"00000000000000000000000000000000",
hex"fc000000000000000000000000000000",
UInt16(8333))
assert(
"000011abfe8da22f030600000000000000000000000000000000208d" == msg.hex)
"000011abfe8da22f0306fc000000000000000000000000000000208d" == msg.hex)
}
"UnknownNetworkAddrV2Message" must "have serialization symmetry" in {

2
core/src/main/scala/org/bitcoins/core/p2p/NetworkPayload.scala
View File

@ -622,6 +622,8 @@ case class CJDNSAddrV2Message(
addrBytes: ByteVector,
port: UInt16)
extends AddrV2Message {
require(addrBytes.head == 0xfc.toByte,
s"CJDNS addresses start with 0xFC, got $addrBytes")
require(
addrBytes.size == AddrV2Message.CJDNS_ADDR_LENGTH,
s"CJDNS addresses are ${AddrV2Message.CJDNS_ADDR_LENGTH} bytes, got ${addrBytes.size}")