Introduce MPT support (XLS-33d): #5143

gregtatcam · 2024-09-19T07:41:44Z

High Level Overview of Change

New Transactions:

MPTokenIssuanceCreate
MPTokenIssuanceDestory
MPTokenIssuanceSet
MPTokenAuthorize

Modified Transactions:

Payment
Clawback

New Objects:

MPTokenIssuance
MPToken

API updates:

ledger_entry
account_objects
ledger_data

Refactor:

Add new types Asset, MPTIssue, MPTAmount to handle MPT amount.
Add SOElement constructor overload to describe the amount fields, which may have MPT amount (currently only sfAmount). The constructors are used in TxFormats to define fields supporting MPT.

Context of Change

XLS-33d specification

Type of Change

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Refactor (non-breaking change that only restructures code)
Performance (increase or change in throughput and/or latency)
Tests (you added tests for code that already exists, or your new feature included in this PR)
Documentation update
Chore (no impact to binary, e.g. .gitignore, formatting, dropping support for older tooling)
Release

API Impact

Public API: New feature (new methods and/or new fields)
Public API: Breaking change (in general, breaking changes should only impact the next api_version)
libxrpl change (any change that may affect libxrpl or dependents of libxrpl)
Peer protocol change (must be backward compatible or bump the peer protocol version)

Test Plan

Added test for new feature:

MPT

Future Tasks

Integrate MPT into XRPL DEX.

codecov · 2024-09-19T08:05:17Z

Codecov Report

Attention: Patch coverage is 86.42534% with 180 lines in your changes missing coverage. Please review.

Project coverage is 77.5%. Comparing base (63209c2) to head (e4009c8).

Files with missing lines	Patch %	Lines
src/libxrpl/protocol/STAmount.cpp	80.0%	34 Missing ⚠️
src/xrpld/app/tx/detail/InvariantCheck.cpp	66.3%	30 Missing ⚠️
src/xrpld/ledger/detail/View.cpp	88.7%	20 Missing ⚠️
src/libxrpl/protocol/MPTIssue.cpp	46.7%	16 Missing ⚠️
src/libxrpl/basics/MPTAmount.cpp	12.5%	14 Missing ⚠️
src/xrpld/rpc/handlers/LedgerEntry.cpp	68.6%	11 Missing ⚠️
src/xrpld/app/tx/detail/MPTokenAuthorize.cpp	92.3%	9 Missing ⚠️
src/libxrpl/protocol/Asset.cpp	71.4%	6 Missing ⚠️
src/libxrpl/protocol/STParsedJSON.cpp	62.5%	6 Missing ⚠️
src/xrpld/app/tx/detail/Payment.cpp	95.5%	6 Missing ⚠️
... and 12 more

Additional details and impacted files

@@            Coverage Diff            @@
##           develop   #5143     +/-   ##
=========================================
+ Coverage     76.1%   77.5%   +1.4%     
=========================================
  Files          762     777     +15     
  Lines        61469   65832   +4363     
  Branches      8121    8187     +66     
=========================================
+ Hits         46807   51020   +4213     
- Misses       14662   14812    +150

Files with missing lines	Coverage Δ
include/xrpl/basics/MPTAmount.h	`100.0% <100.0%> (ø)`
include/xrpl/basics/Number.h	`100.0% <100.0%> (ø)`
include/xrpl/basics/XRPAmount.h	`98.8% <ø> (+<0.1%)`	⬆️
include/xrpl/basics/base_uint.h	`96.8% <ø> (+0.1%)`	⬆️
include/xrpl/protocol/AmountConversions.h	`87.7% <100.0%> (+0.2%)`	⬆️
include/xrpl/protocol/Feature.h	`100.0% <ø> (ø)`
include/xrpl/protocol/Indexes.h	`100.0% <ø> (ø)`
include/xrpl/protocol/Issue.h	`100.0% <100.0%> (ø)`
include/xrpl/protocol/MPTIssue.h	`100.0% <100.0%> (ø)`
include/xrpl/protocol/Rate.h	`100.0% <ø> (ø)`
... and 56 more

... and 530 files with indirect coverage changes

