ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Combine DID Amendments (#522)

Browse Source 
fixEmptyDID -> featureDID
This commit is contained in:
tequ
2025-06-23 21:13:52 +09:00
committed by GitHub
parent 6728221831
commit 348dab7491
3 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/xrpl/protocol/detail/features.macro
View File

@@ -48,7 +48,6 @@ XRPL_FEATURE(NFTokenMintOffer, Supported::yes, VoteBehavior::DefaultNo
XRPL_FIX (AMMv1_1, Supported::yes, VoteBehavior::DefaultNo) XRPL_FIX (AMMv1_1, Supported::yes, VoteBehavior::DefaultNo)
XRPL_FIX (PreviousTxnID, Supported::yes, VoteBehavior::DefaultNo) XRPL_FIX (PreviousTxnID, Supported::yes, VoteBehavior::DefaultNo)
XRPL_FIX (XChainRewardRounding, Supported::yes, VoteBehavior::DefaultNo) XRPL_FIX (XChainRewardRounding, Supported::yes, VoteBehavior::DefaultNo)
XRPL_FIX (EmptyDID, Supported::yes, VoteBehavior::DefaultNo)
XRPL_FEATURE(PriceOracle, Supported::yes, VoteBehavior::DefaultNo) XRPL_FEATURE(PriceOracle, Supported::yes, VoteBehavior::DefaultNo)
XRPL_FIX (AMMOverflowOffer, Supported::yes, VoteBehavior::DefaultYes) XRPL_FIX (AMMOverflowOffer, Supported::yes, VoteBehavior::DefaultYes)
XRPL_FIX (InnerObjTemplate, Supported::yes, VoteBehavior::DefaultNo) XRPL_FIX (InnerObjTemplate, Supported::yes, VoteBehavior::DefaultNo)

15
src/test/app/DID_test.cpp
View File

@@ -168,13 +168,9 @@ struct DID_test : public beast::unit_test::suite
BEAST_EXPECT(ownerCount(env, alice) == 0); BEAST_EXPECT(ownerCount(env, alice) == 0);
// some empty fields, some optional fields // some empty fields, some optional fields
// pre-fix amendment env(did::set(alice), did::uri(""), ter(tecEMPTY_DID));
auto const fixEnabled = env.current()->rules().enabled(fixEmptyDID);
env(did::set(alice),
did::uri(""),
fixEnabled ? ter(tecEMPTY_DID) : ter(tesSUCCESS));
env.close(); env.close();
auto const expectedOwnerReserve = fixEnabled ? 0 : 1; auto const expectedOwnerReserve = 0;
BEAST_EXPECT(ownerCount(env, alice) == expectedOwnerReserve); BEAST_EXPECT(ownerCount(env, alice) == expectedOwnerReserve);
// Modifying a DID to become empty is checked in testSetModify // Modifying a DID to become empty is checked in testSetModify
@@ -391,18 +387,11 @@ struct DID_test : public beast::unit_test::suite
{ {
using namespace test::jtx; using namespace test::jtx;
FeatureBitset const all{supported_amendments()}; FeatureBitset const all{supported_amendments()};
FeatureBitset const emptyDID{fixEmptyDID};
testEnabled(all); testEnabled(all);
testAccountReserve(all); testAccountReserve(all);
testSetInvalid(all); testSetInvalid(all);
testDeleteInvalid(all); testDeleteInvalid(all);
testSetModify(all); testSetModify(all);
testEnabled(all - emptyDID);
testAccountReserve(all - emptyDID);
testSetInvalid(all - emptyDID);
testDeleteInvalid(all - emptyDID);
testSetModify(all - emptyDID);
} }
}; };

3
src/xrpld/app/tx/detail/DID.cpp
View File

@@ -161,8 +161,7 @@ DIDSet::doApply()
set(sfURI); set(sfURI);
set(sfDIDDocument); set(sfDIDDocument);
set(sfData); set(sfData);
if (ctx_.view().rules().enabled(fixEmptyDID) && if (!sleDID->isFieldPresent(sfURI) &&
!sleDID->isFieldPresent(sfURI) &&
!sleDID->isFieldPresent(sfDIDDocument) && !sleDID->isFieldPresent(sfDIDDocument) &&
!sleDID->isFieldPresent(sfData)) !sleDID->isFieldPresent(sfData))
{ {