ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-06-04 17:27:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fullly rename

Browse Source
This commit is contained in:
tequ
2025-09-13 09:49:30 +09:00
parent e589b71ee0
commit 8e895a3e7d
10 changed files with 69 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/xrpl/protocol/TxFlags.h
View File

@@ -255,13 +255,13 @@ constexpr std::uint32_t tfIndependent = 0x00080000;
constexpr std::uint32_t const tfBatchMask =
~(tfUniversal | tfAllOrNothing | tfOnlyOne | tfUntilFailure | tfIndependent) | tfInnerBatchTxn;
// SponsorSet flags:
// SponsorshipSet flags:
constexpr std::uint32_t tfSponsorshipSetRequireSignForFee = 0x00010000;
constexpr std::uint32_t tfSponsorshipClearRequireSignForFee = 0x00020000;
constexpr std::uint32_t tfSponsorshipSetRequireSignForReserve = 0x00040000;
constexpr std::uint32_t tfSponsorshipClearRequireSignForReserve = 0x00080000;
constexpr std::uint32_t tfDeleteObject = 0x00100000;
constexpr std::uint32_t tfSponsorSetMask = ~(tfUniversal | tfSponsorshipSetRequireSignForFee | tfSponsorshipClearRequireSignForFee | tfSponsorshipSetRequireSignForReserve | tfSponsorshipClearRequireSignForReserve | tfDeleteObject);
constexpr std::uint32_t tfSponsorshipSetMask = ~(tfUniversal | tfSponsorshipSetRequireSignForFee | tfSponsorshipClearRequireSignForFee | tfSponsorshipSetRequireSignForReserve | tfSponsorshipClearRequireSignForReserve | tfDeleteObject);
// clang-format on

4
include/xrpl/protocol/detail/transactions.macro
View File

