Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: update tari-crypto and curve library dependencies #6228

Merged
merged 3 commits into from May 17, 2024
Merged

chore: update tari-crypto and curve library dependencies #6228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abbb48c
Curve library and associated updates
AaronFeickert Mar 23, 2024
bd66a15
Address review comments
AaronFeickert May 10, 2024
8219fb0
Update dependency
AaronFeickert May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_binaries.json
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
{
"name": "linux-x86_64",
"runs-on": "ubuntu-20.04",
"rust": "nightly-2024-02-04",
"rust": "nightly-2024-03-01",
"target": "x86_64-unknown-linux-gnu",
"cross": false,
"build_metric": true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_binaries.yml
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ env:
TS_FEATURES: "default, safe"
TS_LIBRARIES: "minotari_mining_helper_ffi"
TARI_NETWORK_DIR: testnet
toolchain: nightly-2024-02-04
toolchain: nightly-2024-03-01
matrix-json-file: ".github/workflows/build_binaries.json"
CARGO_HTTP_MULTIPLEXING: false
CARGO_UNSTABLE_SPARSE_REGISTRY: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_dockers.yml
View file
Open in desktop
Expand Up @@ -48,7 +48,7 @@ name: Build docker images
- xmrig

env:
toolchain_default: nightly-2024-02-04
toolchain_default: nightly-2024-03-01

concurrency:
# https://docs.github.com/en/actions/examples/using-concurrency-expressions-and-a-test-matrix
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_dockers_workflow.yml
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ name: Build docker images - workflow_call/on-demand
toolchain:
type: string
description: 'Rust toolchain'
default: nightly-2024-02-04
default: nightly-2024-03-01
arch:
type: string
default: x86-64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ name: CI
merge_group:

env:
toolchain: nightly-2024-02-04
toolchain: nightly-2024-03-01
CARGO_HTTP_MULTIPLEXING: false
CARGO_TERM_COLOR: always
CARGO_UNSTABLE_SPARSE_REGISTRY: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ name: Source Coverage
- ci-coverage-*

env:
toolchain: nightly-2024-02-04
toolchain: nightly-2024-03-01

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration_tests.yml
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@ name: Integration tests
type: string

env:
toolchain: nightly-2024-02-04
toolchain: nightly-2024-03-01

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
110 changes: 44 additions & 66 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion applications/minotari_app_grpc/Cargo.toml
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ edition = "2018"
tari_common_types = { path = "../../base_layer/common_types" }
tari_comms = { path = "../../comms/core" }
tari_core = { path = "../../base_layer/core" }
tari_crypto = { version = "0.20" }
tari_crypto = { version = "0.20.1" }
tari_script = { path = "../../infrastructure/tari_script" }
tari_utilities = { version = "0.7" }

Expand Down
8 changes: 2 additions & 6 deletions applications/minotari_app_grpc/src/authentication/basic_auth.rs
View file
Open in desktop
Expand Up @@ -227,13 +227,9 @@ mod tests {
}

mod validate {
use std::{
cmp::{max, min},
thread::sleep,
};
use std::{cmp::max, thread::sleep};

use rand::RngCore;
use tari_utilities::{hex::Hex, ByteArray};
use tari_utilities::hex::Hex;

use super::*;
use crate::authentication::salted_password::create_salted_hashed_password;
Expand Down
2 changes: 1 addition & 1 deletion applications/minotari_console_wallet/Cargo.toml
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ tari_common_types = { path = "../../base_layer/common_types" }
tari_comms = { path = "../../comms/core" }
tari_comms_dht = { path = "../../comms/dht" }
tari_contacts = { path = "../../base_layer/contacts" }
tari_crypto = { version = "0.20" }
tari_crypto = { version = "0.20.1" }
tari_key_manager = { path = "../../base_layer/key_manager" }
tari_libtor = { path = "../../infrastructure/libtor", optional = true }
tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }
Expand Down
2 changes: 1 addition & 1 deletion applications/minotari_ledger_wallet/comms/Cargo.toml
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ tari_common = { path = "../../../common", version = "1.0.0-pre.12" }

ledger-transport = { git = "https://github.com/Zondax/ledger-rs", rev = "20e2a20" }
ledger-transport-hid = { git = "https://github.com/Zondax/ledger-rs", rev = "20e2a20" }
num-derive = "0.3.3"
num-derive = "0.4.2"
num-traits = "0.2.15"
serde = { version = "1.0.106", features = ["derive"] }
thiserror = "1.0.26"
2 changes: 1 addition & 1 deletion applications/minotari_merge_mining_proxy/src/block_template_data.rs
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ use std::{collections::HashMap, convert::TryFrom, sync::Arc};

#[cfg(not(test))]
use chrono::Duration;
use chrono::{self, DateTime, Utc};
use chrono::{DateTime, Utc};
use minotari_node_grpc_client::grpc;
use tari_common_types::types::FixedHash;
use tari_core::proof_of_work::monero_rx::FixedByteArray;
Expand Down
2 changes: 1 addition & 1 deletion applications/minotari_miner/Cargo.toml
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ tari_common_types = { path = "../../base_layer/common_types" }
tari_comms = { path = "../../comms/core" }
minotari_app_utilities = { path = "../minotari_app_utilities", features = ["miner_input"] }
minotari_app_grpc = { path = "../minotari_app_grpc" }
tari_crypto = { version = "0.20" }
tari_crypto = { version = "0.20.1" }
tari_utilities = { version = "0.7" }

base64 = "0.13.0"
Expand Down
1 change: 0 additions & 1 deletion applications/minotari_miner/src/stratum/controller.rs
View file
Open in desktop
Expand Up @@ -21,7 +21,6 @@
// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
use std::{
self,
io::{BufRead, ErrorKind, Write},
sync::mpsc,
thread,
Expand Down
2 changes: 1 addition & 1 deletion applications/minotari_miner/src/stratum/stratum_controller/controller.rs
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@
// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
use std::{self, convert::TryFrom, sync::mpsc, thread, time::SystemTime};
use std::{convert::TryFrom, sync::mpsc, thread, time::SystemTime};

use borsh::BorshDeserialize;
use futures::stream::StreamExt;
Expand Down
1 change: 0 additions & 1 deletion applications/minotari_miner/src/stratum/stream.rs
View file
Open in desktop
Expand Up @@ -21,7 +21,6 @@
// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
use std::{
self,
io::{self, BufRead, Read, Write},
net::TcpStream,
};
Expand Down
2 changes: 1 addition & 1 deletion applications/minotari_node/Cargo.toml
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ tari_comms = { path = "../../comms/core", features = ["rpc"] }
tari_common_types = { path = "../../base_layer/common_types" }
tari_comms_dht = { path = "../../comms/dht" }
tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions"] }
tari_crypto = { version = "0.20" }
tari_crypto = { version = "0.20.1" }
tari_libtor = { path = "../../infrastructure/libtor", optional = true }
tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }
tari_storage = {path="../../infrastructure/storage"}
Expand Down
2 changes: 1 addition & 1 deletion base_layer/chat_ffi/Cargo.toml
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ crate-type = ["staticlib","cdylib"]
[dev-dependencies]
chrono = { version = "0.4.19", default-features = false }
rand = "0.8"
tari_crypto = { version = "0.20" }
tari_crypto = { version = "0.20.1" }

[build-dependencies]
cbindgen = "0.24.3"
Expand Down