Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-20 19:11:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rust 1.76 compilation updates (#3781)

Browse source
This commit is contained in:
Yeastplume 2024-02-16 15:00:53 +00:00 committed by GitHub
parent 70d45465c3
commit e1cc58741b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 559 additions and 434 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

856
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

26
Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "grin"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
@ -24,7 +24,7 @@ blake2-rfc = "0.2"
chrono = "0.4.11"
clap = { version = "2.33", features = ["yaml"] }
ctrlc = { version = "3.1", features = ["termination"] }
cursive_table_view = "0.13.2"
cursive_table_view = "0.14"
humansize = "1.1.0"
serde = "1"
futures = "0.3.19"
@ -32,17 +32,17 @@ serde_json = "1"
log = "0.4"
term = "0.6"
grin_api = { path = "./api", version = "5.2.0" }
grin_config = { path = "./config", version = "5.2.0" }
grin_chain = { path = "./chain", version = "5.2.0" }
grin_core = { path = "./core", version = "5.2.0" }
grin_keychain = { path = "./keychain", version = "5.2.0" }
grin_p2p = { path = "./p2p", version = "5.2.0" }
grin_servers = { path = "./servers", version = "5.2.0" }
grin_util = { path = "./util", version = "5.2.0" }
grin_api = { path = "./api", version = "5.2.1-beta.1" }
grin_config = { path = "./config", version = "5.2.1-beta.1" }
grin_chain = { path = "./chain", version = "5.2.1-beta.1" }
grin_core = { path = "./core", version = "5.2.1-beta.1" }
grin_keychain = { path = "./keychain", version = "5.2.1-beta.1" }
grin_p2p = { path = "./p2p", version = "5.2.1-beta.1" }
grin_servers = { path = "./servers", version = "5.2.1-beta.1" }
grin_util = { path = "./util", version = "5.2.1-beta.1" }
[dependencies.cursive]
version = "0.16"
version = "0.17"
default-features = false
features = ["pancurses-backend"]
@ -50,5 +50,5 @@ features = ["pancurses-backend"]
built = { version = "0.4", features = ["git2"]}
[dev-dependencies]
grin_chain = { path = "./chain", version = "5.2.0" }
grin_store = { path = "./store", version = "5.2.0" }
grin_chain = { path = "./chain", version = "5.2.1-beta.1" }
grin_store = { path = "./store", version = "5.2.1-beta.1" }

14
api/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "grin_api"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "APIs for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
@ -30,9 +30,9 @@ rustls = "0.17"
url = "2.1"
bytes = "0.5"
grin_core = { path = "../core", version = "5.2.0" }
grin_chain = { path = "../chain", version = "5.2.0" }
grin_p2p = { path = "../p2p", version = "5.2.0" }
grin_pool = { path = "../pool", version = "5.2.0" }
grin_store = { path = "../store", version = "5.2.0" }
grin_util = { path = "../util", version = "5.2.0" }
grin_core = { path = "../core", version = "5.2.1-beta.1" }
grin_chain = { path = "../chain", version = "5.2.1-beta.1" }
grin_p2p = { path = "../p2p", version = "5.2.1-beta.1" }
grin_pool = { path = "../pool", version = "5.2.1-beta.1" }
grin_store = { path = "../store", version = "5.2.1-beta.1" }
grin_util = { path = "../util", version = "5.2.1-beta.1" }

10
chain/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "grin_chain"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
@ -23,10 +23,10 @@ chrono = "0.4.11"
lru-cache = "0.1"
lazy_static = "1"
grin_core = { path = "../core", version = "5.2.0" }
grin_keychain = { path = "../keychain", version = "5.2.0" }
grin_store = { path = "../store", version = "5.2.0" }
grin_util = { path = "../util", version = "5.2.0" }
grin_core = { path = "../core", version = "5.2.1-beta.1" }
grin_keychain = { path = "../keychain", version = "5.2.1-beta.1" }
grin_store = { path = "../store", version = "5.2.1-beta.1" }
grin_util = { path = "../util", version = "5.2.1-beta.1" }
[dev-dependencies]
env_logger = "0.7"

10
config/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "grin_config"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Configuration for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
@ -16,10 +16,10 @@ serde_derive = "1"
toml = "0.5"
dirs = "2.0"
grin_core = { path = "../core", version = "5.2.0" }
grin_servers = { path = "../servers", version = "5.2.0" }
grin_p2p = { path = "../p2p", version = "5.2.0" }
grin_util = { path = "../util", version = "5.2.0" }
grin_core = { path = "../core", version = "5.2.1-beta.1" }
grin_servers = { path = "../servers", version = "5.2.1-beta.1" }
grin_p2p = { path = "../p2p", version = "5.2.1-beta.1" }
grin_util = { path = "../util", version = "5.2.1-beta.1" }
[dev-dependencies]
pretty_assertions = "0.6.1"

6
core/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "grin_core"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
@ -28,8 +28,8 @@ chrono = { version = "0.4.11", features = ["serde"] }
zeroize = { version = "1.1", features =["zeroize_derive"] }
bytes = "0.5"
keychain = { package = "grin_keychain", path = "../keychain", version = "5.2.0" }
util = { package = "grin_util", path = "../util", version = "5.2.0" }
keychain = { package = "grin_keychain", path = "../keychain", version = "5.2.1-beta.1" }
util = { package = "grin_util", path = "../util", version = "5.2.1-beta.1" }
[dev-dependencies]
serde_json = "1"

4
keychain/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "grin_keychain"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
@ -26,4 +26,4 @@ ripemd160 = "0.9"
sha2 = "0.9"
pbkdf2 = "0.8"
grin_util = { path = "../util", version = "5.2.0" }
grin_util = { path = "../util", version = "5.2.1-beta.1" }

12
p2p/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "grin_p2p"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
@ -22,10 +22,10 @@ log = "0.4"
chrono = { version = "0.4.11", features = ["serde"] }
bytes = "0.5"
grin_core = { path = "../core", version = "5.2.0" }
grin_store = { path = "../store", version = "5.2.0" }
grin_util = { path = "../util", version = "5.2.0" }
grin_chain = { path = "../chain", version = "5.2.0" }
grin_core = { path = "../core", version = "5.2.1-beta.1" }
grin_store = { path = "../store", version = "5.2.1-beta.1" }
grin_util = { path = "../util", version = "5.2.1-beta.1" }
grin_chain = { path = "../chain", version = "5.2.1-beta.1" }
[dev-dependencies]
grin_pool = { path = "../pool", version = "5.2.0" }
grin_pool = { path = "../pool", version = "5.2.1-beta.1" }

10
pool/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "grin_pool"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
@ -18,9 +18,9 @@ thiserror = "1"
log = "0.4"
chrono = "0.4.11"
grin_core = { path = "../core", version = "5.2.0" }
grin_keychain = { path = "../keychain", version = "5.2.0" }
grin_util = { path = "../util", version = "5.2.0" }
grin_core = { path = "../core", version = "5.2.1-beta.1" }
grin_keychain = { path = "../keychain", version = "5.2.1-beta.1" }
grin_util = { path = "../util", version = "5.2.1-beta.1" }
[dev-dependencies]
grin_chain = { path = "../chain", version = "5.2.0" }
grin_chain = { path = "../chain", version = "5.2.1-beta.1" }

18
servers/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "grin_servers"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
@ -26,11 +26,11 @@ tokio = {version = "0.2", features = ["full"] }
tokio-util = { version = "0.2", features = ["codec"] }
walkdir = "2.3.1"
grin_api = { path = "../api", version = "5.2.0" }
grin_chain = { path = "../chain", version = "5.2.0" }
grin_core = { path = "../core", version = "5.2.0" }
grin_keychain = { path = "../keychain", version = "5.2.0" }
grin_p2p = { path = "../p2p", version = "5.2.0" }
grin_pool = { path = "../pool", version = "5.2.0" }
grin_store = { path = "../store", version = "5.2.0" }
grin_util = { path = "../util", version = "5.2.0" }
grin_api = { path = "../api", version = "5.2.1-beta.1" }
grin_chain = { path = "../chain", version = "5.2.1-beta.1" }
grin_core = { path = "../core", version = "5.2.1-beta.1" }
grin_keychain = { path = "../keychain", version = "5.2.1-beta.1" }
grin_p2p = { path = "../p2p", version = "5.2.1-beta.1" }
grin_pool = { path = "../pool", version = "5.2.1-beta.1" }
grin_store = { path = "../store", version = "5.2.1-beta.1" }
grin_util = { path = "../util", version = "5.2.1-beta.1" }

2
src/bin/tui/logs.rs
View file

@ -13,7 +13,7 @@
// limitations under the License.
use cursive::theme::{BaseColor, Color, ColorStyle};
use cursive::traits::Identifiable;
use cursive::traits::Nameable;
use cursive::view::View;
use cursive::views::ResizedView;
use cursive::{Cursive, Printer};

2
src/bin/tui/menu.rs
View file

@ -17,7 +17,7 @@
use cursive::align::HAlign;
use cursive::direction::Orientation;
use cursive::event::Key;
use cursive::view::Identifiable;
use cursive::view::Nameable;
use cursive::view::View;
use cursive::views::{
LinearLayout, OnEventView, ResizedView, SelectView, StackView, TextView, ViewRef,

2
src/bin/tui/mining.rs
View file

@ -19,7 +19,7 @@ use std::cmp::Ordering;
use chrono::prelude::{DateTime, NaiveDateTime, Utc};
use cursive::direction::Orientation;
use cursive::event::Key;
use cursive::traits::{Boxable, Identifiable};
use cursive::traits::{Nameable, Resizable};
use cursive::view::View;
use cursive::views::{
Button, Dialog, LinearLayout, OnEventView, Panel, ResizedView, StackView, TextView,

2
src/bin/tui/peers.rs
View file

@ -23,7 +23,7 @@ use humansize::{file_size_opts::CONVENTIONAL, FileSize};
use cursive::direction::Orientation;
use cursive::event::Key;
use cursive::traits::{Boxable, Identifiable};
use cursive::traits::{Nameable, Resizable};
use cursive::view::View;
use cursive::views::{Dialog, LinearLayout, OnEventView, ResizedView, TextView};
use cursive::Cursive;

2
src/bin/tui/status.rs
View file

@ -16,7 +16,7 @@
use chrono::prelude::Utc;
use cursive::direction::Orientation;
use cursive::traits::Identifiable;
use cursive::traits::Nameable;
use cursive::view::View;
use cursive::views::{LinearLayout, ResizedView, TextView};
use cursive::Cursive;

7
src/bin/tui/ui.rs
View file

@ -23,8 +23,7 @@ use cursive::theme::PaletteColor::{
Background, Highlight, HighlightInactive, Primary, Shadow, View,
};
use cursive::theme::{BaseColor, BorderStyle, Color, Theme};
use cursive::traits::Boxable;
use cursive::traits::Identifiable;
use cursive::traits::{Nameable, Resizable};
use cursive::utils::markup::StyledString;
use cursive::views::{
CircularFocus, Dialog, LinearLayout, Panel, SelectView, StackView, TextView, ViewRef,
@ -124,9 +123,7 @@ impl UI {
let controller_tx_clone = grin_ui.controller_tx.clone();
grin_ui.cursive.add_global_callback('q', move |c| {
let content = StyledString::styled("Shutting down...", Color::Light(BaseColor::Yellow));
c.add_layer(CircularFocus::wrap_tab(Dialog::around(TextView::new(
content,
))));
c.add_layer(CircularFocus::new(Dialog::around(TextView::new(content))).wrap_tab());
controller_tx_clone
.send(ControllerMessage::Shutdown)
.unwrap();

2
src/bin/tui/version.rs
View file

@ -15,7 +15,7 @@
//! Version and build info
use cursive::direction::Orientation;
use cursive::traits::Identifiable;
use cursive::traits::Nameable;
use cursive::view::View;
use cursive::views::{LinearLayout, ResizedView, TextView};

6
store/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "grin_store"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
@ -21,8 +21,8 @@ serde_derive = "1"
thiserror = "1"
log = "0.4"
grin_core = { path = "../core", version = "5.2.0" }
grin_util = { path = "../util", version = "5.2.0" }
grin_core = { path = "../core", version = "5.2.1-beta.1" }
grin_util = { path = "../util", version = "5.2.1-beta.1" }
[dev-dependencies]
chrono = "0.4.11"

2
util/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "grin_util"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"