diff --git a/src/libxrpl/protocol/STIssue.cpp b/src/libxrpl/protocol/STIssue.cpp index 10403d2c50..ba32c1214c 100644 --- a/src/libxrpl/protocol/STIssue.cpp +++ b/src/libxrpl/protocol/STIssue.cpp @@ -11,6 +11,8 @@ #include #include +#include + #include #include #include @@ -45,6 +47,10 @@ STIssue::STIssue(SerialIter& sit, SField const& name) : STBase{name} { MPTID mptID; std::uint32_t sequence = sit.get32(); + // MPTID stores the sequence in canonical big-endian bytes. STIssue + // ledger bytes are the legacy LE-host encoding, so convert the + // native get32() value to LE bytes before copying into the MPTID. + sequence = boost::endian::native_to_little(sequence); static_assert(MPTID::size() == sizeof(sequence) + sizeof(currencyOrAccount)); memcpy(mptID.data(), &sequence, sizeof(sequence)); memcpy( @@ -100,6 +106,10 @@ STIssue::add(Serializer& s) const s.addBitString(noAccount()); std::uint32_t sequence = 0; memcpy(&sequence, issue.getMptID().data(), sizeof(sequence)); + // The MPTID bytes are canonical big-endian. Interpret those bytes + // as the legacy LE-host value so add32() writes the preserved + // STIssue wire bytes on every host endian. + sequence = boost::endian::little_to_native(sequence); s.add32(sequence); }); } diff --git a/src/test/protocol/STIssue_test.cpp b/src/test/protocol/STIssue_test.cpp index b7cc944e6b..41517b38f3 100644 --- a/src/test/protocol/STIssue_test.cpp +++ b/src/test/protocol/STIssue_test.cpp @@ -7,17 +7,22 @@ #include #include +#include #include #include #include #include +#include #include +#include #include #include #include #include #include +#include +#include #include namespace xrpl::test { @@ -273,6 +278,54 @@ public: } } + void + testMPTSerialization() + { + testcase("MPT serialization"); + using namespace jtx; + Account const alice{"alice"}; + + // 0x01020304 pins canonical MPTID bytes 01 02 03 04 and + // preserved STIssue wire bytes 04 03 02 01 on BE and LE. + auto const sequences = std::to_array({0x00000001, 0x01020304, 0xa1b2c3d4}); + + for (auto const vector : sequences) + { + MPTID const mptID = makeMptID(vector, alice); + MPTIssue const issue{mptID}; + STIssue const stIssue(sfAsset, Asset{issue}); + + Serializer actual; + stIssue.add(actual); + + // STIssue preserves the existing little-endian validator ledger bytes. + Serializer expected; + expected.addBitString(alice.id()); + expected.addBitString(noAccount()); + { + std::array const bytes{ + static_cast(vector), + static_cast(vector >> 8), + static_cast(vector >> 16), + static_cast(vector >> 24)}; + expected.addRaw(bytes.data(), bytes.size()); + } + + BEAST_EXPECTS(strHex(actual) == strHex(expected), strHex(actual)); + + // Decoding the preserved wire format must recover the canonical MPTID. + SerialIter iter(expected.slice()); + STIssue const decoded(iter, sfAsset); + BEAST_EXPECT(decoded.holds()); + BEAST_EXPECT(decoded.value().get().getMptID() == mptID); + + // A decoded ledger value must serialize back to the same bytes. + Serializer roundTrip; + decoded.add(roundTrip); + BEAST_EXPECTS(strHex(roundTrip) == strHex(expected), strHex(roundTrip)); + } + } + void run() override { @@ -283,6 +336,7 @@ public: testNoAccountIssuer(); testXrpAccountIssuerRpc(); testXrpAccountIssuer(); + testMPTSerialization(); } };