build(deps): specify exact versions of ecdsa_fun, sigma_fun, and bitcoin-harness

.github/workflows/ci.yml

@@ -19,8 +19,6 @@ jobs:
 
       - name: Check formatting
         uses: dprint/check@v2.1
-        with:
-          dprint-version: 0.30.3
 
       - name: Run clippy with default features
         run: cargo clippy --workspace --all-targets -- -D warnings

Cargo.lock

@@ -259,7 +259,7 @@ checksum = "3face7de38293a2f7e2a9f69a48b442f28e864da0fc7a6a977388e31bdc367d7"
 dependencies = [
  "async-trait",
  "bdk-macros",
- "bitcoin 0.27.1",
+ "bitcoin",
  "electrum-client",
  "js-sys",
  "log",
@@ -300,6 +300,15 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc0455254eb5c6964c4545d8bac815e1a1be4f3afe0ae695ea539c12d728d44b"
 
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -324,37 +333,26 @@ dependencies = [
  "base64-compat",
  "bech32",
  "bitcoin_hashes",
- "secp256k1 0.20.3",
- "serde",
-]
-
-[[package]]
-name = "bitcoin"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05bba324e6baf655b882df672453dbbc527bc938cadd27750ae510aaccc3a66a"
-dependencies = [
- "bech32",
- "bitcoin_hashes",
- "secp256k1 0.22.1",
+ "secp256k1",
  "serde",
 ]
 
 [[package]]
 name = "bitcoin-harness"
-version = "0.2.1"
-source = "git+https://github.com/coblox/bitcoin-harness-rs#bb513903f1a6bafb7470f97254ba4f04c0afce21"
+version = "0.2.0"
+source = "git+https://github.com/coblox/bitcoin-harness-rs?rev=53bdc62a98b9a1e0debb06ab3a4239df1bfe4e04#53bdc62a98b9a1e0debb06ab3a4239df1bfe4e04"
 dependencies = [
+ "async-trait",
  "base64 0.12.3",
- "bitcoin 0.28.1",
+ "bitcoin",
  "bitcoincore-rpc-json",
  "futures",
  "hex",
- "jsonrpc_client",
+ "jsonrpc_client 0.5.1",
  "reqwest",
  "serde",
  "serde_json",
- "testcontainers 0.14.0",
+ "testcontainers 0.11.0",
  "thiserror",
  "tokio",
  "tracing",
@@ -372,11 +370,11 @@ dependencies = [
 
 [[package]]
 name = "bitcoincore-rpc-json"
-version = "0.15.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e2ae16202721ba8c3409045681fac790a5ddc791f05731a2df22c0c6bffc0f1"
+checksum = "dce91de73c61f5776cf938bfa88378c5b404a70e3369b761dacbe6024fea79dd"
 dependencies = [
- "bitcoin 0.28.1",
+ "bitcoin",
  "serde",
  "serde_json",
 ]
@@ -433,17 +431,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "bollard-stubs"
-version = "1.41.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed2f2e73fffe9455141e170fb9c1feb0ac521ec7e7dcd47a7cab72a658490fb8"
-dependencies = [
- "chrono",
- "serde",
- "serde_with",
-]
-
 [[package]]
 name = "bs58"
 version = "0.4.0"
@@ -548,12 +535,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
 dependencies = [
  "iana-time-zone",
- "js-sys",
  "num-integer",
  "num-traits",
- "serde",
- "time 0.1.44",
- "wasm-bindgen",
  "winapi",
 ]
 
@@ -948,6 +931,17 @@ version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
 
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.17"
@@ -989,7 +983,6 @@ checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
 dependencies = [
  "block-buffer 0.10.3",
  "crypto-common",
- "subtle",
 ]
 
 [[package]]
@@ -1027,11 +1020,14 @@ checksum = "f8a6eee2d5d0d113f015688310da018bd1d864d86bd567c8fca9c266889e1bfa"
 
 [[package]]
 name = "ecdsa_fun"
-version = "0.7.1"
-source = "git+https://github.com/LLFourn/secp256kfun#b511ab5f83aa0ae21f10460ada56f535ad3a6d57"
+version = "0.6.2-alpha.0"
+source = "git+https://github.com/LLFourn/secp256kfun?rev=84134daf34845434d7f38cdae7ffc31730a3b1e9#84134daf34845434d7f38cdae7ffc31730a3b1e9"
 dependencies = [
+ "bincode",
+ "rand_chacha 0.3.1",
  "secp256kfun",
  "serde",
+ "sigma_fun",
 ]
 
 [[package]]
@@ -1072,7 +1068,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edd12f125852d77980725243b2a8b3bea73cd4c7a22c33bc52b08b664c561dc7"
 dependencies = [
- "bitcoin 0.27.1",
+ "bitcoin",
  "log",
  "rustls 0.16.0",
  "serde",
@@ -1524,31 +1520,32 @@ checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
 
 [[package]]
 name = "hmac"
-version = "0.10.1"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15"
+checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840"
 dependencies = [
- "crypto-mac 0.10.1",
+ "crypto-mac 0.8.0",
  "digest 0.9.0",
 ]
 
 [[package]]
 name = "hmac"
-version = "0.11.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
+checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15"
 dependencies = [
- "crypto-mac 0.11.1",
+ "crypto-mac 0.10.1",
  "digest 0.9.0",
 ]
 
 [[package]]
 name = "hmac"
-version = "0.12.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
 dependencies = [
- "digest 0.10.5",
+ "crypto-mac 0.11.1",
+ "digest 0.9.0",
 ]
 
 [[package]]
@@ -1778,6 +1775,20 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "jsonrpc_client"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc8515639023bf4260cf89475355fa77301685418f655c680528c380759e7782"
+dependencies = [
+ "async-trait",
+ "jsonrpc_client_macro 0.2.0",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "url",
+]
+
 [[package]]
 name = "jsonrpc_client"
 version = "0.7.1"
@@ -1785,13 +1796,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0c1ec33c537dc1d5a8b597313db6d213fee54320f81ea0d19b0c3869b282e1a"
 dependencies = [
  "async-trait",
- "jsonrpc_client_macro",
+ "jsonrpc_client_macro 0.3.0",
  "reqwest",
  "serde",
  "serde_json",
  "url",
 ]
 
+[[package]]
+name = "jsonrpc_client_macro"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5f3d1e50fefe4252d2e44c805663e73a8c0b2002b73f834ea055c8ed7fc46a8"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "jsonrpc_client_macro"
 version = "0.3.0"
@@ -2276,7 +2297,7 @@ version = "6.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e292b58407dfbf1384e5aca8428d3b0f2eaa09d24cb17088f6db0b7ca31194a"
 dependencies = [
- "bitcoin 0.27.1",
+ "bitcoin",
  "serde",
 ]
 
@@ -2372,7 +2393,7 @@ dependencies = [
  "curve25519-dalek",
  "hex",
  "hex-literal",
- "jsonrpc_client",
+ "jsonrpc_client 0.7.1",
  "monero",
  "monero-epee-bin-serde",
  "rand 0.7.3",
@@ -3553,17 +3574,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97d03ceae636d0fed5bae6a7f4f664354c5f4fcedf6eef053fef17e49f837d0a"
 dependencies = [
  "rand 0.6.5",
- "secp256k1-sys 0.4.2",
- "serde",
-]
-
-[[package]]
-name = "secp256k1"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26947345339603ae8395f68e2f3d85a6b0a8ddfe6315818e80b8504415099db0"
-dependencies = [
- "secp256k1-sys 0.5.2",
+ "secp256k1-sys",
  "serde",
 ]
 
@@ -3577,23 +3588,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "secp256k1-sys"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "152e20a0fd0519390fc43ab404663af8a0b794273d2a91d60ad4a39f13ffe110"
+name = "secp256kfun"
+version = "0.6.2-alpha.0"
+source = "git+https://github.com/LLFourn/secp256kfun?rev=84134daf34845434d7f38cdae7ffc31730a3b1e9#84134daf34845434d7f38cdae7ffc31730a3b1e9"
 dependencies = [
- "cc",
+ "digest 0.9.0",
+ "rand_core 0.6.4",
+ "secp256k1",
+ "secp256kfun_parity_backend",
+ "serde",
+ "subtle-ng",
 ]
 
 [[package]]
-name = "secp256kfun"
-version = "0.7.1"
-source = "git+https://github.com/LLFourn/secp256kfun#b511ab5f83aa0ae21f10460ada56f535ad3a6d57"
+name = "secp256kfun_parity_backend"
+version = "0.1.6-alpha.0"
+source = "git+https://github.com/LLFourn/secp256kfun?rev=84134daf34845434d7f38cdae7ffc31730a3b1e9#84134daf34845434d7f38cdae7ffc31730a3b1e9"
 dependencies = [
- "digest 0.10.5",
- "rand_core 0.6.4",
- "secp256k1 0.22.1",
- "serde",
+ "crunchy",
  "subtle-ng",
 ]
 
@@ -3788,11 +3800,11 @@ dependencies = [
 
 [[package]]
 name = "sigma_fun"
-version = "0.4.1"
-source = "git+https://github.com/LLFourn/secp256kfun#b511ab5f83aa0ae21f10460ada56f535ad3a6d57"
+version = "0.3.2-alpha.0"
+source = "git+https://github.com/LLFourn/secp256kfun?rev=84134daf34845434d7f38cdae7ffc31730a3b1e9#84134daf34845434d7f38cdae7ffc31730a3b1e9"
 dependencies = [
  "curve25519-dalek-ng",
- "digest 0.10.5",
+ "digest 0.9.0",
  "generic-array",
  "rand_core 0.6.4",
  "secp256kfun",
@@ -4160,7 +4172,7 @@ dependencies = [
  "base64 0.13.1",
  "bdk",
  "big-bytes",
- "bitcoin 0.27.1",
+ "bitcoin",
  "bitcoin-harness",
  "bmrng",
  "comfy-table",
@@ -4280,14 +4292,15 @@ dependencies = [
 
 [[package]]
 name = "testcontainers"
-version = "0.12.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5e3ed6e3598dbf32cba8cb356b881c085e0adea57597f387723430dd94b4084"
+checksum = "959ba8f27f326db356678cb5d6ac8a418f3cb9c1ad2d677c1fe8d3afb9056d46"
 dependencies = [
+ "derivative",
  "hex",
- "hmac 0.10.1",
+ "hmac 0.8.1",
  "log",
- "rand 0.8.5",
+ "rand 0.7.3",
  "serde",
  "serde_json",
  "sha2 0.9.9",
@@ -4295,19 +4308,17 @@ dependencies = [
 
 [[package]]
 name = "testcontainers"
-version = "0.14.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e2b1567ca8a2b819ea7b28c92be35d9f76fb9edb214321dcc86eb96023d1f87"
+checksum = "d5e3ed6e3598dbf32cba8cb356b881c085e0adea57597f387723430dd94b4084"
 dependencies = [
- "bollard-stubs",
- "futures",
  "hex",
- "hmac 0.12.1",
+ "hmac 0.10.1",
  "log",
  "rand 0.8.5",
  "serde",
  "serde_json",
- "sha2 0.10.6",
+ "sha2 0.9.9",
 ]
 
 [[package]]

swap/Cargo.toml

@@ -26,7 +26,7 @@ curve25519-dalek = { package = "curve25519-dalek-ng", version = "4" }
 data-encoding = "2.3"
 dialoguer = "0.10"
 directories-next = "2"
-ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", default-features = false, features = [ "libsecp_compat", "serde" ] }
+ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", rev = "84134daf34845434d7f38cdae7ffc31730a3b1e9", default-features = false, features = [ "libsecp_compat", "serde" ] }
 ed25519-dalek = "1"
 futures = { version = "0.3", default-features = false }
 hex = "0.4"
@@ -47,7 +47,7 @@ serde_cbor = "0.11"
 serde_json = "1"
 serde_with = { version = "1", features = [ "macros" ] }
 sha2 = "0.9"
-sigma_fun = { git = "https://github.com/LLFourn/secp256kfun", default-features = false, features = [ "ed25519", "serde" ] }
+sigma_fun = { git = "https://github.com/LLFourn/secp256kfun", rev = "84134daf34845434d7f38cdae7ffc31730a3b1e9", default-features = false, features = [ "ed25519", "serde" ] }
 sqlx = { version = "0.5", features = [ "sqlite", "runtime-tokio-rustls", "offline" ] }
 structopt = "0.3"
 strum = { version = "0.24", features = [ "derive" ] }
@@ -74,7 +74,7 @@ tokio-tar = "0.3"
 zip = "0.5"
 
 [dev-dependencies]
-bitcoin-harness = { git = "https://github.com/coblox/bitcoin-harness-rs" }
+bitcoin-harness = { git = "https://github.com/coblox/bitcoin-harness-rs", rev = "53bdc62a98b9a1e0debb06ab3a4239df1bfe4e04" }
 get-port = "3"
 hyper = "0.14"
 monero-harness = { path = "../monero-harness" }