New Transactions: - MPTokenIssuanceCreate - MPTokenIssuanceDestory - MPTokenIssuanceSet - MPTokenAuthorize Modified Transactions: - Payment - Clawback New Objects: - MPTokenIssuance - MPTokenAuthorize API updates: - ledger_entry - account_objects - ledger_data Read full spec: https:/XRPLF/XRPL-Standards/tree/master/XLS-0033d-multi-purpose-tokens --------- Co-authored-by: Shawn Xie <[email protected]> Co-authored-by: Howard Hinnant <[email protected]>

HowardHinnant · 2024-09-30T19:08:56Z

include/xrpl/protocol/LedgerFormats.h

+ lsfMPTCanClawback = 0x00000040,
+
+ // ltMPTOKEN
+ lsfMPTAuthorized = 0x00000002,


lsfMPTLocked, lsfMPTCanLock and lsfMPTAuthorized do not have unique values within this enum. Is that on purpose?

The LedgerSpecificFlags enum is really just a way to define a bunch of constants. The flags are unique per ledger object type. Those are divided by the comment / label before each one. It might be worthwhile to split them into one per object type, but that's probably beyond the scope of this PR.

thejohnfreeman

Submitting the first phase of my review, a complete review of the changes to libxrpl.

include/xrpl/basics/MPTAmount.h

include/xrpl/protocol/Asset.h

include/xrpl/protocol/UintTypes.h

src/libxrpl/protocol/LedgerFormats.cpp

src/libxrpl/protocol/STTx.cpp

ximinez

Partial review:

include/xrpl/basics/MPTAmount.h

src/test/jtx/impl/mpt.cpp

include/xrpl/basics/MPTAmount.h

include/xrpl/protocol/Asset.h

include/xrpl/protocol/LedgerFormats.h

include/xrpl/protocol/SOTemplate.h

src/libxrpl/protocol/STAmount.cpp

Co-authored-by: Ed Hennis <[email protected]>

Update MPT Payment errors to be consistent with IOU Payment.

ximinez

Partial review

ximinez · 2024-10-01T19:07:42Z

include/xrpl/basics/MPTAmount.h

