.

ripple2010.vcxproj

@@ -93,6 +93,7 @@
     <ClCompile Include="src\cpp\json\json_reader.cpp" />
     <ClCompile Include="src\cpp\json\json_value.cpp" />
     <ClCompile Include="src\cpp\json\json_writer.cpp" />
+    <ClCompile Include="src\cpp\ripple\AccountSetTransactor.cpp" />
     <ClCompile Include="src\cpp\ripple\AccountState.cpp" />
     <ClCompile Include="src\cpp\ripple\Amount.cpp" />
     <ClCompile Include="src\cpp\ripple\Application.cpp" />
@@ -125,17 +126,22 @@
     <ClCompile Include="src\cpp\ripple\main.cpp" />
     <ClCompile Include="src\cpp\ripple\NetworkOPs.cpp" />
     <ClCompile Include="src\cpp\ripple\NicknameState.cpp" />
+    <ClCompile Include="src\cpp\ripple\OfferCancelTransactor.cpp" />
+    <ClCompile Include="src\cpp\ripple\OfferCreateTransactor.cpp" />
     <ClCompile Include="src\cpp\ripple\Operation.cpp" />
     <ClCompile Include="src\cpp\ripple\OrderBook.cpp" />
     <ClCompile Include="src\cpp\ripple\OrderBookDB.cpp" />
     <ClCompile Include="src\cpp\ripple\PackedMessage.cpp" />
     <ClCompile Include="src\cpp\ripple\ParseSection.cpp" />
     <ClCompile Include="src\cpp\ripple\Pathfinder.cpp" />
+    <ClCompile Include="src\cpp\ripple\PaymentTransactor.cpp" />
     <ClCompile Include="src\cpp\ripple\Peer.cpp" />
     <ClCompile Include="src\cpp\ripple\PeerDoor.cpp" />
     <ClCompile Include="src\cpp\ripple\PlatRand.cpp" />
+    <ClCompile Include="src\cpp\ripple\ProofOfWork.cpp" />
     <ClCompile Include="src\cpp\ripple\PubKeyCache.cpp" />
     <ClCompile Include="src\cpp\ripple\RangeSet.cpp" />
+    <ClCompile Include="src\cpp\ripple\RegularKeySetTransactor.cpp" />
     <ClCompile Include="src\cpp\ripple\rfc1751.cpp" />
     <ClCompile Include="src\cpp\ripple\ripple.pb.cc" />
     <ClCompile Include="src\cpp\ripple\RippleAddress.cpp" />
@@ -160,16 +166,18 @@
     <ClCompile Include="src\cpp\ripple\SNTPClient.cpp" />
     <ClCompile Include="src\cpp\ripple\Suppression.cpp" />
     <ClCompile Include="src\cpp\ripple\Transaction.cpp" />
-    <ClCompile Include="src\cpp\ripple\TransactionAction.cpp" />
     <ClCompile Include="src\cpp\ripple\TransactionEngine.cpp" />
     <ClCompile Include="src\cpp\ripple\TransactionErr.cpp" />
     <ClCompile Include="src\cpp\ripple\TransactionFormats.cpp" />
     <ClCompile Include="src\cpp\ripple\TransactionMaster.cpp" />
     <ClCompile Include="src\cpp\ripple\TransactionMeta.cpp" />
+    <ClCompile Include="src\cpp\ripple\Transactor.cpp" />
+    <ClCompile Include="src\cpp\ripple\TrustSetTransactor.cpp" />
     <ClCompile Include="src\cpp\ripple\UniqueNodeList.cpp" />
     <ClCompile Include="src\cpp\ripple\utils.cpp" />
     <ClCompile Include="src\cpp\ripple\ValidationCollection.cpp" />
     <ClCompile Include="src\cpp\ripple\Wallet.cpp" />
+    <ClCompile Include="src\cpp\ripple\WalletAddTransactor.cpp" />
     <ClCompile Include="src\cpp\ripple\WSConnection.cpp" />
     <ClCompile Include="src\cpp\ripple\WSDoor.cpp" />
     <ClCompile Include="src\cpp\websocketpp\src\base64\base64.cpp" />

ripple2010.vcxproj.filters

@@ -249,9 +249,6 @@
     <ClCompile Include="src\cpp\ripple\Transaction.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\TransactionAction.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionEngine.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -321,6 +318,33 @@
     <ClCompile Include="src\cpp\websocketpp\src\rng\boost_rng.cpp">
       <Filter>Source Files\websocketpp</Filter>
     </ClCompile>
+    <ClCompile Include="src\cpp\ripple\AccountSetTransactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\OfferCancelTransactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\OfferCreateTransactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\PaymentTransactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\ProofOfWork.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\RegularKeySetTransactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\Transactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\TrustSetTransactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\WalletAddTransactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="util\pugiconfig.hpp">

src/cpp/ripple/RegularKeySetTransactor.cpp

@@ -41,8 +41,8 @@ TER RegularKeySetTransactor::doApply()
 
 	mTxnAccount->setFlag(lsfPasswordSpent);
 
-	uint160	uAuthKeyID=mTxn.getFieldAccount160(sfAuthorizedKey);
+	uint160	uAuthKeyID=mTxn.getFieldAccount160(sfRegularKey);
-	mTxnAccount->setFieldAccount(sfAuthorizedKey, uAuthKeyID);
+	mTxnAccount->setFieldAccount(sfRegularKey, uAuthKeyID);
 
 
 	std::cerr << "doRegularKeySet<" << std::endl;

src/cpp/ripple/TransactionAction.cpp

@@ -1,39 +0,0 @@
-//
-// XXX Make sure all fields are recognized in transactions.
-//
-
-#include <boost/foreach.hpp>
-#include <boost/format.hpp>
-#include <boost/tuple/tuple_comparison.hpp>
-#include <queue>
-
-#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

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();

src/cpp/ripple/WalletAddTransactor.cpp

@@ -6,7 +6,7 @@ TER WalletAddTransactor::doApply()
 
 	const std::vector<unsigned char>	vucPubKey		= mTxn.getFieldVL(sfPublicKey);
 	const std::vector<unsigned char>	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;