ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-20 11:05:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move from account create fee to reserve XRP.

Browse Source
This commit is contained in:
Arthur Britto
2012-12-12 21:54:56 -08:00
parent 02897d37f6
commit f1735c5cdf
8 changed files with 36 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cpp/ripple/Config.cpp
View File

@@ -13,11 +13,11 @@
#define SECTION_ACCOUNT_PROBE_MAX "account_probe_max" #define SECTION_ACCOUNT_PROBE_MAX "account_probe_max"
#define SECTION_DEBUG_LOGFILE "debug_logfile" #define SECTION_DEBUG_LOGFILE "debug_logfile"
#define SECTION_FEE_ACCOUNT_CREATE "fee_account_create"
#define SECTION_FEE_DEFAULT "fee_default" #define SECTION_FEE_DEFAULT "fee_default"
#define SECTION_FEE_NICKNAME_CREATE "fee_nickname_create" #define SECTION_FEE_NICKNAME_CREATE "fee_nickname_create"
#define SECTION_FEE_OFFER "fee_offer" #define SECTION_FEE_OFFER "fee_offer"
#define SECTION_FEE_OPERATION "fee_operation" #define SECTION_FEE_OPERATION "fee_operation"
#define SECTION_FEE_RESERVE "fee_reserve"
#define SECTION_LEDGER_HISTORY "ledger_history" #define SECTION_LEDGER_HISTORY "ledger_history"
#define SECTION_IPS "ips" #define SECTION_IPS "ips"
#define SECTION_NETWORK_QUORUM "network_quorum" #define SECTION_NETWORK_QUORUM "network_quorum"
@@ -48,7 +48,7 @@
// Fees are in XRP. // Fees are in XRP.
#define DEFAULT_FEE_DEFAULT 10 #define DEFAULT_FEE_DEFAULT 10
#define DEFAULT_FEE_ACCOUNT_CREATE 200*SYSTEM_CURRENCY_PARTS #define DEFAULT_FEE_RESERVE 200*SYSTEM_CURRENCY_PARTS
#define DEFAULT_FEE_NICKNAME_CREATE 1000 #define DEFAULT_FEE_NICKNAME_CREATE 1000
#define DEFAULT_FEE_OFFER DEFAULT_FEE_DEFAULT #define DEFAULT_FEE_OFFER DEFAULT_FEE_DEFAULT
#define DEFAULT_FEE_OPERATION 1 #define DEFAULT_FEE_OPERATION 1
@@ -162,7 +162,7 @@ void Config::setup(const std::string& strConf, bool bQuiet)
NETWORK_QUORUM = 0; // Don't need to see other nodes NETWORK_QUORUM = 0; // Don't need to see other nodes
VALIDATION_QUORUM = 1; // Only need one node to vouch VALIDATION_QUORUM = 1; // Only need one node to vouch
FEE_ACCOUNT_CREATE = DEFAULT_FEE_ACCOUNT_CREATE; FEE_RESERVE = DEFAULT_FEE_RESERVE;
FEE_NICKNAME_CREATE = DEFAULT_FEE_NICKNAME_CREATE; FEE_NICKNAME_CREATE = DEFAULT_FEE_NICKNAME_CREATE;
FEE_OFFER = DEFAULT_FEE_OFFER; FEE_OFFER = DEFAULT_FEE_OFFER;
FEE_DEFAULT = DEFAULT_FEE_DEFAULT; FEE_DEFAULT = DEFAULT_FEE_DEFAULT;
@@ -297,8 +297,8 @@ void Config::load()
if (sectionSingleB(secConfig, SECTION_VALIDATION_QUORUM, strTemp)) if (sectionSingleB(secConfig, SECTION_VALIDATION_QUORUM, strTemp))
VALIDATION_QUORUM = std::max(0, boost::lexical_cast<int>(strTemp)); VALIDATION_QUORUM = std::max(0, boost::lexical_cast<int>(strTemp));
if (sectionSingleB(secConfig, SECTION_FEE_ACCOUNT_CREATE, strTemp)) if (sectionSingleB(secConfig, SECTION_FEE_RESERVE, strTemp))
FEE_ACCOUNT_CREATE = boost::lexical_cast<int>(strTemp); FEE_RESERVE = boost::lexical_cast<uint64>(strTemp);
if (sectionSingleB(secConfig, SECTION_FEE_NICKNAME_CREATE, strTemp)) if (sectionSingleB(secConfig, SECTION_FEE_NICKNAME_CREATE, strTemp))
FEE_NICKNAME_CREATE = boost::lexical_cast<int>(strTemp); FEE_NICKNAME_CREATE = boost::lexical_cast<int>(strTemp);

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

