diff --git a/ripple2010.vcxproj b/ripple2010.vcxproj
index 64b964735d..693ba0038d 100644
--- a/ripple2010.vcxproj
+++ b/ripple2010.vcxproj
@@ -93,6 +93,7 @@
+
@@ -125,17 +126,22 @@
+
+
+
+
+
@@ -160,16 +166,18 @@
-
+
+
+
diff --git a/ripple2010.vcxproj.filters b/ripple2010.vcxproj.filters
index fe62382a9f..9e03588ae8 100644
--- a/ripple2010.vcxproj.filters
+++ b/ripple2010.vcxproj.filters
@@ -249,9 +249,6 @@
Source Files
-
- Source Files
-
Source Files
@@ -321,6 +318,33 @@
Source Files\websocketpp
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
diff --git a/src/cpp/ripple/RegularKeySetTransactor.cpp b/src/cpp/ripple/RegularKeySetTransactor.cpp
index ba9e2ee822..eb89bed283 100644
--- a/src/cpp/ripple/RegularKeySetTransactor.cpp
+++ b/src/cpp/ripple/RegularKeySetTransactor.cpp
@@ -41,8 +41,8 @@ TER RegularKeySetTransactor::doApply()
mTxnAccount->setFlag(lsfPasswordSpent);
- uint160 uAuthKeyID=mTxn.getFieldAccount160(sfAuthorizedKey);
- mTxnAccount->setFieldAccount(sfAuthorizedKey, uAuthKeyID);
+ uint160 uAuthKeyID=mTxn.getFieldAccount160(sfRegularKey);
+ mTxnAccount->setFieldAccount(sfRegularKey, uAuthKeyID);
std::cerr << "doRegularKeySet<" << std::endl;
diff --git a/src/cpp/ripple/TransactionAction.cpp b/src/cpp/ripple/TransactionAction.cpp
deleted file mode 100644
index 4342987e68..0000000000
--- a/src/cpp/ripple/TransactionAction.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// XXX Make sure all fields are recognized in transactions.
-//
-
-#include
-#include
-#include
-#include
-
-#include "TransactionEngine.h"
-
-#include "../json/writer.h"
-
-#include "Config.h"
-#include "Contract.h"
-#include "Interpreter.h"
-#include "Log.h"
-#include "RippleCalc.h"
-#include "TransactionFormats.h"
-#include "utils.h"
-
-#define RIPPLE_PATHS_MAX 3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-// vim:ts=4
diff --git a/src/cpp/ripple/Transactor.cpp b/src/cpp/ripple/Transactor.cpp
index 4878ea406c..1157bf8c28 100644
--- a/src/cpp/ripple/Transactor.cpp
+++ b/src/cpp/ripple/Transactor.cpp
@@ -86,7 +86,7 @@ TER Transactor::checkSig()
{
// Consistency: Check signature
// Verify the transaction's signing public key is the key authorized for signing.
- if (mHasAuthKey && mSigningPubKey.getAccountID() == mTxnAccount->getFieldAccount(sfAuthorizedKey).getAccountID())
+ if (mHasAuthKey && mSigningPubKey.getAccountID() == mTxnAccount->getFieldAccount(sfRegularKey).getAccountID())
{
// Authorized to continue.
nothing();
@@ -201,7 +201,7 @@ TER Transactor::apply()
else
{
mSourceBalance = mTxnAccount->getFieldAmount(sfBalance);
- mHasAuthKey = mTxnAccount->isFieldPresent(sfAuthorizedKey);
+ mHasAuthKey = mTxnAccount->isFieldPresent(sfRegularKey);
}
terResult=payFee();
diff --git a/src/cpp/ripple/WalletAddTransactor.cpp b/src/cpp/ripple/WalletAddTransactor.cpp
index 88dd8f0264..b821abd34c 100644
--- a/src/cpp/ripple/WalletAddTransactor.cpp
+++ b/src/cpp/ripple/WalletAddTransactor.cpp
@@ -6,7 +6,7 @@ TER WalletAddTransactor::doApply()
const std::vector vucPubKey = mTxn.getFieldVL(sfPublicKey);
const std::vector vucSignature = mTxn.getFieldVL(sfSignature);
- const uint160 uAuthKeyID = mTxn.getFieldAccount160(sfAuthorizedKey);
+ const uint160 uAuthKeyID = mTxn.getFieldAccount160(sfRegularKey);
const RippleAddress naMasterPubKey = RippleAddress::createAccountPublic(vucPubKey);
const uint160 uDstAccountID = naMasterPubKey.getAccountID();
@@ -50,7 +50,7 @@ TER WalletAddTransactor::doApply()
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;