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

Merge branch 'ripple/confidential-transfer' into ct-merge-dev-may-4

Browse Source
This commit is contained in:
Shawn Xie
2026-05-04 14:39:54 -04:00
committed by GitHub
parent f1de2738a3 cad129921d
commit aa55d7e360
2 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libxrpl/tx/transactors/token/ConfidentialMPTConvertBack.cpp
View File

@@ -165,12 +165,18 @@ ConfidentialMPTConvertBack::preclaim(PreclaimContext const& ctx)
if (!sleMptoken)
return tecOBJECT_NOT_FOUND;
if (!sleMptoken->isFieldPresent(sfConfidentialBalanceSpending) ||
!sleMptoken->isFieldPresent(sfHolderEncryptionKey))
if (!sleMptoken->isFieldPresent(sfHolderEncryptionKey) ||
!sleMptoken->isFieldPresent(sfConfidentialBalanceSpending) ||
!sleMptoken->isFieldPresent(sfIssuerEncryptedBalance))
{
return tecNO_PERMISSION;
}
// Sanity check: holder's MPToken must have auditor balance field if auditing
// is enabled
if (requiresAuditor && !sleMptoken->isFieldPresent(sfAuditorEncryptedBalance))
return tefINTERNAL; // LCOV_EXCL_LINE
// if the total circulating confidential balance is smaller than what the
// holder is trying to convert back, we know for sure this txn should
// fail

52
src/test/app/ConfidentialTransfer_test.cpp
View File

@@ -243,11 +243,14 @@ class ConfidentialTransfer_test : public beast::unit_test::Suite
*mpt.getEncryptedBalance(sender, test::jtx::MPTTester::HolderEncryptedSpending))
, balanceCommitment(mpt.getPedersenCommitment(prevSpending, balanceBlindingFactor))
{
recipients.push_back({Slice(senderPubKey), senderAmt});
recipients.push_back({Slice(destPubKey), destAmt});
recipients.push_back({Slice(issuerPubKey), issuerAmt});
recipients.push_back({.publicKey = Slice(senderPubKey), .encryptedAmount = senderAmt});
recipients.push_back({.publicKey = Slice(destPubKey), .encryptedAmount = destAmt});
recipients.push_back({.publicKey = Slice(issuerPubKey), .encryptedAmount = issuerAmt});
if (auditor)
recipients.push_back({Slice(*auditorPubKey), *auditorAmt});
{
recipients.push_back(
{.publicKey = Slice(*auditorPubKey), .encryptedAmount = *auditorAmt});
}
}
// Generate proof with current account sequence
@@ -3728,7 +3731,7 @@ class ConfidentialTransfer_test : public beast::unit_test::Suite
});
}
// bob doesn't have encrypted balances
// mptoken exists but lacks confidential fields
{
Env env{*this, features};
Account const alice("alice");
@@ -3737,19 +3740,24 @@ class ConfidentialTransfer_test : public beast::unit_test::Suite
mptAlice.create({
.ownerCount = 1,
.flags = tfMPTCanTransfer | tfMPTCanLock | tfMPTCanConfidentialAmount,
.flags = tfMPTCanTransfer | tfMPTCanConfidentialAmount,
});
mptAlice.authorize({
.account = bob,
});
mptAlice.pay(alice, bob, 100);
mptAlice.generateKeyPair(alice);
mptAlice.generateKeyPair(bob);
mptAlice.set({.account = alice, .issuerPubKey = mptAlice.getPubKey(alice)});
mptAlice.generateKeyPair(bob);
// Bob's MPToken lacks the confidential fields
auto const sleBobMpt = env.le(keylet::mptoken(mptAlice.issuanceID(), bob.id()));
BEAST_EXPECT(sleBobMpt);
BEAST_EXPECT(!sleBobMpt->isFieldPresent(sfHolderEncryptionKey));
BEAST_EXPECT(!sleBobMpt->isFieldPresent(sfConfidentialBalanceSpending));
BEAST_EXPECT(!sleBobMpt->isFieldPresent(sfIssuerEncryptedBalance));
mptAlice.convertBack({
.account = bob,
@@ -5703,7 +5711,8 @@ class ConfidentialTransfer_test : public beast::unit_test::Suite
Env env{*this, features};
Account const alice("alice"), bob("bob");
ConfidentialEnv confEnv{env, alice, {{bob, 100, 40}}};
ConfidentialEnv confEnv{
env, alice, {{.account = bob, .payAmount = 100, .convertAmount = 40}}};
auto& mptAlice = confEnv.mpt;
uint64_t const amt = 10;
@@ -8330,7 +8339,10 @@ class ConfidentialTransfer_test : public beast::unit_test::Suite
using namespace test::jtx;
Env env{*this, features};
Account const alice("alice"), bob("bob"), carol("carol");
ConfidentialEnv confEnv{env, alice, {{bob}, {carol, 1000, 50}}};
ConfidentialEnv confEnv{
env,
alice,
{{.account = bob}, {.account = carol, .payAmount = 1000, .convertAmount = 50}}};
auto& mptAlice = confEnv.mpt;
ConfidentialSendSetup const setup(mptAlice, bob, carol, alice, 10);
@@ -8415,7 +8427,10 @@ class ConfidentialTransfer_test : public beast::unit_test::Suite
using namespace test::jtx;
Env env{*this, features};
Account const alice("alice"), bob("bob"), carol("carol");
ConfidentialEnv confEnv{env, alice, {{bob}, {carol, 1000, 50}}};
ConfidentialEnv confEnv{
env,
alice,
{{.account = bob}, {.account = carol, .payAmount = 1000, .convertAmount = 50}}};
auto& mptAlice = confEnv.mpt;
uint64_t const badAmount = std::numeric_limits<uint64_t>::max();
@@ -9324,7 +9339,8 @@ class ConfidentialTransfer_test : public beast::unit_test::Suite
ConfidentialEnv confEnv{
env,
alice,
{{bob, 1000, 200}, {carol, 1000, 100}},
{{.account = bob, .payAmount = 1000, .convertAmount = 200},
{.account = carol, .payAmount = 1000, .convertAmount = 100}},
tfMPTCanTransfer | tfMPTCanConfidentialAmount};
auto& mptAlice = confEnv.mpt;
@@ -9459,7 +9475,10 @@ class ConfidentialTransfer_test : public beast::unit_test::Suite
Env env{*this, features};
Account const alice("alice"), bob("bob"), carol("carol");
ConfidentialEnv confEnv{
env, alice, {{bob}, {carol, 1000, 50}}, tfMPTCanTransfer | tfMPTCanConfidentialAmount};
env,
alice,
{{.account = bob}, {.account = carol, .payAmount = 1000, .convertAmount = 50}},
tfMPTCanTransfer | tfMPTCanConfidentialAmount};
auto& mptAlice = confEnv.mpt;
uint64_t const sendAmount = 10;
@@ -9552,7 +9571,10 @@ class ConfidentialTransfer_test : public beast::unit_test::Suite
Env env{*this, features};
Account const alice("alice"), bob("bob"), carol("carol");
ConfidentialEnv confEnv{
env, alice, {{bob}, {carol, 1000, 50}}, tfMPTCanTransfer | tfMPTCanConfidentialAmount};
env,
alice,
{{.account = bob}, {.account = carol, .payAmount = 1000, .convertAmount = 50}},
tfMPTCanTransfer | tfMPTCanConfidentialAmount};
auto& mptAlice = confEnv.mpt;
uint64_t const sendAmount = 10;