+
+namespace ripple {
+
+class MPTAmount : private boost::totally_ordered<MPTAmount>,


Seeing how similar MPTAmount is to XRPAmount it's a pity that they aren't implemented with common code. I.e. through a base class, or a template or something. Rather than diving down the potential rabbit hole of implementing it, I'm just going to leave this note here for someone else or for future reference.

My opinion:

They should be called MPTNumber and XRPNumber because they represent quantities, while STAmount represents a quantity plus an asset / issue / unit (however you want to think of it). These are more like Number, and convert directly to and from it.

All of the arithmetic is moving to Number after the switchover anyway. In due time, when we retire that amendment, effectively locking it in permanently, then I think we can remove MPTAmount and XRPAmount.

Should IOUAmount change too? I think that Amount better communicates what the value is. I don't think you'd say number when talking about tokens or currencies even if the values don't have associate unit. And XRPAmount doesn't need an issue, it's implicit. Also doesn't seem like this refactoring has to be done in MPT PR. But this is just my opinion. I'll change if everyone thinks Number is better. There are over 300 instances of XRPAmount, MPTAmount, IOUAmount.

I created a ticket to refactor MPTAmount and XRPAmount to use a common code + renaming.

Yeah, I'm not asking it to be done here, or at all even. Was just stating my position. My opinion is that IOUAmount should be renamed too (in an ideal world), and my only reason for these renames is that STAmount has quantity + issue, while these {XRP,IOU,MPT}Amounts only have quantity, like Number, which is their common representation. The alternative fix is to rename STAmount to a different suffix, but I think that would be even more disruptive, especially to external projects.

include/xrpl/protocol/STAmount.h

src/xrpld/app/misc/NetworkOPs.cpp

src/libxrpl/protocol/LedgerFormats.cpp

src/libxrpl/protocol/MPTIssue.cpp

src/libxrpl/protocol/STAmount.cpp

src/xrpld/ledger/detail/View.cpp

Co-authored-by: Ed Hennis <[email protected]>

thejohnfreeman · 2024-10-02T17:42:57Z

include/xrpl/protocol/Asset.h

+/* Asset is a variant of Issue (XRP and IOU) and MPTIssue (MPT).
+ * It enables handling of different issues when either one is expected.
+ * For instance, it extends STAmount class to support either issue
+ * in a general way. It handles specifics such arithmetics and serialization
+ * depending on specific issue type held by Asset.


I find it odd that you think of this as "either one" (of two, Issue or MPTIssue) instead of "any one" (of three, XRP, IOU, or MPT). Don't we want our abstract ledger functions to think in terms of 3 issue types instead of 2 specific implementations?

I find the example (STAmount) a little hard to understand, too. The "it" at the beginning of the last sentence refers to STAmount, while the "it" in the sentence before is Asset? I don't think "extends" is the right word either. Is the example just trying to convey that STAmount uses Asset to abstract arithmetic and serialization operations over all 3 issue types?

I'm left wondering why we have this Asset instead of making Issue support 3 issue types. STAmount has a native() -> bool method. Can Asset have that too? Issue has a getIssuer() -> AccountID method. Can Asset have that too? Why does Asset exist if it's not going to offer any helper methods? With no helpers, it could just be a type alias for std::variant.

thejohnfreeman · 2024-10-02T18:32:42Z

include/xrpl/basics/MPTAmount.h

+
+namespace ripple {
+
+class MPTAmount : private boost::totally_ordered<MPTAmount>,


My opinion:

They should be called MPTNumber and XRPNumber because they represent quantities, while STAmount represents a quantity plus an asset / issue / unit (however you want to think of it). These are more like Number, and convert directly to and from it.

All of the arithmetic is moving to Number after the switchover anyway. In due time, when we retire that amendment, effectively locking it in permanently, then I think we can remove MPTAmount and XRPAmount.

thejohnfreeman · 2024-10-02T18:37:06Z

include/xrpl/basics/MPTAmount.h

+ friend std::istream&
+ operator>>(std::istream& s, MPTAmount& val);
+


I think this was left behind.

Suggested change

friend std::istream&

operator>>(std::istream& s, MPTAmount& val);

thejohnfreeman · 2024-10-02T18:40:27Z

include/xrpl/protocol/Indexes.h

+MPTID
+makeMptID(AccountID const& account, std::uint32_t sequence);
+


What do you think of putting sequence first in the parameter list? (Here and in the overload of mptIssuance(), and maybe elsewhere.)

thejohnfreeman · 2024-10-02T18:44:47Z

include/xrpl/protocol/Indexes.h

+mptoken(MPTID const& issuanceID, AccountID const& holder) noexcept;
+
+inline Keylet
+mptoken(uint256 const& issuanceKey)


This parameter should be mptokenKey right? I think I confused you with my earlier comment on the other parameters. I was just saying that the issuance parameter name should end with Key like issuanceKey and mptokenKey.

include/xrpl/protocol/MPTIssue.h

thejohnfreeman · 2024-10-02T18:55:51Z

include/xrpl/protocol/jss.h

+JSS(MPTokenIssuance); // ledger type.
+JSS(MPTokenIssuanceCreate); // transaction type.


It's worth it so we don't get radical re-formatting every time a few strings are added. We want the change set to highlight meaningful changes. GitHub's whitespace exclusion can hide these changes, but it can mask unwanted changes too. It's fine to restore the previous formatting so that this changeset has only the added strings.

src/libxrpl/protocol/STTx.cpp

include/xrpl/protocol/UintTypes.h

ximinez

Partial review

src/libxrpl/protocol/STAmount.cpp

Co-authored-by: Ed Hennis <[email protected]>

use std::min, std::max Co-authored-by: Ed Hennis <[email protected]>

* Refactor getSNValue/getMPTValue * Use std::min, std::max * Fix min/max values for MPT

thejohnfreeman · 2024-10-03T15:06:04Z

include/xrpl/protocol/TxFlags.h

+// MPTokenIssuanceCreate flags:
+constexpr std::uint32_t const tfMPTokenIssuanceCreateMask =
+ ~(tfMPTCanLock | tfMPTRequireAuth | tfMPTCanEscrow | tfMPTCanTrade | tfMPTCanTransfer | tfMPTCanClawback | tfUniversal);
+
+// MPTokenIssuanceDestroy flags:
+constexpr std::uint32_t const tfMPTokenIssuanceDestroyMask = ~tfUniversal;
+
+// MPTokenAuthorize flags:
+constexpr std::uint32_t const tfMPTokenAuthorizeMask = ~(tfMPTUnauthorize | tfUniversal);
+
+// MPTokenIssuanceSet flags:
+constexpr std::uint32_t const tfMPTokenIssuanceSetMask = ~(tfMPTLock | tfMPTUnlock | tfUniversal);


Please move the masks next to their flags, like the pattern for AMM, and please put tfUniversal first in the sequences.

* Fix paths comments in Payment * Refactor View

ximinez

Partial feedback review. I forgot to post this first comment last week, so I'll share these now, and continue reviewing.

src/xrpld/ledger/detail/View.cpp

ximinez

Partial review

src/test/protocol/STTx_test.cpp

* Simplify updating some MPT fields in View

* ledger_entry test * remove unneed line

include/xrpl/protocol/STObject.h

src/test/protocol/STTx_test.cpp

ximinez

Partial review

src/test/jtx/mpt.h

* Add STObject unit-test for +=, -= * Update STTx unit-test

* add mpt id * refactor

thejohnfreeman · 2024-10-16T21:06:06Z

src/xrpld/app/tx/detail/MPTokenIssuanceCreate.h

+ TER
+ doApply() override;
+
+ static TER


In my vault branch, I make this method return Expected<MPTID, TER>. Can you please make that change here?

I don't think we necessarily need to make this change in this PR. These refactors could be done at a later time when needed (perhaps include the refactor you open the vault PR).

thejohnfreeman · 2024-10-16T21:07:40Z

src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp

+ if (args.priorBalance <
+ view.fees().accountReserve((*acct)[sfOwnerCount] + 1))
+ return tecINSUFFICIENT_RESERVE;


In my vault branch, I move this check out of this function and into its (for now) only caller.

thejohnfreeman · 2024-10-16T21:09:27Z

src/xrpld/app/tx/detail/MPTokenIssuanceCreate.h

+
+struct MPTCreateArgs
+{
+ XRPAmount const& priorBalance;


In my branch, this field is removed.

include/xrpl/protocol/TER.h

thejohnfreeman · 2024-10-16T21:43:23Z

include/xrpl/protocol/detail/STVar.h

+// Concept to constrain STVar constructors, which
+// instantiate ST* types from SerializedTypeID
+// clang-format off
+template <typename... Args>
+concept ValidConstructSTArgs =
+ (std::is_same_v<
+ std::tuple<std::remove_cvref_t<Args>...>,
+ std::tuple<SField>> ||
+ std::is_same_v<
+ std::tuple<std::remove_cvref_t<Args>...>,
+ std::tuple<SerialIter, SField>>);
+// clang-format on
+


This declaration of ValidConstructSTArgs, and the one below of constructST, don't need to be in this header. They are only used in STVar.cpp, where they are defined. This header doesn't need the new includes, then, either, but STVar.cpp might.

Do you mean to make it non-member function defined in STVar.cpp? It calls private STVar::construct().

src/libxrpl/protocol/Rate2.cpp

src/libxrpl/protocol/STAmount.cpp

thejohnfreeman · 2024-10-16T21:47:56Z

src/libxrpl/protocol/STAmount.cpp

@@ -278,7 +276,7 @@ STAmount::xrp() const
 IOUAmount
 STAmount::iou() const
 {
- if (native() || holds<MPTIssue>())
+ if (native() || !holds<Issue>())
 Throw<std::logic_error>("Cannot return native STAmount as IOUAmount");


Suggested change

Throw<std::logic_error>("Cannot return native STAmount as IOUAmount");

Throw<std::logic_error>("Cannot return non-IOU STAmount as IOUAmount");

src/test/jtx/impl/mpt.cpp

src/xrpld/app/tx/detail/MPTokenAuthorize.h

thejohnfreeman · 2024-10-16T22:10:00Z

src/xrpld/ledger/View.h

 [[nodiscard]] bool
 isGlobalFrozen(ReadView const& view, AccountID const& issuer);

+[[nodiscard]] bool
+isGlobalFrozen(ReadView const& view, MPTIssue const& mptIssue);


Can you please add isGlobalFrozen, isIndividualFrozen, and isFrozen overloads for Asset?

thejohnfreeman · 2024-10-16T22:12:37Z

src/xrpld/ledger/View.h

@@ -209,6 +237,9 @@ forEachItemAfter(
 [[nodiscard]] Rate
 transferRate(ReadView const& view, AccountID const& issuer);

+[[nodiscard]] Rate
+transferRate(ReadView const& view, MPTID const& issuanceID);


There's no docstring for either of the overloads. Can you add one, please?

thejohnfreeman · 2024-10-16T22:16:22Z

src/xrpld/ledger/View.h

 bool bCheckIssuer,
 beast::Journal j);

+[[nodiscard]] TER
+rippleCreditMPT(


Unlike the others, which accept Issue vs MPTIssue, there is no type difference in the parameter list to distinguish these "overloads". What do you think of renaming the original function and all existing callers rippleCreditIOU? Could then add a function rippleCredit that takes an STAmount and works for any asset by delegating to the other overloads. Similar for accountSend.

Sounds good. Let me give it a try.

thejohnfreeman · 2024-10-16T22:23:01Z

src/xrpld/rpc/MPTokenIssuanceID.h

+bool
+canHaveMPTokenIssuanceID(
+ std::shared_ptr<STTx const> const& serializedTx,
+ TxMeta const& transactionMeta);
+
+std::optional<uint192>
+getIDFromCreatedIssuance(TxMeta const& transactionMeta);
+
+void
+insertMPTokenIssuanceID(
+ Json::Value& response,
+ std::shared_ptr<STTx const> const& transaction,
+ TxMeta const& transactionMeta);


Please add some comments explaining why these functions exist, when they should be used, etc.

added in fixed in gregtatcam#43

thejohnfreeman · 2024-10-16T22:23:14Z

src/xrpld/rpc/MPTokenIssuanceID.h

+ Json::Value& response,
+ std::shared_ptr<STTx const> const& transaction,
+ TxMeta const& transactionMeta);
+/** @} */


What is going on this line?

Suggested change

/** @} */

shouldve been a comment, added in gregtatcam#43

include/xrpl/protocol/detail/features.macro

HowardHinnant · 2024-10-17T16:48:13Z

src/xrpld/ledger/View.h

+ MPTIssue const& mptIssue);
+
+[[nodiscard]] bool
+isFrozen(ReadView const& view, AccountID const& account, Asset const& asset)


