mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-03-13 11:35:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix

Browse source
This commit is contained in:
Chris Stewart 2025-02-17 10:09:15 -06:00
parent dc7feede78
commit 3df7905211
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
core/src/main/scala/org/bitcoins/core/util/Base58.scala
View file

@ -1,8 +1,10 @@
package org.bitcoins.core.util
import org.bitcoins.core.crypto.ECPrivateKeyUtil
import org.bitcoins.core.protocol.blockchain._
import org.bitcoins.core.protocol.blockchain.*
import org.bitcoins.crypto.CryptoUtil
import scodec.bits.ByteVector
import scala.util.{Failure, Success, Try}
/** Created by chris on 5/16/16. source of values:
@ -21,7 +23,18 @@ sealed abstract class Base58 {
*/
def decodeCheck(input: String): Try[ByteVector] = {
ByteVector.fromBase58(input) match {
case Some(b) => Success(b)
case Some(decoded) =>
if (decoded.length < 4) {
Failure(new IllegalArgumentException("Invalid input"))
} else {
val splitSeqs = decoded.splitAt(decoded.length - 4)
val data: ByteVector = splitSeqs._1
val checksum: ByteVector = splitSeqs._2
val actualChecksum: ByteVector =
CryptoUtil.doubleSHA256(data).bytes.take(4)
if (checksum == actualChecksum) Success(data)
else Failure(new IllegalArgumentException("checksums don't validate"))
}
case None =>
val exn = new IllegalArgumentException(s"Invalid base58, got=$input")
Failure(exn)
@ -55,12 +68,7 @@ sealed abstract class Base58 {
* [[https://github.com/ACINQ/bitcoin-lib/blob/master/src/main/scala/fr/acinq/bitcoin/Base58.scala]]
*/
def decode(input: String): ByteVector = {
val zeroes = ByteVector(input.takeWhile(_ == '1').map(_ => 0: Byte))
val trim = input.dropWhile(_ == '1').toList
val decoded = trim.foldLeft(BigInt(0))((a, b) =>
a.*(BigInt(58L)).+(BigInt(base58Pairs(b))))
if (trim.isEmpty) zeroes
else zeroes ++ ByteVector(decoded.toByteArray.dropWhile(_ == 0))
ByteVector.fromBase58(input).get
}
/** Determines if a string is a valid