renamed hash tx to pre auth tx

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
stellar · Feb 1, 2017 · e3e334d · e3e334d
1 parent 805c32e
commit e3e334d
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 25 deletions.
diff --git 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
@@ -25,7 +25,7 @@ KeyFunctions<SignerKey>::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<SignerKey>::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<SignerKey>::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<SignerKey>::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<SignerKey>::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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -31,12 +31,12 @@ bool SignatureChecker::checkSignature(AccountID const &accountID, std::vector<Si
     // calculate the weight of the signatures
     int totalWeight = 0;
 
-    // compare all available SIGNER_KEY_TYPE_HASH_TX with current transaction hash
+    // compare all available SIGNER_KEY_TYPE_PRE_AUTH_TX with current transaction hash
     // current transaction hash is not stored in getEnvelope().signatures - it is
     // computed with getContentsHash() method
-    for (auto const &signerKey : signers[SIGNER_KEY_TYPE_HASH_TX])
+    for (auto const &signerKey : signers[SIGNER_KEY_TYPE_PRE_AUTH_TX])
     {
-        if (signerKey.key.hashTx() == mContentsHash)
+        if (signerKey.key.preAuthTx() == mContentsHash)
         {
             mUsedOneTimeSignerKeys[accountID].insert(signerKey.key);
             totalWeight += signerKey.weight;

diff --git a/src/transactions/TxEnvelopeTests.cpp b/src/transactions/TxEnvelopeTests.cpp
@@ -225,7 +225,7 @@ TEST_CASE("txenvelope", "[tx][envelope]")
             AltSignature{
                 "hash tx",
                 true,
-                [](TransactionFrame const& tx){ return SignerKeyUtils::hashTxKey(tx); },
+                [](TransactionFrame const& tx){ return SignerKeyUtils::preAuthTxKey(tx); },
                 [](TransactionFrame &){}
             },
             AltSignature{

diff --git a/src/xdr/Stellar-types.x b/src/xdr/Stellar-types.x
@@ -17,7 +17,7 @@ typedef hyper int64;
 enum CryptoKeyType
 {
     KEY_TYPE_ED25519 = 0,
-    KEY_TYPE_HASH_TX = 1,
+    KEY_TYPE_PRE_AUTH_TX = 1,
     KEY_TYPE_HASH_X = 2
 };
 
@@ -29,7 +29,7 @@ enum PublicKeyType
 enum SignerKeyType
 {
     SIGNER_KEY_TYPE_ED25519 = KEY_TYPE_ED25519,
-    SIGNER_KEY_TYPE_HASH_TX = KEY_TYPE_HASH_TX,
+    SIGNER_KEY_TYPE_PRE_AUTH_TX = KEY_TYPE_PRE_AUTH_TX,
     SIGNER_KEY_TYPE_HASH_X = KEY_TYPE_HASH_X
 };
 
@@ -43,9 +43,9 @@ union SignerKey switch (SignerKeyType type)
 {
 case SIGNER_KEY_TYPE_ED25519:
     uint256 ed25519;
-case SIGNER_KEY_TYPE_HASH_TX:
+case SIGNER_KEY_TYPE_PRE_AUTH_TX:
     /* Hash of Transaction structure */
-    uint256 hashTx;
+    uint256 preAuthTx;
 case SIGNER_KEY_TYPE_HASH_X:
     /* Hash of random 256 bit preimage X */
     uint256 hashX;