ld: warning: ignoring duplicate libraries: '-lc++' duplicate symbol 'ripple::isFrozen(ripple::ReadView const&, ripple::base_uint<160ul, ripple::detail::AccountIDTag> const&, ripple::Asset const&)'

Missing inline.

I have already pushed a fix.

* Add static functions rippleCredit[MPT/IOU]() and accountSend[MPT/IOU]() * Change rippleCredit() and accountSend() to work for any asset by calling the static versions

HowardHinnant

This is a partial review. Here is the list of files I've reviewed:

AmountConversions.h
Asset.h
base_uint.h
Feature.h
LedgerFormats.h
MPTAmount.h
MPTAmount.cpp
MPTIssue.h
MPTIssue.cpp
MPTokenIssuanceSet.h
Number.h
Number.cpp
Protocol.h
Serializer.h
STAmount.h
STAmount.cpp
STBitString.h
STInteger.cpp
View.h
XRPAmount.h

All comments I have made have been resolved.

All unit tests pass.

ximinez

Not as much progress today, but pointed out a couple of small issues.

include/xrpl/protocol/detail/transactions.macro

include/xrpl/protocol/jss.h

thejohnfreeman · 2024-10-18T02:23:06Z

include/xrpl/protocol/Asset.h

+to_string(Asset const& asset);
+
+bool
+validJSONAsset(Json::Value const& jv);


