From c2409b46c4d389621665ed4e5ff0d0d68dca4f1a Mon Sep 17 00:00:00 2001
From: Chris Stewart <stewart.chris1234@gmail.com>
Date: Sun, 28 Mar 2021 08:28:21 -0500
Subject: [PATCH] Silence scalajs warnings for org.bitcoins.crypto package
 (#2822)

* Silence scalajs warnings for org.bitcoins.crypto package

* Add comments

* Create 'facades' package, move all js facades into that package. Make the new -Wconf flags work with only scala 2.13.x

* Small cleanups
---
 build.sbt                                     |  19 +-
 .../crypto/BCryptoCryptoRuntime.scala         | 194 ++++++++++--------
 .../org/bitcoins/crypto/CryptoJsUtil.scala    |  39 ++++
 .../scala/org/bitcoins/crypto/Hasher.scala    |   2 +
 .../bitcoins/crypto/{ => facade}/Buffer.scala |   2 +-
 .../bitcoins/crypto/{ => facade}/ECDSA.scala  |   2 +-
 .../bitcoins/crypto/{ => facade}/HMAC.scala   |   2 +-
 .../crypto/{ => facade}/Hash160.scala         |   4 +-
 .../bitcoins/crypto/{ => facade}/Point.scala  |   0
 .../bitcoins/crypto/{ => facade}/Random.scala |   2 +-
 .../crypto/{ => facade}/RipeMd160.scala       |   4 +-
 .../bitcoins/crypto/{ => facade}/SHA1.scala   |   4 +-
 .../bitcoins/crypto/{ => facade}/SHA256.scala |   4 +-
 .../bitcoins/crypto/{ => facade}/SHA512.scala |   4 +-
 .../crypto/{ => facade}/SipHash.scala         |   2 +-
 15 files changed, 186 insertions(+), 98 deletions(-)
 create mode 100644 crypto/.js/src/main/scala/org/bitcoins/crypto/CryptoJsUtil.scala
 rename crypto/.js/src/main/scala/org/bitcoins/crypto/{ => facade}/Buffer.scala (99%)
 rename crypto/.js/src/main/scala/org/bitcoins/crypto/{ => facade}/ECDSA.scala (97%)
 rename crypto/.js/src/main/scala/org/bitcoins/crypto/{ => facade}/HMAC.scala (89%)
 rename crypto/.js/src/main/scala/org/bitcoins/crypto/{ => facade}/Hash160.scala (85%)
 rename crypto/.js/src/main/scala/org/bitcoins/crypto/{ => facade}/Point.scala (100%)
 rename crypto/.js/src/main/scala/org/bitcoins/crypto/{ => facade}/Random.scala (91%)
 rename crypto/.js/src/main/scala/org/bitcoins/crypto/{ => facade}/RipeMd160.scala (86%)
 rename crypto/.js/src/main/scala/org/bitcoins/crypto/{ => facade}/SHA1.scala (80%)
 rename crypto/.js/src/main/scala/org/bitcoins/crypto/{ => facade}/SHA256.scala (94%)
 rename crypto/.js/src/main/scala/org/bitcoins/crypto/{ => facade}/SHA512.scala (95%)
 rename crypto/.js/src/main/scala/org/bitcoins/crypto/{ => facade}/SipHash.scala (87%)

diff --git a/build.sbt b/build.sbt
index 31ce0cbe4d..55aad40df0 100644
--- a/build.sbt
+++ b/build.sbt
@@ -35,11 +35,7 @@ lazy val commonJsSettings = {
       _.withModuleKind(ModuleKind.CommonJSModule)
     },
     skip.in(publish) := true
-  ) ++ CommonSettings.settings ++
-    //get rid of -Xfatal-warnings for now with scalajs
-    //this will just give us a bunch of warnings rather than errors
-    Seq(
-      scalacOptions in Compile ~= (_ filterNot (s => s == "-Xfatal-warnings")))
+  ) ++ CommonSettings.settings
 }
 
 lazy val crypto = crossProject(JVMPlatform, JSPlatform)
