github-jwinterm/grin-wallet
1
0
Fork 0
mirror of https://github.com/jwinterm/grin-wallet.git synced 2026-10-17 15:21:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into merge_master_staging

Browse Source 
# Conflicts:
#	api/src/owner.rs
#	controller/src/display.rs
#	controller/tests/accounts.rs
#	controller/tests/mwixnet.rs
#	controller/tests/revert.rs
#	controller/tests/slatepack.rs
#	controller/tests/transaction.rs
#	controller/tests/tx_list_filter.rs
#	grin
#	impls/src/lifecycle/default.rs
#	libwallet/src/api_impl/owner.rs
#	libwallet/src/internal/selection.rs
#	libwallet/src/internal/tx.rs
#	tests/cmd_line_basic.rs
This commit is contained in:
ardocrat
2026-10-12 13:59:25 +03:00
parent dce4e5eecc f097811ee9
commit ab03ccf596
12 changed files with 78 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+17 -17
View File
@@ -2233,7 +2233,7 @@ checksum = "9985c9503b412198aa4197559e9a318524ebc4519c229bfa05a535828c950b9d"
[[package]]
name = "grin_api"
version = "5.5.1"
version = "5.5.2"
dependencies = [
"bytes 1.12.0",
"easy-jsonrpc-mw",
@@ -2265,7 +2265,7 @@ dependencies = [
[[package]]
name = "grin_chain"
version = "5.5.1"
version = "5.5.2"
dependencies = [
"bit-vec",
"bitflags 1.3.2",
@@ -2289,7 +2289,7 @@ dependencies = [
[[package]]
name = "grin_core"
version = "5.5.1"
version = "5.5.2"
dependencies = [
"blake2-rfc",
"byteorder",
@@ -2315,7 +2315,7 @@ dependencies = [
[[package]]
name = "grin_keychain"
version = "5.5.1"
version = "5.5.2"
dependencies = [
"blake2-rfc",
"byteorder",
@@ -2336,7 +2336,7 @@ dependencies = [
[[package]]
name = "grin_p2p"
version = "5.5.1"
version = "5.5.2"
dependencies = [
"bitflags 1.3.2",
"built",
@@ -2359,7 +2359,7 @@ dependencies = [
[[package]]
name = "grin_pool"
version = "5.5.1"
version = "5.5.2"
dependencies = [
"blake2-rfc",
"chrono",
@@ -2376,9 +2376,9 @@ dependencies = [
[[package]]
name = "grin_secp256k1zkp"
version = "0.7.15"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf7bb95f155b1eede2648a1b9afbba82bc3d9f2af0518b478767559a572bd973"
checksum = "57e0a5f761e8c56db5be865f79832677d3badb3be91d7172d468e448f3d69f82"
dependencies = [
"arrayvec 0.7.8",
"cc",
@@ -2391,7 +2391,7 @@ dependencies = [
[[package]]
name = "grin_store"
version = "5.5.1"
version = "5.5.2"
dependencies = [
"byteorder",
"chrono",
@@ -2413,7 +2413,7 @@ dependencies = [
[[package]]
name = "grin_util"
version = "5.5.1"
version = "5.5.2"
dependencies = [
"anyhow",
"backtrace",
@@ -2433,7 +2433,7 @@ dependencies = [
[[package]]
name = "grin_wallet"
version = "5.5.0"
version = "5.5.1"
dependencies = [
"built",
"clap",
@@ -2461,7 +2461,7 @@ dependencies = [
[[package]]
name = "grin_wallet_api"
version = "5.5.0"
version = "5.5.1"
dependencies = [
"base64 0.12.3",
"chrono",
@@ -2486,7 +2486,7 @@ dependencies = [
[[package]]
name = "grin_wallet_config"
version = "5.5.0"
version = "5.5.1"
dependencies = [
"dirs 2.0.2",
"grin_core",
@@ -2502,7 +2502,7 @@ dependencies = [
[[package]]
name = "grin_wallet_controller"
version = "5.5.0"
version = "5.5.1"
dependencies = [
"easy-jsonrpc-mw",
"ed25519-dalek",
@@ -2533,7 +2533,7 @@ dependencies = [
[[package]]
name = "grin_wallet_impls"
version = "5.5.0"
version = "5.5.1"
dependencies = [
"arti-client",
"base64 0.12.3",
@@ -2580,7 +2580,7 @@ dependencies = [
[[package]]
name = "grin_wallet_libwallet"
version = "5.5.0"
version = "5.5.1"
dependencies = [
"age",
"base64 0.9.3",
@@ -2618,7 +2618,7 @@ dependencies = [
[[package]]
name = "grin_wallet_util"
version = "5.5.0"
version = "5.5.1"
dependencies = [
"data-encoding",
"ed25519-dalek",
Cargo.toml
+6 -6
View File
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet"
version = "5.5.0"
version = "5.5.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"
@@ -37,11 +37,11 @@ semver = "1.0.28"
rustyline = "9"
lazy_static = "1"
grin_wallet_api = { path = "./api", version = "5.5.0" }
grin_wallet_impls = { path = "./impls", version = "5.5.0" }
grin_wallet_libwallet = { path = "./libwallet", version = "5.5.0" }
grin_wallet_controller = { path = "./controller", version = "5.5.0" }
grin_wallet_config = { path = "./config", version = "5.5.0" }
grin_wallet_api = { path = "./api", version = "5.5.1" }
grin_wallet_impls = { path = "./impls", version = "5.5.1" }
grin_wallet_libwallet = { path = "./libwallet", version = "5.5.1" }
grin_wallet_controller = { path = "./controller", version = "5.5.1" }
grin_wallet_config = { path = "./config", version = "5.5.1" }
##### Grin Imports
api/Cargo.toml
+5 -5
View File
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_api"
version = "5.5.0"
version = "5.5.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Grin Wallet API"
license = "Apache-2.0"
@@ -22,10 +22,10 @@ ring = "0.17.14"
base64 = "0.12"
ed25519-dalek = "2"
grin_wallet_libwallet = { path = "../libwallet", version = "5.5.0" }
grin_wallet_config = { path = "../config", version = "5.5.0" }
grin_wallet_impls = { path = "../impls", version = "5.5.0" }
grin_wallet_util = { path = "../util", version = "5.5.0" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.5.1" }
grin_wallet_config = { path = "../config", version = "5.5.1" }
grin_wallet_impls = { path = "../impls", version = "5.5.1" }
grin_wallet_util = { path = "../util", version = "5.5.1" }
##### Grin Imports
config/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_config"
version = "5.5.0"
version = "5.5.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Configuration for grin wallet , a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
controller/Cargo.toml
+6 -6
View File
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_controller"
version = "5.5.0"
version = "5.5.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Controllers for grin wallet instantiation"
license = "Apache-2.0"
@@ -25,11 +25,11 @@ lazy_static = "1"
thiserror = "1"
qr_code = "1.1.0"
grin_wallet_util = { path = "../util", version = "5.5.0" }
grin_wallet_api = { path = "../api", version = "5.5.0" }
grin_wallet_impls = { path = "../impls", version = "5.5.0" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.5.0" }
grin_wallet_config = { path = "../config", version = "5.5.0" }
grin_wallet_util = { path = "../util", version = "5.5.1" }
grin_wallet_api = { path = "../api", version = "5.5.1" }
grin_wallet_impls = { path = "../impls", version = "5.5.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.5.1" }
grin_wallet_config = { path = "../config", version = "5.5.1" }
##### Grin Imports
grin
+1 -1
Submodule grin updated: 4182d34221...7f100ed59a
impls/Cargo.toml
+4 -4
View File
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_impls"
version = "5.5.0"
version = "5.5.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Concrete types derived from libwallet traits"
license = "Apache-2.0"
@@ -47,9 +47,9 @@ hyper-util = { version = "0.1.20", features = ["tokio"] }
http-body-util = "0.1.3"
bytes = "1.11.1"
grin_wallet_util = { path = "../util", version = "5.5.0" }
grin_wallet_config = { path = "../config", version = "5.5.0" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.5.0" }
grin_wallet_util = { path = "../util", version = "5.5.1" }
grin_wallet_config = { path = "../config", version = "5.5.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.5.1" }
##### Grin Imports
libwallet/Cargo.toml
+3 -3
View File
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_libwallet"
version = "5.5.0"
version = "5.5.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"
@@ -42,8 +42,8 @@ num-bigint = "0.2"
chacha20 = "0.8.1"
hmac = { version = "0.12.0", features = ["std"]}
grin_wallet_util = { path = "../util", version = "5.5.0" }
grin_wallet_config = { path = "../config", version = "5.5.0" }
grin_wallet_util = { path = "../util", version = "5.5.1" }
grin_wallet_config = { path = "../config", version = "5.5.1" }
##### Grin Imports
libwallet/src/address.rs
+13
View File
@@ -65,3 +65,16 @@ mod tests {
assert_eq!(address_derivation_path(&parent, 3), expected);
}
}
#[cfg(test)]
mod tests {
use super::*;
use grin_keychain::ExtKeychain;
#[test]
fn slatepack_address_path() {
let parent = ExtKeychain::derive_key_id(2, 2, 0, 0, 0);
let expected = ExtKeychain::derive_key_id(3, 2, 1, 3, 0);
assert_eq!(address_derivation_path(&parent, 3), expected);
}
}
libwallet/src/mwixnet/onion/mod.rs
+11 -8
View File
@@ -171,6 +171,7 @@ pub mod test_util {
None,
None,
)
.expect("failed to generate test bulletproof")
}
pub fn proof(
@@ -188,14 +189,16 @@ pub mod test_util {
let out_value = value - (fee as u64);
let rp = secp.bullet_proof(
out_value,
blind.clone(),
secp::random_secret(false),
secp::random_secret(false),
None,
None,
);
let rp = secp
.bullet_proof(
out_value,
blind.clone(),
secp::random_secret(false),
secp::random_secret(false),
None,
None,
)
.expect("failed to generate test bulletproof");
(secp::commit(out_value, &blind).unwrap(), rp)
}
libwallet/src/mwixnet/onion/onion.rs
+10 -8
View File
@@ -397,14 +397,16 @@ mod tests {
final_commit = secp::add_excess(&final_commit, &excess).unwrap();
let proof = if i == 4 {
let n1 = random_secret(false);
let rp = secp.bullet_proof(
out_value,
final_blind.clone(),
n1.clone(),
n1.clone(),
None,
None,
);
let rp = secp
.bullet_proof(
out_value,
final_blind.clone(),
n1.clone(),
n1.clone(),
None,
None,
)
.expect("failed to generate test bulletproof");
assert!(secp.verify_bullet_proof(final_commit, rp, None).is_ok());
Some(rp)
} else {
util/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_util"
version = "5.5.0"
version = "5.5.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Util, for generic utilities and to re-export grin crates"
license = "Apache-2.0"