mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2024-11-19 09:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calculate HRP from network param instead of the inverse (#2079)

Browse Source 
* Calculate HRP from network param instead of the inverse

* make hrp lazy

* Fix imports
This commit is contained in:
Ben Carman 2020-09-29 17:00:46 -05:00 committed by GitHub
parent 8c1a1e4a12
commit e505da3651
2 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core-test/src/test/scala/org/bitcoins/core/protocol/Bech32Test.scala
View File

@ -11,7 +11,7 @@ import org.bitcoins.testkit.core.gen.NumberGenerator
import org.bitcoins.testkit.util.BitcoinSUnitTest
import scodec.bits.ByteVector
import scala.util.{Failure, Success}
import scala.util.Success
class Bech32Test extends BitcoinSUnitTest {
@ -154,7 +154,8 @@ class Bech32Test extends BitcoinSUnitTest {
}
it must "encode 0 byte correctly" in {
val addr = Bech32Address(BtcHumanReadablePart.bc, Vector(UInt5.zero))
val addr =
Bech32Address(BtcHumanReadablePart.bc.network, Vector(UInt5.zero))
addr.value must be("bc1q9zpgru")
}

34
core/src/main/scala/org/bitcoins/core/protocol/Address.scala
View File

@ -1,17 +1,11 @@
package org.bitcoins.core.protocol
import org.bitcoins.core.config.{MainNet, TestNet3, _}
import org.bitcoins.core.config._
import org.bitcoins.core.number.{UInt5, UInt8}
import org.bitcoins.core.protocol.script._
import org.bitcoins.core.script.constant.ScriptConstant
import org.bitcoins.core.util._
import org.bitcoins.crypto.{
CryptoUtil,
ECPublicKey,
HashDigest,
Sha256Digest,
Sha256Hash160Digest
}
import org.bitcoins.crypto._
import scodec.bits.ByteVector
import scala.util.{Failure, Success, Try}
@ -79,12 +73,10 @@ sealed abstract class P2SHAddress extends BitcoinAddress {
*/
sealed abstract class Bech32Address extends BitcoinAddress {
def hrp: BtcHumanReadablePart
lazy val hrp: BtcHumanReadablePart = BtcHumanReadablePart(networkParameters)
def data: Vector[UInt5]
override def networkParameters: NetworkParameters = hrp.network
override def value: String = {
val all: Vector[UInt5] = data ++ checksum
val encoding = Bech32.encode5bitToString(all)
@ -119,7 +111,7 @@ sealed abstract class Bech32Address extends BitcoinAddress {
object Bech32Address extends AddressFactory[Bech32Address] {
private case class Bech32AddressImpl(
hrp: BtcHumanReadablePart,
networkParameters: NetworkParameters,
data: Vector[UInt5])
extends Bech32Address {
//require(verifyChecksum(hrp, data), "checksum did not pass")
@ -134,18 +126,14 @@ object Bech32Address extends AddressFactory[Bech32Address] {
//we don't encode the wit version or pushop for program into base5
val prog = UInt8.toUInt8s(witSPK.asmBytes.tail.tail)
val encoded = Bech32.from8bitTo5bit(prog)
val hrp = networkParameters match {
case _: MainNet => BtcHumanReadablePart.bc
case _: TestNet3 => BtcHumanReadablePart.tb
case _: SigNet => BtcHumanReadablePart.tb
case _: RegTest => BtcHumanReadablePart.bcrt
}
val witVersion = witSPK.witnessVersion.version.toInt.toByte
Bech32Address(hrp, Vector(UInt5(witVersion)) ++ encoded)
Bech32Address(networkParameters, Vector(UInt5(witVersion)) ++ encoded)
}
def apply(hrp: BtcHumanReadablePart, data: Vector[UInt5]): Bech32Address = {
Bech32AddressImpl(hrp, data)
def apply(
networkParameters: NetworkParameters,
data: Vector[UInt5]): Bech32Address = {
Bech32AddressImpl(networkParameters, data)
}
/** Returns a base 5 checksum as specified by BIP173 */
@ -192,8 +180,8 @@ object Bech32Address extends AddressFactory[Bech32Address] {
override def fromString(bech32: String): Bech32Address = {
val bech32T = for {
(hrp, data) <- Bech32.splitToHrpAndData(bech32)
btcHrp = BtcHumanReadablePart.fromString(hrp)
} yield Bech32Address(btcHrp, data)
network = BtcHumanReadablePart.fromString(hrp).network
} yield Bech32Address(network, data)
bech32T match {
case Success(bech32) => bech32