Begin to sanitize the fee structure. Implement load scaling.

src/cpp/ripple/RegularKeySetTransactor.cpp

@@ -5,17 +5,14 @@
 SETUP_LOG();
 
 
-void RegularKeySetTransactor::calculateFee()
+uint64_t RegularKeySetTransactor::calculateBaseFee()
 {
-	Transactor::calculateFee();
-
 	if ( !(mTxnAccount->getFlags() & lsfPasswordSpent) && 
 		 (mSigningPubKey.getAccountID() == mTxnAccountID))
 	{  // flag is armed and they signed with the right account
-		
-		mSourceBalance	= mTxnAccount->getFieldAmount(sfBalance);
-		if(mSourceBalance < mFeeDue) mFeeDue	= 0;
+		return 0;
 	}
+	return Transactor::calculateBaseFee();
 }
 
 

src/cpp/ripple/RegularKeySetTransactor.h

@@ -2,7 +2,7 @@
 
 class RegularKeySetTransactor : public Transactor
 {
-	void calculateFee();
+	uint64_t calculateBaseFee();
 public:
 	RegularKeySetTransactor(const SerializedTransaction& txn,TransactionEngineParams params, TransactionEngine* engine) : Transactor(txn,params,engine) {}
 	TER checkFee();

src/cpp/ripple/Transactor.cpp

@@ -42,7 +42,12 @@ Transactor::Transactor(const SerializedTransaction& txn,TransactionEngineParams
 
 void Transactor::calculateFee()
 {
-	mFeeDue	= theConfig.FEE_DEFAULT;
+	mFeeDue	= STAmount(mEngine->getLedger()->scaleFeeLoad(calculateBaseFee()));
+}
+
+uint64_t Transactor::calculateBaseFee()
+{
+	return theConfig.FEE_DEFAULT;
 }
 
 TER Transactor::payFee()

src/cpp/ripple/Transactor.h

@@ -24,7 +24,11 @@ protected:
 	TER checkSeq();
 	TER payFee();
 
-	virtual void calculateFee();
+	void calculateFee();
+
+	// Returns the fee, not scaled for load (Should be in fee units. FIXME)
+	virtual uint64_t calculateBaseFee();
+
 	virtual TER checkSig();
 	virtual TER doApply()=0;