Skip to content

Commit c83c0b6

Browse files
AaronFeickertAaronFeickert
committed
Bump nightly and update deps
1 parent 60bd218 commit c83c0b6

File tree

33 files changed

+69
-85
lines changed

33 files changed

+69
-85
lines changed

‎.github/workflows/base_node_binaries.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"name": "linux-x86_64",
44
"runs-on": "ubuntu-20.04",
5-
"rust": "nightly-2024-02-04",
5+
"rust": "nightly-2024-03-01",
66
"target": "x86_64-unknown-linux-gnu",
77
"cross": false,
88
"build_metric": true

‎.github/workflows/base_node_binaries.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ env:
2626
TBN_FEATURES: "default, safe"
2727
TBN_LIBRARIES: "minotari_mining_helper_ffi"
2828
TARI_NETWORK_DIR: testnet
29-
toolchain: nightly-2024-02-04
29+
toolchain: nightly-2024-03-01
3030
matrix-json-file: ".github/workflows/base_node_binaries.json"
3131
CARGO_HTTP_MULTIPLEXING: false
3232
CARGO_UNSTABLE_SPARSE_REGISTRY: true

‎.github/workflows/build_dockers.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ name: Build docker images
4848
- xmrig
4949

5050
env:
51-
toolchain_default: nightly-2024-02-04
51+
toolchain_default: nightly-2024-03-01
5252

5353
concurrency:
5454
# https://docs.github.com/en/actions/examples/using-concurrency-expressions-and-a-test-matrix

‎.github/workflows/build_dockers_workflow.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ name: Build docker images - workflow_call/on-demand
1414
toolchain:
1515
type: string
1616
description: 'Rust toolchain'
17-
default: nightly-2024-02-04
17+
default: nightly-2024-03-01
1818
arch:
1919
type: string
2020
default: x86-64

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ name: CI
1111
merge_group:
1212

1313
env:
14-
toolchain: nightly-2024-02-04
14+
toolchain: nightly-2024-03-01
1515
CARGO_HTTP_MULTIPLEXING: false
1616
CARGO_TERM_COLOR: always
1717
CARGO_UNSTABLE_SPARSE_REGISTRY: true

‎.github/workflows/coverage.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ name: Source Coverage
1111
- ci-coverage-*
1212

1313
env:
14-
toolchain: nightly-2024-02-04
14+
toolchain: nightly-2024-03-01
1515

1616
concurrency:
1717
group: ${{ github.workflow }}-${{ github.ref }}

‎.github/workflows/integration_tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ name: Integration tests
2727
type: string
2828

2929
env:
30-
toolchain: nightly-2024-02-04
30+
toolchain: nightly-2024-03-01
3131

3232
concurrency:
3333
group: ${{ github.workflow }}-${{ github.ref }}

‎Cargo.lock

+34-49
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎applications/minotari_app_grpc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ edition = "2018"
1111
tari_common_types = { path = "../../base_layer/common_types" }
1212
tari_comms = { path = "../../comms/core" }
1313
tari_core = { path = "../../base_layer/core" }
14-
tari_crypto = { version = "0.20" }
14+
tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
1515
tari_script = { path = "../../infrastructure/tari_script" }
1616
tari_utilities = { version = "0.7" }
1717

‎applications/minotari_console_wallet/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ tari_common_types = { path = "../../base_layer/common_types" }
1313
tari_comms = { path = "../../comms/core" }
1414
tari_comms_dht = { path = "../../comms/dht" }
1515
tari_contacts = { path = "../../base_layer/contacts" }
16-
tari_crypto = { version = "0.20" }
16+
tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
1717
tari_key_manager = { path = "../../base_layer/key_manager" }
1818
tari_libtor = { path = "../../infrastructure/libtor", optional = true }
1919
tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }

‎applications/minotari_ledger_wallet/rust-toolchain.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[toolchain]
2-
channel = "nightly-2024-02-04"
2+
channel = "nightly-2023-05-17"

