diff --git a/Cargo.lock b/Cargo.lock index de6294d121..0a232f29b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -601,6 +601,12 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[package]] +name = "bech32" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" + [[package]] name = "beef" version = "0.5.2" @@ -663,11 +669,26 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +[[package]] +name = "bitcoin" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e99ff7289b20a7385f66a0feda78af2fc119d28fb56aea8886a9cd0a4abdd75" +dependencies = [ + "bech32", + "bitcoin-private", + "bitcoin_hashes 0.12.0", + "core2 0.3.3", + "hex_lit", + "secp256k1 0.27.0", +] + [[package]] name = "bitcoin" version = "1.2.0" dependencies = [ - "bitcoin_hashes", + "bitcoin 0.30.1", + "bitcoin_hashes 0.7.6", "frame-support", "hex", "impl-serde 0.3.2", @@ -681,12 +702,28 @@ dependencies = [ "spin 0.7.1", ] +[[package]] +name = "bitcoin-private" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57" + [[package]] name = "bitcoin_hashes" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b375d62f341cef9cd9e77793ec8f1db3fc9ce2e4d57e982c8fe697a2c16af3b6" +[[package]] +name = "bitcoin_hashes" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d7066118b13d4b20b23645932dfb3a81ce7e29f95726c2036fa33cd7b092501" +dependencies = [ + "bitcoin-private", + "core2 0.3.3", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -858,7 +895,7 @@ checksum = "bd769563b4ea2953e2825c9e6b7470a5f55f67e0be00030bf3e390a2a6071f64" name = "btc-relay" version = "1.2.0" dependencies = [ - "bitcoin", + "bitcoin 1.2.0", "frame-benchmarking", "frame-support", "frame-system", @@ -1083,7 +1120,7 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2" dependencies = [ - "core2", + "core2 0.4.0", "multibase", "multihash 0.16.3", "serde", @@ -1335,6 +1372,15 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +[[package]] +name = "core2" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239fa3ae9b63c2dc74bd3fa852d4792b8b305ae64eeede946265b6af62f1fff3" +dependencies = [ + "memchr", +] + [[package]] name = "core2" version = "0.4.0" @@ -4420,6 +4466,12 @@ dependencies = [ "proc-macro-hack", ] +[[package]] +name = "hex_lit" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd" + [[package]] name = "hkdf" version = "0.12.3" @@ -4770,7 +4822,7 @@ name = "interbtc-parachain" version = "1.2.0" dependencies = [ "async-trait", - "bitcoin", + "bitcoin 1.2.0", "btc-relay-rpc-runtime-api", "clap", "cumulus-client-cli", @@ -4870,7 +4922,7 @@ dependencies = [ name = "interbtc-primitives" version = "1.2.0" dependencies = [ - "bitcoin", + "bitcoin 1.2.0", "bstringify", "parity-scale-codec", "primitive-types", @@ -4947,7 +4999,7 @@ name = "interlay-runtime-parachain" version = "1.2.0" dependencies = [ "annuity", - "bitcoin", + "bitcoin 1.2.0", "btc-relay", "btc-relay-rpc-runtime-api", "clients-info", @@ -5111,7 +5163,7 @@ dependencies = [ name = "issue" version = "1.2.0" dependencies = [ - "bitcoin", + "bitcoin 1.2.0", "btc-relay", "currency", "fee", @@ -5367,7 +5419,7 @@ name = "kintsugi-runtime-parachain" version = "1.2.0" dependencies = [ "annuity", - "bitcoin", + "bitcoin 1.2.0", "btc-relay", "btc-relay-rpc-runtime-api", "clients-info", @@ -6744,7 +6796,7 @@ dependencies = [ "blake2b_simd", "blake2s_simd", "blake3", - "core2", + "core2 0.4.0", "digest 0.10.7", "multihash-derive", "sha2 0.10.7", @@ -6758,7 +6810,7 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" dependencies = [ - "core2", + "core2 0.4.0", "multihash-derive", "unsigned-varint", ] @@ -8637,7 +8689,7 @@ name = "parachain-tests" version = "1.2.0" dependencies = [ "annuity", - "bitcoin", + "bitcoin 1.2.0", "btc-relay", "btc-relay-rpc-runtime-api", "clients-info", @@ -10887,7 +10939,7 @@ dependencies = [ name = "redeem" version = "1.2.0" dependencies = [ - "bitcoin", + "bitcoin 1.2.0", "btc-relay", "currency", "fee", @@ -12978,6 +13030,16 @@ dependencies = [ "secp256k1-sys 0.6.1", ] +[[package]] +name = "secp256k1" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" +dependencies = [ + "bitcoin_hashes 0.12.0", + "secp256k1-sys 0.8.1", +] + [[package]] name = "secp256k1-sys" version = "0.4.0" @@ -12995,6 +13057,15 @@ dependencies = [ "cc", ] +[[package]] +name = "secp256k1-sys" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e" +dependencies = [ + "cc", +] + [[package]] name = "secrecy" version = "0.8.0" @@ -15391,7 +15462,7 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" name = "vault-registry" version = "1.2.0" dependencies = [ - "bitcoin", + "bitcoin 1.2.0", "currency", "fee", "fixed-hash 0.7.0", diff --git a/parachain/runtime/runtime-tests/src/parachain/replace.rs b/parachain/runtime/runtime-tests/src/parachain/replace.rs index 639c6342f8..b9254cd00d 100644 --- a/parachain/runtime/runtime-tests/src/parachain/replace.rs +++ b/parachain/runtime/runtime-tests/src/parachain/replace.rs @@ -551,7 +551,7 @@ fn integration_test_replace_execute_replace_success() { test_with(|old_vault_id, new_vault_id| { let accept_amount = new_vault_id.wrapped(10000); - let (redeem_id, redeem, _issue_id, issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id); + let (redeem_id, redeem, _issue_id, _issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id); let pre_execute_state = ParachainTwoVaultState::get(&old_vault_id, &new_vault_id); @@ -586,7 +586,7 @@ fn integration_test_replace_execute_replace_old_vault_liquidated() { test_with(|old_vault_id, new_vault_id| { let accept_amount = new_vault_id.wrapped(10000); - let (redeem_id, redeem, _issue_id, issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id); + let (redeem_id, redeem, _issue_id, _issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id); let old = CoreVaultData::vault(old_vault_id.clone()); @@ -629,7 +629,7 @@ fn integration_test_replace_execute_replace_new_vault_liquidated() { test_with(|old_vault_id, new_vault_id| { let accept_amount = new_vault_id.wrapped(10000); - let (redeem_id, redeem, _issue_id, issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id); + let (redeem_id, redeem, _issue_id, _issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id); liquidate_vault(&new_vault_id); @@ -657,7 +657,7 @@ fn integration_test_replace_execute_replace_both_vaults_liquidated() { test_with(|old_vault_id, new_vault_id| { let accept_amount = new_vault_id.wrapped(10000); - let (redeem_id, redeem, _issue_id, issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id); + let (redeem_id, redeem, _issue_id, _issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id); let old = CoreVaultData::vault(old_vault_id.clone()); @@ -710,7 +710,7 @@ fn integration_test_replace_execute_replace_with_cancelled() { fn integration_test_replace_cancel_replace_success() { test_with(|old_vault_id, new_vault_id| { let accept_amount = new_vault_id.wrapped(10000); - let (redeem_id, redeem, _issue_id, issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id); + let (redeem_id, redeem, _issue_id, _issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id); let pre_cancellation_state = ParachainTwoVaultState::get(&old_vault_id, &new_vault_id); cancel_replace(redeem_id); @@ -732,7 +732,7 @@ fn integration_test_replace_cancel_replace_success() { fn integration_test_replace_cancel_replace_old_vault_liquidated() { test_with(|old_vault_id, new_vault_id| { let accept_amount = new_vault_id.wrapped(10000); - let (redeem_id, redeem, _issue_id, issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id); + let (redeem_id, redeem, _issue_id, _issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id); let old = CoreVaultData::vault(old_vault_id.clone()); @@ -769,7 +769,7 @@ fn integration_test_replace_cancel_replace_old_vault_liquidated() { fn integration_test_replace_cancel_replace_new_vault_liquidated() { test_with(|old_vault_id, new_vault_id| { let accept_amount = new_vault_id.wrapped(10000); - let (redeem_id, redeem, _issue_id, issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id); + let (redeem_id, redeem, _issue_id, _issue) = setup_replace(accept_amount, &old_vault_id, &new_vault_id); liquidate_vault(&new_vault_id);