Can you please write an assetFromJson? You may want to delegate to issueFromJson (which exists) and mptIssueFromJson (which does not exist). I need in the stissue branch, in STParsedJSON.cpp, in the case for STI_ISSUE (which right now calls issueFromJson).

* Add assetFromJson, mptIssueFromJson * Minor refactoring

* removed unused declarations * comments

ximinez

Partial review. Left off at testMPTInvalidInTx in MPToken_test.cpp.

A couple of general points

I tagged a bunch of asserts with suggested rewrites. We really want to avoid asserts in test code unless there's absolutely no other way to do it. If I missed any, please rewrite those, too.
I haven't tagged any more copyright date issues, but some remain. Please take care of those.

ximinez · 2024-10-18T15:38:15Z

src/libxrpl/protocol/MPTIssue.cpp

+ "mptIssueFromJson, MPTIssue should not have currency or issuer");
+ }
+
+ Json::Value const idStr = v[jss::mpt_issuance_id];


I think idStr can be a const ref

Suggested change

Json::Value const idStr = v[jss::mpt_issuance_id];

Json::Value const& idStr = v[jss::mpt_issuance_id];

ximinez · 2024-10-18T20:12:35Z

src/test/jtx/mpt.h

+ std::unordered_map<std::string, Account>
+ makeHolders(std::vector<Account> const& holders);


