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

fix: backup spend #6466

Merged
merged 3 commits into from
Aug 14, 2024
Merged

fix: backup spend #6466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5c25a8
fix backup spend
SWvheerden Aug 13, 2024
02491d3
fmt
SWvheerden Aug 14, 2024
8a76910
fmt
SWvheerden Aug 14, 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
28 changes: 14 additions & 14 deletions base_layer/core/src/transactions/key_manager/inner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1506,10 +1506,8 @@ where TBackend: KeyManagerBackend<PublicKey> + 'static
txo_version: &TransactionOutputVersion,
metadata_signature_message: &[u8; 32],
) -> Result<ComAndPubSignature, TransactionError> {
let ephemeral_private_key = self.get_private_key(ephemeral_private_nonce_id).await?;
let ephemeral_pubkey = PublicKey::from_secret_key(&ephemeral_private_key);
let sender_offset_private_key = self.get_private_key(sender_offset_key_id).await?; // Take the index and use it to find the key from ledger
let sender_offset_public_key = PublicKey::from_secret_key(&sender_offset_private_key);
let ephemeral_pubkey = self.get_public_key_at_key_id(ephemeral_private_nonce_id).await?;
let sender_offset_public_key = self.get_public_key_at_key_id(sender_offset_key_id).await?;

let challenge = TransactionOutput::finalize_metadata_signature_challenge(
txo_version,
Expand All @@ -1520,16 +1518,18 @@ where TBackend: KeyManagerBackend<PublicKey> + 'static
metadata_signature_message,
);

let metadata_signature = ComAndPubSignature::sign(
&PrivateKey::default(),
&PrivateKey::default(),
&sender_offset_private_key,
&PrivateKey::default(),
&PrivateKey::default(),
&ephemeral_private_key,
&challenge,
&*self.crypto_factories.commitment,
)?;
let sender_partial_metadata_signature_self = self
.sign_with_nonce_and_challenge(sender_offset_key_id, ephemeral_private_nonce_id, &challenge)
.await?;

let metadata_signature = ComAndPubSignature::new(
Default::default(),
sender_partial_metadata_signature_self.get_public_nonce().clone(),
Default::default(),
Default::default(),
sender_partial_metadata_signature_self.get_signature().clone(),
);

Ok(metadata_signature)
}

Expand Down
3 changes: 2 additions & 1 deletion base_layer/wallet/src/output_manager_service/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1765,9 +1765,10 @@ where
.with_sender_offset_public_key(sender_offset_public_key)
.with_script_key(self.resources.key_manager.get_spend_key().await?.key_id)
.with_minimum_value_promise(minimum_value_promise)
.sign_as_sender_and_receiver(
.sign_as_sender_and_receiver_verified(
&self.resources.key_manager,
&sender_offset_private_key_id_self,
&recipient_address,
)
.await
.map_err(|e|service_error_with_id(tx_id, e.to_string(), true))?
Expand Down
Loading