Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add authorization in rippleMPTCredit #7

Merged
merged 5 commits into from
Jan 8, 2024
Merged

Add authorization in rippleMPTCredit #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
10928c9
Authorization
shawnxie999 Jan 5, 2024
c8d638b
modify require auth
shawnxie999 Jan 8, 2024
78a6a93
clang
shawnxie999 Jan 8, 2024
f8d0795
Move requireAuth call
shawnxie999 Jan 8, 2024
31726d9
clang
shawnxie999 Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/ripple/app/tx/impl/MPTokenIssuanceCreate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ MPTokenIssuanceCreate::preflight(PreflightContext const& ctx)
return temMALFORMED;
}

// TODO: check if maximumAmount is within 63 bit range

return preflight2(ctx);
}

Expand Down
9 changes: 9 additions & 0 deletions src/ripple/app/tx/impl/Payment.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,15 @@ Payment::doApply()
}
else if (saDstAmount.isMPT())
{
if (auto const ter = requireAuth(view(), saDstAmount.issue(), account_);
ter != tesSUCCESS)
return ter;

if (auto const ter =
requireAuth(view(), saDstAmount.issue(), uDstAccountID);
ter != tesSUCCESS)
return ter;

PaymentSandbox pv(&view());
auto const res =
rippleMPTCredit(pv, account_, uDstAccountID, saDstAmount, j_);
Expand Down
8 changes: 4 additions & 4 deletions src/ripple/ledger/impl/View.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1563,10 +1563,10 @@ requireAuth(ReadView const& view, Issue const& issue, AccountID const& account)
sle && sle->getFieldU32(sfFlags) & lsfMPTRequireAuth)
{
auto const mptokenID = keylet::mptoken(mptID.key, account);
if (auto const tokSle = view.read(mptokenID))
{
// TODO no lsfAuthorized as in specs
}
if (auto const tokSle = view.read(mptokenID);
(sle->getFlags() & lsfMPTRequireAuth) &&
!(tokSle->getFlags() & lsfMPTAuthorized))
return TER{tecNO_AUTH};
}
return tesSUCCESS;
}
Expand Down
143 changes: 138 additions & 5 deletions src/test/app/MPToken_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ class MPToken_test : public beast::unit_test::suite
BEAST_EXPECT(env.ownerCount(alice) == 0);

auto const id = getMptID(alice.id(), env.seq(alice));
auto const mpt = ripple::MPT(env.seq(alice), alice.id());
env(mpt::create(alice));
env.close();

Expand All @@ -219,7 +220,27 @@ class MPToken_test : public beast::unit_test::suite
env(mpt::destroy(bob, id), ter(tecNO_PERMISSION));
env.close();

// TODO: add test when OutstandingAmount is non zero
// Make sure that issuer can't delete issuance when it still has
// outstanding balance
{
// bob now holds a mptoken object
env(mpt::authorize(bob, id, std::nullopt));
env.close();

BEAST_EXPECT(env.ownerCount(bob) == 1);

// alice pays bob 100 tokens
env(
pay(alice,
bob,
ripple::test::jtx::MPT(alice.name(), mpt)(100)));
env.close();
BEAST_EXPECT(checkMPTokenAmount(
env, keylet::mptIssuance(id).key, bob, 100));

env(mpt::destroy(alice, id), ter(tecHAS_OBLIGATIONS));
env.close();
}
}
}

Expand Down Expand Up @@ -327,6 +348,7 @@ class MPToken_test : public beast::unit_test::suite
BEAST_EXPECT(env.ownerCount(alice) == 0);

auto const id = getMptID(alice.id(), env.seq(alice));
auto const mpt = ripple::MPT(env.seq(alice), alice.id());
env(mpt::create(alice));
env.close();

Expand Down Expand Up @@ -359,7 +381,33 @@ class MPToken_test : public beast::unit_test::suite
env(mpt::authorize(bob, id, std::nullopt), ter(tecMPTOKEN_EXISTS));
env.close();

