diff --git a/applications/minotari_console_wallet/src/automation/commands.rs b/applications/minotari_console_wallet/src/automation/commands.rs
index 75817b3fdf..af6ba05732 100644
--- a/applications/minotari_console_wallet/src/automation/commands.rs
+++ b/applications/minotari_console_wallet/src/automation/commands.rs
@@ -839,10 +839,10 @@ pub async fn command_runner(
let out_dir = out_dir(&session_info.session_id)?;
let step_2_outputs_for_leader = Step2OutputsForLeader {
script_input_signature,
- wallet_public_spend_key: wallet_spend_key.key,
- public_script_nonce_key: script_nonce_key.key,
- public_sender_offset_key: sender_offset_key.key,
- public_sender_offset_nonce_key: sender_offset_nonce.key,
+ wallet_public_spend_key: wallet_spend_key.pub_key,
+ public_script_nonce_key: script_nonce_key.pub_key,
+ public_sender_offset_key: sender_offset_key.pub_key,
+ public_sender_offset_nonce_key: sender_offset_nonce.pub_key,
dh_shared_secret_public_key: shared_secret_public_key,
};
let out_file_leader = out_dir.join(get_file_name(STEP_2_LEADER, Some(args.alias.clone())));
diff --git a/applications/minotari_node/src/grpc/base_node_grpc_server.rs b/applications/minotari_node/src/grpc/base_node_grpc_server.rs
index 337c56fcb5..50872a8bb7 100644
--- a/applications/minotari_node/src/grpc/base_node_grpc_server.rs
+++ b/applications/minotari_node/src/grpc/base_node_grpc_server.rs
@@ -870,7 +870,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer {
.get_next_key(TransactionKeyManagerBranch::KernelNonce.get_branch_key())
.await
.map_err(|e| obscure_error_if_true(report_error_flag, Status::internal(e.to_string())))?;
- total_nonce = &total_nonce + &new_nonce.key;
+ total_nonce = &total_nonce + &new_nonce.pub_key;
total_excess = &total_excess + &coinbase_kernel.excess;
private_keys.push((wallet_output.spending_key_id, new_nonce.key_id));
kernel_message = TransactionKernel::build_kernel_signature_message(
@@ -1067,7 +1067,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer {
.get_next_key(TransactionKeyManagerBranch::KernelNonce.get_branch_key())
.await
.map_err(|e| obscure_error_if_true(report_error_flag, Status::internal(e.to_string())))?;
- total_nonce = &total_nonce + &new_nonce.key;
+ total_nonce = &total_nonce + &new_nonce.pub_key;
total_excess = &total_excess + &coinbase_kernel.excess;
private_keys.push((wallet_output.spending_key_id, new_nonce.key_id));
kernel_message = TransactionKernel::build_kernel_signature_message(
diff --git a/base_layer/core/src/blocks/faucets/mod.rs b/base_layer/core/src/blocks/faucets/mod.rs
index 09b77138e1..88dd787894 100644
--- a/base_layer/core/src/blocks/faucets/mod.rs
+++ b/base_layer/core/src/blocks/faucets/mod.rs
@@ -84,13 +84,9 @@ mod test {
let mut total_private_key = PrivateKey::default();
for _ in 0..num_faucets {
- let (commitment_mask, script_key) =
- key_manager.get_next_commitment_mask_and_script_key().await.unwrap();
- total_private_key = total_private_key +
- &key_manager
- .get_private_key(&commitment_mask.key_id)
- .await
- .unwrap();
+ let (commitment_mask, script_key) = key_manager.get_next_commitment_mask_and_script_key().await.unwrap();
+ total_private_key =
+ total_private_key + &key_manager.get_private_key(&commitment_mask.key_id).await.unwrap();
let commitment = key_manager
.get_commitment(&commitment_mask.key_id, &amount.into())
.await
@@ -100,7 +96,7 @@ mod test {
.finalize()
.into();
- let sender_offset_key = key_manager
+ let sender_offset = key_manager
.get_next_key(TransactionKeyManagerBranch::SenderOffset.get_branch_key())
.await
.unwrap();
@@ -110,7 +106,7 @@ mod test {
list_of_spend_keys.clone(),
Box::new(com_hash),
)]);
- let output = WalletOutputBuilder::new(amount, commitment_mask_key_id.key_id)
+ let output = WalletOutputBuilder::new(amount, commitment_mask.key_id)
.with_features(OutputFeatures::new(
OutputFeaturesVersion::get_current_version(),
OutputType::Standard,
@@ -125,10 +121,10 @@ mod test {
.unwrap()
.with_input_data(ExecutionStack::default())
.with_version(TransactionOutputVersion::get_current_version())
- .with_sender_offset_public_key(sender_offset_key.key)
+ .with_sender_offset_public_key(sender_offset.pub_key)
.with_script_key(script_key.key_id)
.with_minimum_value_promise(amount)
- .sign_as_sender_and_receiver(&key_manager, &sender_offset_key.key_id)
+ .sign_as_sender_and_receiver(&key_manager, &sender_offset.key_id)
.await
.unwrap()
.try_build(&key_manager)
diff --git a/base_layer/core/src/transactions/coinbase_builder.rs b/base_layer/core/src/transactions/coinbase_builder.rs
index ceb9a6c7f0..d9ad3d5cbd 100644
--- a/base_layer/core/src/transactions/coinbase_builder.rs
+++ b/base_layer/core/src/transactions/coinbase_builder.rs
@@ -297,7 +297,7 @@ where TKeyManagerInterface: TransactionKeyManagerInterface
.get_partial_txo_kernel_signature(
&commitment_mask_key_id,
&public_nonce.key_id,
- &public_nonce.key,
+ &public_nonce.pub_key,
&public_commitment_mask_key,
&kernel_version,
&kernel_message,
@@ -862,7 +862,7 @@ mod test {
.get_partial_txo_kernel_signature(
&output.spending_key_id,
&new_nonce.key_id,
- &new_nonce.key,
+ &new_nonce.pub_key,
&excess,
&TransactionKernelVersion::get_current_version(),
&kernel_message,
@@ -878,7 +878,7 @@ mod test {
.unwrap();
let sig_challenge = TransactionKernel::finalize_kernel_signature_challenge(
&TransactionKernelVersion::get_current_version(),
- &new_nonce.key,
+ &new_nonce.pub_key,
&excess,
&kernel_message,
);
@@ -1005,7 +1005,7 @@ mod test {
.get_next_key(TransactionKeyManagerBranch::KernelNonce.get_branch_key())
.await
.unwrap();
- let nonce = &new_nonce1.key + &new_nonce2.key;
+ let nonce = &new_nonce1.pub_key + &new_nonce2.pub_key;
let kernel_message = TransactionKernel::build_kernel_signature_message(
&TransactionKernelVersion::get_current_version(),
kernel_1.fee,
diff --git a/base_layer/core/src/transactions/key_manager/inner.rs b/base_layer/core/src/transactions/key_manager/inner.rs
index ba38f39d10..ab45d22993 100644
--- a/base_layer/core/src/transactions/key_manager/inner.rs
+++ b/base_layer/core/src/transactions/key_manager/inner.rs
@@ -178,7 +178,7 @@ where TBackend: KeyManagerBackend<PublicKey> + 'static
index,
};
let key = self.get_public_key_at_key_id(&key_id).await?;
- Ok(KeyAndId { key_id, key })
+ Ok(KeyAndId { key_id, pub_key: key })
}
pub async fn get_random_key(&self) -> Result<KeyAndId<PublicKey>, KeyManagerServiceError> {
@@ -187,7 +187,7 @@ where TBackend: KeyManagerBackend<PublicKey> + 'static
let public_key = self.get_public_key_at_key_id(&key_id).await?;
Ok(KeyAndId {
key_id,
- key: public_key,
+ pub_key: public_key,
})
}
@@ -258,7 +258,7 @@ where TBackend: KeyManagerBackend<PublicKey> + 'static
Ok(km.derive_public_key(*index)?.key)
},
KeyId::Derived { branch, label, index } => {
- let public_alpha = self.get_spend_key().await?.key;
+ let public_alpha = self.get_spend_key().await?.pub_key;
let km = self
.key_managers
.get(branch)
@@ -387,7 +387,7 @@ where TBackend: KeyManagerBackend<PublicKey> + 'static
index: 0,
};
let key = PublicKey::from_secret_key(&self.get_private_view_key().await?);
- Ok(KeyAndId { key_id, key })
+ Ok(KeyAndId { key_id, pub_key: key })
}
pub async fn get_spend_key(&self) -> Result<KeyAndId<PublicKey>, KeyManagerServiceError> {
@@ -406,7 +406,7 @@ where TBackend: KeyManagerBackend<PublicKey> + 'static
))?,
WalletType::ProvidedKeys(wallet) => wallet.public_spend_key.clone(),
};
- Ok(KeyAndId { key_id, key })
+ Ok(KeyAndId { key_id, pub_key: key })
}
pub async fn get_comms_key(&self) -> Result<KeyAndId<PublicKey>, KeyManagerServiceError> {
@@ -416,7 +416,7 @@ where TBackend: KeyManagerBackend<PublicKey> + 'static
};
let private_key = self.get_private_comms_key().await?;
let key = PublicKey::from_secret_key(&private_key);
- Ok(KeyAndId { key_id, key })
+ Ok(KeyAndId { key_id, pub_key: key })
}
pub async fn get_next_commitment_mask_and_script_key(
@@ -437,7 +437,7 @@ where TBackend: KeyManagerBackend<PublicKey> + 'static
let script_public_key = self.get_public_key_at_key_id(&script_key_id).await?;
Ok((commitment_mask, KeyAndId {
key_id: script_key_id,
- key: script_public_key,
+ pub_key: script_public_key,
}))
}
@@ -1177,7 +1177,7 @@ where TBackend: KeyManagerBackend<PublicKey> + 'static
spending_key_id,
value_as_private_key,
&sender_offset_public_key,
- &ephemeral_pubkey.key,
+ &ephemeral_pubkey.pub_key,
txo_version,
metadata_signature_message,
range_proof_type,
diff --git a/base_layer/core/src/transactions/test_helpers.rs b/base_layer/core/src/transactions/test_helpers.rs
index c3ad5bcb78..d1f3d36f47 100644
--- a/base_layer/core/src/transactions/test_helpers.rs
+++ b/base_layer/core/src/transactions/test_helpers.rs
@@ -122,7 +122,7 @@ impl TestParams {
.get_next_key(TransactionKeyManagerBranch::KernelNonce.get_branch_key())
.await
.unwrap();
- let public_noncey = key_manager
+ let public_nonce = key_manager
.get_next_key(TransactionKeyManagerBranch::Nonce.get_branch_key())
.await
.unwrap();
@@ -134,15 +134,15 @@ impl TestParams {
Self {
commitment_mask_key_id: commitment_mask_key.key_id,
script_key_id: script_key.key_id,
- script_key_pk: script_key.key,
- sender_offset_key_id: sender_offset_key.key_id,
- sender_offset_key_pk: sender_offset_key.key,
- kernel_nonce_key_id: kernel_nonce_key.key_id,
- kernel_nonce_key_pk: kernel_nonce_key.key,
- public_nonce_key_id: public_nonce_key.key_id,
- public_nonce_key_pk: public_nonce_key.key,
+ script_key_pk: script_key.pub_key,
+ sender_offset_key_id: sender_offset.key_id,
+ sender_offset_key_pk: sender_offset.pub_key,
+ kernel_nonce_key_id: kernel_nonce.key_id,
+ kernel_nonce_key_pk: kernel_nonce.pub_key,
+ public_nonce_key_id: public_nonce.key_id,
+ public_nonce_key_pk: public_nonce.pub_key,
ephemeral_public_nonce_key_id: ephemeral_public_nonce.key_id,
- ephemeral_public_nonce_key_pk: ephemeral_public_nonce.key,
+ ephemeral_public_nonce_key_pk: ephemeral_public_nonce.pub_key,
transaction_weight: TransactionWeight::v1(),
}
}
@@ -308,7 +308,7 @@ pub async fn create_random_signature_from_secret_key(
.get_partial_txo_kernel_signature(
&secret_key_id,
&total_nonce.key_id,
- &total_nonce.key,
+ &total_nonce.pub_key,
&total_excess,
&kernel_version,
&kernel_message,
@@ -736,7 +736,7 @@ pub async fn create_stx_protocol_internal(
let script_key_id = KeyId::Derived {
branch: TransactionKeyManagerBranch::CommitmentMask.get_branch_key(),
label: TransactionKeyManagerLabel::ScriptKey.get_branch_key(),
- index: commitment_mask_key.key_id.managed_index().unwrap(),
+ index: commitment_mask.key_id.managed_index().unwrap(),
};
let script_public_key = key_manager.get_public_key_at_key_id(&script_key_id).await.unwrap();
let input_data = match &schema.input_data {
@@ -747,7 +747,7 @@ pub async fn create_stx_protocol_internal(
Some(data) => data,
None => TransactionOutputVersion::get_current_version(),
};
- let output = WalletOutputBuilder::new(val, commitment_mask_key.key_id)
+ let output = WalletOutputBuilder::new(val, commitment_mask.key_id)
.with_features(schema.features.clone())
.with_script(schema.script.clone())
.encrypt_data_for_recovery(key_manager, None, PaymentId::Empty)
@@ -756,9 +756,9 @@ pub async fn create_stx_protocol_internal(
.with_input_data(input_data)
.with_covenant(schema.covenant.clone())
.with_version(version)
- .with_sender_offset_public_key(sender_offset_key.key)
+ .with_sender_offset_public_key(sender_offset.pub_key)
.with_script_key(script_key_id.clone())
- .sign_as_sender_and_receiver(key_manager, &sender_offset_key.key_id)
+ .sign_as_sender_and_receiver(key_manager, &sender_offset.key_id)
.await
.unwrap()
.try_build(key_manager)
@@ -766,7 +766,7 @@ pub async fn create_stx_protocol_internal(
.unwrap();
outputs.push(output.clone());
- stx_builder.with_output(output, sender_offset_key.key_id).await.unwrap();
+ stx_builder.with_output(output, sender_offset.key_id).await.unwrap();
}
for mut utxo in schema.to_outputs {
let sender_offset = key_manager
@@ -778,7 +778,7 @@ pub async fn create_stx_protocol_internal(
.get_metadata_signature(
&utxo.spending_key_id,
&utxo.value.into(),
- &sender_offset_key.key_id,
+ &sender_offset.key_id,
&utxo.version,
&metadata_message,
utxo.features.range_proof_type,
@@ -786,7 +786,7 @@ pub async fn create_stx_protocol_internal(
.await
.unwrap();
- stx_builder.with_output(utxo, sender_offset_key.key_id).await.unwrap();
+ stx_builder.with_output(utxo, sender_offset.key_id).await.unwrap();
}
stx_builder
@@ -813,7 +813,7 @@ pub async fn create_coinbase_kernel(
.get_partial_txo_kernel_signature(
commitment_mask_key_id,
&public_nonce.key_id,
- &public_nonce.key,
+ &public_nonce.pub_key,
&public_commitment_mask,
&kernel_version,
&kernel_message,
@@ -858,7 +858,7 @@ pub async fn create_utxo(
.await
.unwrap();
let encrypted_data = key_manager
- .encrypt_data_for_recovery(&commitment_mask_key.key_id, None, value.into(), PaymentId::Empty)
+ .encrypt_data_for_recovery(&commitment_mask.key_id, None, value.into(), PaymentId::Empty)
.await
.unwrap();
let sender_offset = key_manager
@@ -875,9 +875,9 @@ pub async fn create_utxo(
);
let metadata_sig = key_manager
.get_metadata_signature(
- &commitment_mask_key.key_id,
+ &commitment_mask.key_id,
&value.into(),
- &sender_offset_key.key_id,
+ &sender_offset.key_id,
&TransactionOutputVersion::get_current_version(),
&metadata_message,
features.range_proof_type,
@@ -885,13 +885,13 @@ pub async fn create_utxo(
.await
.unwrap();
let commitment = key_manager
- .get_commitment(&commitment_mask_key.key_id, &value.into())
+ .get_commitment(&commitment_mask.key_id, &value.into())
.await
.unwrap();
let proof = if features.range_proof_type == RangeProofType::BulletProofPlus {
Some(
key_manager
- .construct_range_proof(&commitment_mask_key.key_id, value.into(), minimum_value_promise.into())
+ .construct_range_proof(&commitment_mask.key_id, value.into(), minimum_value_promise.into())
.await
.unwrap(),
)
@@ -904,7 +904,7 @@ pub async fn create_utxo(
commitment,
proof,
script.clone(),
- sender_offset_key.key,
+ sender_offset.pub_key,
metadata_sig,
covenant.clone(),
encrypted_data,
@@ -912,7 +912,7 @@ pub async fn create_utxo(
);
utxo.verify_range_proof(&CryptoFactories::default().range_proof)
.unwrap();
- (utxo, commitment_mask_key.key_id, sender_offset_key.key_id)
+ (utxo, commitment_mask.key_id, sender_offset.key_id)
}
pub async fn schema_to_transaction(
diff --git a/base_layer/core/src/transactions/transaction_components/wallet_output.rs b/base_layer/core/src/transactions/transaction_components/wallet_output.rs
index 6e85f8939a..ec1d50ca8e 100644
--- a/base_layer/core/src/transactions/transaction_components/wallet_output.rs
+++ b/base_layer/core/src/transactions/transaction_components/wallet_output.rs
@@ -256,7 +256,7 @@ impl WalletOutput {
let script_public_key_self = key_manager.get_public_key_at_key_id(&self.script_key_id).await?;
let script_public_key = aggregated_script_public_key_shares + script_public_key_self;
- let total_ephemeral_public_key = aggregated_script_signature_public_nonces + &ephemeral_public_key_self.key;
+ let total_ephemeral_public_key = aggregated_script_signature_public_nonces + &ephemeral_public_key_self.pub_key;
let commitment_partial_script_signature = key_manager
.get_partial_script_signature(
&self.spending_key_id,
diff --git a/base_layer/core/src/transactions/transaction_components/wallet_output_builder.rs b/base_layer/core/src/transactions/transaction_components/wallet_output_builder.rs
index d6da2fe424..7280e139b3 100644
--- a/base_layer/core/src/transactions/transaction_components/wallet_output_builder.rs
+++ b/base_layer/core/src/transactions/transaction_components/wallet_output_builder.rs
@@ -229,7 +229,7 @@ impl WalletOutputBuilder {
let ephemeral_pubkey_self = key_manager
.get_next_key(TransactionKeyManagerBranch::MetadataEphemeralNonce.get_branch_key())
.await?;
- let aggregate_ephemeral_pubkey = aggregated_ephemeral_public_key_shares + &ephemeral_pubkey_self.key;
+ let aggregate_ephemeral_pubkey = aggregated_ephemeral_public_key_shares + &ephemeral_pubkey_self.pub_key;
let receiver_partial_metadata_signature = key_manager
.get_receiver_partial_metadata_signature(
@@ -324,11 +324,11 @@ mod test {
let kmob = WalletOutputBuilder::new(value, commitment_mask_key.key_id.clone());
let kmob = kmob.with_script(TariScript::new(vec![]));
assert!(kmob.clone().try_build(&key_manager).await.is_err());
- let sender_offset_key = key_manager
+ let sender_offset = key_manager
.get_next_key(TransactionKeyManagerBranch::SenderOffset.get_branch_key())
.await
.unwrap();
- let kmob = kmob.with_sender_offset_public_key(sender_offset_key.key);
+ let kmob = kmob.with_sender_offset_public_key(sender_offset.pub_key);
assert!(kmob.clone().try_build(&key_manager).await.is_err());
let kmob = kmob.with_input_data(ExecutionStack::new(vec![]));
let kmob = kmob.with_script_key(script_key_id.key_id);
@@ -337,7 +337,7 @@ mod test {
.encrypt_data_for_recovery(&key_manager, None, PaymentId::Empty)
.await
.unwrap()
- .sign_as_sender_and_receiver(&key_manager, &sender_offset_key.key_id)
+ .sign_as_sender_and_receiver(&key_manager, &sender_offset.key_id)
.await
.unwrap();
match kmob.clone().try_build(&key_manager).await {
@@ -365,11 +365,11 @@ mod test {
let value = MicroMinotari(100);
let kmob = WalletOutputBuilder::new(value, commitment_mask_key.key_id.clone());
let kmob = kmob.with_script(TariScript::new(vec![]));
- let sender_offset_key = key_manager
+ let sender_offset = key_manager
.get_next_key(TransactionKeyManagerBranch::SenderOffset.get_branch_key())
.await
.unwrap();
- let kmob = kmob.with_sender_offset_public_key(sender_offset_key.key);
+ let kmob = kmob.with_sender_offset_public_key(sender_offset.pub_key);
let kmob = kmob.with_input_data(ExecutionStack::new(vec![]));
let kmob = kmob.with_script_key(script_key.key_id);
let kmob = kmob.with_features(OutputFeatures::default());
@@ -377,7 +377,7 @@ mod test {
.encrypt_data_for_recovery(&key_manager, None, PaymentId::Empty)
.await
.unwrap()
- .sign_as_sender_and_receiver(&key_manager, &sender_offset_key.key_id)
+ .sign_as_sender_and_receiver(&key_manager, &sender_offset.key_id)
.await
.unwrap();
match kmob.clone().try_build(&key_manager).await {
@@ -397,7 +397,7 @@ mod test {
&wallet_output.spending_key_id,
&wallet_output.value.into(),
&wallet_output.sender_offset_public_key,
- &ephemeral_key.key,
+ &ephemeral_key.pub_key,
&wallet_output.version,
&metadata_message,
wallet_output.features.range_proof_type,
@@ -412,7 +412,7 @@ mod test {
let sender_metadata_signature = key_manager
.get_sender_partial_metadata_signature(
&ephemeral_key.key_id,
- &sender_offset_key.key_id,
+ &sender_offset.key_id,
&commitment,
receiver_metadata_signature.ephemeral_commitment(),
&wallet_output.version,
diff --git a/base_layer/core/src/transactions/transaction_protocol/sender.rs b/base_layer/core/src/transactions/transaction_protocol/sender.rs
index 7b93ac2386..af5a275ac8 100644
--- a/base_layer/core/src/transactions/transaction_protocol/sender.rs
+++ b/base_layer/core/src/transactions/transaction_protocol/sender.rs
@@ -963,7 +963,7 @@ mod test {
.await
.unwrap();
let value = 1000u64;
- let sender_offset_key = key_manager
+ let sender_offset = key_manager
.get_next_key(TransactionKeyManagerBranch::SenderOffset.get_branch_key())
.await
.unwrap();
@@ -1004,8 +1004,8 @@ mod test {
.get_receiver_partial_metadata_signature(
&commitment_mask_key.key_id,
&value.into(),
- &sender_offset_key.key,
- &ephemeral_key.key,
+ &sender_offset.pub_key,
+ &ephemeral_key.pub_key,
&txo_version,
&metadata_message,
output_features.range_proof_type,
@@ -1018,7 +1018,7 @@ mod test {
commitment,
Some(proof),
script.clone(),
- sender_offset_key.key,
+ sender_offset.pub_key,
partial_metadata_signature.clone(),
covenant.clone(),
encrypted_data,
@@ -1030,7 +1030,7 @@ mod test {
let partial_sender_metadata_signature = key_manager
.get_sender_partial_metadata_signature(
&ephemeral_key.key_id,
- &sender_offset_key.key_id,
+ &sender_offset.key_id,
&output.commitment,
partial_metadata_signature.ephemeral_commitment(),
&txo_version,
diff --git a/base_layer/core/src/transactions/transaction_protocol/single_receiver.rs b/base_layer/core/src/transactions/transaction_protocol/single_receiver.rs
index f4fca82f02..883cff1f0d 100644
--- a/base_layer/core/src/transactions/transaction_protocol/single_receiver.rs
+++ b/base_layer/core/src/transactions/transaction_protocol/single_receiver.rs
@@ -77,7 +77,7 @@ impl SingleReceiverTransactionProtocol {
.get_partial_txo_kernel_signature(
&output.spending_key_id,
&public_nonce.key_id,
- &(&sender_info.public_nonce + &public_nonce.key),
+ &(&sender_info.public_nonce + &public_nonce.pub_key),
&(&sender_info.public_excess + &public_excess),
&sender_info.kernel_version,
&kernel_message,
diff --git a/base_layer/core/src/transactions/transaction_protocol/transaction_initializer.rs b/base_layer/core/src/transactions/transaction_protocol/transaction_initializer.rs
index c75c2bb1a7..85fdea1e0d 100644
--- a/base_layer/core/src/transactions/transaction_protocol/transaction_initializer.rs
+++ b/base_layer/core/src/transactions/transaction_protocol/transaction_initializer.rs
@@ -369,7 +369,7 @@ where KM: TransactionKeyManagerInterface
let change_script = change_data.change_script.clone();
let change_script_key_id = change_data.change_script_key_id.clone();
let change_key_id = change_data.change_commitment_mask_key_id.clone();
- let sender_offset_public_key = self
+ let sender_offset_public = self
.key_manager
.get_next_key(TransactionKeyManagerBranch::SenderOffset.get_branch_key())
.await
@@ -408,7 +408,7 @@ where KM: TransactionKeyManagerInterface
.get_metadata_signature(
&change_key_id,
&v.into(),
- &sender_offset_public_key.key_id,
+ &sender_offset_public.key_id,
&output_version,
&metadata_message,
features.range_proof_type,
@@ -423,7 +423,7 @@ where KM: TransactionKeyManagerInterface
change_script,
input_data,
change_script_key_id,
- sender_offset_public_key.key.clone(),
+ sender_offset_public.pub_key.clone(),
metadata_sig,
0,
covenant,
@@ -437,7 +437,7 @@ where KM: TransactionKeyManagerInterface
Ok((
fee_without_change + change_fee,
v,
- Some((change_wallet_output, sender_offset_public_key.key_id)),
+ Some((change_wallet_output, sender_offset_public.key_id)),
))
},
}
diff --git a/base_layer/core/tests/helpers/block_builders.rs b/base_layer/core/tests/helpers/block_builders.rs
index a9e2ab60c9..1e133655db 100644
--- a/base_layer/core/tests/helpers/block_builders.rs
+++ b/base_layer/core/tests/helpers/block_builders.rs
@@ -88,7 +88,7 @@ pub async fn create_coinbase(
.get_partial_txo_kernel_signature(
&p.commitment_mask_key_id,
&nonce.key_id,
- &nonce.key,
+ &nonce.pub_key,
&public_exess,
&TransactionKernelVersion::get_current_version(),
&kernel_message,
diff --git a/base_layer/core/tests/tests/mempool.rs b/base_layer/core/tests/tests/mempool.rs
index 9a7a1b5b79..083f3fec15 100644
--- a/base_layer/core/tests/tests/mempool.rs
+++ b/base_layer/core/tests/tests/mempool.rs
@@ -1229,7 +1229,7 @@ async fn consensus_validation_large_tx() {
.await
.unwrap();
let mut sender_offsets = Vec::new();
- let mut pub_nonce = input_kernel_nonce.key.clone();
+ let mut pub_nonce = input_kernel_nonce.pub_key.clone();
for i in 0..output_count {
let test_params = TestParams::new(&key_manager).await;
let output_amount = if i < output_count - 1 {
@@ -1416,7 +1416,7 @@ async fn validation_reject_min_fee() {
)
.await
.unwrap();
- let pub_nonce = input_kernel_nonce.key + test_params.kernel_nonce_key_pk;
+ let pub_nonce = input_kernel_nonce.pub_key + test_params.kernel_nonce_key_pk;
sender_offsets.push(test_params.sender_offset_key_id.clone());
let mut agg_sig = Signature::default();
diff --git a/base_layer/core/tests/tests/node_comms_interface.rs b/base_layer/core/tests/tests/node_comms_interface.rs
index 93dd3fdf0c..cd6c80d6a6 100644
--- a/base_layer/core/tests/tests/node_comms_interface.rs
+++ b/base_layer/core/tests/tests/node_comms_interface.rs
@@ -301,7 +301,7 @@ async fn initialize_sender_transaction_protocol_for_overflow_test(
.get_next_key(TransactionKeyManagerBranch::CommitmentMask.get_branch_key())
.await
.unwrap();
- let sender_offset_key = key_manager
+ let sender_offset = key_manager
.get_next_key(TransactionKeyManagerBranch::SenderOffset.get_branch_key())
.await
.unwrap();
@@ -330,16 +330,16 @@ async fn initialize_sender_transaction_protocol_for_overflow_test(
.with_input_data(input_data)
.with_covenant(txn_schema.covenant.clone())
.with_version(version)
- .with_sender_offset_public_key(sender_offset_key.key)
+ .with_sender_offset_public_key(sender_offset.pub_key)
.with_script_key(script_key_id.clone())
- .sign_as_sender_and_receiver(key_manager, &sender_offset_key.key_id)
+ .sign_as_sender_and_receiver(key_manager, &sender_offset.key_id)
.await
.unwrap()
.try_build(key_manager)
.await
.unwrap();
- stx_builder.with_output(output, sender_offset_key.key_id).await.unwrap();
+ stx_builder.with_output(output, sender_offset.key_id).await.unwrap();
}
for mut utxo in txn_schema.to_outputs {
let sender_offset_key = key_manager
diff --git a/base_layer/key_manager/src/key_manager_service/service.rs b/base_layer/key_manager/src/key_manager_service/service.rs
index d42f4791bd..681edc5bb4 100644
--- a/base_layer/key_manager/src/key_manager_service/service.rs
+++ b/base_layer/key_manager/src/key_manager_service/service.rs
@@ -114,7 +114,7 @@ where
branch: branch.to_string(),
index,
},
- key,
+ pub_key: key,
})
}
@@ -124,7 +124,7 @@ where
let public_key = self.get_public_key_at_key_id(&key_id).await?;
Ok(KeyAndId {
key_id,
- key: public_key,
+ pub_key: public_key,
})
}
diff --git a/base_layer/wallet/src/output_manager_service/service.rs b/base_layer/wallet/src/output_manager_service/service.rs
index 3a79670799..9421218452 100644
--- a/base_layer/wallet/src/output_manager_service/service.rs
+++ b/base_layer/wallet/src/output_manager_service/service.rs
@@ -749,7 +749,7 @@ where
let script = if single_round_sender_data.script == script!(Nop) {
single_round_sender_data.script.clone()
} else if single_round_sender_data.script == script!(PushPubKey(Box::default())) {
- script!(PushPubKey(Box::new(script_public_key.key.clone())))
+ script!(PushPubKey(Box::new(script_public_key.pub_key.clone())))
} else {
return Err(OutputManagerError::InvalidScriptHash);
};
@@ -996,7 +996,7 @@ where
.get_next_commitment_mask_and_script_key()
.await?;
builder.with_change_data(
- script!(PushPubKey(Box::new(change_script_key.key.clone()))),
+ script!(PushPubKey(Box::new(change_script_key.pub_key.clone()))),
ExecutionStack::default(),
change_script_key.key_id,
change_commitment_mask_key.key_id,
@@ -1103,7 +1103,7 @@ where
.get_next_commitment_mask_and_script_key()
.await?;
builder.with_change_data(
- script!(PushPubKey(Box::new(change_script_key.key))),
+ script!(PushPubKey(Box::new(change_script_key.pub_key))),
ExecutionStack::default(),
change_script_key.key_id,
change_commitment_mask_key.key_id,
@@ -1250,7 +1250,10 @@ where
&script_challange,
)
.await?;
- script_input_shares.insert(self.resources.key_manager.get_spend_key().await?.key, self_signature);
+ script_input_shares.insert(
+ self.resources.key_manager.get_spend_key().await?.pub_key,
+ self_signature,
+ );
// the order here is important, we need to add the signatures in the same order as public keys where
// added to the script originally
@@ -1258,7 +1261,7 @@ where
if let Some(signature) = script_input_shares.get(&key) {
script_signatures.push(StackItem::Signature(signature.clone()));
// our own key should not be added yet, it will be added with the script signing
- if key != self.resources.key_manager.get_spend_key().await?.key {
+ if key != self.resources.key_manager.get_spend_key().await?.pub_key {
aggregated_script_public_key_shares = aggregated_script_public_key_shares + key;
}
}
@@ -1562,7 +1565,7 @@ where
.get_next_commitment_mask_and_script_key()
.await?;
builder.with_change_data(
- script!(PushPubKey(Box::new(change_script_public_key.key.clone()))),
+ script!(PushPubKey(Box::new(change_script_public_key.pub_key.clone()))),
ExecutionStack::default(),
change_script_public_key.key_id.clone(),
change_commitment_mask_key_id.key_id,
@@ -2196,7 +2199,7 @@ where
.get_next_commitment_mask_and_script_key()
.await?;
tx_builder.with_change_data(
- script!(PushPubKey(Box::new(change_script.key))),
+ script!(PushPubKey(Box::new(change_script.pub_key))),
ExecutionStack::default(),
change_script.key_id,
change_mask.key_id,
@@ -2277,7 +2280,7 @@ where
.key_manager
.get_next_commitment_mask_and_script_key()
.await?;
- let script = script!(PushPubKey(Box::new(script_key.key.clone())));
+ let script = script!(PushPubKey(Box::new(script_key.pub_key.clone())));
let encrypted_data = self
.resources
@@ -2319,7 +2322,7 @@ where
script,
ExecutionStack::default(),
script_key.key_id,
- sender_offset.key,
+ sender_offset.pub_key,
metadata_signature,
0,
covenant,
@@ -2535,7 +2538,7 @@ where
.get_next_commitment_mask_and_script_key()
.await?;
builder.with_change_data(
- script!(PushPubKey(Box::new(change_script_key.key.clone()))),
+ script!(PushPubKey(Box::new(change_script_key.pub_key.clone()))),
ExecutionStack::default(),
change_script_key.key_id,
change_commitment_mask_key.key_id,
@@ -2619,7 +2622,7 @@ where
.get_next_commitment_mask_and_script_key()
.await?;
builder.with_change_data(
- script!(PushPubKey(Box::new(change_script_key.key.clone()))),
+ script!(PushPubKey(Box::new(change_script_key.pub_key.clone()))),
ExecutionStack::default(),
change_script_key.key_id,
change_commitment_mask_key.key_id,
@@ -2727,7 +2730,7 @@ where
.get_diffie_hellman_stealth_domain_hasher(&view_key.key_id, &output.sender_offset_public_key)
.await?;
let script_spending_key =
- stealth_address_script_spending_key(&stealth_address_hasher, &spend_key.key);
+ stealth_address_script_spending_key(&stealth_address_hasher, &spend_key.pub_key);
if &script_spending_key != scanned_pk.as_ref() {
continue;
}
diff --git a/base_layer/wallet/src/transaction_service/service.rs b/base_layer/wallet/src/transaction_service/service.rs
index 002b431cec..7850127b2b 100644
--- a/base_layer/wallet/src/transaction_service/service.rs
+++ b/base_layer/wallet/src/transaction_service/service.rs
@@ -268,13 +268,13 @@ where
TariAddressFeatures::create_one_sided_only()
};
let one_sided_tari_address = TariAddress::new_dual_address(
- view_key.key.clone(),
- comms_key.key,
+ view_key.pub_key.clone(),
+ comms_key.pub_key,
network,
TariAddressFeatures::create_one_sided_only(),
);
let interactive_tari_address =
- TariAddress::new_dual_address(view_key.key, spend_key.key, network, interactive_features);
+ TariAddress::new_dual_address(view_key.pub_key, spend_key.pub_key, network, interactive_features);
let resources = TransactionServiceResources {
db: db.clone(),
output_manager_service,
@@ -1105,7 +1105,7 @@ where
.transaction_key_manager_service
.get_comms_key()
.await?
- .key ==
+ .pub_key ==
destination.comms_public_key()
{
debug!(
@@ -2306,7 +2306,7 @@ where
Ok((tx_id, BurntProof {
// Key used to claim the burn on L2
- reciprocal_claim_public_key: commitment_mask_key.key,
+ reciprocal_claim_public_key: commitment_mask_key.pub_key,
commitment,
ownership_proof,
range_proof,
diff --git a/base_layer/wallet/src/utxo_scanner_service/initializer.rs b/base_layer/wallet/src/utxo_scanner_service/initializer.rs
index 5ff91debb0..88e20ebcb3 100644
--- a/base_layer/wallet/src/utxo_scanner_service/initializer.rs
+++ b/base_layer/wallet/src/utxo_scanner_service/initializer.rs
@@ -113,8 +113,8 @@ where
.await
.expect("Could not initialize UTXO scanner Service");
let one_sided_tari_address = TariAddress::new_dual_address(
- view_key.key,
- spend_key.key,
+ view_key.pub_key,
+ spend_key.pub_key,
network,
TariAddressFeatures::create_one_sided_only(),
);
diff --git a/base_layer/wallet/src/wallet.rs b/base_layer/wallet/src/wallet.rs
index ef43d48a69..b0ce4caf25 100644
--- a/base_layer/wallet/src/wallet.rs
+++ b/base_layer/wallet/src/wallet.rs
@@ -484,8 +484,8 @@ where
WalletType::Ledger(_) | WalletType::ProvidedKeys(_) => TariAddressFeatures::create_interactive_only(),
};
Ok(TariAddress::new_dual_address(
- view_key.key,
- comms_key.key,
+ view_key.pub_key,
+ comms_key.pub_key,
self.network.as_network(),
features,
))
@@ -495,8 +495,8 @@ where
let view_key = self.key_manager_service.get_view_key().await?;
let spend_key = self.key_manager_service.get_spend_key().await?;
Ok(TariAddress::new_dual_address(
- view_key.key,
- spend_key.key,
+ view_key.pub_key,
+ spend_key.pub_key,
self.network.as_network(),
TariAddressFeatures::create_one_sided_only(),
))
diff --git a/base_layer/wallet/tests/key_manager_service_tests/service.rs b/base_layer/wallet/tests/key_manager_service_tests/service.rs
index b3726569db..18bbe2adf0 100644
--- a/base_layer/wallet/tests/key_manager_service_tests/service.rs
+++ b/base_layer/wallet/tests/key_manager_service_tests/service.rs
@@ -66,7 +66,7 @@ async fn get_key_at_test_with_encryption() {
})
.await
.unwrap();
- assert_eq!(key_1.key, key_1_2);
+ assert_eq!(key_1.pub_key, key_1_2);
}
#[tokio::test]
@@ -147,7 +147,7 @@ async fn key_manager_find_index() {
let _next_key = key_manager.get_next_key("branch1").await.unwrap();
let _next_key = key_manager.get_next_key("branch1").await.unwrap();
let key_1 = key_manager.get_next_key("branch1").await.unwrap();
- let index = key_manager.find_key_index("branch1", &key_1.key).await.unwrap();
+ let index = key_manager.find_key_index("branch1", &key_1.pub_key).await.unwrap();
assert_eq!(index, 3);
}
@@ -170,7 +170,7 @@ async fn key_manager_update_current_key_index_if_higher() {
let _next_key_result = key_manager.get_next_key("branch1").await.unwrap();
let _next_key_result = key_manager.get_next_key("branch1").await.unwrap();
let key_1 = key_manager.get_next_key("branch1").await.unwrap();
- let index = key_manager.find_key_index("branch1", &key_1.key).await.unwrap();
+ let index = key_manager.find_key_index("branch1", &key_1.pub_key).await.unwrap();
assert_eq!(index, 3);
@@ -188,7 +188,7 @@ async fn key_manager_update_current_key_index_if_higher() {
.unwrap();
let index = key_manager.find_key_index("branch1", &key_1_2).await.unwrap();
assert_eq!(index, 7);
- assert_eq!(key_1_2, key_1.key);
+ assert_eq!(key_1_2, key_1.pub_key);
}
#[tokio::test]
@@ -220,7 +220,7 @@ async fn key_manager_test_index() {
assert_eq!(
result.key_id.managed_index().unwrap(),
- key_manager.find_key_index("branch1", &result.key).await.unwrap()
+ key_manager.find_key_index("branch1", &result.pub_key).await.unwrap()
);
assert_eq!(
result.key_id.managed_index().unwrap(),
diff --git a/base_layer/wallet/tests/transaction_service_tests/service.rs b/base_layer/wallet/tests/transaction_service_tests/service.rs
index c7600d2178..e4a55087e7 100644
--- a/base_layer/wallet/tests/transaction_service_tests/service.rs
+++ b/base_layer/wallet/tests/transaction_service_tests/service.rs
@@ -1767,7 +1767,7 @@ async fn recover_one_sided_transaction() {
let mut alice_ts_clone = alice_ts.clone();
let bob_view_key = bob_key_manager_handle.get_view_key().await.unwrap();
let bob_address = TariAddress::new_dual_address_with_default_features(
- bob_view_key.key,
+ bob_view_key.pub_key,
bob_node_identity.public_key().clone(),
network,
);
@@ -1891,7 +1891,7 @@ async fn recover_stealth_one_sided_transaction() {
let mut alice_ts_clone = alice_ts.clone();
let bob_address = TariAddress::new_dual_address_with_default_features(
- bob_view_key.key,
+ bob_view_key.pub_key,
bob_node_identity.public_key().clone(),
network,
);
@@ -2002,7 +2002,7 @@ async fn test_htlc_send_and_claim() {
let bob_pubkey = bob_ts_interface.base_node_identity.public_key().clone();
let bob_view_key = bob_ts_interface.key_manager_handle.get_view_key().await.unwrap();
let bob_address =
- TariAddress::new_dual_address_with_default_features(bob_view_key.key, bob_pubkey.clone(), network);
+ TariAddress::new_dual_address_with_default_features(bob_view_key.pub_key, bob_pubkey.clone(), network);
let (tx_id, pre_image, output) = alice_ts
.send_sha_atomic_swap_transaction(
bob_address,
@@ -4225,7 +4225,7 @@ async fn test_restarting_transaction_protocols() {
let bob_view_key = bob_ts_interface.key_manager_handle.get_view_key().await.unwrap();
let bob_address = TariAddress::new_dual_address_with_default_features(
- bob_view_key.key,
+ bob_view_key.pub_key,
bob_identity.public_key().clone(),
network,
);
@@ -4251,7 +4251,7 @@ async fn test_restarting_transaction_protocols() {
.unwrap();
let alice_view_key = alice_ts_interface.key_manager_handle.get_view_key().await.unwrap();
let alice_address = TariAddress::new_dual_address_with_default_features(
- alice_view_key.key,
+ alice_view_key.pub_key,
alice_identity.public_key().clone(),
network,
);
diff --git a/base_layer/wallet/tests/transaction_service_tests/transaction_protocols.rs b/base_layer/wallet/tests/transaction_service_tests/transaction_protocols.rs
index 7163cb7f22..92922c7b27 100644
--- a/base_layer/wallet/tests/transaction_service_tests/transaction_protocols.rs
+++ b/base_layer/wallet/tests/transaction_service_tests/transaction_protocols.rs
@@ -167,13 +167,13 @@ pub async fn setup() -> (
TariAddressFeatures::create_one_sided_only()
};
let one_sided_tari_address = TariAddress::new_dual_address(
- view_key.key.clone(),
- comms_key.key,
+ view_key.pub_key.clone(),
+ comms_key.pub_key,
network,
TariAddressFeatures::create_one_sided_only(),
);
let interactive_tari_address =
- TariAddress::new_dual_address(view_key.key, spend_key.key, network, interactive_features);
+ TariAddress::new_dual_address(view_key.pub_key, spend_key.pub_key, network, interactive_features);
let resources = TransactionServiceResources {
db,
output_manager_service: output_manager_service_handle,
diff --git a/base_layer/wallet/tests/utxo_scanner/mod.rs b/base_layer/wallet/tests/utxo_scanner/mod.rs
index 9ac701c327..e985560f59 100644
--- a/base_layer/wallet/tests/utxo_scanner/mod.rs
+++ b/base_layer/wallet/tests/utxo_scanner/mod.rs
@@ -195,7 +195,7 @@ async fn setup(
let view_key = key_manager.get_view_key().await.unwrap();
let tari_address = TariAddress::new_dual_address_with_default_features(
- view_key.key,
+ view_key.pub_key,
node_identity.public_key().clone(),
Network::default(),
);