Looking at it again, makeHolders should be static.

ximinez · 2024-10-18T20:24:36Z

src/test/jtx/impl/mpt.cpp

+ else
+ {
+ assert(id_);
+ jv[sfMPTokenIssuanceID] = to_string(*id_);
+ }


Suggested change

else

{

assert(id_);

jv[sfMPTokenIssuanceID] = to_string(*id_);

}

else if (env_.test.BEAST_EXPECT(id_))

{

jv[sfMPTokenIssuanceID] = to_string(*id_);

}

If id_ is undefined, the transaction will be generated without one, and will fail, which is good.

ximinez · 2024-10-18T20:34:17Z

src/test/jtx/impl/mpt.cpp

+ else if (arg.flags)
+ env_.require(mptflags(*this, *arg.flags));


Suggested change

else if (arg.flags)

env_.require(mptflags(*this, *arg.flags));

else

env_.require(mptflags(*this, arg.flags.value_or(0)));

This ensures the Issuance is created regardless, and that no unwanted flags are set.

ximinez · 2024-10-18T20:36:01Z

src/test/jtx/impl/mpt.cpp

+ assert(it != holders_.cend());
+ if (it == holders_.cend())
+ Throw<std::runtime_error>("Holder is not found");


Suggested change

assert(it != holders_.cend());

if (it == holders_.cend())

Throw<std::runtime_error>("Holder is not found");

if (it == holders_.cend())

Throw<std::runtime_error>("Holder is not found");

Get rid of the assert so that other runners aren't affected, but the Throw will still cause the test suite to fail.

ximinez · 2024-10-18T22:33:07Z

src/test/app/MPToken_test.cpp

+ // Check that bob cannot delete MPToken when his balance is
+ // non-zero
+ {
+ // alice pays bob 100 tokens
+ mptAlice.pay(alice, bob, 100);
+
+ // bob tries to delete his MPToken, but fails since he still
+ // holds tokens
+ mptAlice.authorize(
+ {.account = bob,
+ .flags = tfMPTUnauthorize,
+ .err = tecHAS_OBLIGATIONS});
+
+ // bob pays back alice 100 tokens
+ mptAlice.pay(bob, alice, 100);
+ }


Nit: These {} are redundant, since nothing was created inside the scope.

ximinez · 2024-10-18T22:45:40Z

src/test/app/MPToken_test.cpp

+ MPTTester mptAlice1(
+ env,
+ alice,
+ {.holders = {bob},
+ .xrpHolders = acctReserve + XRP(1).value().xrp()});


Suggested change

MPTTester mptAlice1(

env,

alice,

{.holders = {bob},

.xrpHolders = acctReserve + XRP(1).value().xrp()});

// 1 drop

BEAST_EXPECT(incReserve > XRPAmount(1));

MPTTester mptAlice1(

env,

alice,

{.holders = {bob},

.xrpHolders = acctReserve + (incReserve - 1)});

ximinez · 2024-10-18T22:54:35Z

src/test/app/MPToken_test.cpp

+ // test invalid flag
+ mptAlice.set(
+ {.account = alice,
+ .flags = 0x00000008,
+ .err = temINVALID_FLAG});


Suggested change

// test invalid flag

mptAlice.set(

{.account = alice,

.flags = 0x00000008,

.err = temINVALID_FLAG});

// test invalid flag - only valid flags are tfMPTLock (1) and Unlock (2)

mptAlice.set(

{.account = alice,

.flags = 0x00000008,

.err = temINVALID_FLAG});

ximinez · 2024-10-18T23:03:48Z

src/test/app/MPToken_test.cpp

+ jv[jss::tx_json][jss::Fee] = to_string(env.current()->fees().base);
+ jv[jss::tx_json] = pay(alice, carol, mpt);