‎applications/minotari_miner/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ tari_common_types = { path = "../../base_layer/common_types" }
1414
tari_comms = { path = "../../comms/core" }
1515
minotari_app_utilities = { path = "../minotari_app_utilities", features = ["miner_input"] }
1616
minotari_app_grpc = { path = "../minotari_app_grpc" }
17-
tari_crypto = { version = "0.20" }
17+
tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
1818
tari_utilities = { version = "0.7" }
1919

2020
base64 = "0.13.0"

‎applications/minotari_node/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ tari_comms = { path = "../../comms/core", features = ["rpc"] }
1515
tari_common_types = { path = "../../base_layer/common_types" }
1616
tari_comms_dht = { path = "../../comms/dht" }
1717
tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions"] }
18-
tari_crypto = { version = "0.20" }
18+
tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
1919
tari_libtor = { path = "../../infrastructure/libtor", optional = true }
2020
tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }
2121
tari_storage = {path="../../infrastructure/storage"}

‎base_layer/chat_ffi/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ crate-type = ["staticlib","cdylib"]
3232
[dev-dependencies]
3333
chrono = { version = "0.4.19", default-features = false }
3434
rand = "0.8"
35-
tari_crypto = { version = "0.20" }
35+
tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
3636

3737
[build-dependencies]
3838
cbindgen = "0.24.3"

‎base_layer/common_types/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ version = "1.0.0-pre.11a"
77
edition = "2018"
88

99
[dependencies]
10-
tari_crypto = { version = "0.20" }
10+
tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
1111
tari_utilities = { version = "0.7" }
1212
tari_common = { path = "../../common", version = "1.0.0-pre.11a" }
1313

‎base_layer/contacts/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-pre.11a" }
1212
tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-pre.11a" }
1313
tari_comms = { path = "../../comms/core", version = "1.0.0-pre.11a" }
1414
tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-pre.11a" }
15-
tari_crypto = { version = "0.20" }
15+
tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
1616
tari_p2p = { path = "../p2p", features = ["auto-update"], version = "1.0.0-pre.11a" }
1717
tari_service_framework = { path = "../service_framework", version = "1.0.0-pre.11a" }
1818
tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-pre.11a" }

