Merge remote-tracking branch 'upstream/develop' into ripple/wasmi

fix: Handle WSClient write failure when server closes WebSocket (#6671 )
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-04-08 04:52:30 +00:00 · 2026-04-07 16:02:56 -04:00 · 2026-04-07 16:01:26 -04:00 · 2026-04-07 16:01:26 -04:00 · 2026-04-07 16:01:26 -04:00 · 2026-04-07 16:01:26 -04:00
4 changed files with 6 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/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(
--- a/cmake/XrplCore.cmake
+++ b/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>
--- a/conan.lock
+++ b/conan.lock
@@ -3,6 +3,7 @@
    "requires": [
        "zlib/1.3.1#cac0f6daea041b0ccf42934163defb20%1774439233.809",
        "xxhash/0.8.3#681d36a0a6111fc56e5e45ea182c19cc%1765850149.987",
+        "wasmi/1.0.9#1fecdab9b90c96698eb35ea99ca4f5cb%1772227278.324",
        "sqlite3/3.51.0#66aa11eabd0e34954c5c1c061ad44abe%1774467355.988",
        "soci/4.0.3#fe32b9ad5eb47e79ab9e45a68f363945%1774450067.231",
        "snappy/1.1.10#968fef506ff261592ec30c574d4a7809%1765850147.878",
@@ -11,7 +12,7 @@
        "re2/20251105#8579cfd0bda4daf0683f9e3898f964b4%1774398111.888",
        "protobuf/6.33.5#d96d52ba5baaaa532f47bda866ad87a5%1774467363.12",
        "openssl/3.6.1#e6399de266349245a4542fc5f6c71552%1774458290.139",
-        "nudb/2.0.9#11149c73f8f2baff9a0198fe25971fc7%1774883011.384",
+        "nudb/2.0.9#11149c73f8f2baff9a0198fe25971fc7%1775040983.408",
        "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1765850143.914",
        "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1765842973.492",
        "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1765842973.03",
--- a/conanfile.py
+++ b/conanfile.py
@@ -35,6 +35,7 @@ class Xrpl(ConanFile):
        "openssl/3.6.1",
        "secp256k1/0.7.1",
        "soci/4.0.3",
+        "wasmi/1.0.9",
        "zlib/1.3.1",
    ]

@@ -220,6 +221,7 @@ class Xrpl(ConanFile):
            "soci::soci",
            "secp256k1::secp256k1",
            "sqlite3::sqlite",
+            "wasmi::wasmi",
            "xxhash::xxhash",
            "zlib::zlib",
        ]
Author	SHA1	Message	Date
Mayukha Vadari	9917f96166	Merge remote-tracking branch 'upstream/develop' into ripple/wasmi	2026-04-07 16:02:56 -04:00
Pratik Mankawde	2cc9439fde	fix: Handle WSClient write failure when server closes WebSocket (#6671 ) Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>	2026-04-07 16:01:26 -04:00
Ayaz Salikhov	52af9582e2	ci: Change conditions for uploading artifacts in public/private/org repos (#6734 )	2026-04-07 16:01:26 -04:00
Bart	46e88dc732	refactor: Rename non-functional uses of `ripple(d)` to `xrpl(d)` (#6676 ) Co-authored-by: Bart <11445373+bthomee@users.noreply.github.com>	2026-04-07 16:01:26 -04:00
Mayukha Vadari	bc24f2e211	refactor: Move more helper files into `libxrpl/ledger/helpers` (#6731 ) Co-authored-by: xrplf-ai-reviewer[bot] <266832837+xrplf-ai-reviewer[bot]@users.noreply.github.com>	2026-04-07 16:01:26 -04:00
Mayukha Vadari	7a7c993b15	fix: Minor RPC fixes (#6730 )	2026-04-07 16:01:26 -04:00
Zhiyuan Wang	9733ca8f91	fix: Prevent deletion of MPTokens with active escrow (#6635 ) Co-authored-by: Bart <bthomee@users.noreply.github.com>	2026-04-07 16:01:26 -04:00
Vito Tumas	18d5e3e226	fix: Clamp VaultClawback to assetsAvailable for zero-amount clawback (#6646 )	2026-04-07 16:01:25 -04:00
Vito Tumas	b30b4e1d65	fix: Add assorted Lending Protocol fixes (#6678 ) Co-authored-by: Shawn Xie <35279399+shawnxie999@users.noreply.github.com>	2026-04-07 16:01:25 -04:00
Mayukha Vadari	d435893602	fix: Change variable signedness and correctly handle `std::optional` (#6657 )	2026-04-07 16:01:25 -04:00
Olek	00b0cf50f6	Update wasmi to 1.0.9 (#6727 )	2026-04-07 15:58:29 -04:00
Mayukha Vadari	1338062be7	Merge branch 'develop' of https://github.com/XRPLF/rippled into ripple/wasmi	2026-04-03 09:56:55 -04:00
Mayukha Vadari	1d4a3c00b8	Merge branch 'develop' of https://github.com/XRPLF/rippled into ripple/wasmi	2026-04-02 17:53:53 -04:00
Mayukha Vadari	2930ef217f	Merge remote-tracking branch 'upstream/develop' into ripple/wasmi	2026-03-24 10:20:38 -07:00
Mayukha Vadari	913e4b919e	Merge remote-tracking branch 'upstream/develop' into ripple/wasmi	2026-03-24 08:41:12 -07:00
Mayukha Vadari	bce5d91e45	Merge branch 'develop' into ripple/wasmi	2026-03-12 14:37:01 -04:00
Mayukha Vadari	654338fa66	Merge branch 'develop' into ripple/wasmi	2026-03-06 16:27:50 -04:00
Mayukha Vadari	3a825a41e1	Merge branch 'develop' into ripple/wasmi	2026-03-05 13:48:16 -04:00
Mayukha Vadari	61bcb7621f	Merge branch 'develop' into ripple/wasmi	2026-03-03 11:18:26 -04:00
Mayukha Vadari	a3f71b1774	Merge branch 'develop' into ripple/wasmi	2026-03-02 17:06:17 -05:00
Mayukha Vadari	b08bcf5d21	Merge branch 'develop' into ripple/wasmi	2026-02-27 16:41:44 -05:00
Mayukha Vadari	77dfd56ace	Merge branch 'develop' into ripple/wasmi	2026-02-27 13:49:25 -05:00
Mayukha Vadari	9c3c0280b1	Merge branch 'develop' into ripple/wasmi	2026-02-18 12:35:51 -05:00
Mayukha Vadari	bd16f7989d	Merge branch 'develop' into ripple/wasmi	2026-02-10 17:26:33 -05:00
Mayukha Vadari	2ec4a1114e	Merge branch 'develop' into ripple/wasmi	2026-02-04 18:13:00 -05:00
Mayukha Vadari	b2627039f6	Merge branch 'develop' into ripple/wasmi	2026-02-03 14:51:59 -05:00
Mayukha Vadari	e85e7b1b1a	Merge branch 'develop' into ripple/wasmi	2026-01-29 13:53:55 -05:00
Mayukha Vadari	72fffb6e51	Merge branch 'develop' into ripple/wasmi	2026-01-28 15:56:18 -05:00
Mayukha Vadari	f7ee580f01	Merge commit '5f638f55536def0d88b970d1018a465a238e55f4' into ripple/wasmi	2026-01-28 15:56:11 -05:00
Mayukha Vadari	122d405750	Merge commit '92046785d1fea5f9efe5a770d636792ea6cab78b' into ripple/wasmi	2026-01-28 15:56:04 -05:00
Mayukha Vadari	d7ed6d6512	Merge branch 'develop' into ripple/wasmi	2026-01-27 13:26:39 -05:00
Mayukha Vadari	8bc6f9cd70	Merge branch 'develop' into ripple/wasmi	2026-01-23 13:13:11 -05:00
Mayukha Vadari	ed5139d4e3	Merge branch 'develop' into ripple/wasmi	2026-01-21 12:57:29 -05:00
Mayukha Vadari	7a9d245950	Merge branch 'develop' into ripple/wasmi	2026-01-14 13:01:35 -05:00
Olek	d83ec96848	Switch to wasmi v1.0.6 (#6204 )	2026-01-12 13:36:02 -05:00
Mayukha Vadari	419d53ec4c	Merge branch 'develop' into ripple/wasmi	2026-01-12 13:10:58 -05:00
Mayukha Vadari	d4d70d5675	Merge branch 'develop' into ripple/wasmi	2026-01-12 12:27:48 -05:00
Mayukha Vadari	bbc28b3b1c	Merge branch 'develop' into ripple/wasmi	2026-01-08 11:42:28 -05:00
Mayukha Vadari	5aab274b7a	Merge branch 'develop' into ripple/wasmi	2026-01-07 16:52:10 -05:00
Mayukha Vadari	2c30e41191	use the develop hashes	2026-01-07 16:50:45 -05:00
Mayukha Vadari	8ea5106b0b	Merge branch 'develop' into ripple/wasmi	2026-01-07 14:34:49 -05:00
Mayukha Vadari	1977df9c2e	Merge remote-tracking branch 'upstream/develop' into ripple/wasmi	2026-01-05 18:43:49 -05:00
Mayukha Vadari	6c95548df5	Merge remote-tracking branch 'upstream/develop' into ripple/wasmi	2025-12-22 15:51:19 -08:00
Mayukha Vadari	90e0bbd0fc	Merge branch 'develop' into ripple/wasmi	2025-12-08 14:28:41 -05:00
Olek	b57df290de	Use conan repo for wasmi lib (#6109 ) * Use conan repo for wasmi lib * Generate lockfile	2025-12-08 13:02:01 -05:00
Mayukha Vadari	8a403f1241	Merge branch 'develop' into ripple/wasmi	2025-12-05 14:32:48 -05:00
Mayukha Vadari	6d2640871d	Merge branch 'develop' into ripple/wasmi	2025-12-02 18:40:54 -05:00
Olek	500bb68831	Fix win build (#6076 )	2025-11-24 16:56:23 -05:00
Mayukha Vadari	16087c9680	fix merge issue	2025-11-25 02:57:47 +05:30
Mayukha Vadari	25c3060fef	remove conan.lock (temporary)	2025-11-25 02:40:57 +05:30
Mayukha Vadari	ce9f0b38a4	Merge branch 'develop' into ripple/wasmi	2025-11-25 02:33:47 +05:30
Mayukha Vadari	35f7cbf772	update	2025-11-25 02:31:51 +05:30
Mayukha Vadari	0db564d261	WASMI data	2025-11-04 15:57:07 -05:00