From 39412834386622de97ca6fda78f15bcf0fbe54ea Mon Sep 17 00:00:00 2001 From: Shawn Xie <35279399+shawnxie999@users.noreply.github.com> Date: Mon, 2 Feb 2026 12:13:18 -0500 Subject: [PATCH] Prefix confidential transfer transaction names with "MPT" (#6312) --- .../xrpl/protocol/detail/transactions.macro | 20 ++++++++--------- src/libxrpl/protocol/ConfidentialTransfer.cpp | 8 +++---- src/test/app/ConfidentialTransfer_test.cpp | 22 +++++++++---------- src/test/jtx/impl/mpt.cpp | 10 ++++----- ...awback.cpp => ConfidentialMPTClawback.cpp} | 8 +++---- ...alClawback.h => ConfidentialMPTClawback.h} | 4 ++-- ...Convert.cpp => ConfidentialMPTConvert.cpp} | 8 +++---- ...tialConvert.h => ConfidentialMPTConvert.h} | 4 ++-- ...ack.cpp => ConfidentialMPTConvertBack.cpp} | 8 +++---- ...ertBack.h => ConfidentialMPTConvertBack.h} | 4 ++-- ...nbox.cpp => ConfidentialMPTMergeInbox.cpp} | 8 +++---- ...rgeInbox.h => ConfidentialMPTMergeInbox.h} | 4 ++-- ...entialSend.cpp => ConfidentialMPTSend.cpp} | 16 +++++++------- ...nfidentialSend.h => ConfidentialMPTSend.h} | 4 ++-- 14 files changed, 64 insertions(+), 64 deletions(-) rename src/xrpld/app/tx/detail/{ConfidentialClawback.cpp => ConfidentialMPTClawback.cpp} (96%) rename src/xrpld/app/tx/detail/{ConfidentialClawback.h => ConfidentialMPTClawback.h} (78%) rename src/xrpld/app/tx/detail/{ConfidentialConvert.cpp => ConfidentialMPTConvert.cpp} (97%) rename src/xrpld/app/tx/detail/{ConfidentialConvert.h => ConfidentialMPTConvert.h} (78%) rename src/xrpld/app/tx/detail/{ConfidentialConvertBack.cpp => ConfidentialMPTConvertBack.cpp} (96%) rename src/xrpld/app/tx/detail/{ConfidentialConvertBack.h => ConfidentialMPTConvertBack.h} (77%) rename src/xrpld/app/tx/detail/{ConfidentialMergeInbox.cpp => ConfidentialMPTMergeInbox.cpp} (92%) rename src/xrpld/app/tx/detail/{ConfidentialMergeInbox.h => ConfidentialMPTMergeInbox.h} (77%) rename src/xrpld/app/tx/detail/{ConfidentialSend.cpp => ConfidentialMPTSend.cpp} (96%) rename src/xrpld/app/tx/detail/{ConfidentialSend.h => ConfidentialMPTSend.h} (78%) diff --git a/include/xrpl/protocol/detail/transactions.macro b/include/xrpl/protocol/detail/transactions.macro index dbcf633b87..49ee7f2265 100644 --- a/include/xrpl/protocol/detail/transactions.macro +++ b/include/xrpl/protocol/detail/transactions.macro @@ -1062,9 +1062,9 @@ TRANSACTION(ttLOAN_PAY, 84, LoanPay, /** This transaction type converts into confidential MPT balance. */ #if TRANSACTION_INCLUDE -#include +#include #endif -TRANSACTION(ttCONFIDENTIAL_CONVERT, 85, ConfidentialConvert, +TRANSACTION(ttCONFIDENTIAL_MPT_CONVERT, 85, ConfidentialMPTConvert, Delegation::delegable, featureConfidentialTransfer, noPriv, @@ -1081,9 +1081,9 @@ TRANSACTION(ttCONFIDENTIAL_CONVERT, 85, ConfidentialConvert, /** This transaction type merges MPT inbox. */ #if TRANSACTION_INCLUDE -#include +#include #endif -TRANSACTION(ttCONFIDENTIAL_MERGE_INBOX, 86, ConfidentialMergeInbox, +TRANSACTION(ttCONFIDENTIAL_MPT_MERGE_INBOX, 86, ConfidentialMPTMergeInbox, Delegation::delegable, featureConfidentialTransfer, noPriv, @@ -1093,9 +1093,9 @@ TRANSACTION(ttCONFIDENTIAL_MERGE_INBOX, 86, ConfidentialMergeInbox, /** This transaction type converts back into public MPT balance. */ #if TRANSACTION_INCLUDE -#include +#include #endif -TRANSACTION(ttCONFIDENTIAL_CONVERT_BACK, 87, ConfidentialConvertBack, +TRANSACTION(ttCONFIDENTIAL_MPT_CONVERT_BACK, 87, ConfidentialMPTConvertBack, Delegation::delegable, featureConfidentialTransfer, noPriv, @@ -1111,9 +1111,9 @@ TRANSACTION(ttCONFIDENTIAL_CONVERT_BACK, 87, ConfidentialConvertBack, })) #if TRANSACTION_INCLUDE -#include +#include #endif -TRANSACTION(ttCONFIDENTIAL_SEND, 88, ConfidentialSend, +TRANSACTION(ttCONFIDENTIAL_MPT_SEND, 88, ConfidentialMPTSend, Delegation::delegable, featureConfidentialTransfer, noPriv, @@ -1131,9 +1131,9 @@ TRANSACTION(ttCONFIDENTIAL_SEND, 88, ConfidentialSend, })) #if TRANSACTION_INCLUDE -#include +#include #endif -TRANSACTION(ttCONFIDENTIAL_CLAWBACK, 89, ConfidentialClawback, +TRANSACTION(ttCONFIDENTIAL_MPT_CLAWBACK, 89, ConfidentialMPTClawback, Delegation::delegable, featureConfidentialTransfer, noPriv, diff --git a/src/libxrpl/protocol/ConfidentialTransfer.cpp b/src/libxrpl/protocol/ConfidentialTransfer.cpp index 19a2e7963d..1834d52c9d 100644 --- a/src/libxrpl/protocol/ConfidentialTransfer.cpp +++ b/src/libxrpl/protocol/ConfidentialTransfer.cpp @@ -28,7 +28,7 @@ getSendContextHash( std::uint32_t version) { Serializer s; - addCommonZKPFields(s, ttCONFIDENTIAL_SEND, account, sequence, issuanceID); + addCommonZKPFields(s, ttCONFIDENTIAL_MPT_SEND, account, sequence, issuanceID); s.addBitString(destination); s.addInteger(version); @@ -45,7 +45,7 @@ getClawbackContextHash( AccountID const& holder) { Serializer s; - addCommonZKPFields(s, ttCONFIDENTIAL_CLAWBACK, account, sequence, issuanceID); + addCommonZKPFields(s, ttCONFIDENTIAL_MPT_CLAWBACK, account, sequence, issuanceID); s.add64(amount); s.addBitString(holder); @@ -57,7 +57,7 @@ uint256 getConvertContextHash(AccountID const& account, std::uint32_t sequence, uint192 const& issuanceID, std::uint64_t amount) { Serializer s; - addCommonZKPFields(s, ttCONFIDENTIAL_CONVERT, account, sequence, issuanceID); + addCommonZKPFields(s, ttCONFIDENTIAL_MPT_CONVERT, account, sequence, issuanceID); s.add64(amount); @@ -73,7 +73,7 @@ getConvertBackContextHash( std::uint32_t version) { Serializer s; - addCommonZKPFields(s, ttCONFIDENTIAL_CONVERT_BACK, account, sequence, issuanceID); + addCommonZKPFields(s, ttCONFIDENTIAL_MPT_CONVERT_BACK, account, sequence, issuanceID); s.add64(amount); s.addInteger(version); diff --git a/src/test/app/ConfidentialTransfer_test.cpp b/src/test/app/ConfidentialTransfer_test.cpp index 3dddcb7acc..2630d2c16b 100644 --- a/src/test/app/ConfidentialTransfer_test.cpp +++ b/src/test/app/ConfidentialTransfer_test.cpp @@ -1028,7 +1028,7 @@ class ConfidentialTransfer_test : public beast::unit_test::suite void testSendPreflight(FeatureBitset features) { - testcase("test ConfidentialSend Preflight"); + testcase("test ConfidentialMPTSend Preflight"); using namespace test::jtx; // test disabled @@ -1166,7 +1166,7 @@ class ConfidentialTransfer_test : public beast::unit_test::suite void testSendPreclaim(FeatureBitset features) { - testcase("test ConfidentialSend Preclaim"); + testcase("test ConfidentialMPTSend Preclaim"); using namespace test::jtx; Env env{*this, features}; @@ -1228,7 +1228,7 @@ class ConfidentialTransfer_test : public beast::unit_test::suite Json::Value jv; jv[jss::Account] = bob.human(); jv[jss::Destination] = carol.human(); - jv[jss::TransactionType] = jss::ConfidentialSend; + jv[jss::TransactionType] = jss::ConfidentialMPTSend; jv[sfMPTokenIssuanceID] = to_string(mptAlice.issuanceID()); jv[sfSenderEncryptedAmount] = strHex(getTrivialCiphertext()); jv[sfDestinationEncryptedAmount] = strHex(getTrivialCiphertext()); @@ -2082,7 +2082,7 @@ class ConfidentialTransfer_test : public beast::unit_test::suite void testClawback(FeatureBitset features) { - testcase("test ConfidentialClawback"); + testcase("test ConfidentialMPTClawback"); using namespace test::jtx; Env env{*this, features}; @@ -2159,7 +2159,7 @@ class ConfidentialTransfer_test : public beast::unit_test::suite void testClawbackWithAuditor(FeatureBitset features) { - testcase("test ConfidentialClawback with auditor"); + testcase("test ConfidentialMPTClawback with auditor"); using namespace test::jtx; Env env{*this, features}; @@ -2241,7 +2241,7 @@ class ConfidentialTransfer_test : public beast::unit_test::suite void testClawbackPreflight(FeatureBitset features) { - testcase("test ConfidentialClawback Preflight"); + testcase("test ConfidentialMPTClawback Preflight"); using namespace test::jtx; // test feature disabled @@ -2285,7 +2285,7 @@ class ConfidentialTransfer_test : public beast::unit_test::suite Json::Value jv; jv[jss::Account] = alice.human(); jv[sfHolder] = bob.human(); - jv[jss::TransactionType] = jss::ConfidentialClawback; + jv[jss::TransactionType] = jss::ConfidentialMPTClawback; jv[sfMPTAmount] = std::to_string(10); jv[sfZKProof] = "123"; @@ -2408,7 +2408,7 @@ class ConfidentialTransfer_test : public beast::unit_test::suite Json::Value jv; jv[jss::Account] = alice.human(); jv[sfHolder] = bob.human(); - jv[jss::TransactionType] = jss::ConfidentialClawback; + jv[jss::TransactionType] = jss::ConfidentialMPTClawback; jv[sfMPTAmount] = std::to_string(10); std::string const dummyProof(196, '0'); jv[sfZKProof] = dummyProof; @@ -2490,7 +2490,7 @@ class ConfidentialTransfer_test : public beast::unit_test::suite void testClawbackProof(FeatureBitset features) { - testcase("ConfidentialClawback Proof"); + testcase("ConfidentialMPTClawback Proof"); using namespace test::jtx; Account const alice("alice"); @@ -2951,14 +2951,14 @@ class ConfidentialTransfer_test : public beast::unit_test::suite testSetPreflight(features); - // ConfidentialSend + // ConfidentialMPTSend testSend(features); testSendPreflight(features); testSendPreclaim(features); testSendDepositPreauth(features); testSendWithAuditor(features); - // ConfidentialClawback + // ConfidentialMPTClawback testClawback(features); testClawbackPreflight(features); testClawbackPreclaim(features); diff --git a/src/test/jtx/impl/mpt.cpp b/src/test/jtx/impl/mpt.cpp index a5bd0130b0..1da8ac22cc 100644 --- a/src/test/jtx/impl/mpt.cpp +++ b/src/test/jtx/impl/mpt.cpp @@ -977,7 +977,7 @@ MPTTester::convert(MPTConvert const& arg) else Throw("Account not specified"); - jv[jss::TransactionType] = jss::ConfidentialConvert; + jv[jss::TransactionType] = jss::ConfidentialMPTConvert; if (arg.id) jv[sfMPTokenIssuanceID] = to_string(*arg.id); else @@ -1100,7 +1100,7 @@ void MPTTester::send(MPTConfidentialSend const& arg) { Json::Value jv; - jv[jss::TransactionType] = jss::ConfidentialSend; + jv[jss::TransactionType] = jss::ConfidentialMPTSend; if (arg.account) jv[sfAccount] = arg.account->human(); @@ -1361,7 +1361,7 @@ MPTTester::confidentialClaw(MPTConfidentialClawback const& arg) else Throw("Holder not specified"); - jv[jss::TransactionType] = jss::ConfidentialClawback; + jv[jss::TransactionType] = jss::ConfidentialMPTClawback; if (arg.id) jv[sfMPTokenIssuanceID] = to_string(*arg.id); else if (id_) @@ -1536,7 +1536,7 @@ MPTTester::mergeInbox(MPTMergeInbox const& arg) jv[sfMPTokenIssuanceID] = to_string(*id_); } - jv[sfTransactionType] = jss::ConfidentialMergeInbox; + jv[sfTransactionType] = jss::ConfidentialMPTMergeInbox; auto const prevInboxBalance = getDecryptedBalance(*arg.account, HOLDER_ENCRYPTED_INBOX); auto const prevSpendingBalance = getDecryptedBalance(*arg.account, HOLDER_ENCRYPTED_SPENDING); auto const prevIssuerBalance = getDecryptedBalance(*arg.account, ISSUER_ENCRYPTED_BALANCE); @@ -1603,7 +1603,7 @@ MPTTester::convertBack(MPTConvertBack const& arg) else Throw("Account not specified"); - jv[jss::TransactionType] = jss::ConfidentialConvertBack; + jv[jss::TransactionType] = jss::ConfidentialMPTConvertBack; if (arg.id) jv[sfMPTokenIssuanceID] = to_string(*arg.id); else diff --git a/src/xrpld/app/tx/detail/ConfidentialClawback.cpp b/src/xrpld/app/tx/detail/ConfidentialMPTClawback.cpp similarity index 96% rename from src/xrpld/app/tx/detail/ConfidentialClawback.cpp rename to src/xrpld/app/tx/detail/ConfidentialMPTClawback.cpp index 8adb74d078..2b15f3a0c6 100644 --- a/src/xrpld/app/tx/detail/ConfidentialClawback.cpp +++ b/src/xrpld/app/tx/detail/ConfidentialMPTClawback.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include @@ -11,7 +11,7 @@ namespace xrpl { NotTEC -ConfidentialClawback::preflight(PreflightContext const& ctx) +ConfidentialMPTClawback::preflight(PreflightContext const& ctx) { if (!ctx.rules.enabled(featureConfidentialTransfer)) return temDISABLED; @@ -39,7 +39,7 @@ ConfidentialClawback::preflight(PreflightContext const& ctx) } TER -ConfidentialClawback::preclaim(PreclaimContext const& ctx) +ConfidentialMPTClawback::preclaim(PreclaimContext const& ctx) { // Check if sender account exists auto const account = ctx.tx[sfAccount]; @@ -96,7 +96,7 @@ ConfidentialClawback::preclaim(PreclaimContext const& ctx) } TER -ConfidentialClawback::doApply() +ConfidentialMPTClawback::doApply() { auto const mptIssuanceID = ctx_.tx[sfMPTokenIssuanceID]; auto const holder = ctx_.tx[sfHolder]; diff --git a/src/xrpld/app/tx/detail/ConfidentialClawback.h b/src/xrpld/app/tx/detail/ConfidentialMPTClawback.h similarity index 78% rename from src/xrpld/app/tx/detail/ConfidentialClawback.h rename to src/xrpld/app/tx/detail/ConfidentialMPTClawback.h index c31fdaf69e..b080218af5 100644 --- a/src/xrpld/app/tx/detail/ConfidentialClawback.h +++ b/src/xrpld/app/tx/detail/ConfidentialMPTClawback.h @@ -5,12 +5,12 @@ namespace xrpl { -class ConfidentialClawback : public Transactor +class ConfidentialMPTClawback : public Transactor { public: static constexpr ConsequencesFactoryType ConsequencesFactory{Normal}; - explicit ConfidentialClawback(ApplyContext& ctx) : Transactor(ctx) + explicit ConfidentialMPTClawback(ApplyContext& ctx) : Transactor(ctx) { } diff --git a/src/xrpld/app/tx/detail/ConfidentialConvert.cpp b/src/xrpld/app/tx/detail/ConfidentialMPTConvert.cpp similarity index 97% rename from src/xrpld/app/tx/detail/ConfidentialConvert.cpp rename to src/xrpld/app/tx/detail/ConfidentialMPTConvert.cpp index a6d404b5f4..3a626c7939 100644 --- a/src/xrpld/app/tx/detail/ConfidentialConvert.cpp +++ b/src/xrpld/app/tx/detail/ConfidentialMPTConvert.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include @@ -11,7 +11,7 @@ namespace xrpl { NotTEC -ConfidentialConvert::preflight(PreflightContext const& ctx) +ConfidentialMPTConvert::preflight(PreflightContext const& ctx) { if (!ctx.rules.enabled(featureConfidentialTransfer)) return temDISABLED; @@ -56,7 +56,7 @@ ConfidentialConvert::preflight(PreflightContext const& ctx) } TER -ConfidentialConvert::preclaim(PreclaimContext const& ctx) +ConfidentialMPTConvert::preclaim(PreclaimContext const& ctx) { auto const account = ctx.tx[sfAccount]; auto const issuanceID = ctx.tx[sfMPTokenIssuanceID]; @@ -149,7 +149,7 @@ ConfidentialConvert::preclaim(PreclaimContext const& ctx) } TER -ConfidentialConvert::doApply() +ConfidentialMPTConvert::doApply() { auto const mptIssuanceID = ctx_.tx[sfMPTokenIssuanceID]; diff --git a/src/xrpld/app/tx/detail/ConfidentialConvert.h b/src/xrpld/app/tx/detail/ConfidentialMPTConvert.h similarity index 78% rename from src/xrpld/app/tx/detail/ConfidentialConvert.h rename to src/xrpld/app/tx/detail/ConfidentialMPTConvert.h index dbf543a1d1..d375ed9a39 100644 --- a/src/xrpld/app/tx/detail/ConfidentialConvert.h +++ b/src/xrpld/app/tx/detail/ConfidentialMPTConvert.h @@ -5,12 +5,12 @@ namespace xrpl { -class ConfidentialConvert : public Transactor +class ConfidentialMPTConvert : public Transactor { public: static constexpr ConsequencesFactoryType ConsequencesFactory{Normal}; - explicit ConfidentialConvert(ApplyContext& ctx) : Transactor(ctx) + explicit ConfidentialMPTConvert(ApplyContext& ctx) : Transactor(ctx) { } diff --git a/src/xrpld/app/tx/detail/ConfidentialConvertBack.cpp b/src/xrpld/app/tx/detail/ConfidentialMPTConvertBack.cpp similarity index 96% rename from src/xrpld/app/tx/detail/ConfidentialConvertBack.cpp rename to src/xrpld/app/tx/detail/ConfidentialMPTConvertBack.cpp index e9d34b753b..fa1c63bb2a 100644 --- a/src/xrpld/app/tx/detail/ConfidentialConvertBack.cpp +++ b/src/xrpld/app/tx/detail/ConfidentialMPTConvertBack.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include @@ -13,7 +13,7 @@ namespace xrpl { NotTEC -ConfidentialConvertBack::preflight(PreflightContext const& ctx) +ConfidentialMPTConvertBack::preflight(PreflightContext const& ctx) { if (!ctx.rules.enabled(featureConfidentialTransfer)) return temDISABLED; @@ -99,7 +99,7 @@ verifyProofs(STTx const& tx, std::shared_ptr const& issuance, std::sh } TER -ConfidentialConvertBack::preclaim(PreclaimContext const& ctx) +ConfidentialMPTConvertBack::preclaim(PreclaimContext const& ctx) { auto const mptIssuanceID = ctx.tx[sfMPTokenIssuanceID]; auto const account = ctx.tx[sfAccount]; @@ -165,7 +165,7 @@ ConfidentialConvertBack::preclaim(PreclaimContext const& ctx) } TER -ConfidentialConvertBack::doApply() +ConfidentialMPTConvertBack::doApply() { auto const mptIssuanceID = ctx_.tx[sfMPTokenIssuanceID]; diff --git a/src/xrpld/app/tx/detail/ConfidentialConvertBack.h b/src/xrpld/app/tx/detail/ConfidentialMPTConvertBack.h similarity index 77% rename from src/xrpld/app/tx/detail/ConfidentialConvertBack.h rename to src/xrpld/app/tx/detail/ConfidentialMPTConvertBack.h index f69b807394..8ef63c3d1e 100644 --- a/src/xrpld/app/tx/detail/ConfidentialConvertBack.h +++ b/src/xrpld/app/tx/detail/ConfidentialMPTConvertBack.h @@ -5,12 +5,12 @@ namespace xrpl { -class ConfidentialConvertBack : public Transactor +class ConfidentialMPTConvertBack : public Transactor { public: static constexpr ConsequencesFactoryType ConsequencesFactory{Normal}; - explicit ConfidentialConvertBack(ApplyContext& ctx) : Transactor(ctx) + explicit ConfidentialMPTConvertBack(ApplyContext& ctx) : Transactor(ctx) { } diff --git a/src/xrpld/app/tx/detail/ConfidentialMergeInbox.cpp b/src/xrpld/app/tx/detail/ConfidentialMPTMergeInbox.cpp similarity index 92% rename from src/xrpld/app/tx/detail/ConfidentialMergeInbox.cpp rename to src/xrpld/app/tx/detail/ConfidentialMPTMergeInbox.cpp index a8eebdd4d5..1f4859a8d1 100644 --- a/src/xrpld/app/tx/detail/ConfidentialMergeInbox.cpp +++ b/src/xrpld/app/tx/detail/ConfidentialMPTMergeInbox.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include @@ -10,7 +10,7 @@ namespace xrpl { NotTEC -ConfidentialMergeInbox::preflight(PreflightContext const& ctx) +ConfidentialMPTMergeInbox::preflight(PreflightContext const& ctx) { if (!ctx.rules.enabled(featureConfidentialTransfer)) return temDISABLED; @@ -23,7 +23,7 @@ ConfidentialMergeInbox::preflight(PreflightContext const& ctx) } TER -ConfidentialMergeInbox::preclaim(PreclaimContext const& ctx) +ConfidentialMPTMergeInbox::preclaim(PreclaimContext const& ctx) { auto const sleIssuance = ctx.view.read(keylet::mptIssuance(ctx.tx[sfMPTokenIssuanceID])); if (!sleIssuance) @@ -50,7 +50,7 @@ ConfidentialMergeInbox::preclaim(PreclaimContext const& ctx) } TER -ConfidentialMergeInbox::doApply() +ConfidentialMPTMergeInbox::doApply() { auto const mptIssuanceID = ctx_.tx[sfMPTokenIssuanceID]; auto sleMptoken = view().peek(keylet::mptoken(mptIssuanceID, account_)); diff --git a/src/xrpld/app/tx/detail/ConfidentialMergeInbox.h b/src/xrpld/app/tx/detail/ConfidentialMPTMergeInbox.h similarity index 77% rename from src/xrpld/app/tx/detail/ConfidentialMergeInbox.h rename to src/xrpld/app/tx/detail/ConfidentialMPTMergeInbox.h index ce7ba15632..2eaa4e9fcf 100644 --- a/src/xrpld/app/tx/detail/ConfidentialMergeInbox.h +++ b/src/xrpld/app/tx/detail/ConfidentialMPTMergeInbox.h @@ -5,12 +5,12 @@ namespace xrpl { -class ConfidentialMergeInbox : public Transactor +class ConfidentialMPTMergeInbox : public Transactor { public: static constexpr ConsequencesFactoryType ConsequencesFactory{Normal}; - explicit ConfidentialMergeInbox(ApplyContext& ctx) : Transactor(ctx) + explicit ConfidentialMPTMergeInbox(ApplyContext& ctx) : Transactor(ctx) { } diff --git a/src/xrpld/app/tx/detail/ConfidentialSend.cpp b/src/xrpld/app/tx/detail/ConfidentialMPTSend.cpp similarity index 96% rename from src/xrpld/app/tx/detail/ConfidentialSend.cpp rename to src/xrpld/app/tx/detail/ConfidentialMPTSend.cpp index 3bc7eae1f9..323fb4d28e 100644 --- a/src/xrpld/app/tx/detail/ConfidentialSend.cpp +++ b/src/xrpld/app/tx/detail/ConfidentialMPTSend.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include @@ -12,7 +12,7 @@ namespace xrpl { NotTEC -ConfidentialSend::preflight(PreflightContext const& ctx) +ConfidentialMPTSend::preflight(PreflightContext const& ctx) { if (!ctx.rules.enabled(featureConfidentialTransfer)) return temDISABLED; @@ -20,7 +20,7 @@ ConfidentialSend::preflight(PreflightContext const& ctx) auto const account = ctx.tx[sfAccount]; auto const issuer = MPTIssue(ctx.tx[sfMPTokenIssuanceID]).getIssuer(); - // ConfidentialSend only allows holder to holder, holder to second account, + // ConfidentialMPTSend only allows holder to holder, holder to second account, // and second account to holder transfers. So issuer cannot be the sender. if (account == issuer) return temMALFORMED; @@ -137,7 +137,7 @@ verifySendProofs( if (auto const ter = verifyMultiCiphertextEqualityProof(equalityProof, recipients, recipientCount, contextHash); !isTesSuccess(ter)) { - JLOG(ctx.j.trace()) << "ConfidentialSend: Equality proof failed."; + JLOG(ctx.j.trace()) << "ConfidentialMPTSend: Equality proof failed."; return ter; } @@ -150,7 +150,7 @@ verifySendProofs( contextHash); !isTesSuccess(ter)) { - JLOG(ctx.j.trace()) << "ConfidentialSend: Amount linkage proof failed."; + JLOG(ctx.j.trace()) << "ConfidentialMPTSend: Amount linkage proof failed."; return ter; } @@ -163,7 +163,7 @@ verifySendProofs( contextHash); !isTesSuccess(ter)) { - JLOG(ctx.j.trace()) << "ConfidentialSend: Balance linkage proof failed."; + JLOG(ctx.j.trace()) << "ConfidentialMPTSend: Balance linkage proof failed."; return ter; } @@ -171,7 +171,7 @@ verifySendProofs( } TER -ConfidentialSend::preclaim(PreclaimContext const& ctx) +ConfidentialMPTSend::preclaim(PreclaimContext const& ctx) { // Check if sender account exists auto const account = ctx.tx[sfAccount]; @@ -259,7 +259,7 @@ ConfidentialSend::preclaim(PreclaimContext const& ctx) } TER -ConfidentialSend::doApply() +ConfidentialMPTSend::doApply() { auto const mptIssuanceID = ctx_.tx[sfMPTokenIssuanceID]; auto const destination = ctx_.tx[sfDestination]; diff --git a/src/xrpld/app/tx/detail/ConfidentialSend.h b/src/xrpld/app/tx/detail/ConfidentialMPTSend.h similarity index 78% rename from src/xrpld/app/tx/detail/ConfidentialSend.h rename to src/xrpld/app/tx/detail/ConfidentialMPTSend.h index 165bdcaee2..22c47ad771 100644 --- a/src/xrpld/app/tx/detail/ConfidentialSend.h +++ b/src/xrpld/app/tx/detail/ConfidentialMPTSend.h @@ -5,12 +5,12 @@ namespace xrpl { -class ConfidentialSend : public Transactor +class ConfidentialMPTSend : public Transactor { public: static constexpr ConsequencesFactoryType ConsequencesFactory{Normal}; - explicit ConfidentialSend(ApplyContext& ctx) : Transactor(ctx) + explicit ConfidentialMPTSend(ApplyContext& ctx) : Transactor(ctx) { }