‎base_layer/core/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-p
3535
tari_comms = { path = "../../comms/core", version = "1.0.0-pre.11a" }
3636
tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-pre.11a" }
3737
tari_comms_rpc_macros = { path = "../../comms/rpc_macros", version = "1.0.0-pre.11a" }
38-
tari_crypto = { version = "0.20", features = ["borsh"] }
38+
tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update", features = ["borsh"] }
3939
tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.0.0-pre.11a" }
4040
tari_mmr = { path = "../../base_layer/mmr", optional = true , version = "1.0.0-pre.11a"}
4141
tari_p2p = { path = "../../base_layer/p2p", version = "1.0.0-pre.11a" }
@@ -100,7 +100,6 @@ tiny-keccak = { package = "tari-tiny-keccak", version = "2.0.2", features = [
100100
criterion = { version = "0.4.0" }
101101
tari_p2p = { path = "../../base_layer/p2p", features = ["test-mocks"] }
102102
tari_test_utils = { path = "../../infrastructure/test_utils" }
103-
curve25519-dalek = { package = "tari-curve25519-dalek", version = "4.0.3" }
104103
# SQLite required for the integration tests
105104
libsqlite3-sys = { version = "0.25.1", features = ["bundled"] }
106105
config = { version = "0.14.0" }

‎base_layer/key_manager/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ edition = "2021"
1111
crate-type = ["lib", "cdylib"]
1212

1313
[dependencies]
14-
tari_crypto = { version = "0.20" }
14+
tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
1515
tari_utilities = { version = "0.7" }
1616
tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-pre.11a" }
1717
tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-pre.11a"}

‎base_layer/mmr/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ default = []
1212

1313
[dependencies]
1414
tari_utilities = { version = "0.7" }
15-
tari_crypto = { version = "0.20" }
15+
tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
1616
tari_common = { path = "../../common", version = "1.0.0-pre.11a" }
1717
thiserror = "1.0"
1818
borsh = "1.2"

‎base_layer/p2p/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ edition = "2018"
1313
tari_comms = { path = "../../comms/core", version = "1.0.0-pre.11a" }
1414
tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-pre.11a" }
1515
tari_common = { path = "../../common", version = "1.0.0-pre.11a" }
16-
tari_crypto = { version = "0.20" }
16+
tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
1717
tari_service_framework = { path = "../service_framework", version = "1.0.0-pre.11a" }
1818
tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-pre.11a" }
1919
tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-pre.11a" }

‎base_layer/tari_mining_helper_ffi/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2018"
88

99
[dependencies]
1010
tari_comms = { path = "../../comms/core" }
11-
tari_crypto = { version = "0.20" }
11+
tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
1212
tari_common = { path = "../../common" }
1313
tari_core = { path = "../core", default-features = false, features = ["transactions", "base_node_proto", "base_node"] }
1414
tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-pre.11a" }

‎base_layer/wallet/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ tari_common = { path = "../../common", version = "1.0.0-pre.11a" }
1212
tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-pre.11a" }
1313
tari_comms = { path = "../../comms/core", version = "1.0.0-pre.11a" }
1414
tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-pre.11a" }
15-
tari_crypto = { version = "0.20" }
15+
tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
1616
tari_key_manager = { path = "../key_manager", features = ["key_manager_service"], version = "1.0.0-pre.11a" }
1717
tari_p2p = { path = "../p2p", features = ["auto-update"], version = "1.0.0-pre.11a"}
1818
tari_script = { path = "../../infrastructure/tari_script", version = "1.0.0-pre.11a" }

‎base_layer/wallet_ffi/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ tari_common = { path="../../common" }
1212
tari_common_types = { path="../common_types" }
1313
tari_comms = { path = "../../comms/core", features = ["c_integration"]}
1414
tari_comms_dht = { path = "../../comms/dht", default-features = false }
15-
tari_crypto = { version = "0.20" }
15+
tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
1616
tari_key_manager = { path = "../key_manager" }
1717
tari_p2p = { path = "../p2p" }
1818
tari_script = { path = "../../infrastructure/tari_script" }

‎base_layer/wallet_ffi/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ Install [Rust](https://www.rust-lang.org/tools/install)
132132

133133
Install the following tools and system images
134134
```Shell Script
135-
rustup toolchain add nightly-2024-02-04
136-
rustup default nightly-2024-02-04
135+
rustup toolchain add nightly-2024-03-01
136+
rustup default nightly-2024-03-01
137137
rustup component add rustfmt --toolchain nightly
138138
rustup component add clippy
139139
rustup target add x86_64-apple-ios aarch64-apple-ios # iPhone and emulator cross compiling

‎buildtools/docker/base_node.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# syntax=docker/dockerfile:1
22
#FROM rust:1.42.0 as builder
3-
FROM quay.io/tarilabs/rust_tari-build-with-deps:nightly-2024-02-04 as builder
3+
FROM quay.io/tarilabs/rust_tari-build-with-deps:nightly-2024-03-01 as builder
44

55
# Copy the dependency lists
66
#ADD Cargo.toml ./
77
ADD . /minotari_node
88
WORKDIR /minotari_node
99

10-
# RUN rustup component add rustfmt --toolchain nightly-2024-02-04-x86_64-unknown-linux-gnu
10+
# RUN rustup component add rustfmt --toolchain nightly-2024-03-01-x86_64-unknown-linux-gnu
1111
#ARG TBN_ARCH=native
1212
ARG TBN_ARCH=x86-64
1313
#ARG TBN_FEATURES=avx2

0 commit comments

Comments
 (0)