From 0f854bab2eb5345019328ce41a4a9a0eb6f430f8 Mon Sep 17 00:00:00 2001 From: Kasper Ziemianek Date: Fri, 24 May 2024 17:07:23 +0200 Subject: [PATCH] lock musig2 sgx dep on specific tag (#2757) Co-authored-by: Kai <7630809+Kailai-Wang@users.noreply.github.com> --- bitacross-worker/Cargo.lock | 22 +++++++++---------- .../core/bc-musig2-ceremony/Cargo.toml | 2 +- .../core/bc-musig2-runner/Cargo.toml | 2 +- bitacross-worker/enclave-runtime/Cargo.lock | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bitacross-worker/Cargo.lock b/bitacross-worker/Cargo.lock index 21ab463563..0830f8907b 100644 --- a/bitacross-worker/Cargo.lock +++ b/bitacross-worker/Cargo.lock @@ -374,8 +374,8 @@ dependencies = [ "k256", "litentry-primitives", "log 0.4.20", + "musig2 0.0.8 (git+https://github.com/kziemianek/musig2.git?tag=v0.0.8)", "musig2 0.0.8 (git+https://github.com/kziemianek/musig2.git?branch=master)", - "musig2 0.0.8 (git+https://github.com/kziemianek/musig2.git?branch=sgx)", "parity-scale-codec", "rand 0.8.5", "sgx_rand", @@ -400,8 +400,8 @@ dependencies = [ "lc-direct-call", "litentry-primitives", "log 0.4.20", + "musig2 0.0.8 (git+https://github.com/kziemianek/musig2.git?tag=v0.0.8)", "musig2 0.0.8 (git+https://github.com/kziemianek/musig2.git?branch=master)", - "musig2 0.0.8 (git+https://github.com/kziemianek/musig2.git?branch=sgx)", "parity-scale-codec", "rand 0.8.5", "sgx_crypto_helper", @@ -4523,32 +4523,32 @@ dependencies = [ [[package]] name = "musig2" version = "0.0.8" -source = "git+https://github.com/kziemianek/musig2.git?branch=master#cd5e61ac9ecdf842da58605ac7b07b6e359f08c5" +source = "git+https://github.com/kziemianek/musig2.git?tag=v0.0.8#179f1eb5e7b9d7433bd1a5fd9af94477efb0fb38" dependencies = [ "base16ct", "hmac 0.12.1", "k256", - "once_cell 1.19.0", - "secp 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "once_cell 1.4.0 (git+https://github.com/mesalock-linux/once_cell-sgx?branch=master)", + "secp 0.2.3 (git+https://github.com/kziemianek/secp.git?branch=sgx)", "secp256k1 0.28.0", + "sgx_tstd", "sha2 0.10.8", - "subtle 2.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "subtle 2.5.0 (git+https://github.com/kziemianek/subtle-sgx.git?branch=2.5.0-update)", ] [[package]] name = "musig2" version = "0.0.8" -source = "git+https://github.com/kziemianek/musig2.git?branch=sgx#179f1eb5e7b9d7433bd1a5fd9af94477efb0fb38" +source = "git+https://github.com/kziemianek/musig2.git?branch=master#cd5e61ac9ecdf842da58605ac7b07b6e359f08c5" dependencies = [ "base16ct", "hmac 0.12.1", "k256", - "once_cell 1.4.0 (git+https://github.com/mesalock-linux/once_cell-sgx?branch=master)", - "secp 0.2.3 (git+https://github.com/kziemianek/secp.git?branch=sgx)", + "once_cell 1.19.0", + "secp 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "secp256k1 0.28.0", - "sgx_tstd", "sha2 0.10.8", - "subtle 2.5.0 (git+https://github.com/kziemianek/subtle-sgx.git?branch=2.5.0-update)", + "subtle 2.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/bitacross-worker/bitacross/core/bc-musig2-ceremony/Cargo.toml b/bitacross-worker/bitacross/core/bc-musig2-ceremony/Cargo.toml index 5ed54aff89..71dc1abf06 100644 --- a/bitacross-worker/bitacross/core/bc-musig2-ceremony/Cargo.toml +++ b/bitacross-worker/bitacross/core/bc-musig2-ceremony/Cargo.toml @@ -12,7 +12,7 @@ musig2 = { package = "musig2", branch = "master", git = "https://github.com/kzie rand = { version = "0.8.5", optional = true } # sgx dependencies -musig2_sgx = { package = "musig2", branch = "sgx", git = "https://github.com/kziemianek/musig2.git", optional = true, features = ["k256"] } +musig2_sgx = { package = "musig2", tag = "v0.0.8", git = "https://github.com/kziemianek/musig2.git", optional = true, features = ["k256"] } sgx_rand = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true } sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git", branch = "master", optional = true, features = ["net", "thread"] } diff --git a/bitacross-worker/bitacross/core/bc-musig2-runner/Cargo.toml b/bitacross-worker/bitacross/core/bc-musig2-runner/Cargo.toml index c67deec579..01e6ffbcc8 100644 --- a/bitacross-worker/bitacross/core/bc-musig2-runner/Cargo.toml +++ b/bitacross-worker/bitacross/core/bc-musig2-runner/Cargo.toml @@ -26,7 +26,7 @@ k256 = { version = "0.13.3", default-features = false, features = ["ecdsa-core", lc-direct-call = { path = "../../../litentry/core/direct-call", default-features = false } litentry-primitives = { path = "../../../litentry/primitives", default-features = false } musig2 = { package = "musig2", branch = "master", git = "https://github.com/kziemianek/musig2.git", optional = true, features = ["k256"] } -musig2_sgx = { package = "musig2", branch = "sgx", git = "https://github.com/kziemianek/musig2.git", optional = true, features = ["k256"] } +musig2_sgx = { package = "musig2", tag = "v0.0.8", git = "https://github.com/kziemianek/musig2.git", optional = true, features = ["k256"] } rand = { version = "0.8.5", optional = true } sgx_crypto_helper = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", default-features = false } sgx_rand = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true } diff --git a/bitacross-worker/enclave-runtime/Cargo.lock b/bitacross-worker/enclave-runtime/Cargo.lock index a7fb050702..49e3c0e14a 100644 --- a/bitacross-worker/enclave-runtime/Cargo.lock +++ b/bitacross-worker/enclave-runtime/Cargo.lock @@ -2965,7 +2965,7 @@ dependencies = [ [[package]] name = "musig2" version = "0.0.8" -source = "git+https://github.com/kziemianek/musig2.git?branch=sgx#179f1eb5e7b9d7433bd1a5fd9af94477efb0fb38" +source = "git+https://github.com/kziemianek/musig2.git?tag=v0.0.8#179f1eb5e7b9d7433bd1a5fd9af94477efb0fb38" dependencies = [ "base16ct", "hmac",