Merge branch 'develop' into ripple/wasmi

2026-03-03 11:12:34 +00:00 · 2026-03-02 17:06:17 -05:00 · 2026-02-27 16:41:44 -05:00 · 2026-02-27 13:49:25 -05:00 · 2026-02-18 12:35:51 -05:00 · 2026-02-10 17:26:33 -05:00
5 changed files with 6 additions and 0 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,6 +106,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
@@ -47,6 +47,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#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",
--- a/conanfile.py
+++ b/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",
        ]
--- a/cspell.config.yaml
+++ b/cspell.config.yaml
@@ -293,6 +293,7 @@ words:
  - venv
  - vfalco
  - vinnie
+  - wasmi
  - wextra
  - wptr
  - writeme
Author	SHA1	Message	Date
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