fix merge issues (mostly with Conan2 upgrade)

Author: mvadari

.github/workflows/macos.yml

@@ -11,7 +11,7 @@ on:
       - release
       - master
       # Branches that opt-in to running
-      - 'ci/**'
+      - "ci/**"
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -31,7 +31,6 @@ env:
     tools.compilation:verbosity=verbose
 
 jobs:
-
   test:
     if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
     strategy:
@@ -88,7 +87,7 @@ jobs:
           sysctl -n hw.logicalcpu
           clang --version
       - name: configure Conan
-        run : |
+        run: |
           echo "${CONAN_GLOBAL_CONF}" >> $(conan config home)/global.conf
           conan config install conan/profiles/ -tf $(conan config home)/profiles/
           conan profile show
@@ -98,6 +97,7 @@ jobs:
           conan export --version 1.1.10 external/snappy
           conan export --version 9.7.3 external/rocksdb
           conan export --version 4.0.3 external/soci
+          conan export --version 2.3.1 external/wamr
       - name: add Ripple Conan remote
         if: env.CONAN_URL != ''
         shell: bash

.github/workflows/nix.yml

@@ -384,6 +384,7 @@ jobs:
         run: |
           echo "${CONAN_GLOBAL_CONF}" >> $(conan config home)/global.conf
           conan config install conan/profiles/ -tf $(conan config home)/profiles/
+          conan export --version 2.3.1 external/wamr
           conan profile show
       - name: build dependencies
         run: |

.github/workflows/windows.yml

@@ -12,7 +12,7 @@ on:
       - release
       - master
       # Branches that opt-in to running
-      - 'ci/**'
+      - "ci/**"
 
 # https://docs.github.com/en/actions/using-jobs/using-concurrency
 concurrency:
@@ -34,7 +34,6 @@ env:
     tools.compilation:verbosity=verbose
 
 jobs:
-
   test:
     if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
     strategy:
@@ -70,8 +69,8 @@ jobs:
       - name: restore Python cache directory
         uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
         with:
-            path: ${{ steps.pip-cache.outputs.dir }}
-            key: ${{ runner.os }}-${{ hashFiles('.github/workflows/windows.yml') }}
+          path: ${{ steps.pip-cache.outputs.dir }}
+          key: ${{ runner.os }}-${{ hashFiles('.github/workflows/windows.yml') }}
       - name: install Conan
         run: pip install wheel conan
       - name: check environment
@@ -93,6 +92,7 @@ jobs:
           conan export --version 1.1.10 external/snappy
           conan export --version 9.7.3 external/rocksdb
           conan export --version 4.0.3 external/soci
+          conan export --version 2.3.1 external/wamr
       - name: add Ripple Conan remote
         if: env.CONAN_URL != ''
         shell: bash
@@ -110,10 +110,10 @@ jobs:
       - name: build
         uses: ./.github/actions/build
         with:
-          generator: '${{ matrix.version.generator }}'
+          generator: "${{ matrix.version.generator }}"
           configuration: ${{ matrix.configuration.type }}
           # Hard code for now. Move to the matrix if varied options are needed
-          cmake-args: '-Dassert=TRUE -Dwerr=TRUE -Dreporting=OFF -Dunity=ON'
+          cmake-args: "-Dassert=TRUE -Dwerr=TRUE -Dreporting=OFF -Dunity=ON"
           cmake-target: install
       - name: test
         shell: bash

conanfile.py

@@ -193,6 +193,7 @@ def package_info(self):
             'protobuf::libprotobuf',
             'soci::soci',
             'sqlite3::sqlite',
+            'wamr::wamr',
             'xxhash::xxhash',
             'zlib::zlib',
         ]

external/wamr/conanfile.py

@@ -1,10 +1,11 @@
-from conans import ConanFile, tools
+from conan 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,
 )
+from conan.tools.scm import Git
 
 # import os
 
@@ -21,7 +22,6 @@ class WamrConan(ConanFile):
     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):
@@ -39,11 +39,10 @@ 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",
-            "2a303861cc916dc182b7fecaa0aacc1b797e7ac6",
-            shallow=True,
+        git = Git(self)
+        git.fetch_commit(
+            url="https://github.com/bytecodealliance/wasm-micro-runtime.git",
+            commit="2a303861cc916dc182b7fecaa0aacc1b797e7ac6",
         )
         # get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
@@ -89,4 +88,3 @@ 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"
-

src/test/app/Escrow_test.cpp

@@ -1712,7 +1712,7 @@ struct Escrow_test : public beast::unit_test::suite
 
         {
             // featureSmartEscrow disabled
-            Env env(*this, supported_amendments() - featureSmartEscrow);
+            Env env(*this, testable_amendments() - featureSmartEscrow);
             env.fund(XRP(5000), alice, carol);
             XRPAmount const txnFees = env.current()->fees().base + 1000;
             auto escrowCreate = escrow::create(alice, carol, XRP(1000));
@@ -1882,7 +1882,7 @@ struct Escrow_test : public beast::unit_test::suite
 
         {
             // featureSmartEscrow disabled
-            Env env(*this, supported_amendments() - featureSmartEscrow);
+            Env env(*this, testable_amendments() - featureSmartEscrow);
             env.fund(XRP(5000), alice, carol);
             XRPAmount const txnFees = env.current()->fees().base + 1000;
             env(escrow::finish(carol, alice, 1),

src/xrpld/app/tx/detail/Escrow.cpp

@@ -1189,7 +1189,8 @@ EscrowFinish::doApply()
 
         if (ctx_.view().rules().enabled(featureDepositAuth))
         {
-            if (auto err = verifyDepositPreauth(ctx_, account_, destID, sled);
+            if (auto err = verifyDepositPreauth(
+                    ctx_.tx, ctx_.view(), account_, destID, sled, ctx_.journal);
                 !isTesSuccess(err))
                 return err;
         }