@@ -62,6 +58,19 @@ lazy val crypto = crossProject(JVMPlatform, JSPlatform)
   .in(file("crypto"))
 
 lazy val cryptoJS = crypto.js
+  .settings(scalacOptions in Compile += {
+    //Added to supress all of the dead code and unused variable warnings
+    //inside of org.bitcoins.crypto.facade which is used with scalajs
+    //see: https://www.scala-lang.org/2021/01/12/configuring-and-suppressing-warnings.html
+    //see: https://github.com/bitcoin-s/bitcoin-s/pull/2822
+    if (scalaVersion.value.startsWith("2.13")) {
+      "-Wconf:cat=unused:site=org\\.bitcoins\\.crypto\\.facade\\..*:silent,cat=w-flag-dead-code:site=org\\.bitcoins\\.crypto\\.facade\\..*:silent"
+    } else {
+      //-Wconf doesn't work on Scala 2.12.x until we get 2.12.13
+      //which is currently blocked on a scoverage bug
+      ""
+    }
+  })
   .enablePlugins(ScalaJSBundlerPlugin)
 
 lazy val cryptoJVM = crypto.jvm
diff --git a/crypto/.js/src/main/scala/org/bitcoins/crypto/BCryptoCryptoRuntime.scala b/crypto/.js/src/main/scala/org/bitcoins/crypto/BCryptoCryptoRuntime.scala
index b11e2b49d6..2cc7b25cb8 100644
--- a/crypto/.js/src/main/scala/org/bitcoins/crypto/BCryptoCryptoRuntime.scala
+++ b/crypto/.js/src/main/scala/org/bitcoins/crypto/BCryptoCryptoRuntime.scala
@@ -1,11 +1,24 @@
 package org.bitcoins.crypto
 
+import org.bitcoins.crypto.facade.{
+  Buffer,
+  ECDSA,
+  HMAC,
+  Hash160,
+  Random,
+  RandomBrowser,
+  RipeMd160,
+  SHA1,
+  SHA256,
+  SHA256Factory,
+  SHA512,
+  SipHash
+}
 import scodec.bits.ByteVector
 
 import java.math.BigInteger
 import scala.scalajs.js
 import scala.scalajs.js.JSStringOps._
