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

address reviews

Browse Source
This commit is contained in:
tequ
2025-11-21 17:44:05 +09:00
parent 7f0a940a43
commit a9629ae325
5 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ constexpr std::uint32_t tfUniversalMask = ~tfUniversal;
// Sponsor flags (Global):
constexpr std::uint32_t tfSponsorFee = 0x00000001;
constexpr std::uint32_t tfSponsorReserve = 0x00000002;
constexpr std::uint32_t tfSponsorMask = tfSponsorFee | tfSponsorReserve;
constexpr std::uint32_t tfSponsorMask = ~(tfSponsorFee | tfSponsorReserve);
// AccountSet flags:
constexpr std::uint32_t tfRequireDestTag = 0x00010000;

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

@@ -335,7 +335,7 @@ public:
// Invalid Flags
env(noop(alice), sponsor::as(sponsor, 4), ter(temINVALID_FLAG));
env(noop(alice),
sponsor::as(sponsor, ~tfSponsorMask),
sponsor::as(sponsor, tfSponsorMask),
ter(temINVALID_FLAG));
}
@@ -4511,6 +4511,12 @@ public:
env.close();
testFeePermission(tesSUCCESS);
// test with SponsorReserve (should failed)
env(sponsor::set(alice, 0, 100, XRP(100)),
sponsor::sponseeAcc(bob),
delegate::as(carol),
ter(terNO_DELEGATE_PERMISSION));
}
//
@@ -4549,6 +4555,12 @@ public:
env.close();
testReservePermission(tesSUCCESS);
// test with SponsorFee (should failed)
env(sponsor::set(alice, 0, 100, XRP(100)),
sponsor::sponseeAcc(bob),
delegate::as(carol),
ter(terNO_DELEGATE_PERMISSION));
}
}

5
src/test/jtx/sponsor.h
View File

@@ -1,4 +1,5 @@
#pragma once
#ifndef XRPL_TEST_JTX_SPONSOR_H_INCLUDED
#define XRPL_TEST_JTX_SPONSOR_H_INCLUDED
#include <test/jtx/Account.h>
#include <test/jtx/Env.h>
@@ -92,3 +93,5 @@ ledgerEntry(
} // namespace jtx
} // namespace test
} // namespace ripple
#endif

43
src/xrpld/app/tx/detail/SponsorshipSet.cpp
View File

@@ -53,26 +53,27 @@ SponsorshipSet::preflight(PreflightContext const& ctx)
if (sponsee == sponsor)
return temMALFORMED;
if (ctx.tx.isFieldPresent(sfFeeAmount))
{
auto const feeAmount = ctx.tx.getFieldAmount(sfFeeAmount);
auto const checkOptionalAmountField = [&](SField const& field) -> NotTEC {
if (!ctx.tx.isFieldPresent(field))
return tesSUCCESS;
if (!isXRP(feeAmount))
auto const amount = ctx.tx.getFieldAmount(field);
if (!isXRP(amount))
return temBAD_AMOUNT;
if (feeAmount.xrp().drops() <= 0)
return temBAD_AMOUNT;
}
if (ctx.tx.isFieldPresent(sfMaxFee))
{
auto const maxFee = ctx.tx.getFieldAmount(sfMaxFee);
if (!isXRP(maxFee))
if (amount.xrp().drops() <= 0)
return temBAD_AMOUNT;
if (maxFee.xrp().drops() <= 0)
return temBAD_AMOUNT;
}
return tesSUCCESS;
};
if (auto const ret = checkOptionalAmountField(sfFeeAmount);
!isTesSuccess(ret))
return ret;
if (auto const ret = checkOptionalAmountField(sfMaxFee); !isTesSuccess(ret))
return ret;
if (ctx.tx.isFieldPresent(sfReserveCount))
{
@@ -122,15 +123,13 @@ SponsorshipSet::checkPermission(ReadView const& view, STTx const& tx)
auto const sponsoringReserve = tx.isFieldPresent(sfReserveCount) ||
tx.isFlag(tfSponsorshipSetRequireSignForReserve);
if (granularPermissions.contains(SponsorFee) && sponsoringFee)
return tesSUCCESS;
if (sponsoringFee && !granularPermissions.contains(SponsorFee))
return terNO_DELEGATE_PERMISSION;
if (granularPermissions.contains(SponsorReserve) && sponsoringReserve)
return tesSUCCESS;
if (sponsoringReserve && !granularPermissions.contains(SponsorReserve))
return terNO_DELEGATE_PERMISSION;
// TODO: needs to check permission to delete sponsorship?
return terNO_DELEGATE_PERMISSION;
return tesSUCCESS;
}
TER

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

@@ -154,9 +154,7 @@ Transactor::preflight1(PreflightContext const& ctx, std::uint32_t flagMask)
}
if (ctx.tx.isFieldPresent(sfSponsor) && !ctx.rules.enabled(featureSponsor))
{
return temDISABLED;
}
if (auto const ret = preflight0(ctx, flagMask))
return ret;
@@ -206,7 +204,7 @@ Transactor::preflight1(PreflightContext const& ctx, std::uint32_t flagMask)
JLOG(ctx.j.debug()) << "preflight1: invalid sponsor account";
return temMALFORMED;
}
if (!(sponsor.getFlags() & tfSponsorMask))
if (sponsor.getFlags() & tfSponsorMask)
{
JLOG(ctx.j.debug()) << "preflight1: invalid sponsor flags";
return temINVALID_FLAG;