Merge branch 'develop' into ripple/wasmi

* Use conan repo for wasmi lib
* Generate lockfile

CMakeLists.txt

@@ -93,6 +93,7 @@ find_package(OpenSSL REQUIRED)
 find_package(secp256k1 REQUIRED)
 find_package(SOCI REQUIRED)
 find_package(SQLite3 REQUIRED)
+find_package(wasmi REQUIRED)
 find_package(xxHash REQUIRED)
 
 target_link_libraries(

cmake/XrplCore.cmake

@@ -67,6 +67,7 @@ target_link_libraries(
         Xrpl::opts
         Xrpl::syslibs
         secp256k1::secp256k1
+        wasmi::wasmi
         xrpl.libpb
         xxHash::xxhash
         $<$<BOOL:${voidstar}>:antithesis-sdk-cpp>

conan.lock

@@ -3,6 +3,7 @@
     "requires": [
         "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1765850150.075",
         "xxhash/0.8.3#681d36a0a6111fc56e5e45ea182c19cc%1765850149.987",
+        "wasmi/1.0.6#407c9db14601a8af1c7dd3b388f3e4cd%1768164779.349",
         "sqlite3/3.49.1#8631739a4c9b93bd3d6b753bac548a63%1765850149.926",
         "soci/4.0.3#a9f8d773cd33e356b5879a4b0564f287%1765850149.46",
         "snappy/1.1.10#968fef506ff261592ec30c574d4a7809%1765850147.878",

conanfile.py

@@ -35,6 +35,7 @@ class Xrpl(ConanFile):
         "openssl/3.5.5",
         "secp256k1/0.7.1",
         "soci/4.0.3",
+        "wasmi/1.0.6",
         "zlib/1.3.1",
     ]
 
@@ -215,6 +216,7 @@ class Xrpl(ConanFile):
             "soci::soci",
             "secp256k1::secp256k1",
             "sqlite3::sqlite",
+            "wasmi::wasmi",
             "xxhash::xxhash",
             "zlib::zlib",
         ]

cspell.config.yaml

@@ -293,6 +293,7 @@ words:
   - venv
   - vfalco
   - vinnie
+  - wasmi
   - wextra
   - wptr
   - writeme

src/libxrpl/ledger/View.cpp

@@ -2020,99 +2020,6 @@ rippleSendIOU(
     return terResult;
 }
 
-template <class TAsset>
-static TER
-doSendMulti(
-    std::string const& name,
-    ApplyView& view,
-    AccountID const& senderID,
-    TAsset const& issue,
-    MultiplePaymentDestinations const& receivers,
-    STAmount& actual,
-    beast::Journal j,
-    WaiveTransferFee waiveFee,
-    // Don't pass back parameters that the caller already has
-    std::function<
-        TER(AccountID const& senderID,
-            AccountID const& receiverID,
-            STAmount const& amount,
-            bool checkIssuer)> doCredit,
-    std::function<
-        TER(AccountID const& issuer, STAmount const& takeFromSender, STAmount const& amount)>
-        preMint = {})
-{
-    // Use the same pattern for all the SendMulti functions to help avoid
-    // divergence and copy/paste errors.
-    auto const& issuer = issue.getIssuer();
-
-    // These values may not stay in sync
-    STAmount takeFromSender{issue};
-    actual = takeFromSender;
-
-    // Failures return immediately.
-    for (auto const& r : receivers)
-    {
-        auto const& receiverID = r.first;
-        STAmount amount{issue, r.second};
-
-        if (amount < beast::zero)
-        {
-            return tecINTERNAL;  // LCOV_EXCL_LINE
-        }
-
-        /* If we aren't sending anything or if the sender is the same as the
-         * receiver then we don't need to do anything.
-         */
-        if (!amount || (senderID == receiverID))
-            continue;
-
-        using namespace std::string_literals;
-        XRPL_ASSERT(!isXRP(receiverID), ("xrpl::"s + name + " : receiver is not XRP").c_str());
-
-        if (senderID == issuer || receiverID == issuer || issuer == noAccount())
-        {
-            if (preMint)
-            {
-                if (auto const ter = preMint(issuer, takeFromSender, amount))
-                    return ter;
-            }
-            // Direct send: redeeming IOUs and/or sending own IOUs.
-            if (auto const ter = doCredit(senderID, receiverID, amount, false))
-                return ter;
-            actual += amount;
-            // Do not add amount to takeFromSender, because doCredit took
-            // it.
-
-            continue;
-        }
-
-        // Sending 3rd party: transit.
-
-        // Calculate the amount to transfer accounting
-        // for any transfer fees if the fee is not waived:
-        STAmount actualSend = (waiveFee == WaiveTransferFee::Yes || issue.native())
-            ? amount
-            : multiply(amount, transferRate(view, amount));
-        actual += actualSend;
-        takeFromSender += actualSend;
-
-        JLOG(j.debug()) << name << "> " << to_string(senderID) << " - > " << to_string(receiverID)
-                        << " : deliver=" << amount.getFullText()
-                        << " cost=" << actualSend.getFullText();
-
-        if (TER const terResult = doCredit(issuer, receiverID, amount, true))
-            return terResult;
-    }
-
-    if (senderID != issuer && takeFromSender)
-    {
-        if (TER const terResult = doCredit(senderID, issuer, takeFromSender, true))
-            return terResult;
-    }
-
-    return tesSUCCESS;
-}
-
 // Send regardless of limits.
 // --> receivers: Amount/currency/issuer to deliver to receivers.
 // <-- saActual: Amount actually cost to sender.  Sender pays fees.
@@ -2126,18 +2033,65 @@ rippleSendMultiIOU(
     beast::Journal j,
     WaiveTransferFee waiveFee)
 {
+    auto const& issuer = issue.getIssuer();
+
     XRPL_ASSERT(!isXRP(senderID), "xrpl::rippleSendMultiIOU : sender is not XRP");
 
-    auto doCredit = [&view, j](
-                        AccountID const& senderID,
-                        AccountID const& receiverID,
-                        STAmount const& amount,
-                        bool checkIssuer) {
-        return rippleCreditIOU(view, senderID, receiverID, amount, checkIssuer, j);
-    };
+    // These may diverge
+    STAmount takeFromSender{issue};
+    actual = takeFromSender;
 
-    return doSendMulti(
-        "rippleSendMultiIOU", view, senderID, issue, receivers, actual, j, waiveFee, doCredit);
+    // Failures return immediately.
+    for (auto const& r : receivers)
+    {
+        auto const& receiverID = r.first;
+        STAmount amount{issue, r.second};
+
+        /* If we aren't sending anything or if the sender is the same as the
+         * receiver then we don't need to do anything.
+         */
+        if (!amount || (senderID == receiverID))
+            continue;
+
+        XRPL_ASSERT(!isXRP(receiverID), "xrpl::rippleSendMultiIOU : receiver is not XRP");
+
+        if (senderID == issuer || receiverID == issuer || issuer == noAccount())
+        {
+            // Direct send: redeeming IOUs and/or sending own IOUs.
+            if (auto const ter = rippleCreditIOU(view, senderID, receiverID, amount, false, j))
+                return ter;
+            actual += amount;
+            // Do not add amount to takeFromSender, because rippleCreditIOU took
+            // it.
+
+            continue;
+        }
+
+        // Sending 3rd party IOUs: transit.
+
+        // Calculate the amount to transfer accounting
+        // for any transfer fees if the fee is not waived:
+        STAmount actualSend = (waiveFee == WaiveTransferFee::Yes)
+            ? amount
+            : multiply(amount, transferRate(view, issuer));
+        actual += actualSend;
+        takeFromSender += actualSend;
+
+        JLOG(j.debug()) << "rippleSendMultiIOU> " << to_string(senderID) << " - > "
+                        << to_string(receiverID) << " : deliver=" << amount.getFullText()
+                        << " cost=" << actual.getFullText();
+
+        if (TER const terResult = rippleCreditIOU(view, issuer, receiverID, amount, true, j))
+            return terResult;
+    }
+
+    if (senderID != issuer && takeFromSender)
+    {
+        if (TER const terResult = rippleCreditIOU(view, senderID, issuer, takeFromSender, true, j))
+            return terResult;
+    }
+
+    return tesSUCCESS;
 }
 
 static TER
@@ -2271,9 +2225,9 @@ accountSendMultiIOU(
     XRPL_ASSERT_PARTS(
         receivers.size() > 1, "xrpl::accountSendMultiIOU", "multiple recipients provided");
 
-    STAmount actual;
     if (!issue.native())
     {
+        STAmount actual;
         JLOG(j.trace()) << "accountSendMultiIOU: " << to_string(senderID) << " sending "
                         << receivers.size() << " IOUs";
 
@@ -2300,85 +2254,6 @@ accountSendMultiIOU(
                << receivers.size() << " receivers.";
     }
 
-    auto doCredit = [&view, &sender, &receivers, j](
-                        AccountID const& senderID,
-                        AccountID const& receiverID,
-                        STAmount const& amount,
-                        bool /*checkIssuer*/) -> TER {
-        if (!senderID)
-        {
-            SLE::pointer receiver =
-                receiverID != beast::zero ? view.peek(keylet::account(receiverID)) : SLE::pointer();
-
-            if (auto stream = j.trace())
-            {
-                std::string receiver_bal("-");
-
-                if (receiver)
-                    receiver_bal = receiver->getFieldAmount(sfBalance).getFullText();
-
-                stream << "accountSendMultiIOU> " << to_string(senderID) << " -> "
-                       << to_string(receiverID) << " (" << receiver_bal
-                       << ") : " << amount.getFullText();
-            }
-
-            if (receiver)
-            {
-                // Increment XRP balance.
-                auto const rcvBal = receiver->getFieldAmount(sfBalance);
-                receiver->setFieldAmount(sfBalance, rcvBal + amount);
-                view.creditHook(xrpAccount(), receiverID, amount, -rcvBal);
-
-                view.update(receiver);
-            }
-
-            if (auto stream = j.trace())
-            {
-                std::string receiver_bal("-");
-
-                if (receiver)
-                    receiver_bal = receiver->getFieldAmount(sfBalance).getFullText();
-
-                stream << "accountSendMultiIOU< " << to_string(senderID) << " -> "
-                       << to_string(receiverID) << " (" << receiver_bal
-                       << ") : " << amount.getFullText();
-            }
-            return tesSUCCESS;
-        }
-        // Sender
-        if (sender)
-        {
-            if (sender->getFieldAmount(sfBalance) < amount)
-            {
-                return TER{tecFAILED_PROCESSING};
-            }
-            else
-            {
-                auto const sndBal = sender->getFieldAmount(sfBalance);
-                view.creditHook(senderID, xrpAccount(), amount, sndBal);
-
-                // Decrement XRP balance.
-                sender->setFieldAmount(sfBalance, sndBal - amount);
-                view.update(sender);
-            }
-        }
-
-        if (auto stream = j.trace())
-        {
-            std::string sender_bal("-");
-
-            if (sender)
-                sender_bal = sender->getFieldAmount(sfBalance).getFullText();
-
-            stream << "accountSendMultiIOU< " << to_string(senderID) << " (" << sender_bal
-                   << ") -> " << receivers.size() << " receivers.";
-        }
-
-        return tesSUCCESS;
-    };
-    return doSendMulti(
-        "accountSendMultiIOU", view, senderID, issue, receivers, actual, j, waiveFee, doCredit);
-
     // Failures return immediately.
     STAmount takeFromSender{issue};
     for (auto const& r : receivers)
@@ -2596,47 +2471,82 @@ rippleSendMultiMPT(
     beast::Journal j,
     WaiveTransferFee waiveFee)
 {
+    // Safe to get MPT since rippleSendMultiMPT is only called by
+    // accountSendMultiMPT
+    auto const& issuer = mptIssue.getIssuer();
+
     auto const sle = view.read(keylet::mptIssuance(mptIssue.getMptID()));
     if (!sle)
         return tecOBJECT_NOT_FOUND;
 
-    auto preMint = [&](AccountID const& issuer,
-                       STAmount const& takeFromSender,
-                       STAmount const& amount) -> TER {
-        // if sender is issuer, check that the new OutstandingAmount will
-        // not exceed MaximumAmount
-        if (senderID == issuer)
+    // These may diverge
+    STAmount takeFromSender{mptIssue};
+    actual = takeFromSender;
+
+    for (auto const& r : receivers)
+    {
+        auto const& receiverID = r.first;
+        STAmount amount{mptIssue, r.second};
+
+        if (amount < beast::zero)
         {
-            XRPL_ASSERT_PARTS(
-                takeFromSender == beast::zero,
-                "rippler::rippleSendMultiMPT",
-                "sender == issuer, takeFromSender == zero");
-            auto const sendAmount = amount.mpt().value();
-            auto const maximumAmount = sle->at(~sfMaximumAmount).value_or(maxMPTokenAmount);
-            if (sendAmount > maximumAmount ||
-                sle->getFieldU64(sfOutstandingAmount) > maximumAmount - sendAmount)
-                return tecPATH_DRY;
+            return tecINTERNAL;  // LCOV_EXCL_LINE
         }
 
-        return tesSUCCESS;
-    };
-    auto doCredit =
-        [&view, j](
-            AccountID const& senderID, AccountID const& receiverID, STAmount const& amount, bool) {
-            return rippleCreditMPT(view, senderID, receiverID, amount, j);
-        };
+        /* If we aren't sending anything or if the sender is the same as the
+         * receiver then we don't need to do anything.
+         */
+        if (!amount || (senderID == receiverID))
+            continue;
 
-    return doSendMulti(
-        "rippleSendMultiMPT",
-        view,
-        senderID,
-        mptIssue,
-        receivers,
-        actual,
-        j,
-        waiveFee,
-        doCredit,
-        preMint);
+        if (senderID == issuer || receiverID == issuer)
+        {
+            // if sender is issuer, check that the new OutstandingAmount will
+            // not exceed MaximumAmount
+            if (senderID == issuer)
+            {
+                XRPL_ASSERT_PARTS(
+                    takeFromSender == beast::zero,
+                    "rippler::rippleSendMultiMPT",
+                    "sender == issuer, takeFromSender == zero");
+                auto const sendAmount = amount.mpt().value();
+                auto const maximumAmount = sle->at(~sfMaximumAmount).value_or(maxMPTokenAmount);
+                if (sendAmount > maximumAmount ||
+                    sle->getFieldU64(sfOutstandingAmount) > maximumAmount - sendAmount)
+                    return tecPATH_DRY;
+            }
+
+            // Direct send: redeeming MPTs and/or sending own MPTs.
+            if (auto const ter = rippleCreditMPT(view, senderID, receiverID, amount, j))
+                return ter;
+            actual += amount;
+            // Do not add amount to takeFromSender, because rippleCreditMPT took
+            // it
+
+            continue;
+        }
+
+        // Sending 3rd party MPTs: transit.
+        STAmount actualSend = (waiveFee == WaiveTransferFee::Yes)
+            ? amount
+            : multiply(amount, transferRate(view, amount.get<MPTIssue>().getMptID()));
+        actual += actualSend;
+        takeFromSender += actualSend;
+
+        JLOG(j.debug()) << "rippleSendMultiMPT> " << to_string(senderID) << " - > "
+                        << to_string(receiverID) << " : deliver=" << amount.getFullText()
+                        << " cost=" << actualSend.getFullText();
+
+        if (auto const terResult = rippleCreditMPT(view, issuer, receiverID, amount, j))
+            return terResult;
+    }
+    if (senderID != issuer && takeFromSender)
+    {
+        if (TER const terResult = rippleCreditMPT(view, senderID, issuer, takeFromSender, j))
+            return terResult;
+    }
+
+    return tesSUCCESS;
 }
 
 static TER