-import scala.scalajs.js.typedarray._
 import scala.scalajs.js.{JavaScriptException, UnicodeNormalizationForm}
 
 /** This is an implementation of [[CryptoRuntime]] that defaults to
@@ -14,10 +27,6 @@ import scala.scalajs.js.{JavaScriptException, UnicodeNormalizationForm}
 trait BCryptoCryptoRuntime extends CryptoRuntime {
   override val cryptoContext: CryptoContext = CryptoContext.BCrypto
 
-  implicit def bufferToByteVector(b: Buffer): ByteVector = toByteVector(b)
-
-  implicit def byteVectorToBuffer(b: ByteVector): Buffer = toNodeBuffer(b)
-
   private lazy val hash160 = new Hash160
   private lazy val ripeMd160 = new RipeMd160
   private lazy val sha1 = new SHA1
@@ -27,32 +36,38 @@ trait BCryptoCryptoRuntime extends CryptoRuntime {
   private lazy val ecdsa =
     new ECDSA("SECP256K1", sha256, js.constructorOf[SHA256], null)
 
-  private lazy val randomBytesFunc: Int => ByteVector =
+  private lazy val randomBytesFunc: Int => ByteVector = { int =>
     try {
       // try to call the native implementation
       Random.randomBytes(1)
-      Random.randomBytes
+      CryptoJsUtil.toByteVector(Random.randomBytes(int))
     } catch {
       case _: Throwable =>
         // the native implementation is not available,
         // fall back to the JS implementation
-        RandomBrowser.randomBytes
+        val bytesBuffer = RandomBrowser.randomBytes(int)
+        CryptoJsUtil.toByteVector(bytesBuffer)
     }
+  }
 
   def randomBytes(n: Int): ByteVector = randomBytesFunc(n)
 
   override def ripeMd160(bytes: ByteVector): RipeMd160Digest = {
+    val buffer = CryptoJsUtil.toNodeBuffer(bytes)
     ripeMd160.init()
-    ripeMd160.update(bytes)
+    ripeMd160.update(buffer)
     val hashBytes = ripeMd160.`final`()
-    RipeMd160Digest.fromBytes(hashBytes)
+    val hashByteVec = CryptoJsUtil.toByteVector(hashBytes)
+    RipeMd160Digest.fromBytes(hashByteVec)
   }
 
   override def sha256Hash160(bytes: ByteVector): Sha256Hash160Digest = {
+    val buffer = CryptoJsUtil.toNodeBuffer(bytes)
     hash160.init()
-    hash160.update(bytes)
+    hash160.update(buffer)
     val hashBytes = hash160.`final`()
-    Sha256Hash160Digest.fromBytes(hashBytes)
+    val hashBytesVec = CryptoJsUtil.toByteVector(hashBytes)
+    Sha256Hash160Digest.fromBytes(hashBytesVec)
   }
 
   /** Converts a private key -> public key
@@ -61,36 +76,46 @@ trait BCryptoCryptoRuntime extends CryptoRuntime {
     * @param isCompressed whether the returned public key should be compressed or not
     */
   override def toPublicKey(privateKey: ECPrivateKey): ECPublicKey = {
+    val buffer = CryptoJsUtil.toNodeBuffer(privateKey.bytes)
     val pubKeyBuffer =
-      ecdsa.publicKeyCreate(key = privateKey.bytes,
-                            compressed = privateKey.isCompressed)
-    ECPublicKey.fromBytes(pubKeyBuffer)
+      ecdsa.publicKeyCreate(key = buffer, compressed = privateKey.isCompressed)
+    val privKeyByteVec = CryptoJsUtil.toByteVector(pubKeyBuffer)
+    ECPublicKey.fromBytes(privKeyByteVec)
   }
 
   override def sha256(bytes: ByteVector): Sha256Digest = {
+    val buffer = CryptoJsUtil.toNodeBuffer(bytes)
     sha256.init()
-    sha256.update(bytes)
-    val hashBytes = sha256.`final`()
-    Sha256Digest.fromBytes(hashBytes)
+    sha256.update(buffer)
+    val hashBuffer = sha256.`final`()
+    val hashByteVec = CryptoJsUtil.toByteVector(hashBuffer)
+    Sha256Digest.fromBytes(hashByteVec)
   }
 
   /** Generates a 32 byte private key */
   override def freshPrivateKey: ECPrivateKey = {
     val keyBytes = ecdsa.privateKeyGenerate()
-    ECPrivateKey.fromBytes(keyBytes)
+    val byteVec = CryptoJsUtil.toByteVector(keyBytes)
+    ECPrivateKey.fromBytes(byteVec)
   }
 
   override def sha1(bytes: ByteVector): Sha1Digest = {
+    val buffer = CryptoJsUtil.toNodeBuffer(bytes)
     sha1.init()
-    sha1.update(bytes)
-    val hashBytes = sha1.`final`()
-    Sha1Digest.fromBytes(hashBytes)
+    sha1.update(buffer)
+    val hashBuffer = sha1.`final`()
+    val hashByteVec = CryptoJsUtil.toByteVector(hashBuffer)
+    val result = Sha1Digest.fromBytes(hashByteVec)
+    result
   }
 
   override def hmac512(key: ByteVector, data: ByteVector): ByteVector = {
-    hmac.init(key)
-    hmac.update(data)
-    hmac.`final`()
+    val keyBuffer = CryptoJsUtil.toNodeBuffer(key)
+    val dataBuffer = CryptoJsUtil.toNodeBuffer(data)
+    hmac.init(keyBuffer)
+    hmac.update(dataBuffer)
+    val result = hmac.`final`()
+    CryptoJsUtil.toByteVector(result)
   }
 
   override def normalize(str: String): String =