This will overwrite Fee.

Suggested change

jv[jss::tx_json][jss::Fee] = to_string(env.current()->fees().base);

jv[jss::tx_json] = pay(alice, carol, mpt);

jv[jss::tx_json] = pay(alice, carol, mpt);

jv[jss::tx_json][jss::Fee] = to_string(env.current()->fees().base);

ximinez · 2024-10-18T23:10:39Z

src/test/app/MPToken_test.cpp

+ mptAlice.pay(alice, bob, -1, temBAD_AMOUNT);
+
+ env(pay(alice, bob, MPT(10)), sendmax(MPT(-1)), ter(temBAD_AMOUNT));


Please add a few more cases here with bob trying to pay another holder (carol), and bob trying to pay back to alice. That'll probably require alice sending a valid amount to bob first.

gregtatcam mentioned this pull request Sep 19, 2024

Introduce MPT V1 support (XLS-33d) #5108

Closed

13 tasks

gregtatcam requested review from HowardHinnant and ximinez September 19, 2024 07:43

gregtatcam force-pushed the feature/mpt-v1-var-issues branch 2 times, most recently from 4ca85a2 to ba5f67c Compare September 19, 2024 14:22

gregtatcam force-pushed the feature/mpt-v1-var-issues branch from ba5f67c to 6d6fda2 Compare September 27, 2024 14:01

HowardHinnant reviewed Sep 30, 2024

View reviewed changes

thejohnfreeman requested changes Sep 30, 2024

View reviewed changes

Merge branch 'develop' into feature/mpt-v1-var-issues

aaf7fe5

ximinez requested changes Sep 30, 2024

View reviewed changes

gregtatcam and others added 3 commits October 1, 2024 13:25

Apply suggestions from code review

f84e9ea

Co-authored-by: Ed Hennis <[email protected]>

Address reviewer's feedback

18515dd

Allow MPT SendMax in Payment tx.

aef1426

Update MPT Payment errors to be consistent with IOU Payment.

ximinez requested changes Oct 1, 2024

View reviewed changes

gregtatcam and others added 2 commits October 2, 2024 07:47

Apply suggestions from code review

9136a89

Co-authored-by: Ed Hennis <[email protected]>

Address reviewer's feedback

16a029a

thejohnfreeman requested changes Oct 2, 2024

View reviewed changes

ximinez requested changes Oct 2, 2024

View reviewed changes

gregtatcam and others added 4 commits October 3, 2024 08:45

Manually align jss and disable clang-format

2beb2d9

Apply suggestions from code review

3cc7003

Co-authored-by: Ed Hennis <[email protected]>

Fix clang format

069273c

Apply suggestions from code review

86bcebd

use std::min, std::max Co-authored-by: Ed Hennis <[email protected]>

thejohnfreeman mentioned this pull request Oct 3, 2024

Consolidate definitions of fields, objects, transactions, and features #5122

Merged

Address reviewer's feedback

b9cb9ca

* Refactor getSNValue/getMPTValue * Use std::min, std::max * Fix min/max values for MPT

thejohnfreeman reviewed Oct 3, 2024

View reviewed changes

shawnxie999 and others added 3 commits October 3, 2024 11:07

