Merge pull request #9565

7cd33d1 Fix typos. (Soren Stoutner)
This commit is contained in:
luigi1111 2024-12-23 10:54:08 -05:00
commit 3a414c5132
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
4 changed files with 4 additions and 4 deletions

View File

@ -511,7 +511,7 @@ namespace trezor {
tools::wallet2::signed_tx_set & signed_tx,
hw::tx_aux_data & aux_data)
{
CHECK_AND_ASSERT_THROW_MES(std::get<0>(unsigned_tx.transfers) == 0, "Unsuported non zero offset");
CHECK_AND_ASSERT_THROW_MES(std::get<0>(unsigned_tx.transfers) == 0, "Unsupported non zero offset");
TREZOR_AUTO_LOCK_CMD();
require_connected();

View File

@ -156,7 +156,7 @@ namespace multisig
const std::string& get_next_kex_round_msg() const { return m_next_round_kex_message; }
//account status functions
// account has been intialized, and the account holder can use the 'common' key
// account has been initialized, and the account holder can use the 'common' key
bool account_is_active() const;
// account has gone through main kex rounds, only remaining step is to verify all other participants are ready
bool main_kex_rounds_done() const;

View File

@ -598,7 +598,7 @@ namespace multisig
// note: if num_signers_required == signers.size(), then this test will ensure all signers are present in 'origins',
// which contains only unique pubkeys
CHECK_AND_ASSERT_THROW_MES(std::find(signers.begin(), signers.end(), origin) != signers.end(),
"An unknown origin recommended a multisig post-kex verification messsage.");
"An unknown origin recommended a multisig post-kex verification message.");
}
return pubkey_origins_map;

View File

@ -5909,7 +5909,7 @@ std::string wallet2::make_multisig(const epee::wipeable_string &password,
CHECK_AND_ASSERT_THROW_MES(std::find(signers.begin(), signers.end(), multisig_account.get_base_pubkey()) != signers.end(),
"The local account's signer key was not found in initial multisig kex messages when converting a wallet to multisig.");
// intialize key exchange
// initialize key exchange
multisig_account.initialize_kex(threshold, signers, expanded_msgs);
CHECK_AND_ASSERT_THROW_MES(multisig_account.account_is_active(), "Failed to activate multisig account.");