ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

AuthorizedKey -> RegularKey

Browse Source
This commit is contained in:
jed
2012-11-13 04:20:15 -08:00
parent 4dfc237e4f
commit 44826f1ce3
10 changed files with 954 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpp/ripple/AccountState.h
View File

@@ -33,12 +33,12 @@ public:
bool bHaveAuthorizedKey()
{
return mLedgerEntry->isFieldPresent(sfAuthorizedKey);
return mLedgerEntry->isFieldPresent(sfRegularKey);
}
RippleAddress getAuthorizedKey()
{
return mLedgerEntry->getFieldAccount(sfAuthorizedKey);
return mLedgerEntry->getFieldAccount(sfRegularKey);
}
STAmount getBalance() const { return mLedgerEntry->getFieldAmount(sfBalance); }

2
src/cpp/ripple/LedgerFormats.cpp
View File

@@ -21,7 +21,7 @@ static bool LEFInit()
<< SOElement(sfBalance, SOE_REQUIRED)
<< SOElement(sfPreviousTxnID, SOE_REQUIRED)
<< SOElement(sfPreviousTxnLgrSeq, SOE_REQUIRED)
<< SOElement(sfAuthorizedKey, SOE_OPTIONAL)
<< SOElement(sfRegularKey, SOE_OPTIONAL)
<< SOElement(sfEmailHash, SOE_OPTIONAL)
<< SOElement(sfWalletLocator, SOE_OPTIONAL)
<< SOElement(sfWalletSize, SOE_OPTIONAL)

2
src/cpp/ripple/SerializeProto.h
View File

@@ -116,7 +116,7 @@
FIELD(Destination, ACCOUNT, 3)
FIELD(Issuer, ACCOUNT, 4)
FIELD(Target, ACCOUNT, 7)
FIELD(AuthorizedKey, ACCOUNT, 8)
FIELD(RegularKey, ACCOUNT, 8)
// path set
FIELD(Paths, PATHSET, 1)

19
src/cpp/ripple/TransactionAction.cpp
View File

@@ -71,8 +71,8 @@ TER TransactionEngine::setAuthorized(const SerializedTransaction& txn, bool bMus
: txn.getFieldAccount160(sfAuthorizedKey); // PasswordSet
*/
uint160 uAuthKeyID=txn.getFieldAccount160(sfAuthorizedKey);
mTxnAccount->setFieldAccount(sfAuthorizedKey, uAuthKeyID);
uint160 uAuthKeyID=txn.getFieldAccount160(sfRegularKey);
mTxnAccount->setFieldAccount(sfRegularKey, uAuthKeyID);
return tesSUCCESS;
}
@@ -195,17 +195,6 @@ TER TransactionEngine::doAccountSet(const SerializedTransaction& txn)
return tesSUCCESS;
}
TER TransactionEngine::doClaim(const SerializedTransaction& txn)
{
Log(lsINFO) << "doClaim>";
//TER terResult = setAuthorized(txn, true);
TER terResult=tefEXCEPTION;
Log(lsINFO) << "doClaim<";
return terResult;
}
TER TransactionEngine::doTrustSet(const SerializedTransaction& txn)
{
@@ -573,7 +562,7 @@ TER TransactionEngine::doWalletAdd(const SerializedTransaction& txn)
const std::vector<unsigned char> vucPubKey = txn.getFieldVL(sfPublicKey);
const std::vector<unsigned char> vucSignature = txn.getFieldVL(sfSignature);
const uint160 uAuthKeyID = txn.getFieldAccount160(sfAuthorizedKey);
const uint160 uAuthKeyID = txn.getFieldAccount160(sfRegularKey);
const RippleAddress naMasterPubKey = RippleAddress::createAccountPublic(vucPubKey);
const uint160 uDstAccountID = naMasterPubKey.getAccountID();
@@ -617,7 +606,7 @@ TER TransactionEngine::doWalletAdd(const SerializedTransaction& txn)
sleDst->setFieldAccount(sfAccount, uDstAccountID);
sleDst->setFieldU32(sfSequence, 1);
sleDst->setFieldAmount(sfBalance, saAmount);
sleDst->setFieldAccount(sfAuthorizedKey, uAuthKeyID);
sleDst->setFieldAccount(sfRegularKey, uAuthKeyID);
std::cerr << "WalletAdd<" << std::endl;

11
src/cpp/ripple/TransactionEngine.cpp
View File

@@ -227,7 +227,7 @@ TER TransactionEngine::applyTransaction(const SerializedTransaction& txn, Transa
else
{
saSrcBalance = mTxnAccount->getFieldAmount(sfBalance);
bHaveAuthKey = mTxnAccount->isFieldPresent(sfAuthorizedKey);
bHaveAuthKey = mTxnAccount->isFieldPresent(sfRegularKey);
}
// Check if account claimed.
@@ -283,7 +283,7 @@ TER TransactionEngine::applyTransaction(const SerializedTransaction& txn, Transa
default:
// Verify the transaction's signing public key is the key authorized for signing.
if (bHaveAuthKey && naSigningPubKey.getAccountID() == mTxnAccount->getFieldAccount(sfAuthorizedKey).getAccountID())
if (bHaveAuthKey && naSigningPubKey.getAccountID() == mTxnAccount->getFieldAccount(sfRegularKey).getAccountID())
{
// Authorized to continue.
nothing();
@@ -384,9 +384,6 @@ TER TransactionEngine::applyTransaction(const SerializedTransaction& txn, Transa
terResult = doAccountSet(txn);
break;
case ttCLAIM:
terResult = doClaim(txn);
break;
case ttTRUST_SET:
terResult = doTrustSet(txn);
@@ -397,10 +394,6 @@ TER TransactionEngine::applyTransaction(const SerializedTransaction& txn, Transa
terResult = temINVALID;
break;
//case ttINVOICE:
// terResult = doInvoice(txn);
// break;
case ttOFFER_CREATE:
terResult = doOfferCreate(txn);
break;

1
src/cpp/ripple/TransactionEngine.h
View File

@@ -63,7 +63,6 @@ protected:
void txnWrite();
TER doAccountSet(const SerializedTransaction& txn);
TER doClaim(const SerializedTransaction& txn);
TER doTrustSet(const SerializedTransaction& txn);
TER doOfferCreate(const SerializedTransaction& txn);
TER doOfferCancel(const SerializedTransaction& txn);

2
src/cpp/ripple/TransactionFormats.cpp
View File

@@ -45,7 +45,7 @@ static bool TFInit()
;
DECLARE_TF(SetRegularKey, ttREGULAR_KEY_SET)
<< SOElement(sfAuthorizedKey, SOE_REQUIRED)
<< SOElement(sfRegularKey, SOE_REQUIRED)
;
DECLARE_TF(Payment, ttPAYMENT)