remove unneeded fields (#36)

8af452e

rename codes (#37)

fab0c78

Address reviewer feedback

ea887bf

Address reviewer's feedback:

ac45342

* Fix paths comments in Payment * Refactor View

ximinez requested changes Oct 14, 2024

View reviewed changes

src/xrpld/ledger/detail/View.cpp Outdated Show resolved Hide resolved

src/xrpld/ledger/detail/View.cpp Outdated Show resolved Hide resolved

src/xrpld/ledger/detail/View.cpp Outdated Show resolved Hide resolved

ximinez requested changes Oct 15, 2024

View reviewed changes

src/test/protocol/STTx_test.cpp Outdated Show resolved Hide resolved

shawnxie999 and others added 3 commits October 15, 2024 09:59

use mptJson

af29f41

Add += and -= operators to ValueProxy

9e3cfef

* Simplify updating some MPT fields in View

ledger_entry test (#41)

4bbf613

* ledger_entry test * remove unneed line

ximinez reviewed Oct 15, 2024

View reviewed changes

include/xrpl/protocol/STObject.h Outdated Show resolved Hide resolved

src/test/protocol/STTx_test.cpp Outdated Show resolved Hide resolved

ximinez requested changes Oct 15, 2024

View reviewed changes

gregtatcam and others added 5 commits October 16, 2024 09:42

Simplify constraint for +=, -= of ValueProxy

3bb44c2

* Add STObject unit-test for +=, -= * Update STTx unit-test

Address reviewer's feedback on mpt uni-test helper

0bf5b42

refactor mpt_issuance_id into SLE::getJson (#42)

924dd9c

* add mpt id * refactor

Merge branch 'develop' into feature/mpt-v1-var-issues

31b3be3

Fix clang-format

c3f2bd4

XRPLF deleted a comment from Speedtraders48 Oct 16, 2024

thejohnfreeman requested changes Oct 16, 2024

View reviewed changes

Merge with the latest develop

29c6f5d

thejohnfreeman requested changes Oct 17, 2024

View reviewed changes

include/xrpl/protocol/detail/features.macro Outdated Show resolved Hide resolved

gregtatcam added 2 commits October 17, 2024 12:02

Address reviewer's feedback

bd97cc9

Fix inline isFrozen definition

38781df

HowardHinnant reviewed Oct 17, 2024

View reviewed changes

Address reviewer feedback

e239fcb

* Add static functions rippleCredit[MPT/IOU]() and accountSend[MPT/IOU]() * Change rippleCredit() and accountSend() to work for any asset by calling the static versions

HowardHinnant approved these changes Oct 17, 2024

View reviewed changes

ximinez requested changes Oct 18, 2024

View reviewed changes

include/xrpl/protocol/detail/transactions.macro Outdated Show resolved Hide resolved

include/xrpl/protocol/jss.h Outdated Show resolved Hide resolved

Fix clang-format

fe6fa60

thejohnfreeman requested changes Oct 18, 2024

View reviewed changes

gregtatcam and others added 3 commits October 18, 2024 09:39

Address reviewer's feedback

f4bc120

* Add assetFromJson, mptIssueFromJson * Minor refactoring

removed mptHolders (#43)

780af7a

* removed unused declarations * comments

address comments (#44)

e4009c8

ximinez requested changes Oct 18, 2024

View reviewed changes


		namespace ripple {

		class MPTAmount : private boost::totally_ordered<MPTAmount>,

		friend std::istream&
		operator>>(std::istream& s, MPTAmount& val);

		MPTID
		makeMptID(AccountID const& account, std::uint32_t sequence);

		JSS(MPTokenIssuance); // ledger type.
		JSS(MPTokenIssuanceCreate); // transaction type.

	Throw<std::logic_error>("Cannot return native STAmount as IOUAmount");
	Throw<std::logic_error>("Cannot return non-IOU STAmount as IOUAmount");

	Json::Value const idStr = v[jss::mpt_issuance_id];
	Json::Value const& idStr = v[jss::mpt_issuance_id];

		std::unordered_map<std::string, Account>
		makeHolders(std::vector<Account> const& holders);

		else if (arg.flags)
		env_.require(mptflags(this, arg.flags));

		jv[jss::tx_json][jss::Fee] = to_string(env.current()->fees().base);
		jv[jss::tx_json] = pay(alice, carol, mpt);

		mptAlice.pay(alice, bob, -1, temBAD_AMOUNT);

		env(pay(alice, bob, MPT(10)), sendmax(MPT(-1)), ter(temBAD_AMOUNT));

Introduce MPT support (XLS-33d): #5143

Are you sure you want to change the base?

Introduce MPT support (XLS-33d): #5143

Conversation

gregtatcam commented Sep 19, 2024

High Level Overview of Change

Context of Change

Type of Change

API Impact

Test Plan

Future Tasks

codecov bot commented Sep 19, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thejohnfreeman left a comment

Choose a reason for hiding this comment

ximinez left a comment

Choose a reason for hiding this comment

ximinez left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ximinez left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ximinez left a comment • edited Loading

Choose a reason for hiding this comment

ximinez left a comment

Choose a reason for hiding this comment

ximinez left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HowardHinnant left a comment

Choose a reason for hiding this comment

ximinez left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ximinez left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Sep 19, 2024 •

edited

Loading

ximinez left a comment •

edited

Loading