@@ -106,9 +106,9 @@ public:
// Validation // Validation
RippleAddress VALIDATION_SEED, VALIDATION_PUB, VALIDATION_PRIV; RippleAddress VALIDATION_SEED, VALIDATION_PUB, VALIDATION_PRIV;
// Fees // Fee schedule
uint64 FEE_DEFAULT; // Default fee. uint64 FEE_DEFAULT; // Default fee.
uint64 FEE_ACCOUNT_CREATE; // Fee to create an account. uint64 FEE_RESERVE; // Amount of XRP not allowed to send.
uint64 FEE_NICKNAME_CREATE; // Fee to create a nickname. uint64 FEE_NICKNAME_CREATE; // Fee to create a nickname.
uint64 FEE_OFFER; // Rate per day. uint64 FEE_OFFER; // Rate per day.
int FEE_CONTRACT_OPERATION; // fee for each contract operation int FEE_CONTRACT_OPERATION; // fee for each contract operation

31
src/cpp/ripple/PaymentTransactor.cpp
View File

@@ -4,23 +4,10 @@
#define RIPPLE_PATHS_MAX 3 #define RIPPLE_PATHS_MAX 3
// only have the higher fee if the account doesn't in fact exist
void PaymentTransactor::calculateFee()
{
if (mTxn.getFlags() & tfCreateAccount)
{
const uint160 uDstAccountID = mTxn.getFieldAccount160(sfDestination);
SLE::pointer sleDst = mEngine->entryCache(ltACCOUNT_ROOT, Ledger::getAccountRootIndex(uDstAccountID));
if(!sleDst) mFeeDue = theConfig.FEE_ACCOUNT_CREATE;
else Transactor::calculateFee();
}else Transactor::calculateFee();
}
TER PaymentTransactor::doApply() TER PaymentTransactor::doApply()
{ {
// Ripple if source or destination is non-native or if there are paths. // Ripple if source or destination is non-native or if there are paths.
const uint32 uTxFlags = mTxn.getFlags(); const uint32 uTxFlags = mTxn.getFlags();
const bool bCreate = isSetBit(uTxFlags, tfCreateAccount);
const bool bPartialPayment = isSetBit(uTxFlags, tfPartialPayment); const bool bPartialPayment = isSetBit(uTxFlags, tfPartialPayment);
const bool bLimitQuality = isSetBit(uTxFlags, tfLimitQuality); const bool bLimitQuality = isSetBit(uTxFlags, tfLimitQuality);
const bool bNoRippleDirect = isSetBit(uTxFlags, tfNoRippleDirect); const bool bNoRippleDirect = isSetBit(uTxFlags, tfNoRippleDirect);
@@ -87,17 +74,20 @@ TER PaymentTransactor::doApply()
if (!sleDst) if (!sleDst)
{ {
// Destination account does not exist. // Destination account does not exist.
if (bCreate && !saDstAmount.isNative())
if (!saDstAmount.isNative())
{ {
// This restriction could be relaxed. // This restriction could be relaxed.
Log(lsINFO) << "doPayment: Malformed transaction: Create account may only fund XRP."; Log(lsINFO) << "doPayment: Malformed transaction: Create account may only fund XRP.";
return temCREATEXRP; return temCREATEXRP;
} }
else if (!bCreate) else if (isSetBit(mParams, tapOPEN_LEDGER) // Ledger is not final, we can vote.
&& saDstAmount.getNValue() < theConfig.FEE_RESERVE) // Reserve is not scaled by fee.
{ {
Log(lsINFO) << "doPayment: Delay transaction: Destination account does not exist."; Log(lsINFO) << "doPayment: Delay transaction: Destination account does not exist insufficent payment to create account.";
// Not a local failure. Another transaction could create account and then this transaction would succeed.
return terNO_DST; return terNO_DST;
} }
@@ -148,7 +138,7 @@ TER PaymentTransactor::doApply()
STAmount saSrcXRPBalance = mTxnAccount->getFieldAmount(sfBalance); STAmount saSrcXRPBalance = mTxnAccount->getFieldAmount(sfBalance);
if (saSrcXRPBalance < saDstAmount) if (saSrcXRPBalance < saDstAmount + theConfig.FEE_RESERVE) // Reserve is not scaled by fee.
{ {
// Transaction might succeed, if applied in a different order. // Transaction might succeed, if applied in a different order.
Log(lsINFO) << "doPayment: Delay transaction: Insufficient funds."; Log(lsINFO) << "doPayment: Delay transaction: Insufficient funds.";
@@ -158,13 +148,18 @@ TER PaymentTransactor::doApply()
else else
{ {
mTxnAccount->setFieldAmount(sfBalance, saSrcXRPBalance - saDstAmount); mTxnAccount->setFieldAmount(sfBalance, saSrcXRPBalance - saDstAmount);
// re-arm the password change fee if we can and need to // re-arm the password change fee if we can and need to
if ( (sleDst->getFlags() & lsfPasswordSpent) && if ( (sleDst->getFlags() & lsfPasswordSpent) &&
(saDstAmount > theConfig.FEE_DEFAULT) ) (saDstAmount > theConfig.FEE_DEFAULT) )
{ {
sleDst->setFieldAmount(sfBalance, sleDst->getFieldAmount(sfBalance) + saDstAmount-theConfig.FEE_DEFAULT); sleDst->setFieldAmount(sfBalance, sleDst->getFieldAmount(sfBalance) + saDstAmount-theConfig.FEE_DEFAULT);
sleDst->clearFlag(lsfPasswordSpent); sleDst->clearFlag(lsfPasswordSpent);
}else sleDst->setFieldAmount(sfBalance, sleDst->getFieldAmount(sfBalance) + saDstAmount); }
else
{
sleDst->setFieldAmount(sfBalance, sleDst->getFieldAmount(sfBalance) + saDstAmount);
}
terResult = tesSUCCESS; terResult = tesSUCCESS;
} }

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

@@ -5,7 +5,6 @@
class PaymentTransactor : public Transactor class PaymentTransactor : public Transactor
{ {
void calculateFee();
public: public:
PaymentTransactor(const SerializedTransaction& txn,TransactionEngineParams params, TransactionEngine* engine) : Transactor(txn,params,engine) {} PaymentTransactor(const SerializedTransaction& txn,TransactionEngineParams params, TransactionEngine* engine) : Transactor(txn,params,engine) {}

5
src/cpp/ripple/RPCHandler.cpp
View File

@@ -912,10 +912,7 @@ Json::Value RPCHandler::doSubmit(Json::Value jvRequest)
if (!txJSON.isMember("Fee")) if (!txJSON.isMember("Fee"))
{ {
if (mNetOps->getAccountState(mNetOps->getCurrentLedger(), dstAccountID)) txJSON["Fee"] = (int) theConfig.FEE_DEFAULT;
txJSON["Fee"] = (int) theConfig.FEE_DEFAULT;
else
txJSON["Fee"] = (int) theConfig.FEE_ACCOUNT_CREATE;
} }
if (txJSON.isMember("Paths") && jvRequest.isMember("build_path")) if (txJSON.isMember("Paths") && jvRequest.isMember("build_path"))

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

@@ -61,12 +61,12 @@ const uint32 tfPassive = 0x00010000;
const uint32 tfOfferCreateMask = ~(tfPassive); const uint32 tfOfferCreateMask = ~(tfPassive);
// Payment flags: // Payment flags:
const uint32 tfCreateAccount = 0x00010000; const uint32 tfPaymentLegacy = 0x00010000; // Left here to avoid ledger change.
const uint32 tfPartialPayment = 0x00020000; const uint32 tfPartialPayment = 0x00020000;
const uint32 tfLimitQuality = 0x00040000; const uint32 tfLimitQuality = 0x00040000;
const uint32 tfNoRippleDirect = 0x00080000; const uint32 tfNoRippleDirect = 0x00080000;
const uint32 tfPaymentMask = ~(tfCreateAccount|tfPartialPayment|tfLimitQuality|tfNoRippleDirect); const uint32 tfPaymentMask = ~(tfPartialPayment|tfLimitQuality|tfNoRippleDirect);
#endif #endif
// vim:ts=4 // vim:ts=4

15
src/js/remote.js
View File

@@ -267,7 +267,7 @@ Remote.flags = {
}, },
'Payment' : { 'Payment' : {
'CreateAccount' : 0x00010000, 'PaymentLegacy' : 0x00010000,
'PartialPayment' : 0x00020000, 'PartialPayment' : 0x00020000,
'LimitQuality' : 0x00040000, 'LimitQuality' : 0x00040000,
'NoRippleDirect' : 0x00080000, 'NoRippleDirect' : 0x00080000,
@@ -277,7 +277,6 @@ Remote.flags = {
// XXX This needs to be determined from the network. // XXX This needs to be determined from the network.
Remote.fees = { Remote.fees = {
'default' : Amount.from_json("10"), 'default' : Amount.from_json("10"),
'account_create' : Amount.from_json("1000000000"),
'nickname_create' : Amount.from_json("1000"), 'nickname_create' : Amount.from_json("1000"),
'offer' : Amount.from_json("10"), 'offer' : Amount.from_json("10"),
}; };
@@ -1260,14 +1259,7 @@ Transaction.prototype.submit = function (callback) {
// YYY Might check paths for invalid accounts. // YYY Might check paths for invalid accounts.
if (this.remote.local_fee && undefined === tx_json.Fee) { if (this.remote.local_fee && undefined === tx_json.Fee) {
if ('Payment' === tx_json.TransactionType tx_json.Fee = Remote.fees['default'].to_json();
&& tx_json.Flags & Remote.flags.Payment.CreateAccount) {
tx_json.Fee = Remote.fees.account_create.to_json();
}
else {
tx_json.Fee = Remote.fees['default'].to_json();
}
} }
if (this.callback || this.listeners('final').length || this.listeners('lost').length || this.listeners('pending').length) { if (this.callback || this.listeners('final').length || this.listeners('lost').length || this.listeners('pending').length) {
@@ -1435,9 +1427,6 @@ Transaction.prototype.set_flags = function (flags) {
// XXX Immediately report an error or mark it. // XXX Immediately report an error or mark it.
} }
} }
if (this.remote.local_fee && (this.tx_json.Flags & Remote.flags.Payment.CreateAccount))
this.tx_json.Fee = Remote.fees.account_create.to_json();
} }
return this; return this;

24
test/offer-test.js
View File

@@ -157,7 +157,7 @@ buster.testCase("Offer tests", {
}, },
"new user offer_create then ledger_accept then offer_cancel then ledger_accept." : "//new user offer_create then ledger_accept then offer_cancel then ledger_accept." :
function (done) { function (done) {
var self = this; var self = this;
var final_create; var final_create;
@@ -167,7 +167,6 @@ buster.testCase("Offer tests", {
function (callback) { function (callback) {
self.remote.transaction() self.remote.transaction()
.payment('root', 'alice', "1000") .payment('root', 'alice', "1000")
.set_flags('CreateAccount')
.on('proposed', function (m) { .on('proposed', function (m) {
// console.log("proposed: %s", JSON.stringify(m)); // console.log("proposed: %s", JSON.stringify(m));
buster.assert.equals(m.result, 'tesSUCCESS'); buster.assert.equals(m.result, 'tesSUCCESS');
@@ -260,8 +259,7 @@ buster.testCase("Offer tests", {
async.waterfall([ async.waterfall([
function (callback) { function (callback) {
self.remote.transaction() self.remote.transaction()
.payment('root', 'alice', Amount.from_json("10000")) .payment('root', 'alice', Amount.from_json("10000.0"))
.set_flags('CreateAccount')
.on('proposed', function (m) { .on('proposed', function (m) {
// console.log("PROPOSED: CreateAccount: %s", JSON.stringify(m)); // console.log("PROPOSED: CreateAccount: %s", JSON.stringify(m));
callback(m.result !== 'tesSUCCESS', m); callback(m.result !== 'tesSUCCESS', m);
@@ -345,7 +343,7 @@ buster.testCase("Offer tests", {
function (callback) { function (callback) {
self.what = "Create accounts."; self.what = "Create accounts.";
testutils.create_accounts(self.remote, "root", "10000", ["alice", "bob", "mtgox"], callback); testutils.create_accounts(self.remote, "root", "10000.0", ["alice", "bob", "mtgox"], callback);
}, },
function (callback) { function (callback) {
self.what = "Set limits."; self.what = "Set limits.";
@@ -402,7 +400,7 @@ buster.testCase("Offer tests", {
testutils.verify_balances(self.remote, testutils.verify_balances(self.remote,
{ {
"alice" : [ "0/USD/mtgox", String(10000+500-2*(Remote.fees['default'].to_number())) ], "alice" : [ "0/USD/mtgox", String(10000000000+500-2*(Remote.fees['default'].to_number())) ],
"bob" : "100/USD/mtgox", "bob" : "100/USD/mtgox",
}, },
callback); callback);
@@ -427,7 +425,7 @@ buster.testCase("Offer tests", {
function (callback) { function (callback) {
self.what = "Create accounts."; self.what = "Create accounts.";
testutils.create_accounts(self.remote, "root", "10000", ["alice", "bob", "mtgox"], callback); testutils.create_accounts(self.remote, "root", "10000.0", ["alice", "bob", "mtgox"], callback);
}, },
function (callback) { function (callback) {
self.what = "Set limits."; self.what = "Set limits.";
@@ -484,7 +482,7 @@ buster.testCase("Offer tests", {
testutils.verify_balances(self.remote, testutils.verify_balances(self.remote,
{ {
"alice" : [ "160/USD/mtgox", String(10000+200-2*(Remote.fees['default'].to_number())) ], "alice" : [ "160/USD/mtgox", String(10000000000+200-2*(Remote.fees['default'].to_number())) ],
"bob" : "40/USD/mtgox", "bob" : "40/USD/mtgox",
}, },
callback); callback);
@@ -526,7 +524,7 @@ buster.testCase("Offer tests", {
testutils.verify_balances(self.remote, testutils.verify_balances(self.remote,
{ {
"alice" : [ "100/USD/mtgox", String(10000+200+300-4*(Remote.fees['default'].to_number())) ], "alice" : [ "100/USD/mtgox", String(10000000000+200+300-4*(Remote.fees['default'].to_number())) ],
"bob" : "100/USD/mtgox", "bob" : "100/USD/mtgox",
}, },
callback); callback);
@@ -555,7 +553,7 @@ buster.testCase("Offer cross currency", {
function (callback) { function (callback) {
self.what = "Create accounts."; self.what = "Create accounts.";
testutils.create_accounts(self.remote, "root", "10000", ["alice", "bob", "carol", "mtgox"], callback); testutils.create_accounts(self.remote, "root", "10000.0", ["alice", "bob", "carol", "mtgox"], callback);
}, },
function (callback) { function (callback) {
self.what = "Set limits."; self.what = "Set limits.";
@@ -637,7 +635,7 @@ buster.testCase("Offer cross currency", {
function (callback) { function (callback) {
self.what = "Create accounts."; self.what = "Create accounts.";
testutils.create_accounts(self.remote, "root", "10000", ["alice", "bob", "carol", "mtgox"], callback); testutils.create_accounts(self.remote, "root", "10000.0", ["alice", "bob", "carol", "mtgox"], callback);
}, },
function (callback) { function (callback) {
self.what = "Set limits."; self.what = "Set limits.";
@@ -690,7 +688,7 @@ buster.testCase("Offer cross currency", {
testutils.verify_balances(self.remote, testutils.verify_balances(self.remote,
{ {
"alice" : "475/USD/mtgox", "alice" : "475/USD/mtgox",
"bob" : "10250", "bob" : "10000000250",
"carol" : "25/USD/mtgox", "carol" : "25/USD/mtgox",
}, },
callback); callback);
@@ -720,7 +718,7 @@ buster.testCase("Offer cross currency", {
function (callback) { function (callback) {
self.what = "Create accounts."; self.what = "Create accounts.";
testutils.create_accounts(self.remote, "root", "10000", ["alice", "bob", "carol", "dan", "bitstamp", "mtgox"], callback); testutils.create_accounts(self.remote, "root", "10000.0", ["alice", "bob", "carol", "dan", "bitstamp", "mtgox"], callback);
}, },
function (callback) { function (callback) {
self.what = "Set limits."; self.what = "Set limits.";