@@ -107,34 +132,45 @@ trait BCryptoCryptoRuntime extends CryptoRuntime {
   override def recoverPublicKey(
       signature: ECDigitalSignature,
       message: ByteVector): (ECPublicKey, ECPublicKey) = {
+    val msgBuffer = CryptoJsUtil.toNodeBuffer(message)
+    val sigBuffer = CryptoJsUtil.toNodeBuffer(signature.bytes)
     val keyBytes =
       if (signature.isDEREncoded)
-        ecdsa.recoverDER(message, signature.bytes, param = 0, compress = true)
+        ecdsa.recoverDER(msgBuffer, sigBuffer, param = 0, compress = true)
       else
-        ecdsa.recover(message, signature.bytes, param = 0, compress = true)
-    val key = ECPublicKey.fromBytes(keyBytes)
+        ecdsa.recover(msgBuffer, sigBuffer, param = 0, compress = true)
+
+    val keyByteVec = CryptoJsUtil.toByteVector(keyBytes)
+    val key = ECPublicKey.fromBytes(keyByteVec)
 
     val keyBytesWithSign =
       if (signature.isDEREncoded)
-        ecdsa.recoverDER(message, signature.bytes, param = 1, compress = true)
+        ecdsa.recoverDER(msgBuffer, sigBuffer, param = 1, compress = true)
       else
-        ecdsa.recover(message, signature.bytes, param = 1, compress = true)
-    val keyWithSign = ECPublicKey.fromBytes(keyBytesWithSign)
+        ecdsa.recover(msgBuffer, sigBuffer, param = 1, compress = true)
+
+    val keyWithSignByteVec = CryptoJsUtil.toByteVector(keyBytesWithSign)
+    val keyWithSign = ECPublicKey.fromBytes(keyWithSignByteVec)
 
     (key, keyWithSign)
   }
 
   override def publicKey(privateKey: ECPrivateKey): ECPublicKey = {
-    val buffer =
-      ecdsa.publicKeyCreate(privateKey.bytes, privateKey.isCompressed)
-    ECPublicKey.fromBytes(buffer)
+    val buffer = CryptoJsUtil.toNodeBuffer(privateKey.bytes)
+    val bufferPubKey =
+      ecdsa.publicKeyCreate(buffer, privateKey.isCompressed)
+    val byteVec = CryptoJsUtil.toByteVector(bufferPubKey)
+    ECPublicKey.fromBytes(byteVec)
   }
 
   override def sign(
       privateKey: ECPrivateKey,
       dataToSign: ByteVector): ECDigitalSignature = {
-    val buffer = ecdsa.signDER(dataToSign, privateKey.bytes)
-    ECDigitalSignature.fromFrontOfBytes(buffer)
+    val privBuffer = CryptoJsUtil.toNodeBuffer(privateKey.bytes)
+    val dataBuffer = CryptoJsUtil.toNodeBuffer(dataToSign)
+    val buffer = ecdsa.signDER(dataBuffer, privBuffer)
+    val byteVec = CryptoJsUtil.toByteVector(buffer)
+    ECDigitalSignature.fromFrontOfBytes(byteVec)
   }
 
   override def signWithEntropy(
@@ -142,29 +178,40 @@ trait BCryptoCryptoRuntime extends CryptoRuntime {
       bytes: ByteVector,
       entropy: ByteVector): ECDigitalSignature = ???
 
-  override def secKeyVerify(privateKeybytes: ByteVector): Boolean =
-    ecdsa.privateKeyVerify(privateKeybytes)
+  override def secKeyVerify(privateKeybytes: ByteVector): Boolean = {
+    val buffer = CryptoJsUtil.toNodeBuffer(privateKeybytes)
+    ecdsa.privateKeyVerify(buffer)
+  }
 
   override def verify(
       publicKey: ECPublicKey,
       data: ByteVector,
       signature: ECDigitalSignature): Boolean = {
+    val dataBuffer = CryptoJsUtil.toNodeBuffer(data)
+    val sigBuffer = CryptoJsUtil.toNodeBuffer(signature.bytes)
+    val pubKeyBuffer = CryptoJsUtil.toNodeBuffer(publicKey.bytes)
     if (signature.isDEREncoded) {
-      ecdsa.verifyDER(data, signature.bytes, publicKey.bytes)
+      ecdsa.verifyDER(dataBuffer, sigBuffer, pubKeyBuffer)
     } else {
-      ecdsa.verify(data, signature.bytes, publicKey.bytes)
+      ecdsa.verify(dataBuffer, sigBuffer, pubKeyBuffer)
     }
   }
 
   override def tweakMultiply(
       publicKey: ECPublicKey,
       tweak: FieldElement): ECPublicKey = {
-    val keyBuffer = ecdsa.publicKeyTweakMul(publicKey.bytes, tweak.bytes, true)
-    ECPublicKey.fromBytes(keyBuffer)
+    val pubKeyBuffer = CryptoJsUtil.toNodeBuffer(publicKey.bytes)
+    val tweakBuffer = CryptoJsUtil.toNodeBuffer(tweak.bytes)
+    val keyBuffer = ecdsa.publicKeyTweakMul(pubKeyBuffer, tweakBuffer, true)
+    val keyByteVec = CryptoJsUtil.toByteVector(keyBuffer)
+    ECPublicKey.fromBytes(keyByteVec)
   }
 
-  def publicKeyConvert(buffer: ByteVector, compressed: Boolean): ByteVector =
-    publicKeyConvert(toNodeBuffer(buffer), compressed)
+  def publicKeyConvert(buffer: ByteVector, compressed: Boolean): ByteVector = {
+    val pubKeyBuffer =
+      publicKeyConvert(CryptoJsUtil.toNodeBuffer(buffer), compressed)
+    CryptoJsUtil.toByteVector(pubKeyBuffer)
+  }
 
   def publicKeyConvert(buffer: Buffer, compressed: Boolean): Buffer =
     ecdsa.publicKeyConvert(buffer, compressed)
@@ -175,18 +222,21 @@ trait BCryptoCryptoRuntime extends CryptoRuntime {
     ECPublicKey(publicKeyConvert(key.bytes, compressed))
 
   override def add(pk1: ECPublicKey, pk2: ECPublicKey): ECPublicKey = {
+    val pk1Buffer = CryptoJsUtil.toNodeBuffer(pk1.bytes)
+    val pk2Buffer = CryptoJsUtil.toNodeBuffer(pk2.bytes)
     try {
       val keyBuffer =
-        ecdsa.publicKeyCombine(js.Array(pk1.bytes, pk2.bytes), true)
-      ECPublicKey.fromBytes(keyBuffer)
+        ecdsa.publicKeyCombine(js.Array(pk1Buffer, pk2Buffer), true)
+      val keyBytes = CryptoJsUtil.toByteVector(keyBuffer)
+      ECPublicKey.fromBytes(keyBytes)
     } catch {
       case ex: JavaScriptException =>
         // check for infinity
-        val k1: Buffer =
+        val k1: ByteVector =
           if (pk1.isCompressed) pk1.bytes
           else publicKeyConvert(pk1.bytes, compressed = true)
 
-        val k2: Buffer =
+        val k2: ByteVector =
           if (pk2.isCompressed) pk2.bytes
           else publicKeyConvert(pk2.bytes, compressed = true)
 
@@ -205,55 +255,33 @@ trait BCryptoCryptoRuntime extends CryptoRuntime {
   override def pubKeyTweakAdd(
       pubkey: ECPublicKey,
       privkey: ECPrivateKey): ECPublicKey = {
-    val keyBuffer = ecdsa.publicKeyTweakAdd(pubkey.bytes, privkey.bytes, true)
-    ECPublicKey.fromBytes(keyBuffer)
+    val pubKeyBuffer = CryptoJsUtil.toNodeBuffer(pubkey.bytes)
+    val privKeyBuffer = CryptoJsUtil.toNodeBuffer(privkey.bytes)
+    val keyBuffer = ecdsa.publicKeyTweakAdd(pubKeyBuffer, privKeyBuffer, true)
+    val keyByteVec = CryptoJsUtil.toByteVector(keyBuffer)
+    ECPublicKey.fromBytes(keyByteVec)
   }
 
-  override def isValidPubKey(bytes: ByteVector): Boolean =
-    ecdsa.publicKeyVerify(bytes)
+  override def isValidPubKey(bytes: ByteVector): Boolean = {
+    val buffer = CryptoJsUtil.toNodeBuffer(bytes)
+    ecdsa.publicKeyVerify(buffer)
+  }
 
   override def sipHash(item: ByteVector, key: SipHashKey): Long = {
-    val siphash = SipHash.siphash(item, key.bytes)
+    val itemBuffer = CryptoJsUtil.toNodeBuffer(item)
+    val keyBuffer = CryptoJsUtil.toNodeBuffer(key.bytes)
+    val siphash = SipHash.siphash(itemBuffer, keyBuffer)
     val hi = (siphash(0).toLong & 0x00000000ffffffffL) << 32
     val lo = siphash(1).toLong & 0x00000000ffffffffL
     hi | lo
   }
 
-  private def toNodeBuffer(byteVector: ByteVector): Buffer = {
-    //the implicit used here is this
-    //https://github.com/scala-js/scala-js/blob/b5a93bb99a0b0b5044141d4b2871ea260ef17798/library/src/main/scala/scala/scalajs/js/typedarray/package.scala#L33
-    Buffer.from(byteVector.toArray.toTypedArray.buffer)
-  }
-
-  private def toByteVector(buffer: Buffer): ByteVector =
-    toByteVector(buffer, buffer.length)
-
-  private def toByteVector(buffer: Buffer, len: Int): ByteVector = {
-    //is this right?
-    val iter: js.Iterator[Int] = buffer.values()
-
-    val accum = new scala.collection.mutable.ArrayBuffer[Int](len)
-
-    var done = false
-    while (!done) {
-      val entry = iter.next()
-      if (entry.done) {
-        done = true
-      } else {
-        accum += entry.value
-      }
-    }
-    require(accum.length == len,
-            s"Need $len bytes for buffer -> bytevector conversion")
-    ByteVector(accum.map(_.toByte))
-  }
-
   override def decodePoint(bytes: ByteVector): ECPoint = {
     if (bytes.size == 1 && bytes(0) == 0x00) {
       ECPointInfinity
     } else {
       val decoded = ecdsa.curve
-        .applyDynamic("decodePoint")(toNodeBuffer(bytes))
+        .applyDynamic("decodePoint")(CryptoJsUtil.toNodeBuffer(bytes))
         .asInstanceOf[Point]
 
       if (decoded.isInfinity())
diff --git a/crypto/.js/src/main/scala/org/bitcoins/crypto/CryptoJsUtil.scala b/crypto/.js/src/main/scala/org/bitcoins/crypto/CryptoJsUtil.scala
new file mode 100644
index 0000000000..0de05b5c04
--- /dev/null
+++ b/crypto/.js/src/main/scala/org/bitcoins/crypto/CryptoJsUtil.scala
@@ -0,0 +1,39 @@
+package org.bitcoins.crypto
+
+import org.bitcoins.crypto.facade.Buffer
+import scodec.bits.ByteVector
+
+import scala.scalajs.js
+import scala.scalajs.js.typedarray.AB2TA
+
+object CryptoJsUtil {
+
+  def toByteVector(buffer: Buffer): ByteVector =
+    toByteVector(buffer, buffer.length)
+
+  def toByteVector(buffer: Buffer, len: Int): ByteVector = {
+    //is this right?
+    val iter: js.Iterator[Int] = buffer.values()
+
+    val accum = new scala.collection.mutable.ArrayBuffer[Int](len)
+
+    var done = false
+    while (!done) {
+      val entry = iter.next()
+      if (entry.done) {
+        done = true
+      } else {
+        accum += entry.value
+      }
+    }
+    require(accum.length == len,
+            s"Need $len bytes for buffer -> bytevector conversion")
+    ByteVector(accum.map(_.toByte))
+  }
+
+  def toNodeBuffer(byteVector: ByteVector): Buffer = {
+    //the implicit used here is this
+    //https://github.com/scala-js/scala-js/blob/b5a93bb99a0b0b5044141d4b2871ea260ef17798/library/src/main/scala/scala/scalajs/js/typedarray/package.scala#L33
+    Buffer.from(byteVector.toArray.toTypedArray.buffer)
+  }
+}
diff --git a/crypto/.js/src/main/scala/org/bitcoins/crypto/Hasher.scala b/crypto/.js/src/main/scala/org/bitcoins/crypto/Hasher.scala
index 336f7ac317..6cf5247567 100644
--- a/crypto/.js/src/main/scala/org/bitcoins/crypto/Hasher.scala
+++ b/crypto/.js/src/main/scala/org/bitcoins/crypto/Hasher.scala
@@ -1,5 +1,7 @@
 package org.bitcoins.crypto
 
+import org.bitcoins.crypto.facade.Buffer
+
 import scala.scalajs.js
 
 /** All hash classes in bcrypto have this structure */
diff --git a/crypto/.js/src/main/scala/org/bitcoins/crypto/Buffer.scala b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/Buffer.scala
similarity index 99%
rename from crypto/.js/src/main/scala/org/bitcoins/crypto/Buffer.scala
rename to crypto/.js/src/main/scala/org/bitcoins/crypto/facade/Buffer.scala
index eeb1a716c4..6837d59b9d 100644
--- a/crypto/.js/src/main/scala/org/bitcoins/crypto/Buffer.scala
+++ b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/Buffer.scala
@@ -1,4 +1,4 @@
-package org.bitcoins.crypto
+package org.bitcoins.crypto.facade
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.{JSBracketAccess, JSGlobal, JSImport}
diff --git a/crypto/.js/src/main/scala/org/bitcoins/crypto/ECDSA.scala b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/ECDSA.scala
similarity index 97%
rename from crypto/.js/src/main/scala/org/bitcoins/crypto/ECDSA.scala
rename to crypto/.js/src/main/scala/org/bitcoins/crypto/facade/ECDSA.scala
index 0f9a0eb96f..a01ca66206 100644
--- a/crypto/.js/src/main/scala/org/bitcoins/crypto/ECDSA.scala
+++ b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/ECDSA.scala
@@ -1,4 +1,4 @@
-package org.bitcoins.crypto
+package org.bitcoins.crypto.facade
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation._
diff --git a/crypto/.js/src/main/scala/org/bitcoins/crypto/HMAC.scala b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/HMAC.scala
similarity index 89%
rename from crypto/.js/src/main/scala/org/bitcoins/crypto/HMAC.scala
rename to crypto/.js/src/main/scala/org/bitcoins/crypto/facade/HMAC.scala
index 5a24da70de..8666004212 100644
--- a/crypto/.js/src/main/scala/org/bitcoins/crypto/HMAC.scala
+++ b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/HMAC.scala
@@ -1,4 +1,4 @@
-package org.bitcoins.crypto
+package org.bitcoins.crypto.facade
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
diff --git a/crypto/.js/src/main/scala/org/bitcoins/crypto/Hash160.scala b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/Hash160.scala
similarity index 85%
rename from crypto/.js/src/main/scala/org/bitcoins/crypto/Hash160.scala
rename to crypto/.js/src/main/scala/org/bitcoins/crypto/facade/Hash160.scala
index 0b1d955e38..8d28a1127c 100644
--- a/crypto/.js/src/main/scala/org/bitcoins/crypto/Hash160.scala
+++ b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/Hash160.scala
@@ -1,4 +1,6 @@
-package org.bitcoins.crypto
+package org.bitcoins.crypto.facade
+
+import org.bitcoins.crypto.Hasher
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation._
diff --git a/crypto/.js/src/main/scala/org/bitcoins/crypto/Point.scala b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/Point.scala
similarity index 100%
rename from crypto/.js/src/main/scala/org/bitcoins/crypto/Point.scala
rename to crypto/.js/src/main/scala/org/bitcoins/crypto/facade/Point.scala
diff --git a/crypto/.js/src/main/scala/org/bitcoins/crypto/Random.scala b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/Random.scala
similarity index 91%
rename from crypto/.js/src/main/scala/org/bitcoins/crypto/Random.scala
rename to crypto/.js/src/main/scala/org/bitcoins/crypto/facade/Random.scala
index 74df6e83b8..cb6a525ae0 100644
--- a/crypto/.js/src/main/scala/org/bitcoins/crypto/Random.scala
+++ b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/Random.scala
@@ -1,4 +1,4 @@
-package org.bitcoins.crypto
+package org.bitcoins.crypto.facade
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation._
diff --git a/crypto/.js/src/main/scala/org/bitcoins/crypto/RipeMd160.scala b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/RipeMd160.scala
similarity index 86%
rename from crypto/.js/src/main/scala/org/bitcoins/crypto/RipeMd160.scala
rename to crypto/.js/src/main/scala/org/bitcoins/crypto/facade/RipeMd160.scala
index c17da6785f..d2ce26e4a6 100644
--- a/crypto/.js/src/main/scala/org/bitcoins/crypto/RipeMd160.scala
+++ b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/RipeMd160.scala
@@ -1,4 +1,6 @@
-package org.bitcoins.crypto
+package org.bitcoins.crypto.facade
+
+import org.bitcoins.crypto.Hasher
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation._
diff --git a/crypto/.js/src/main/scala/org/bitcoins/crypto/SHA1.scala b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/SHA1.scala
similarity index 80%
rename from crypto/.js/src/main/scala/org/bitcoins/crypto/SHA1.scala
rename to crypto/.js/src/main/scala/org/bitcoins/crypto/facade/SHA1.scala
index cc8345f538..21ac6210d4 100644
--- a/crypto/.js/src/main/scala/org/bitcoins/crypto/SHA1.scala
+++ b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/SHA1.scala
@@ -1,4 +1,6 @@
-package org.bitcoins.crypto
+package org.bitcoins.crypto.facade
+
+import org.bitcoins.crypto.Hasher
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation._
diff --git a/crypto/.js/src/main/scala/org/bitcoins/crypto/SHA256.scala b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/SHA256.scala
similarity index 94%
rename from crypto/.js/src/main/scala/org/bitcoins/crypto/SHA256.scala
rename to crypto/.js/src/main/scala/org/bitcoins/crypto/facade/SHA256.scala
index 65d1e78e22..161d494d56 100644
--- a/crypto/.js/src/main/scala/org/bitcoins/crypto/SHA256.scala
+++ b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/SHA256.scala
@@ -1,4 +1,6 @@
-package org.bitcoins.crypto
+package org.bitcoins.crypto.facade
+
+import org.bitcoins.crypto.Hasher
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation._
diff --git a/crypto/.js/src/main/scala/org/bitcoins/crypto/SHA512.scala b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/SHA512.scala
similarity index 95%
rename from crypto/.js/src/main/scala/org/bitcoins/crypto/SHA512.scala
rename to crypto/.js/src/main/scala/org/bitcoins/crypto/facade/SHA512.scala
index 212b79a1e4..1cf659bcbb 100644
--- a/crypto/.js/src/main/scala/org/bitcoins/crypto/SHA512.scala
+++ b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/SHA512.scala
@@ -1,4 +1,6 @@
-package org.bitcoins.crypto
+package org.bitcoins.crypto.facade
+
+import org.bitcoins.crypto.Hasher
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation._
diff --git a/crypto/.js/src/main/scala/org/bitcoins/crypto/SipHash.scala b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/SipHash.scala
similarity index 87%
rename from crypto/.js/src/main/scala/org/bitcoins/crypto/SipHash.scala
rename to crypto/.js/src/main/scala/org/bitcoins/crypto/facade/SipHash.scala
index 4e915a339b..5f14442ce0 100644
--- a/crypto/.js/src/main/scala/org/bitcoins/crypto/SipHash.scala
+++ b/crypto/.js/src/main/scala/org/bitcoins/crypto/facade/SipHash.scala
@@ -1,4 +1,4 @@
-package org.bitcoins.crypto
+package org.bitcoins.crypto.facade
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport