Merge branch 'ripple/smart-escrow' into develop2

Author: mvadari

.github/actions/dependencies/action.yml

@@ -17,6 +17,7 @@ runs:
         conan export external/rocksdb rocksdb/9.7.3@
         conan export external/soci soci/4.0.3@
         conan export external/nudb nudb/2.0.8@
+        conan export -k external/wamr wamr/2.2.0@
     - name: add Ripple Conan remote
       shell: bash
       run: |

.github/workflows/nix.yml

@@ -408,6 +408,7 @@ jobs:
             conan profile update 'conf.tools.build:cxxflags+=["-DBOOST_ASIO_DISABLE_CONCEPTS"]' default
             conan export external/snappy snappy/1.1.10@
             conan export external/soci soci/4.0.3@
+            conan export -k external/wamr wamr/2.2.0@
 
         - name: build dependencies
           run: |

BUILD.md

@@ -204,6 +204,17 @@ It fixes some source files to add missing `#include`s.
    conan export --version 2.0.8 external/nudb
    ```
 
+Export our [Conan recipe for WAMR](./external/wamr).
+It add metering and expose some internal structures.
+
+
+   ```
+   # Conan 1.x
+   conan export external/wamr wamr/2.2.0@
+   # Conan 2.x
+   conan export --version 2.2.0 external/wamr
+   ```
+
 ### Build and Test
 
 1. Create a build directory and move into it.

CMakeLists.txt

@@ -115,7 +115,7 @@ endif()
 find_package(nudb REQUIRED)
 find_package(date REQUIRED)
 find_package(xxHash REQUIRED)
-find_package(wasmedge REQUIRED)
+find_package(wamr REQUIRED)
 
 target_link_libraries(ripple_libs INTERFACE
   ed25519::ed25519

cfg/rippled-example.cfg

@@ -1259,7 +1259,7 @@
 #       default. Don't change this without understanding the consequences.
 #
 #       Example:
-#           extension_compute_limit = 2000000      # 2 million gas
+#           extension_compute_limit = 1000000      # 1 million gas
 #
 #   extension_size_limit = <bytes>
 #
@@ -1271,7 +1271,7 @@
 #       default. Don't change this without understanding the consequences.
 #
 #       Example:
-#           extension_size_limit = 2000000      # 2 mb
+#           extension_size_limit = 100000      # 100 kb
 #
 #   gas_price = <bytes>
 #
@@ -1281,7 +1281,7 @@
 #       default. Don't change this without understanding the consequences.
 #
 #       Example:
-#           gas_price = 2000000      # 2 drops per gas
+#           gas_price = 1000000      # 1 drop per gas
 #-------------------------------------------------------------------------------
 #
 # 9. Misc Settings

cmake/RippledCore.cmake

@@ -65,7 +65,7 @@ target_link_libraries(xrpl.imports.main
     xrpl.libpb
     xxHash::xxhash
     $<$<BOOL:${voidstar}>:antithesis-sdk-cpp>
-    wasmedge::wasmedge
+    wamr::wamr
 )
 
 include(add_module)

conanfile.py

@@ -33,7 +33,7 @@ class Xrpl(ConanFile):
         'soci/4.0.3',
         'xxhash/0.8.2',
         'zlib/1.3.1',
-        'wasmedge/0.14.1',
+        'wamr/2.2.0',
     ]
 
     tool_requires = [

external/wamr/conandata.yml

@@ -0,0 +1,6 @@
+patches:
+  2.2.0:
+  - patch_description: add metering to iwasm interpreter
+    patch_file: patches/ripp_metering.patch
+    patch_type: conan
+

external/wamr/conanfile.py

@@ -0,0 +1,90 @@
+from conans import ConanFile, tools
+from conan.tools.cmake import CMake, CMakeToolchain, CMakeDeps, cmake_layout
+from conan.tools.files import apply_conandata_patches, export_conandata_patches, get, copy
+import os
+import json
+
+required_conan_version = ">=1.55.0"
+
+class WamrConan(ConanFile):
+    name = "wamr"
+    version = "2.2.0"
+    license = "Apache License v2.0"
+    url = "https://github.com/bytecodealliance/wasm-micro-runtime.git"
+    description = "Webassembly micro runtime"
+    package_type = "library"
+    settings = "os", "compiler", "build_type", "arch"
+    options = {"shared": [True, False], "fPIC": [True, False]}
+    default_options = {"shared": False, "fPIC": True}
+    generators = "CMakeToolchain", "CMakeDeps"
+    #requires = [("llvm/20.1.1@")]
+
+    def export_sources(self):
+        export_conandata_patches(self)
+        pass
+
+
+    #def build_requirements(self):
+    #    self.tool_requires("llvm/20.1.1")
+
+
+    def config_options(self):
+        if self.settings.os == "Windows":
+            del self.options.fPIC
+
+
+    def layout(self):
+        cmake_layout(self, src_folder="src")
+
+
+    def source(self):
+        git = tools.Git()
+        git.clone("https://github.com/bytecodealliance/wasm-micro-runtime.git", "c883fafead005e87ad3122b05409886f507c1cb0",shallow=True)
+        #get(self, **self.conan_data["sources"][self.version], strip_root=True)
+
+
+    def generate(self):
+        tc = CMakeToolchain(self)
+
+        tc.variables["WAMR_BUILD_INTERP"] = 1
+        tc.variables["WAMR_BUILD_FAST_INTERP"] = 1
+        tc.variables["WAMR_BUILD_INSTRUCTION_METERING"] = 1
+        tc.variables["WAMR_BUILD_AOT"] = 0
+        tc.variables["WAMR_BUILD_JIT"] = 0
+        tc.variables["WAMR_BUILD_FAST_JIT"] = 0
+        tc.variables["WAMR_DISABLE_HW_BOUND_CHECK"] = 1
+        tc.variables["WAMR_DISABLE_STACK_HW_BOUND_CHECK"] = 1
+        #tc.variables["WAMR_BUILD_FAST_JIT"] = 0 if self.settings.os == "Windows" else 1
+        #ll_dep = self.dependencies["llvm"]
+        #self.output.info(f"-----------package_folder: {type(ll_dep.__dict__)}")
+        #tc.variables["LLVM_DIR"] = os.path.join(ll_dep.package_folder, "lib", "cmake", "llvm")
+        tc.generate()
+
+        # This generates "foo-config.cmake" and "bar-config.cmake" in self.generators_folder
+        deps = CMakeDeps(self)
+        deps.generate()
+
+
+    def build(self):
+        apply_conandata_patches(self)
+        cmake = CMake(self)
+        cmake.verbose = True
+        cmake.configure()
+        cmake.build()
+        #self.run(f'echo {self.source_folder}')
+        # Explicit way:
+        # self.run('cmake %s/hello %s' % (self.source_folder, cmake.command_line))
+        # self.run("cmake --build . %s" % cmake.build_config)
+
+
+    def package(self):
+        cmake = CMake(self)
+        cmake.verbose = True
+        cmake.install()
+
+
+    def package_info(self):
+        self.cpp_info.libs = ["iwasm"]
+        self.cpp_info.names["cmake_find_package"] = "wamr"
+        self.cpp_info.names["cmake_find_package_multi"] = "wamr"
+