@@ -527,12 +527,12 @@ TRANSACTION(ttBATCH, 71, Batch, Delegation::notDelegatable, ({
}))
/** This transaction transfer sponsorship */
TRANSACTION(ttSPONSORSHIP_TRANSFER, 72, SponsorTransfer, Delegation::notDelegatable, ({
TRANSACTION(ttSPONSORSHIP_TRANSFER, 72, SponsorshipTransfer, Delegation::notDelegatable, ({
{sfObjectID, soeOPTIONAL},
}))
/** This transaction create sponsorship object */
TRANSACTION(ttSPONSORSHIP_SET, 73, SponsorSet, Delegation::notDelegatable, ({
TRANSACTION(ttSPONSORSHIP_SET, 73, SponsorshipSet, Delegation::notDelegatable, ({
{sfSponsorAccount, soeOPTIONAL},
{sfSponsee, soeREQUIRED},
{sfFeeAmount, soeOPTIONAL},

8
src/test/app/Sponsor_test.cpp
View File

@@ -53,9 +53,9 @@ public:
}
void
testInvalidSponsorSet()
testInvalidSponsorshipSet()
{
testcase("Invalid SponsorSet");
testcase("Invalid SponsorshipSet");
using namespace test::jtx;
Env env{*this, testable_amendments()};
Account const alice("alice");
@@ -75,7 +75,7 @@ public:
// Invalid flags
{
env(sponsor::set(
sponsor, alice, ~tfSponsorSetMask - tfInnerBatchTxn),
sponsor, alice, ~tfSponsorshipSetMask - tfInnerBatchTxn),
ter(temINVALID_FLAG));
env(sponsor::set(
@@ -974,7 +974,7 @@ public:
run() override
{
testDisabled();
testInvalidSponsorSet();
testInvalidSponsorshipSet();
testSingleSigning();
testMultiSigning();

6
src/test/jtx/impl/sponsor.cpp
View File

@@ -39,7 +39,7 @@ set(jtx::Account const& account,
std::optional<STAmount> feeAmount)
{
Json::Value jv;
jv[jss::TransactionType] = jss::SponsorSet;
jv[jss::TransactionType] = jss::SponsorshipSet;
jv[jss::Account] = account.human();
jv[sfSponsee.jsonName] = sponsee.human();
jv[sfFlags.jsonName] = flags;
@@ -54,7 +54,7 @@ Json::Value
del(jtx::Account const& account, jtx::Account const& sponsee)
{
Json::Value jv;
jv[jss::TransactionType] = jss::SponsorSet;
jv[jss::TransactionType] = jss::SponsorshipSet;
jv[jss::Account] = account.human();
jv[sfSponsee.jsonName] = sponsee.human();
jv[sfFlags.jsonName] = tfDeleteObject;
@@ -65,7 +65,7 @@ Json::Value
transfer(jtx::Account const& account, std::optional<uint256> const& index)
{
Json::Value jv;
jv[jss::TransactionType] = jss::SponsorTransfer;
jv[jss::TransactionType] = jss::SponsorshipTransfer;
jv[jss::Account] = account.human();
if (index)
jv[sfObjectID.jsonName] = to_string(*index);

4
src/xrpld/app/tx/detail/DeleteAccount.cpp
View File

@@ -25,7 +25,7 @@
#include <xrpld/app/tx/detail/DepositPreauth.h>
#include <xrpld/app/tx/detail/NFTokenUtils.h>
#include <xrpld/app/tx/detail/SetSignerList.h>
#include <xrpld/app/tx/detail/SponsorSet.h>
#include <xrpld/app/tx/detail/SponsorshipSet.h>
#include <xrpld/ledger/View.h>
#include <xrpl/basics/Log.h>
@@ -204,7 +204,7 @@ removeSponsorshipFromLedger(
std::shared_ptr<SLE> const& sleDel,
beast::Journal j)
{
return SponsorSet::deleteSponsorship(view, sleDel, j);
return SponsorshipSet::deleteSponsorship(view, sleDel, j);
}
// Return nullptr if the LedgerEntryType represents an obligation that can't

40
src/xrpld/app/tx/detail/SponsorSet.cpp → src/xrpld/app/tx/detail/SponsorshipSet.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include <xrpld/app/tx/detail/SponsorSet.h>
#include <xrpld/app/tx/detail/SponsorshipSet.h>
#include <xrpld/ledger/View.h>
#include <xrpl/protocol/TxFlags.h>
@@ -25,7 +25,7 @@
namespace ripple {
NotTEC
SponsorSet::preflight(PreflightContext const& ctx)
SponsorshipSet::preflight(PreflightContext const& ctx)
{
if (!ctx.rules.enabled(featureSponsor))
return temDISABLED;
@@ -35,7 +35,7 @@ SponsorSet::preflight(PreflightContext const& ctx)
// check Flags
{
if (ctx.tx.getFlags() & tfSponsorSetMask)
if (ctx.tx.getFlags() & tfSponsorshipSetMask)
return temINVALID_FLAG;
if (ctx.tx.isFlag(tfSponsorshipSetRequireSignForFee) &&
@@ -116,7 +116,7 @@ SponsorSet::preflight(PreflightContext const& ctx)
}
TER
SponsorSet::preclaim(PreclaimContext const& ctx)
SponsorshipSet::preclaim(PreclaimContext const& ctx)
{
auto const sponsor = ctx.tx.isFieldPresent(sfSponsorAccount)
? ctx.tx.getAccountID(sfSponsorAccount)
@@ -142,7 +142,7 @@ SponsorSet::preclaim(PreclaimContext const& ctx)
}
TER
SponsorSet::doApply()
SponsorshipSet::doApply()
{
auto const sponseeAcc = ctx_.tx[sfSponsee];
auto const keylet = keylet::sponsor(account_, sponseeAcc);
@@ -270,4 +270,34 @@ SponsorSet::doApply()
return tesSUCCESS;
}
TER
SponsorshipSet::deleteSponsorship(
ApplyView& view,
std::shared_ptr<SLE> const& sle,
beast::Journal j)
{
auto const sponsor = sle->getAccountID(sfSponsorAccount);
auto const sponsee = sle->getAccountID(sfSponsee);
// adjust balance
auto const sponsorAccSle = view.peek(keylet::account(sponsor));
if (!sponsorAccSle)
return tecINTERNAL;
auto const feeAmount = sle->getFieldAmount(sfFeeAmount);
(*sponsorAccSle)[sfBalance] += feeAmount;
// delete sponsor node
view.dirRemove(
keylet::ownerDir(sponsor), (*sle)[sfSponsorNode], sle->key(), false);
// delete sponsee node
view.dirRemove(
keylet::ownerDir(sponsee), (*sle)[sfSponseeNode], sle->key(), false);
view.erase(sle);
return tesSUCCESS;
}
} // namespace ripple

15
src/xrpld/app/tx/detail/SponsorTransfer.h → src/xrpld/app/tx/detail/SponsorshipSet.h
View File

@@ -17,19 +17,19 @@
*/
//==============================================================================
#ifndef RIPPLE_TX_SPONSORTRANSFER_H_INCLUDED
#define RIPPLE_TX_SPONSORTRANSFER_H_INCLUDED
#ifndef RIPPLE_TX_SPONSORSHIPSET_H_INCLUDED
#define RIPPLE_TX_SPONSORSHIPSET_H_INCLUDED
#include <xrpld/app/tx/detail/Transactor.h>
namespace ripple {
class SponsorTransfer : public Transactor
class SponsorshipSet : public Transactor
{
public:
static constexpr ConsequencesFactoryType ConsequencesFactory{Normal};
explicit SponsorTransfer(ApplyContext& ctx) : Transactor(ctx)
explicit SponsorshipSet(ApplyContext& ctx) : Transactor(ctx)
{
}
@@ -41,6 +41,13 @@ public:
TER
doApply() override;
// Interface used by DeleteAccount
static TER
deleteSponsorship(
ApplyView& view,
std::shared_ptr<SLE> const& sle,
beast::Journal j);
};
} // namespace ripple

8
src/xrpld/app/tx/detail/SponsorTransfer.cpp → src/xrpld/app/tx/detail/SponsorshipTransfer.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include <xrpld/app/tx/detail/SponsorTransfer.h>
#include <xrpld/app/tx/detail/SponsorshipTransfer.h>
#include <xrpld/ledger/ReadView.h>
#include <xrpld/ledger/View.h>
@@ -32,7 +32,7 @@
namespace ripple {
NotTEC
SponsorTransfer::preflight(PreflightContext const& ctx)
SponsorshipTransfer::preflight(PreflightContext const& ctx)
{
if (!ctx.rules.enabled(featureSponsor))
return temDISABLED;
@@ -108,7 +108,7 @@ getLedgerEntryOwner(
}
TER
SponsorTransfer::preclaim(PreclaimContext const& ctx)
SponsorshipTransfer::preclaim(PreclaimContext const& ctx)
{
auto const index = ctx.tx[~sfObjectID];
auto const newSponsor = getTxReserveSponsor(ctx.view, ctx.tx);
@@ -194,7 +194,7 @@ SponsorTransfer::preclaim(PreclaimContext const& ctx)
}
TER
SponsorTransfer::doApply()
SponsorshipTransfer::doApply()
{
auto const& tx = ctx_.tx;

8
src/xrpld/app/tx/detail/SponsorSet.h → src/xrpld/app/tx/detail/SponsorshipTransfer.h
View File

@@ -17,19 +17,19 @@
*/
//==============================================================================
#ifndef RIPPLE_TX_SPONSORSET_H_INCLUDED
#define RIPPLE_TX_SPONSORSET_H_INCLUDED
#ifndef RIPPLE_TX_SponsorshipTransfer_H_INCLUDED
#define RIPPLE_TX_SponsorshipTransfer_H_INCLUDED
#include <xrpld/app/tx/detail/Transactor.h>
namespace ripple {
class SponsorSet : public Transactor
class SponsorshipTransfer : public Transactor
{
public:
static constexpr ConsequencesFactoryType ConsequencesFactory{Normal};
explicit SponsorSet(ApplyContext& ctx) : Transactor(ctx)
explicit SponsorshipTransfer(ApplyContext& ctx) : Transactor(ctx)
{
}

4
src/xrpld/app/tx/detail/applySteps.cpp
View File

@@ -62,8 +62,8 @@
#include <xrpld/app/tx/detail/SetRegularKey.h>
#include <xrpld/app/tx/detail/SetSignerList.h>
#include <xrpld/app/tx/detail/SetTrust.h>
#include <xrpld/app/tx/detail/SponsorSet.h>
#include <xrpld/app/tx/detail/SponsorTransfer.h>
#include <xrpld/app/tx/detail/SponsorshipSet.h>
#include <xrpld/app/tx/detail/SponsorshipTransfer.h>
#include <xrpld/app/tx/detail/VaultClawback.h>
#include <xrpld/app/tx/detail/VaultCreate.h>
#include <xrpld/app/tx/detail/VaultDelete.h>