From 5c19684f8314bb8ef200eda950536bb89204e767 Mon Sep 17 00:00:00 2001
From: raphjaph <raphjaph@protonmail.com>
Date: Tue, 6 Aug 2024 16:51:32 -0400
Subject: [PATCH] Compiling works

---
 Cargo.lock     | 17 -----------------
 Cargo.toml     |  2 +-
 www/Cargo.lock | 19 -------------------
 www/Cargo.toml |  3 +++
 www/justfile   |  5 ++++-
 5 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7c1eb0a..85614b3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -40,7 +40,6 @@ dependencies = [
  "bech32",
  "bitcoin-internals",
  "bitcoin_hashes 0.13.0",
- "bitcoinconsensus",
  "hex-conservative 0.1.2",
  "hex_lit",
  "secp256k1",
@@ -78,16 +77,6 @@ dependencies = [
  "hex-conservative 0.2.1",
 ]
 
-[[package]]
-name = "bitcoinconsensus"
-version = "0.20.2-0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54505558b77e0aa21b2491a7b39cbae9db22ac8b1bc543ef4600edb762306f9c"
-dependencies = [
- "cc",
- "libc",
-]
-
 [[package]]
 name = "cc"
 version = "1.1.6"
@@ -121,12 +110,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
 
-[[package]]
-name = "libc"
-version = "0.2.155"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-
 [[package]]
 name = "miniscript"
 version = "11.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 0fd39cf..4a67417 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ license = "CC0-1.0"
 
 [dependencies]
 base64 = "0.22.1"
-bitcoin = { version =  "0.31.2", features = ["bitcoinconsensus"] }
+bitcoin = { version =  "0.31.2" }
 bitcoin_hashes = "0.14.0"
 hex = "0.4.3"
 miniscript = "11.0.0"
diff --git a/www/Cargo.lock b/www/Cargo.lock
index 791626c..a382de4 100644
--- a/www/Cargo.lock
+++ b/www/Cargo.lock
@@ -23,8 +23,6 @@ checksum = "98f7eed2b2781a6f0b5c903471d48e15f56fb4e1165df8a9a2337fd1a59d45ea"
 [[package]]
 name = "bip322"
 version = "0.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea198cb6bc6f443099b9628a60b02183cd3d1ea1d3cd172f890f90196c44d00"
 dependencies = [
  "base64",
  "bitcoin",
@@ -42,7 +40,6 @@ dependencies = [
  "bech32",
  "bitcoin-internals",
  "bitcoin_hashes 0.13.0",
- "bitcoinconsensus",
  "hex-conservative 0.1.2",
  "hex_lit",
  "secp256k1",
@@ -80,16 +77,6 @@ dependencies = [
  "hex-conservative 0.2.1",
 ]
 
-[[package]]
-name = "bitcoinconsensus"
-version = "0.20.2-0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54505558b77e0aa21b2491a7b39cbae9db22ac8b1bc543ef4600edb762306f9c"
-dependencies = [
- "cc",
- "libc",
-]
-
 [[package]]
 name = "bumpalo"
 version = "3.16.0"
@@ -135,12 +122,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
 
-[[package]]
-name = "libc"
-version = "0.2.155"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-
 [[package]]
 name = "log"
 version = "0.4.22"
diff --git a/www/Cargo.toml b/www/Cargo.toml
index 8818913..a85130a 100644
--- a/www/Cargo.toml
+++ b/www/Cargo.toml
@@ -9,3 +9,6 @@ crate-type = ["cdylib"]
 [dependencies]
 bip322 = "0.0.2"
 wasm-bindgen = "0.2.92"
+
+[patch.crates-io]
+bip322 = { path = "../" }
diff --git a/www/justfile b/www/justfile
index 38410fe..f82e9d1 100644
--- a/www/justfile
+++ b/www/justfile
@@ -1,3 +1,6 @@
 wasm:
-  wasm-pack build --target web --no-typescript
+ rustup toolchain install nightly
+ rustup target add wasm32-unknown-unknown --toolchain nightly
+ rustup default nightly-aarch64-apple-darwin
+ AR=/opt/homebrew/opt/llvm/bin/llvm-ar CC=/opt/homebrew/opt/llvm/bin/clang wasm-pack build --target web --no-typescript