diff --git a/src/crypto/KeyUtils.cpp b/src/crypto/KeyUtils.cpp index b9782b76ce..54111015d7 100644 --- a/src/crypto/KeyUtils.cpp +++ b/src/crypto/KeyUtils.cpp @@ -17,7 +17,7 @@ KeyUtils::getKeyVersionSize(strKey::StrKeyVersionByte keyVersion) case strKey::STRKEY_PUBKEY_ED25519: case strKey::STRKEY_SEED_ED25519: return crypto_sign_PUBLICKEYBYTES; - case strKey::STRKEY_HASH_TX: + case strKey::STRKEY_PRE_AUTH_TX: case strKey::STRKEY_HASH_X: return 32U; default: diff --git a/src/crypto/SignerKey.cpp b/src/crypto/SignerKey.cpp index 6de38051dc..96bf167add 100644 --- a/src/crypto/SignerKey.cpp +++ b/src/crypto/SignerKey.cpp @@ -25,7 +25,7 @@ KeyFunctions::getKeyVersionIsSupported(strKey::StrKeyVersionByte keyV { case strKey::STRKEY_PUBKEY_ED25519: return true; - case strKey::STRKEY_HASH_TX: + case strKey::STRKEY_PRE_AUTH_TX: return true; case strKey::STRKEY_HASH_X: return true; @@ -41,8 +41,8 @@ KeyFunctions::toKeyType(strKey::StrKeyVersionByte keyVersion) { case strKey::STRKEY_PUBKEY_ED25519: return SignerKeyType::SIGNER_KEY_TYPE_ED25519; - case strKey::STRKEY_HASH_TX: - return SignerKeyType::SIGNER_KEY_TYPE_HASH_TX; + case strKey::STRKEY_PRE_AUTH_TX: + return SignerKeyType::SIGNER_KEY_TYPE_PRE_AUTH_TX; case strKey::STRKEY_HASH_X: return SignerKeyType::SIGNER_KEY_TYPE_HASH_X; default: @@ -57,8 +57,8 @@ KeyFunctions::toKeyVersion(SignerKeyType keyType) { case SignerKeyType::SIGNER_KEY_TYPE_ED25519: return strKey::STRKEY_PUBKEY_ED25519; - case SignerKeyType::SIGNER_KEY_TYPE_HASH_TX: - return strKey::STRKEY_HASH_TX; + case SignerKeyType::SIGNER_KEY_TYPE_PRE_AUTH_TX: + return strKey::STRKEY_PRE_AUTH_TX; case SignerKeyType::SIGNER_KEY_TYPE_HASH_X: return strKey::STRKEY_HASH_X; default: @@ -73,8 +73,8 @@ KeyFunctions::getKeyValue(SignerKey &key) { case SIGNER_KEY_TYPE_ED25519: return key.ed25519(); - case SIGNER_KEY_TYPE_HASH_TX: - return key.hashTx(); + case SIGNER_KEY_TYPE_PRE_AUTH_TX: + return key.preAuthTx(); case SIGNER_KEY_TYPE_HASH_X: return key.hashX(); default: @@ -89,8 +89,8 @@ KeyFunctions::getKeyValue(SignerKey const &key) { case SIGNER_KEY_TYPE_ED25519: return key.ed25519(); - case SIGNER_KEY_TYPE_HASH_TX: - return key.hashTx(); + case SIGNER_KEY_TYPE_PRE_AUTH_TX: + return key.preAuthTx(); case SIGNER_KEY_TYPE_HASH_X: return key.hashX(); default: diff --git a/src/crypto/SignerKeyUtils.cpp b/src/crypto/SignerKeyUtils.cpp index 7c3c79e252..8bc7558385 100644 --- a/src/crypto/SignerKeyUtils.cpp +++ b/src/crypto/SignerKeyUtils.cpp @@ -14,11 +14,11 @@ namespace SignerKeyUtils { SignerKey -hashTxKey(TransactionFrame const &tx) +preAuthTxKey(TransactionFrame const &tx) { SignerKey sk; - sk.type(SIGNER_KEY_TYPE_HASH_TX); - sk.hashTx() = tx.getContentsHash(); + sk.type(SIGNER_KEY_TYPE_PRE_AUTH_TX); + sk.preAuthTx() = tx.getContentsHash(); return sk; } diff --git a/src/crypto/SignerKeyUtils.h b/src/crypto/SignerKeyUtils.h index 1bc6e8d6d5..999747e398 100644 --- a/src/crypto/SignerKeyUtils.h +++ b/src/crypto/SignerKeyUtils.h @@ -14,7 +14,7 @@ struct SignerKey; namespace SignerKeyUtils { -SignerKey hashTxKey(TransactionFrame const &tx); +SignerKey preAuthTxKey(TransactionFrame const &tx); SignerKey hashXKey(ByteSlice const &bs); } diff --git a/src/crypto/StrKey.h b/src/crypto/StrKey.h index df4795aa82..8e75cbb75a 100644 --- a/src/crypto/StrKey.h +++ b/src/crypto/StrKey.h @@ -17,7 +17,7 @@ typedef enum // version bytes - 5 bits only STRKEY_PUBKEY_ED25519 = 6, // 'G' STRKEY_SEED_ED25519 = 18, // 'S' - STRKEY_HASH_TX = 19, // 'T', + STRKEY_PRE_AUTH_TX = 19, // 'T', STRKEY_HASH_X = 23 // 'X' } StrKeyVersionByte; diff --git a/src/transactions/SetOptionsTests.cpp b/src/transactions/SetOptionsTests.cpp index 9659314522..59887da25c 100644 --- a/src/transactions/SetOptionsTests.cpp +++ b/src/transactions/SetOptionsTests.cpp @@ -100,7 +100,7 @@ TEST_CASE("set options", "[tx][setoptions]") // add signer 3 - non account, will fail for old ledger SignerKey s3; - s3.type(SIGNER_KEY_TYPE_HASH_TX); + s3.type(SIGNER_KEY_TYPE_PRE_AUTH_TX); Signer sk3(s3, 100); REQUIRE_THROWS_AS(a1.setOptions(nullptr, nullptr, nullptr, nullptr, &sk3, nullptr), @@ -180,7 +180,7 @@ TEST_CASE("set options", "[tx][setoptions]") // add signer 3 - non account SignerKey s3; - s3.type(SIGNER_KEY_TYPE_HASH_TX); + s3.type(SIGNER_KEY_TYPE_PRE_AUTH_TX); Signer sk3(s3, 100); a1.setOptions(nullptr, nullptr, nullptr, nullptr, &sk3, nullptr); diff --git a/src/transactions/SignatureChecker.cpp b/src/transactions/SignatureChecker.cpp index 8a786be4d3..429c37de42 100644 --- a/src/transactions/SignatureChecker.cpp +++ b/src/transactions/SignatureChecker.cpp @@ -31,12 +31,12 @@ bool SignatureChecker::checkSignature(AccountID const &accountID, std::vector