ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-07-23 15:10:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Gregory Tsipenyuk
2026-07-06 15:33:17 -04:00
parent 2ec4f133cf
commit e80bdd9146
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/app/OfferMPT_test.cpp
View File

@@ -5061,7 +5061,7 @@ public:
musd.pay(issuer, maker, 100);
auto const issuance = env.le(keylet::mptIssuance(usd.mpt()));
auto const issuance = env.le(keylet::mptokenIssuance(usd.mpt()));
if (!BEAST_EXPECT(issuance))
return;
BEAST_EXPECT(issuance->getFieldU64(sfOutstandingAmount) == 100);

2
src/xrpld/rpc/detail/MPT.h
View File

@@ -1,5 +1,7 @@
#pragma once
#include <xrpl/protocol/AccountID.h>
#include <xrpl/protocol/MPTIssue.h>
#include <xrpl/protocol/UintTypes.h>
namespace xrpl {

2
src/xrpld/rpc/detail/Pathfinder.cpp
View File

@@ -815,7 +815,7 @@ Pathfinder::getPathsOut(
{
for (auto const& mpt : *mpts)
{
if (pathAsset.get<MPTID>() != mpt.getMptID() || mpt.canSend() ||
if (pathAsset.get<MPTID>() != mpt.getMptID() || mpt.canSend(account) ||
bAuthRequired)
continue;
if (isDstAsset && dstAccount == getMPTIssuer(mpt))