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

updats to warnings, cargo.lock, version number (#3739)

Browse source
This commit is contained in:
Yeastplume 2022-10-21 13:17:39 +01:00 committed by GitHub
parent 34d23f5235
commit 684f0a387a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 462 additions and 302 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

621
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

22
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "grin" name = "grin"
version = "5.2.0-alpha.1" version = "5.2.0-alpha.2"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"] authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0" license = "Apache-2.0"
@ -32,14 +32,14 @@ serde_json = "1"
log = "0.4" log = "0.4"
term = "0.6" term = "0.6"
grin_api = { path = "./api", version = "5.2.0-alpha.1" } grin_api = { path = "./api", version = "5.2.0-alpha.2" }
grin_config = { path = "./config", version = "5.2.0-alpha.1" } grin_config = { path = "./config", version = "5.2.0-alpha.2" }
grin_chain = { path = "./chain", version = "5.2.0-alpha.1" } grin_chain = { path = "./chain", version = "5.2.0-alpha.2" }
grin_core = { path = "./core", version = "5.2.0-alpha.1" } grin_core = { path = "./core", version = "5.2.0-alpha.2" }
grin_keychain = { path = "./keychain", version = "5.2.0-alpha.1" } grin_keychain = { path = "./keychain", version = "5.2.0-alpha.2" }
grin_p2p = { path = "./p2p", version = "5.2.0-alpha.1" } grin_p2p = { path = "./p2p", version = "5.2.0-alpha.2" }
grin_servers = { path = "./servers", version = "5.2.0-alpha.1" } grin_servers = { path = "./servers", version = "5.2.0-alpha.2" }
grin_util = { path = "./util", version = "5.2.0-alpha.1" } grin_util = { path = "./util", version = "5.2.0-alpha.2" }
[dependencies.cursive] [dependencies.cursive]
version = "0.16" version = "0.16"
@ -50,5 +50,5 @@ features = ["pancurses-backend"]
built = { version = "0.4", features = ["git2"]} built = { version = "0.4", features = ["git2"]}
[dev-dependencies] [dev-dependencies]
grin_chain = { path = "./chain", version = "5.2.0-alpha.1" } grin_chain = { path = "./chain", version = "5.2.0-alpha.2" }
grin_store = { path = "./store", version = "5.2.0-alpha.1" } grin_store = { path = "./store", version = "5.2.0-alpha.2" }

14
api/Cargo.toml
View file

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

10
chain/Cargo.toml
View file

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

10
config/Cargo.toml
View file

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

6
core/Cargo.toml
View file

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

6
core/fuzz/Cargo.lock generated
View file

@ -388,7 +388,7 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]] [[package]]
name = "grin_core" name = "grin_core"
version = "5.2.0-alpha.1" version = "5.2.0-alpha.2"
dependencies = [ dependencies = [
"blake2-rfc", "blake2-rfc",
"byteorder", "byteorder",
@ -422,7 +422,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_keychain" name = "grin_keychain"
version = "5.2.0-alpha.1" version = "5.2.0-alpha.2"
dependencies = [ dependencies = [
"blake2-rfc", "blake2-rfc",
"byteorder", "byteorder",
@ -459,7 +459,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_util" name = "grin_util"
version = "5.2.0-alpha.1" version = "5.2.0-alpha.2"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"base64", "base64",

5
core/src/core/block.rs
View file

@ -27,7 +27,6 @@ use crate::pow::{verify_size, Difficulty, Proof, ProofOfWork};
use crate::ser::{ use crate::ser::{
self, deserialize_default, serialize_default, PMMRable, Readable, Reader, Writeable, Writer, self, deserialize_default, serialize_default, PMMRable, Readable, Reader, Writeable, Writer,
}; };
use chrono::naive::{MAX_DATE, MIN_DATE};
use chrono::prelude::{DateTime, NaiveDateTime, Utc}; use chrono::prelude::{DateTime, NaiveDateTime, Utc};
use chrono::Duration; use chrono::Duration;
use keychain::{self, BlindingFactor}; use keychain::{self, BlindingFactor};
@ -289,8 +288,8 @@ fn read_block_header<R: Reader>(reader: &mut R) -> Result<BlockHeader, ser::Erro
let (output_mmr_size, kernel_mmr_size) = ser_multiread!(reader, read_u64, read_u64); let (output_mmr_size, kernel_mmr_size) = ser_multiread!(reader, read_u64, read_u64);
let pow = ProofOfWork::read(reader)?; let pow = ProofOfWork::read(reader)?;
if timestamp > MAX_DATE.and_hms(0, 0, 0).timestamp() if timestamp > chrono::NaiveDate::MAX.and_hms(0, 0, 0).timestamp()
|| timestamp < MIN_DATE.and_hms(0, 0, 0).timestamp() || timestamp < chrono::NaiveDate::MIN.and_hms(0, 0, 0).timestamp()
{ {
return Err(ser::Error::CorruptedData); return Err(ser::Error::CorruptedData);
} }

4
keychain/Cargo.toml
View file

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

12
p2p/Cargo.toml
View file

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

10
pool/Cargo.toml
View file

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

12
pool/fuzz/Cargo.lock generated
View file

@ -419,7 +419,7 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]] [[package]]
name = "grin_chain" name = "grin_chain"
version = "5.2.0-alpha.1" version = "5.2.0-alpha.2"
dependencies = [ dependencies = [
"bit-vec", "bit-vec",
"bitflags 1.2.1", "bitflags 1.2.1",
@ -441,7 +441,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_core" name = "grin_core"
version = "5.2.0-alpha.1" version = "5.2.0-alpha.2"
dependencies = [ dependencies = [
"blake2-rfc", "blake2-rfc",
"byteorder", "byteorder",
@ -466,7 +466,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_keychain" name = "grin_keychain"
version = "5.2.0-alpha.1" version = "5.2.0-alpha.2"
dependencies = [ dependencies = [
"blake2-rfc", "blake2-rfc",
"byteorder", "byteorder",
@ -487,7 +487,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_pool" name = "grin_pool"
version = "5.2.0-alpha.1" version = "5.2.0-alpha.2"
dependencies = [ dependencies = [
"blake2-rfc", "blake2-rfc",
"chrono", "chrono",
@ -532,7 +532,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_store" name = "grin_store"
version = "5.2.0-alpha.1" version = "5.2.0-alpha.2"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"croaring", "croaring",
@ -550,7 +550,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_util" name = "grin_util"
version = "5.2.0-alpha.1" version = "5.2.0-alpha.2"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"base64", "base64",

18
servers/Cargo.toml
View file

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

6
servers/src/grin/seed.rs
View file

@ -18,7 +18,7 @@
//! list of DNS records (the default). //! list of DNS records (the default).
use chrono::prelude::{DateTime, Utc}; use chrono::prelude::{DateTime, Utc};
use chrono::{Duration, MIN_DATE}; use chrono::Duration;
use p2p::{msg::PeerAddrs, P2PConfig}; use p2p::{msg::PeerAddrs, P2PConfig};
use rand::prelude::*; use rand::prelude::*;
use std::collections::HashMap; use std::collections::HashMap;
@ -69,8 +69,8 @@ pub fn connect_and_monitor(
// check seeds first // check seeds first
connect_to_seeds_and_peers(peers.clone(), tx.clone(), seed_list, config); connect_to_seeds_and_peers(peers.clone(), tx.clone(), seed_list, config);
let mut prev = MIN_DATE.and_hms(0, 0, 0); let mut prev = chrono::Date::<Utc>::MIN_UTC.and_hms(0, 0, 0);
let mut prev_expire_check = MIN_DATE.and_hms(0, 0, 0); let mut prev_expire_check = chrono::Date::<Utc>::MIN_UTC.and_hms(0, 0, 0);
let mut prev_ping = Utc::now(); let mut prev_ping = Utc::now();
let mut start_attempt = 0; let mut start_attempt = 0;
let mut connecting_history: HashMap<PeerAddr, DateTime<Utc>> = HashMap::new(); let mut connecting_history: HashMap<PeerAddr, DateTime<Utc>> = HashMap::new();

6
store/Cargo.toml
View file

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

2
util/Cargo.toml
View file

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