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

WIP: transaction report rework #3316

Draft
wants to merge 12 commits into
base: release/v6.0
Choose a base branch
from
Draft

WIP: transaction report rework #3316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d495bd4
working on summary report improvements
ryankurte Feb 14, 2023
28470de
add sci inputs to summary reports
ryankurte Jun 21, 2023
486ae12
rebase and update lock
ryankurte Jul 14, 2023
3ab66d3
add swap elision to report, update docs
ryankurte Jul 25, 2023
735ef94
lockfile change
ryankurte Sep 19, 2023
3493a01
fix report tests to include sci totals
ryankurte Sep 21, 2023
fdec87f
fix lints
ryankurte Sep 21, 2023
6110326
swap transaction summary report to 128-bit types
ryankurte Sep 23, 2023
960011e
Merge branch 'release/v6.0' into ryan/tx-report-rework
holtzman Aug 1, 2024
80cf635
lint fix; update Cargo.lock
holtzman Aug 1, 2024
0cf5f7e
lint fixes
holtzman Aug 1, 2024
bd88579
lint fixes
holtzman Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 46 additions & 2 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.

4 changes: 2 additions & 2 deletions account-keys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ rust-version = { workspace = true }
[features]
std = ["mc-util-repr-bytes/alloc"]
prost = ["dep:prost", "mc-util-repr-bytes/prost", "mc-crypto-keys/prost"]
serde = ["mc-crypto-keys/serde"]
serde = ["dep:serde", "mc-crypto-keys/serde", "curve25519-dalek/serde"]
default = ["std", "prost", "serde", "mc-util-serial", "mc-crypto-digestible/default", "mc-crypto-hashes/default", "mc-crypto-keys/default"]

[dependencies]
Expand All @@ -22,7 +22,7 @@ hex_fmt = "0.3"
hkdf = "0.12.4"
prost = { version = "0.12", optional = true, default-features = false, features = ["prost-derive"] }
rand_core = { version = "0.6", default-features = false }
serde = { version = "1.0", default-features = false }
serde = { version = "1.0", optional = true, default-features = false, features = [ "alloc", "derive" ] }
subtle = { version = "2", default-features = false }
zeroize = { version = "1", default-features = false }

Expand Down
8 changes: 4 additions & 4 deletions account-keys/src/account_keys.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2018-2022 The MobileCoin Foundation
// Copyright (c) 2018-2023 The MobileCoin Foundation

//! MobileCoin account keys.
//!
Expand Down Expand Up @@ -37,6 +37,7 @@ use mc_util_from_random::FromRandom;
#[cfg(feature = "prost")]
use prost::Message;
use rand_core::{CryptoRng, RngCore};
#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
use zeroize::Zeroize;

Expand All @@ -49,10 +50,9 @@ pub use mc_core::{
};

/// A MobileCoin user's public subaddress.
#[derive(
Clone, Deserialize, Digestible, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize, Zeroize,
)]
#[derive(Clone, Digestible, Eq, Hash, Ord, PartialEq, PartialOrd, Zeroize)]
#[cfg_attr(feature = "prost", derive(Message))]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub struct PublicAddress {
/// The user's public subaddress view key 'C'.
#[cfg_attr(feature = "prost", prost(message, required, tag = "1"))]
Expand Down
Loading
Loading