Skip to content

Commit

Permalink
Add pre-mine spend
Browse files Browse the repository at this point in the history 
Added pre-mine spend with improved logging for fault finding
  • Loading branch information
@hansieodendaal
hansieodendaal committed Aug 2, 2024
1 parent 6a9485c commit 6bd4cd6
Show file tree
Hide file tree
Showing 6 changed files with 474 additions and 206 deletions.
45 changes: 25 additions & 20 deletions applications/minotari_ledger_wallet/comms/examples/ledger_demo/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@

//! # Multi-party Ledger - command line example
/// This example demonstrates how to use the Ledger Nano S/X for the Tari wallet. In order to run the example, you
/// need to have the `MinoTari Wallet` application installed on your Ledger device. For that, please follow the
/// instructions in the [README](../../wallet/README.md) file.
/// With this example, you can:
/// - Detect the hardware wallet
/// - Verify that the Ledger application is installed and the version is correct
/// - TBD
///
/// -----------------------------------------------------------------------------------------------
/// Example use:
/// `cargo run --release --example ledger_demo`
/// -----------------------------------------------------------------------------------------------
use dialoguer::{theme::ColorfulTheme, Select};
use minotari_ledger_wallet_comms::{
accessor_methods::{
Expand All @@ -21,20 +33,7 @@ use minotari_ledger_wallet_comms::{
error::LedgerDeviceError,
ledger_wallet::get_transport,
};
use rand::rngs::OsRng;
/// This example demonstrates how to use the Ledger Nano S/X for the Tari wallet. In order to run the example, you
/// need to have the `MinoTari Wallet` application installed on your Ledger device. For that, please follow the
/// instructions in the [README](../../wallet/README.md) file.
/// With this example, you can:
/// - Detect the hardware wallet
/// - Verify that the Ledger application is installed and the version is correct
/// - TBD
///
/// -----------------------------------------------------------------------------------------------
/// Example use:
/// `cargo run --release --example ledger_demo`
/// -----------------------------------------------------------------------------------------------
use rand::RngCore;
use rand::{rngs::OsRng, RngCore};
use tari_common::configuration::Network;
use tari_common_types::{
key_branches::TransactionKeyManagerBranch,
Expand Down Expand Up @@ -181,18 +180,24 @@ fn main() {

// GetScriptOffset
println!("\ntest: GetScriptOffset");
let total_script_private_key = PrivateKey::default();
let mut derived_key_commitments = Vec::new();
let partial_script_offset = PrivateKey::default();
let mut derived_script_keys = Vec::new();
let mut script_key_indexes = Vec::new();
let mut derived_sender_offsets = Vec::new();
let mut sender_offset_indexes = Vec::new();
for _i in 0..5 {
derived_key_commitments.push(get_random_nonce());
sender_offset_indexes.push(OsRng.next_u64());
derived_script_keys.push(get_random_nonce());
script_key_indexes.push((TransactionKeyManagerBranch::Spend, OsRng.next_u64()));
derived_sender_offsets.push(get_random_nonce());
sender_offset_indexes.push((TransactionKeyManagerBranch::OneSidedSenderOffset, OsRng.next_u64()));
}

match ledger_get_script_offset(
account,
&total_script_private_key,
&derived_key_commitments,
&partial_script_offset,
&derived_script_keys,
&script_key_indexes,
&derived_sender_offsets,
&sender_offset_indexes,
) {
Ok(script_offset) => println!("script_offset: {}", script_offset.to_hex()),
Expand Down
107 changes: 77 additions & 30 deletions applications/minotari_ledger_wallet/comms/src/accessor_methods.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use tari_common_types::{
};
use tari_crypto::dhke::DiffieHellmanSharedSecret;
use tari_script::CheckSigSchnorrSignature;
use tari_utilities::ByteArray;
use tari_utilities::{hex::Hex, ByteArray};

use crate::{
error::LedgerDeviceError,
Expand Down Expand Up @@ -187,7 +187,7 @@ pub fn ledger_get_version() -> Result<String, LedgerDeviceError> {

/// Get the public alpha key from the ledger device
pub fn ledger_get_public_spend_key(account: u64) -> Result<PublicKey, LedgerDeviceError> {
debug!(target: LOG_TARGET, "ledger_get_public_spend_key: account {}", account);
debug!(target: LOG_TARGET, "ledger_get_public_spend_key: account '{}'", account);
verify_ledger_application()?;

match Command::<Vec<u8>>::build_command(account, Instruction::GetPublicSpendKey, vec![]).execute() {
Expand All @@ -212,7 +212,11 @@ pub fn ledger_get_public_key(
index: u64,
branch: TransactionKeyManagerBranch,
) -> Result<PublicKey, LedgerDeviceError> {
debug!(target: LOG_TARGET, "ledger_get_public_key: account {}, index {}, branch {:?}", account, index, branch);
debug!(
target: LOG_TARGET,
"ledger_get_public_key: account '{}', index '{}', branch '{:?}'",
account, index, branch
);
verify_ledger_application()?;

let mut data = Vec::new();
Expand Down Expand Up @@ -245,9 +249,9 @@ pub fn ledger_get_script_signature(
value: &PrivateKey,
commitment_private_key: &PrivateKey,
commitment: &Commitment,
script_message: [u8; 32],
message: [u8; 32],
) -> Result<ComAndPubSignature, LedgerDeviceError> {
debug!(target: LOG_TARGET, "ledger_get_script_signature: account {}", account);
debug!(target: LOG_TARGET, "ledger_get_script_signature: account '{}', message '{}'", account, message.to_hex());
verify_ledger_application()?;

let mut data = Vec::new();
Expand All @@ -263,7 +267,7 @@ pub fn ledger_get_script_signature(
data.extend_from_slice(&commitment_private_key);
let commitment = commitment.to_vec();
data.extend_from_slice(&commitment);
data.extend_from_slice(&script_message);
data.extend_from_slice(&message);

match Command::<Vec<u8>>::build_command(account, Instruction::GetScriptSignature, data).execute() {
Ok(result) => {
Expand Down Expand Up @@ -291,28 +295,55 @@ pub fn ledger_get_script_signature(
/// Get the script offset from the ledger device
pub fn ledger_get_script_offset(
account: u64,
total_script_private_key: &PrivateKey,
derived_key_commitments: &[PrivateKey],
sender_offset_indexes: &[u64],
partial_script_offset: &PrivateKey,
derived_script_keys: &[PrivateKey],
script_key_indexes: &[(TransactionKeyManagerBranch, u64)],
derived_sender_offsets: &[PrivateKey],
sender_offset_indexes: &[(TransactionKeyManagerBranch, u64)],
) -> Result<PrivateKey, LedgerDeviceError> {
debug!(target: LOG_TARGET, "ledger_get_script_offset: account {}", account);
debug!(
target: LOG_TARGET,
"ledger_get_script_offset: account '{}', partial_script_offset '{}', derived_script_keys: '{:?}', \
script_key_indexes: '{:?}', derived_sender_offsets '{:?}', sender_offset_indexes '{:?}'",
account,
partial_script_offset.to_hex(),
derived_script_keys,
script_key_indexes,
derived_sender_offsets,
sender_offset_indexes
);
verify_ledger_application()?;

let num_commitments = derived_key_commitments.len() as u64;
let num_offset_key = sender_offset_indexes.len() as u64;

let mut instructions = num_offset_key.to_le_bytes().to_vec();
instructions.extend_from_slice(&num_commitments.to_le_bytes());

// 1. data sizes
let mut instructions: Vec<u8> = Vec::new();
instructions.extend_from_slice(&(sender_offset_indexes.len() as u64).to_le_bytes());
instructions.extend_from_slice(&(script_key_indexes.len() as u64).to_le_bytes());
instructions.extend_from_slice(&(derived_sender_offsets.len() as u64).to_le_bytes());
instructions.extend_from_slice(&(derived_script_keys.len() as u64).to_le_bytes());
let mut data: Vec<Vec<u8>> = vec![instructions.to_vec()];
data.push(total_script_private_key.to_vec());

for sender_offset_index in sender_offset_indexes {
data.push(sender_offset_index.to_le_bytes().to_vec());
}
// 2. partial_script_offset
data.push(partial_script_offset.to_vec());

for derived_key_commitment in derived_key_commitments {
data.push(derived_key_commitment.to_vec());
// 3. sender_offset_indexes
for (branch, index) in sender_offset_indexes {
let mut payload = u64::from(branch.as_byte()).to_le_bytes().to_vec();
payload.extend_from_slice(&index.to_le_bytes());
data.push(payload);
}
// 4. script_key_indexes
for (branch, index) in script_key_indexes {
let mut payload = u64::from(branch.as_byte()).to_le_bytes().to_vec();
payload.extend_from_slice(&index.to_le_bytes());
data.push(payload);
}
// 5. derived_sender_offsets
for sender_offset in derived_sender_offsets {
data.push(sender_offset.to_vec());
}
// 6. derived_script_keys
for script_key in derived_script_keys {
data.push(script_key.to_vec());
}

let commands = Command::<Vec<u8>>::chunk_command(account, Instruction::GetScriptOffset, data);
Expand Down Expand Up @@ -343,7 +374,7 @@ pub fn ledger_get_script_offset(

/// Get the view key from the ledger device
pub fn ledger_get_view_key(account: u64) -> Result<PrivateKey, LedgerDeviceError> {
debug!(target: LOG_TARGET, "ledger_get_view_key: account {}", account);
debug!(target: LOG_TARGET, "ledger_get_view_key: account '{}'", account);
verify_ledger_application()?;

match Command::<Vec<u8>>::build_command(account, Instruction::GetViewKey, vec![]).execute() {
Expand All @@ -369,7 +400,11 @@ pub fn ledger_get_dh_shared_secret(
branch: TransactionKeyManagerBranch,
public_key: &PublicKey,
) -> Result<DiffieHellmanSharedSecret<PublicKey>, LedgerDeviceError> {
debug!(target: LOG_TARGET, "ledger_get_dh_shared_secret: account {}, index {}, branch {:?}", account, index, branch);
debug!(
target: LOG_TARGET,
"ledger_get_dh_shared_secret: account '{}', index '{}', branch '{:?}'",
account, index, branch
);
verify_ledger_application()?;

let mut data = Vec::new();
Expand Down Expand Up @@ -402,8 +437,12 @@ pub fn ledger_get_raw_schnorr_signature(
nonce_branch: TransactionKeyManagerBranch,
challenge: &[u8; 64],
) -> Result<Signature, LedgerDeviceError> {
debug!(target: LOG_TARGET, "ledger_get_raw_schnorr_signature: account {}, pk index {}, pk branch {:?}, nonce index {}, nonce branch {:?}",
account, private_key_index, private_key_branch, nonce_index, nonce_branch);
debug!(
target: LOG_TARGET,
"ledger_get_raw_schnorr_signature: account '{}', pk index '{}', pk branch '{:?}', nonce index '{}', \
nonce branch' {:?}', challenge '{}'",
account, private_key_index, private_key_branch, nonce_index, nonce_branch, challenge.to_hex()
);
verify_ledger_application()?;

let mut data = Vec::new();
Expand Down Expand Up @@ -440,8 +479,11 @@ pub fn ledger_get_script_schnorr_signature(
private_key_branch: TransactionKeyManagerBranch,
nonce: &[u8],
) -> Result<CheckSigSchnorrSignature, LedgerDeviceError> {
debug!(target: LOG_TARGET, "ledger_get_raw_schnorr_signature: account {}, pk index {}, pk branch {:?}",
account, private_key_index, private_key_branch);
debug!(
target: LOG_TARGET,
"ledger_get_raw_schnorr_signature: account '{}', pk index '{}', pk branch '{:?}'",
account, private_key_index, private_key_branch
);
verify_ledger_application()?;

let mut data = Vec::new();
Expand Down Expand Up @@ -483,8 +525,13 @@ pub fn ledger_get_one_sided_metadata_signature(
value: u64,
sender_offset_key_index: u64,
commitment_mask: &PrivateKey,
metadata_signature_message: &[u8; 32],
message: &[u8; 32],
) -> Result<ComAndPubSignature, LedgerDeviceError> {
debug!(
target: LOG_TARGET,
"ledger_get_one_sided_metadata_signature: account '{}', message '{}'",
account, message.to_hex()
);
verify_ledger_application()?;

let mut data = Vec::new();
Expand All @@ -493,7 +540,7 @@ pub fn ledger_get_one_sided_metadata_signature(
data.extend_from_slice(&sender_offset_key_index.to_le_bytes());
data.extend_from_slice(&value.to_le_bytes());
data.extend_from_slice(&commitment_mask.to_vec());
data.extend_from_slice(&metadata_signature_message.to_vec());
data.extend_from_slice(&message.to_vec());

match Command::<Vec<u8>>::build_command(account, Instruction::GetOneSidedMetadataSignature, data).execute() {
Ok(result) => {
Expand Down
Loading

0 comments on commit 6bd4cd6

Please sign in to comment.