// TODO: check where mptoken balance is nonzero
// Check that bob cannot delete CFToken when his balance is non-zero
{
// alice pays bob 100 tokens
env(
pay(alice,
bob,
ripple::test::jtx::MPT(alice.name(), mpt)(100)));
env.close();
BEAST_EXPECT(checkMPTokenAmount(
env, keylet::mptIssuance(id).key, bob, 100));

// bob tries to delete his CFToken, but fails since he still
// holds tokens
env(mpt::authorize(bob, id, std::nullopt),
txflags(tfMPTUnauthorize),
ter(tecHAS_OBLIGATIONS));
env.close();

// bob pays back alice 100 tokens
env(
pay(bob,
alice,
ripple::test::jtx::MPT(alice.name(), mpt)(100)));
env.close();
BEAST_EXPECT(checkMPTokenAmount(
env, keylet::mptIssuance(id).key, bob, 0));
}

env(mpt::authorize(bob, id, std::nullopt),
txflags(tfMPTUnauthorize));
Expand Down Expand Up @@ -600,9 +648,6 @@ class MPToken_test : public beast::unit_test::suite

BEAST_EXPECT(env.ownerCount(bob) == 0);
}

// TODO: test allowlisting cases where bob tries to send tokens
// without being authorized.
}

void
Expand Down Expand Up @@ -963,6 +1008,94 @@ class MPToken_test : public beast::unit_test::suite
BEAST_EXPECT(checkMPTokenOutstandingAmount(
env, keylet::mptIssuance(id).key, 100));
}

// If allowlisting is enabled, Payment fails if the receiver is not
// authorized
{
Env env{*this, features};
Account const alice("alice"); // issuer
Account const bob("bob"); // holder

env.fund(XRP(10000), alice, bob);
env.close();

BEAST_EXPECT(env.ownerCount(alice) == 0);

auto const seq = env.seq(alice);
auto const id = getMptID(alice.id(), seq);
auto const mpt = ripple::MPT(seq, alice.id());

env(mpt::create(alice), txflags(tfMPTRequireAuth));
env.close();

BEAST_EXPECT(env.ownerCount(alice) == 1);
BEAST_EXPECT(env.ownerCount(bob) == 0);

env(mpt::authorize(bob, id, std::nullopt));
env.close();

env(pay(alice, bob, ripple::test::jtx::MPT(alice.name(), mpt)(100)),
ter(tecNO_AUTH));
env.close();
BEAST_EXPECT(
checkMPTokenAmount(env, keylet::mptIssuance(id).key, bob, 0));
BEAST_EXPECT(checkMPTokenOutstandingAmount(
env, keylet::mptIssuance(id).key, 0));
}

// If allowlisting is enabled, Payment fails if the sender is not
// authorized
{
Env env{*this, features};
Account const alice("alice"); // issuer
Account const bob("bob"); // holder

env.fund(XRP(10000), alice, bob);
env.close();

BEAST_EXPECT(env.ownerCount(alice) == 0);

auto const seq = env.seq(alice);
auto const id = getMptID(alice.id(), seq);
auto const mpt = ripple::MPT(seq, alice.id());

env(mpt::create(alice), txflags(tfMPTRequireAuth));
env.close();

BEAST_EXPECT(env.ownerCount(alice) == 1);
BEAST_EXPECT(env.ownerCount(bob) == 0);

// bob creates an empty MPToken
env(mpt::authorize(bob, id, std::nullopt));
env.close();

// alice authorizes bob to hold funds
env(mpt::authorize(alice, id, bob));
env.close();

// alice sends 100 MPT to bob
env(pay(
alice, bob, ripple::test::jtx::MPT(alice.name(), mpt)(100)));
env.close();
BEAST_EXPECT(
checkMPTokenAmount(env, keylet::mptIssuance(id).key, bob, 100));
BEAST_EXPECT(checkMPTokenOutstandingAmount(
env, keylet::mptIssuance(id).key, 100));

// alice UNAUTHORIZES bob
env(mpt::authorize(alice, id, bob), txflags(tfMPTUnauthorize));
env.close();

// bob fails to send back to alice because he is no longer authorize
// to move his funds!
env(pay(bob, alice, ripple::test::jtx::MPT(bob.name(), mpt)(100)),
ter(tecNO_AUTH));
env.close();
BEAST_EXPECT(
checkMPTokenAmount(env, keylet::mptIssuance(id).key, bob, 100));
BEAST_EXPECT(checkMPTokenOutstandingAmount(
env, keylet::mptIssuance(id).key, 100));
}
}

void
Expand Down
Loading