diff --git a/include/xrpl/protocol/UintTypes.h b/include/xrpl/protocol/UintTypes.h index 9a7284158e..c95ee41ded 100644 --- a/include/xrpl/protocol/UintTypes.h +++ b/include/xrpl/protocol/UintTypes.h @@ -61,7 +61,8 @@ using NodeID = base_uint<160, detail::NodeIDTag>; /** MPTID is a 192-bit value representing MPT Issuance ID, * which is a concatenation of a 32-bit sequence (big endian) * and a 160-bit account */ -using MPTID = base_uint<192>; +// TODO - edhennis - Add a tag +using MPTID = uint192; /** XRP currency. */ Currency const& diff --git a/src/xrpld/app/tx/detail/MPTokenAuthorize.h b/src/xrpld/app/tx/detail/MPTokenAuthorize.h index ef35e78e76..e869ac43dc 100644 --- a/src/xrpld/app/tx/detail/MPTokenAuthorize.h +++ b/src/xrpld/app/tx/detail/MPTokenAuthorize.h @@ -27,7 +27,7 @@ namespace ripple { struct MPTAuthorizeArgs { XRPAmount const& priorBalance; - uint192 const& mptIssuanceID; + MPTID const& mptIssuanceID; AccountID const& accountID; std::uint32_t flags{}; std::optional holderID{}; diff --git a/src/xrpld/app/tx/detail/VaultCreate.cpp b/src/xrpld/app/tx/detail/VaultCreate.cpp index 65876d6cb4..f364e8a2a5 100644 --- a/src/xrpld/app/tx/detail/VaultCreate.cpp +++ b/src/xrpld/app/tx/detail/VaultCreate.cpp @@ -142,7 +142,9 @@ VaultCreate::doApply() view(), j_, { - .account = pseudoId, + // The operator-> gives the underlying STAccount, + // whose value function returns a const&. + .account = pseudoId->value(), .sequence = 1, .flags = mptFlags, .metadata = tx[~sfMPTokenMetadata], diff --git a/src/xrpld/app/tx/detail/VaultDelete.cpp b/src/xrpld/app/tx/detail/VaultDelete.cpp index b999c277cf..84140403eb 100644 --- a/src/xrpld/app/tx/detail/VaultDelete.cpp +++ b/src/xrpld/app/tx/detail/VaultDelete.cpp @@ -71,7 +71,9 @@ VaultDelete::doApply() if (auto ter = MPTokenIssuanceDestroy::destroy( view(), j_, - {.account = vault->at(sfAccount), + // The operator-> gives the underlying STAccount, + // whose value function returns a const&. + {.account = vault->at(sfAccount)->value(), .issuanceID = vault->at(sfMPTokenIssuanceID)})) return ter; diff --git a/src/xrpld/app/tx/detail/VaultDeposit.cpp b/src/xrpld/app/tx/detail/VaultDeposit.cpp index 1561b4487e..10da4e8f3a 100644 --- a/src/xrpld/app/tx/detail/VaultDeposit.cpp +++ b/src/xrpld/app/tx/detail/VaultDeposit.cpp @@ -122,7 +122,9 @@ VaultDeposit::doApply() view(), ctx_.journal, {.priorBalance = mPriorBalance, - .mptIssuanceID = mptIssuanceID, + // The operator-> gives the underlying STUInt192 + // whose value function returns a const&. + .mptIssuanceID = mptIssuanceID->value(), .accountID = account_}); !isTesSuccess(err)) return err;