Merge remote-tracking branch 'upstream/sync-2.4.0' into HookAPISerializedType240

* Hook API Refactor2: Amendment Guards (#621)

* Hook API Refactor3: Consolidate the Hook API definitions from Enum.h and ApplyHook.h into a single file. (#622)

* Hook API Refactoring / Unit Testing (#581)

* fix `Xahau Ledger` to `Xahau Network` (#651)

* Add GitHub Actions workflow for Guard Checker Build (#658)

* fix `Xahau Ledger` to `Xahau Network` (#651)

* Add GitHub Actions workflow for Guard Checker Build (#658)

* fix: update guard checker build path for directory restructure

* fix: update stale ripple include paths in hook headers

* fix(test): avoid deleted PublicKey default ctor in HookAPI test

* chore(levelization): update ordering after hook/protocol dependency change

---------

Co-authored-by: tequ <git@tequ.dev>

.codecov.yml

@@ -1,6 +0,0 @@
-coverage:
-  status:
-    project:
-      default:
-        target: 60%
-        threshold: 2%

.gitattributes

@@ -11,6 +11,3 @@ LICENSE binary
 *.vcxproj   text eol=crlf
 *.props     text eol=crlf
 *.filters   text eol=crlf
-
-# Mark it as generated and folded out by default
-src/test/app/SetJSHook_wasm.h linguist-generated=true

.githooks/pre-commit

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Pre-commit hook that runs the suspicious patterns check on staged files
-
-# Get the repository's root directory
-repo_root=$(git rev-parse --show-toplevel)
-
-# Run the suspicious patterns script in pre-commit mode
-"$repo_root/suspicious_patterns.sh" --pre-commit
-
-# Exit with the same code as the script
-exit $?

.githooks/setup.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-echo "Configuring git to use .githooks directory..."
-git config core.hooksPath .githooks

.github/actions/xahau-ga-build/action.yml

@@ -2,14 +2,6 @@ name: build
 description: 'Builds the project with ccache integration'
 
 inputs:
-  cmake-target:
-    description: 'CMake target to build'
-    required: false
-    default: all
-  cmake-args:
-    description: 'Additional CMake arguments'
-    required: false
-    default: null
   generator:
     description: 'CMake generator to use'
     required: true
@@ -28,10 +20,6 @@ inputs:
     description: 'C++ compiler to use'
     required: false
     default: ''
-  gcov:
-    description: 'Gcov to use'
-    required: false
-    default: ''
   compiler-id:
     description: 'Unique identifier: compiler-version-stdlib[-gccversion] (e.g. clang-14-libstdcxx-gcc11, gcc-13-libstdcxx)'
     required: false
@@ -53,11 +41,10 @@ inputs:
     required: false
     default: 'dev'
   stdlib:
-    description: 'C++ standard library to use (default = compiler default, e.g. GCC always uses libstdc++)'
+    description: 'C++ standard library to use'
     required: true
     type: choice
     options:
-      - default
       - libstdcxx
       - libcxx
   clang_gcc_toolchain:
@@ -100,6 +87,11 @@ runs:
         export CCACHE_CONFIGPATH="$HOME/.config/ccache/ccache.conf"
         echo "CCACHE_CONFIGPATH=$CCACHE_CONFIGPATH" >> $GITHUB_ENV
 
+        # Keep config separate from cache_dir so configs aren't swapped when CCACHE_DIR changes between steps
+        mkdir -p ~/.config/ccache
+        export CCACHE_CONFIGPATH="$HOME/.config/ccache/ccache.conf"
+        echo "CCACHE_CONFIGPATH=$CCACHE_CONFIGPATH" >> $GITHUB_ENV
+
         # Configure ccache settings AFTER cache restore (prevents stale cached config)
         ccache --set-config=max_size=${{ inputs.ccache_max_size }}
         ccache --set-config=hash_dir=${{ inputs.ccache_hash_dir }}
@@ -130,10 +122,6 @@ runs:
           export CXX="${{ inputs.cxx }}"
         fi
 
-        if [ -n "${{ inputs.gcov }}" ]; then
-          ln -sf /usr/bin/${{ inputs.gcov }} /usr/local/bin/gcov
-        fi
-
         # Create wrapper toolchain that overlays ccache on top of Conan's toolchain
         # This enables ccache for the main app build without affecting Conan dependency builds
         if [ "${{ inputs.ccache_enabled }}" = "true" ]; then
@@ -197,8 +185,7 @@ runs:
           -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${TOOLCHAIN_FILE} \
           -DCMAKE_BUILD_TYPE=${{ inputs.configuration }} \
           -Dtests=TRUE \
-          -Dxrpld=TRUE \
-          ${{ inputs.cmake-args }}
+          -Dxrpld=TRUE
 
     - name: Show ccache config before build
       if: inputs.ccache_enabled == 'true'
@@ -222,7 +209,7 @@ runs:
           VERBOSE_FLAG="-- -v"
         fi
 
-        cmake --build . --config ${{ inputs.configuration }} --parallel $(nproc) --target ${{ inputs.cmake-target }} ${VERBOSE_FLAG}
+        cmake --build . --config ${{ inputs.configuration }} --parallel $(nproc) ${VERBOSE_FLAG}
 
     - name: Show ccache statistics
       if: inputs.ccache_enabled == 'true'

.github/workflows/check-genesis-hooks.yml

@@ -1,107 +0,0 @@
-name: Check Genesis Hooks
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  check-genesis-hooks:
-    runs-on: ubuntu-24.04
-    env:
-      CLANG_VERSION: 18
-    name: Verify xahau.h is in sync with genesis hooks
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      # Install binaryen from GitHub Releases (pinned to version 100)
-      - name: Install binaryen (version 100)
-        run: |
-          curl -LO https://github.com/WebAssembly/binaryen/releases/download/version_100/binaryen-version_100-x86_64-linux.tar.gz
-          tar -xzf binaryen-version_100-x86_64-linux.tar.gz
-          sudo cp binaryen-version_100/bin/* /usr/local/bin/
-          wasm-opt --version
-
-      - name: Install clang-format
-        run: |
-          codename=$( lsb_release --codename --short )
-          sudo tee /etc/apt/sources.list.d/llvm.list >/dev/null <<EOF
-          deb http://apt.llvm.org/${codename}/ llvm-toolchain-${codename}-${CLANG_VERSION} main
-          deb-src http://apt.llvm.org/${codename}/ llvm-toolchain-${codename}-${CLANG_VERSION} main
-          EOF
-          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add
-          sudo apt-get update
-          sudo apt-get install clang-format-${CLANG_VERSION}
-          clang-format --version
-
-      # Install wasienv (WebAssembly SDK)
-      - name: Install wasienv
-        run: |
-          # Download install.sh
-          curl -o /tmp/wasienv-install.sh https://raw.githubusercontent.com/wasienv/wasienv/master/install.sh
-          
-          # Replace /bin to /local/bin
-          sed -i 's|/bin|/local/bin|g' /tmp/wasienv-install.sh
-
-          # Execute the installed script
-          bash /tmp/wasienv-install.sh
-
-      # Add wasienv to PATH for subsequent steps
-      - name: Setup wasienv
-        run: |
-          echo "$HOME/.wasienv/bin" >> $GITHUB_PATH
-          wasmcc -v || true
-
-      # Build and install hook-cleaner tool
-      - name: Build and install hook-cleaner
-        run: |
-          git clone https://github.com/richardah/hook-cleaner-c.git /tmp/hook-cleaner
-          cd /tmp/hook-cleaner
-          make
-          cp hook-cleaner /usr/local/bin/
-          chmod +x /usr/local/bin/hook-cleaner
-
-      # Build and install guard_checker tool
-      - name: Build and install guard_checker
-        run: |
-          cd include/xrpl/hook
-          make
-          cp guard_checker /usr/local/bin/
-          chmod +x /usr/local/bin/guard_checker
-
-      # Verify all required tools are available
-      - name: Verify required tools
-        run: |
-          echo "Checking tool availability..."
-          command -v wasmcc || (echo "Error: wasmcc not found" && exit 1)
-          command -v wasm-opt || (echo "Error: wasm-opt not found" && exit 1)
-          command -v hook-cleaner || (echo "Error: hook-cleaner not found" && exit 1)
-          command -v guard_checker || (echo "Error: guard_checker not found" && exit 1)
-          command -v xxd || (echo "Error: xxd not found" && exit 1)
-          command -v clang-format || (echo "Error: clang-format not found" && exit 1)
-          echo "All tools verified successfully"
-
-      # Execute build script to regenerate xahau.h
-      - name: Run build_xahau_h.sh
-        run: |
-          cd hook/genesis
-          ./build_xahau_h.sh
-
-      # Check if xahau.h has changed (fail if out of sync)
-      - name: Verify xahau.h is in sync
-        run: |
-          if ! git diff --exit-code include/xrpl/hook/xahau.h; then
-            echo ""
-            echo "❌ ERROR: xahau.h is out of sync with genesis hooks"
-            echo ""
-            echo "The generated xahau.h differs from the committed version."
-            echo "Please run the following command and commit the changes:"
-            echo ""
-            echo "    cd hook/genesis && ./build_xahau_h.sh"
-            echo ""
-            echo "Diff:"
-            git diff include/xrpl/hook/xahau.h
-            exit 1
-          fi
-          echo "✅ xahau.h is in sync with genesis hooks"

.github/workflows/clang-format.yml

@@ -20,7 +20,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install clang-format-${CLANG_VERSION}
     - name: Format first-party sources
-      run: find include src -type f \( -name '*.cpp' -o -name '*.hpp' -o -name '*.h' -o -name '*.ipp' \) -not -path "src/quickjs/*" -exec clang-format-${CLANG_VERSION} -i {} +
+      run: find include src -type f \( -name '*.cpp' -o -name '*.hpp' -o -name '*.h' -o -name '*.ipp' \) -not -path "src/magic/magic_enum.h" -exec clang-format-${CLANG_VERSION} -i {} +
     - name: Check for differences
       id: assert
       run: |

.github/workflows/levelization.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Check levelization
-      run: python Builds/levelization/levelization.py
+      run: Builds/levelization/levelization.sh
     - name: Check for differences
       id: assert
       run: |
@@ -40,7 +40,7 @@ jobs:
           To fix it, you can do one of two things:
           1. Download and apply the patch generated as an artifact of this
              job to your repo, commit, and push.
-          2. Run 'python Builds/levelization/levelization.py' in your repo,
+          2. Run './Builds/levelization/levelization.sh' in your repo,
              commit, and push.
 
           See Builds/levelization/README.md for more info.

.github/workflows/verify-generated-headers.yml

@@ -18,10 +18,6 @@ jobs:
             generator: bash ./hook/generate_sfcodes.sh
           - target: hook/tts.h
             generator: ./hook/generate_tts.sh
-          - target: hook/ls_flags.h
-            generator: ./hook/generate_lsflags.sh
-          - target: hook/tx_flags.h
-            generator: ./hook/generate_txflags.sh
     runs-on: ubuntu-24.04
     env:
       CLANG_VERSION: 18

.github/workflows/xahau-ga-macos.yml

@@ -4,8 +4,7 @@ on:
   push:
     branches: ["dev", "candidate", "release"]
   pull_request:
-    branches: ["**"]
-    types: [opened, synchronize, reopened, labeled, unlabeled]
+    branches: ["dev", "candidate", "release"]
   schedule:
     - cron: '0 0 * * *'
 
@@ -15,10 +14,6 @@ concurrency:
 
 jobs:
   test:
-    if: >
-      github.event_name != 'pull_request' ||
-      contains(fromJson('["dev","candidate","release"]'), github.base_ref) ||
-      contains(join(github.event.pull_request.labels.*.name, ','), 'ci-full-build')
     strategy:
       matrix:
         generator:

.github/workflows/xahau-ga-nix.yml

@@ -4,16 +4,9 @@ on:
   push:
     branches: ["dev", "candidate", "release"]
   pull_request:
-    branches: ["**"]
-    types: [opened, synchronize, reopened, labeled, unlabeled]
+    branches: ["dev", "candidate", "release"]
   schedule:
     - cron: '0 0 * * *'
-  workflow_dispatch:
-    inputs:
-      full_matrix:
-        description: "Force full matrix (6 configs)"
-        required: false
-        default: "false"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -21,10 +14,6 @@ concurrency:
 
 jobs:
   matrix-setup:
-    if: >
-      github.event_name != 'pull_request' ||
-      contains(fromJson('["dev","candidate","release"]'), github.base_ref) ||
-      contains(join(github.event.pull_request.labels.*.name, ','), 'ci-full-build')
     runs-on: [self-hosted, generic, 20.04]
     container: python:3-slim
     outputs:
@@ -57,9 +46,8 @@ jobs:
                   "cc": "gcc-11",
                   "cxx": "g++-11",
                   "compiler_version": 11,
-                  "stdlib": "default",
-                  "configuration": "Debug",
-                  "job_type": "build"
+                  "stdlib": "libstdcxx",
+                  "configuration": "Debug"
               },
               {
                   "compiler_id": "gcc-13-libstdcxx",
@@ -67,20 +55,8 @@ jobs:
                   "cc": "gcc-13",
                   "cxx": "g++-13",
                   "compiler_version": 13,
-                  "stdlib": "default",
-                  "configuration": "Debug",
-                  "job_type": "build"
-              },
-              {
-                  "compiler_id": "gcc-13-libstdcxx",
-                  "compiler": "gcc",
-                  "cc": "gcc-13",
-                  "cxx": "g++-13",
-                  "gcov": "gcov-13",
-                  "compiler_version": 13,
-                  "stdlib": "default",
-                  "configuration": "Debug",
-                  "job_type": "coverage"
+                  "stdlib": "libstdcxx",
+                  "configuration": "Debug"
               },
               {
                   "compiler_id": "clang-14-libstdcxx-gcc11",
@@ -90,8 +66,7 @@ jobs:
                   "compiler_version": 14,
                   "stdlib": "libstdcxx",
                   "clang_gcc_toolchain": 11,
-                  "configuration": "Debug",
-                  "job_type": "build"
+                  "configuration": "Debug"
               },
               {
                   "compiler_id": "clang-16-libstdcxx-gcc13",
@@ -101,8 +76,7 @@ jobs:
                   "compiler_version": 16,
                   "stdlib": "libstdcxx",
                   "clang_gcc_toolchain": 13,
-                  "configuration": "Debug",
-                  "job_type": "build"
+                  "configuration": "Debug"
               },
               {
                   "compiler_id": "clang-17-libcxx",
@@ -111,8 +85,7 @@ jobs:
                   "cxx": "clang++-17",
                   "compiler_version": 17,
                   "stdlib": "libcxx",
-                  "configuration": "Debug",
-                  "job_type": "build"
+                  "configuration": "Debug"
               },
               {
                   # Clang 18 - testing if it's faster than Clang 17 with libc++
@@ -123,16 +96,14 @@ jobs:
                   "cxx": "clang++-18",
                   "compiler_version": 18,
                   "stdlib": "libcxx",
-                  "configuration": "Debug",
-                  "job_type": "build"
+                  "configuration": "Debug"
               }
           ]
           
           # Minimal matrix for PRs and feature branches
           minimal_matrix = [
               full_matrix[1],  # gcc-13 (middle-ground gcc)
-              full_matrix[2],  # gcc-13 coverage
-              full_matrix[3]   # clang-14 (mature, stable clang)
+              full_matrix[2]   # clang-14 (mature, stable clang)
           ]
           
           # Determine which matrix to use based on the target branch
@@ -140,7 +111,6 @@ jobs:
           base_ref = "${{ github.base_ref }}"  # For PRs, this is the target branch
           event_name = "${{ github.event_name }}"
           pr_title = """${{ steps.escape.outputs.title }}"""
-          pr_labels = """${{ join(github.event.pull_request.labels.*.name, ',') }}"""
           pr_head_sha = "${{ github.event.pull_request.head.sha }}"
 
           # Get commit message - for PRs, fetch via API since head_commit.message is empty
@@ -166,24 +136,11 @@ jobs:
           print(f"Base ref: {base_ref}")
           print(f"PR head SHA: {pr_head_sha}")
           print(f"PR title: {pr_title}")
-          print(f"PR labels: {pr_labels}")
           print(f"Commit message: {commit_message}")
           
-          # Manual trigger input to force full matrix.
-          manual_full = "${{ github.event.inputs.full_matrix || 'false' }}" == "true"
-
-          # Label/manual overrides, while preserving existing title/commit behavior.
-          force_full = (
-              manual_full
-              or "[ci-nix-full-matrix]" in commit_message
-              or "[ci-nix-full-matrix]" in pr_title
-              or ("ci-full-build" in pr_labels and "ci-nix-full-matrix" in pr_labels)
-          )
-          force_min = (
-              "ci-full-build" in pr_labels
-          )
+          # Check for override tags in commit message or PR title
+          force_full = "[ci-nix-full-matrix]" in commit_message or "[ci-nix-full-matrix]" in pr_title
           print(f"Force full matrix: {force_full}")
-          print(f"Force min matrix: {force_min}")
           
           # Check if this is targeting a main branch
           # For PRs: check base_ref (target branch)
@@ -191,11 +148,8 @@ jobs:
           main_branches = ["refs/heads/dev", "refs/heads/release", "refs/heads/candidate"]
           
           if force_full:
-              # Override: always use full matrix if forced by manual input or label.
+              # Override: always use full matrix if tag is present
               use_full = True
-          elif force_min:
-              # Override: always use minimal matrix if ci-full-build label is present.
-              use_full = False
           elif event_name == "pull_request":
               # For PRs, base_ref is just the branch name (e.g., "dev", not "refs/heads/dev")
               # Check if the PR targets release or candidate (more critical branches)
@@ -207,21 +161,14 @@ jobs:
           # Select the appropriate matrix
           if use_full:
               if force_full:
-                  print(f"Using FULL matrix (7 configs) - forced by [ci-nix-full-matrix] tag")
+                  print(f"Using FULL matrix (6 configs) - forced by [ci-nix-full-matrix] tag")
               else:
-                  print(f"Using FULL matrix (7 configs) - targeting main branch")
+                  print(f"Using FULL matrix (6 configs) - targeting main branch")
               matrix = full_matrix
           else:
-              print(f"Using MINIMAL matrix (3 configs) - feature branch/PR")
+              print(f"Using MINIMAL matrix (2 configs) - feature branch/PR")
               matrix = minimal_matrix
-
-          # Add runs_on based on job_type
-          for entry in matrix:
-              if entry.get("job_type") == "coverage":
-                  entry["runs_on"] = '["self-hosted", "generic", 24.04]'
-              else:
-                  entry["runs_on"] = '["self-hosted", "generic", 20.04]'
-
+          
           # Output the matrix as JSON
           output = json.dumps({"include": matrix})
           with open(os.environ['GITHUB_OUTPUT'], 'a') as f:
@@ -229,10 +176,7 @@ jobs:
 
   build:
     needs: matrix-setup
-    runs-on: ${{ fromJSON(matrix.runs_on) }}
-    permissions:
-      id-token: write
-      contents: read
+    runs-on: [self-hosted, generic, 20.04]
     container:
       image: ubuntu:24.04
       volumes:
@@ -261,7 +205,7 @@ jobs:
           apt-get install -y software-properties-common
           add-apt-repository ppa:ubuntu-toolchain-r/test -y
           apt-get update
-          apt-get install -y git python3 python-is-python3 pipx
+          apt-get install -y python3 python-is-python3 pipx
           pipx ensurepath
           apt-get install -y cmake ninja-build ${{ matrix.cc }} ${{ matrix.cxx }} ccache
           apt-get install -y perl # for openssl build
@@ -332,12 +276,6 @@ jobs:
           pipx install "conan>=2.0,<3"
           echo "$HOME/.local/bin" >> $GITHUB_PATH
 
-          # Install gcovr for coverage jobs
-          if [ "${{ matrix.job_type }}" = "coverage" ]; then
-            pipx install "gcovr>=7,<9"
-            apt-get install -y curl lcov
-          fi
-
       - name: Check environment
         run: |
           echo "PATH:"
@@ -347,13 +285,6 @@ jobs:
           which ${{ matrix.cc }} && ${{ matrix.cc }} --version || echo "${{ matrix.cc }} not found"
           which ${{ matrix.cxx }} && ${{ matrix.cxx }} --version || echo "${{ matrix.cxx }} not found"
           which ccache && ccache --version || echo "ccache not found"
-
-          # Check gcovr for coverage jobs
-          if [ "${{ matrix.job_type }}" = "coverage" ]; then
-            which gcov && gcov --version || echo "gcov not found"
-            which gcovr && gcovr --version || echo "gcovr not found"
-          fi
-
           echo "---- Full Environment ----"
           env
 
@@ -381,7 +312,6 @@ jobs:
           gha_cache_enabled: 'false' # Disable caching for self hosted runner
 
       - name: Build
-        if: matrix.job_type == 'build'
         uses: ./.github/actions/xahau-ga-build
         with:
           generator: Ninja
@@ -396,27 +326,7 @@ jobs:
           clang_gcc_toolchain: ${{ matrix.clang_gcc_toolchain || '' }}
           ccache_max_size: '100G'
 
-      - name: Build (Coverage)
-        if: matrix.job_type == 'coverage'
-        uses: ./.github/actions/xahau-ga-build
-        with:
-          generator: Ninja
-          configuration: ${{ matrix.configuration }}
-          build_dir: ${{ env.build_dir }}
-          cc: ${{ matrix.cc }}
-          cxx: ${{ matrix.cxx }}
-          gcov: ${{ matrix.gcov }}
-          compiler-id: ${{ matrix.compiler_id }}
-          cache_version: ${{ env.CACHE_VERSION }}
-          main_branch: ${{ env.MAIN_BRANCH_NAME }}
-          stdlib: ${{ matrix.stdlib }}
-          # Coverage builds are slower due to instrumentation; use fewer parallel jobs to avoid flakiness
-          cmake-args: '-Dcoverage=ON -Dcoverage_format=xml -Dcoverage_test_parallelism=$(($(nproc)/2)) -DCODE_COVERAGE_VERBOSE=ON -DCMAKE_CXX_FLAGS="-O0" -DCMAKE_C_FLAGS="-O0"'
-          cmake-target: 'coverage'
-          ccache_max_size: '100G'
-
       - name: Set artifact name
-        if: matrix.job_type == 'build'
         id: set-artifact-name
         run: |
           ARTIFACT_NAME="build-output-nix-${{ github.run_id }}-${{ matrix.compiler }}-${{ matrix.configuration }}"
@@ -429,7 +339,6 @@ jobs:
           ls -la ${{ env.build_dir }} || echo "Build directory not found or empty"
 
       - name: Run tests
-        if: matrix.job_type == 'build'
         run: |
           # Ensure the binary exists before trying to run
           if [ -f "${{ env.build_dir }}/rippled" ]; then
@@ -438,42 +347,3 @@ jobs:
              echo "Error: rippled executable not found in ${{ env.build_dir }}"
              exit 1
           fi
-
-      # Coverage-specific steps
-      - name: Move coverage report
-        if: matrix.job_type == 'coverage'
-        shell: bash
-        run: |
-          mv "${{ env.build_dir }}/coverage.xml" ./
-
-      - name: Archive coverage report
-        if: matrix.job_type == 'coverage'
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage.xml
-          path: coverage.xml
-          retention-days: 30
-
-      - name: Upload coverage report
-        if: matrix.job_type == 'coverage'
-        uses: codecov/codecov-action@v5
-        with:
-          files: coverage.xml
-          fail_ci_if_error: true
-          disable_search: true
-          verbose: true
-          plugins: noop
-          use_oidc: true
-
-      - name: Export server definitions
-        if: matrix.job_type == 'build' && matrix.compiler_id == 'gcc-13-libstdcxx'
-        run: |
-          ${{ env.build_dir }}/rippled --definitions | python3 -m json.tool > server_definitions.json
-
-      - name: Upload server definitions
-        if: matrix.job_type == 'build' && matrix.compiler_id == 'gcc-13-libstdcxx'
-        uses: actions/upload-artifact@v7
-        with:
-          name: server-definitions
-          path: server_definitions.json
-          archive: false

.gitignore

@@ -53,9 +53,6 @@ Builds/levelization/results/paths.txt
 Builds/levelization/results/includes/
 Builds/levelization/results/includedby/
 
-# Python
-__pycache__
-
 # Ignore tmp directory.
 tmp
 
@@ -79,7 +76,6 @@ docs/html_doc
 # Xcode
 .DS_Store
 */build/*
-!/docs/build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -124,8 +120,6 @@ pkg
 CMakeUserPresets.json
 bld.rippled/
 
-# binary
-qjsc
 generated
 .vscode
 

.mise.toml

@@ -0,0 +1,2 @@
+[tools]
+clang-format = "18"

BUILD.md

@@ -10,7 +10,7 @@
 ## Branches
 
 For a stable release, choose the `master` branch or one of the [tagged
-releases](https://github.com/Xahau/xahaud/releases).
+releases](https://github.com/ripple/rippled/releases).
 
 ```
 git checkout master
@@ -39,7 +39,13 @@ Building rippled generally requires git, Python, Conan, CMake, and a C++ compile
 - [Conan 2.x](https://conan.io/downloads)
 - [CMake 3.16](https://cmake.org/download/)
 
-`xahaud` is written in the C++20 dialect and includes the `<concepts>` header.
+[^1]: It is possible to build with Conan 2.x,
+but the instructions are significantly different,
+which is why we are not recommending it yet.
+Notably, the `conan profile update` command is removed in 2.x.
+Profiles must be edited by hand.
+
+`rippled` is written in the C++20 dialect and includes the `<concepts>` header.
 The [minimum compiler versions][2] required are:
 
 | Compiler    | Version |
@@ -58,19 +64,17 @@ Here are [sample instructions for setting up a C++ development environment on Li
 
 ### Mac
 
-Many xahaud engineers use macOS for development.
+Many rippled engineers use macOS for development.
 
 Here are [sample instructions for setting up a C++ development environment on macOS](./docs/build/environment.md#macos).
 
 ### Windows
 
-We don't recommend Windows for `xahaud` production at this time. As of
-November 2025, Ubuntu has the highest level of quality assurance, testing,
-and support.
+Windows is not recommended for production use at this time.
 
-Windows developers should use Visual Studio 2019. `xahaud` isn't
-compatible with [Boost](https://www.boost.org/) 1.78 or 1.79, and Conan
-can't build earlier Boost versions.
+- Additionally, 32-bit Windows development is not supported.
+
+[Boost]: https://www.boost.org/
 
 ## Steps
 
@@ -140,8 +144,8 @@ conan profile show default
 An easy way to do that is to run the shortcut "x64 Native Tools Command
 Prompt" for the version of Visual Studio that you have installed.
 
-   Windows developers must also build `xahaud` and its dependencies for the x64
-   architecture.
+   Windows developers must also build `rippled` and its dependencies for the x64
+   architecture:
 
    ```
    # In ~/.conan2/profiles/default, ensure:
@@ -149,7 +153,10 @@ Prompt" for the version of Visual Studio that you have installed.
    arch=x86_64
    ```
 
-### Multiple compilers
+3. (Optional) If you have multiple compilers installed on your platform,
+   make sure that Conan and CMake select the one you want to use.
+   This setting will set the correct variables (`CMAKE_<LANG>_COMPILER`)
+   in the generated CMake toolchain file.
 
    ```
    # In ~/.conan2/profiles/default, add under [conf] section:
@@ -166,17 +173,9 @@ Prompt" for the version of Visual Studio that you have installed.
    CXX=<path>
    ```
 
-It should choose the compiler for dependencies as well,
-but not all of them have a Conan recipe that respects this setting (yet).
-For the rest, you can set these environment variables.
-Replace `<path>` with paths to the desired compilers:
-
-- `conan profile update env.CC=<path> default`
-- `conan profile update env.CXX=<path> default`
-
-Export our [Conan recipe for Snappy](./external/snappy).
-It does not explicitly link the C++ standard library,
-which allows you to statically link it with GCC, if you want.
+4. Export our [Conan recipe for Snappy](./external/snappy).
+   It doesn't explicitly link the C++ standard library,
+   which allows you to statically link it with GCC, if you want.
 
    ```
    conan export external/snappy --version 1.1.10 --user xahaud --channel stable
@@ -185,16 +184,6 @@ which allows you to statically link it with GCC, if you want.
 Export our [Conan recipe for RocksDB](./external/rocksdb).
 It does not override paths to dependencies when building with Visual Studio.
 
-   ```
-   # Conan 1.x
-   conan export external/rocksdb rocksdb/6.29.5@
-   # Conan 2.x
-   conan export --version 6.29.5 external/rocksdb
-   ```
-
-Export our [Conan recipe for SOCI](./external/soci).
-It patches their CMake to correctly import its dependencies.
-
    ```
    conan export external/soci --version 4.0.3 --user xahaud --channel stable
    ```
@@ -205,17 +194,6 @@ It patches their CMake to correctly import its dependencies.
    conan export external/wasmedge --version 0.11.2 --user xahaud --channel stable
    ```
 
-Export our [Conan recipe for NuDB](./external/nudb).
-It fixes some source files to add missing `#include`s.
-
-
-   ```
-   # Conan 1.x
-   conan export external/nudb nudb/2.0.8@
-   # Conan 2.x
-   conan export --version 2.0.8 external/nudb
-   ```
-
 ### Build and Test
 
 1. Create a build directory and move into it.
@@ -289,14 +267,13 @@ It fixes some source files to add missing `#include`s.
     cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -Dxrpld=ON -Dtests=ON  ..
     ```
 
-    **Note:** You can pass build options for `xahaud` in this step.
+    **Note:** You can pass build options for `rippled` in this step.
 
-4. Build `xahaud`.
+5. Build `rippled`.
 
    For a single-configuration generator, it will build whatever configuration
    you passed for `CMAKE_BUILD_TYPE`. For a multi-configuration generator,
    you must pass the option `--config` to select the build configuration. 
-   The output file is currently named 'rippled'.
 
    Single-config generators:
 
@@ -311,7 +288,7 @@ It fixes some source files to add missing `#include`s.
    cmake --build . --config Debug
    ```
 
-5. Test xahaud.
+6. Test rippled.
 
    Single-config generators:
 
@@ -326,7 +303,7 @@ It fixes some source files to add missing `#include`s.
    ./Debug/rippled --unittest
    ```
 
-   The location of `xahaud` in your build directory depends on your CMake
+   The location of `rippled` in your build directory depends on your CMake
    generator. Pass `--help` to see the rest of the command line options.
 
 

Builds/levelization/README.md

@@ -50,7 +50,7 @@ that `test` code should *never* be included in `ripple` code.)
 
 ## Validation
 
-The [levelization.py](levelization.py) script takes no parameters,
+The [levelization.sh](levelization.sh) script takes no parameters,
 reads no environment variables, and can be run from any directory,
 as long as it is in the expected location in the rippled repo.
 It can be run at any time from within a checked out repo, and will
@@ -84,7 +84,7 @@ It generates many files of [results](results):
   Github Actions workflow to test that levelization loops haven't
   changed.  Unfortunately, if changes are detected, it can't tell if
   they are improvements or not, so if you have resolved any issues or
-  done anything else to improve levelization, run `levelization.py`,
+  done anything else to improve levelization, run `levelization.sh`,
   and commit the updated results.
 
 The  `loops.txt` and `ordering.txt` files relate the modules
@@ -108,7 +108,7 @@ The committed files hide the detailed values intentionally, to
 prevent false alarms and merging issues, and because it's easy to
 get those details locally.
 
-1. Run `levelization.py`
+1. Run `levelization.sh`
 2. Grep the modules in `paths.txt`.
    * For example, if a cycle is found `A ~= B`, simply `grep -w
      A Builds/levelization/results/paths.txt | grep -w B`

Builds/levelization/levelization.py

@@ -1,283 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-Usage: levelization.py
-This script takes no parameters, and can be called from any directory in the file system.
-"""
-
-import os
-import re
-import sys
-from collections import defaultdict
-from pathlib import Path
-
-# Compile regex patterns once at module level
-INCLUDE_PATTERN = re.compile(r"^\s*#include.*/.*\.h")
-INCLUDE_PATH_PATTERN = re.compile(r'[<"]([^>"]+)[>"]')
-
-
-def dictionary_sort_key(s):
-    """
-    Create a sort key that mimics 'sort -d' (dictionary order).
-    Dictionary order only considers blanks and alphanumeric characters.
-    """
-    return "".join(c for c in s if c.isalnum() or c.isspace())
-
-
-def get_level(file_path):
-    """
-    Extract the level from a file path (second and third directory components).
-    Equivalent to bash: cut -d/ -f 2,3
-
-    Examples:
-        src/ripple/app/main.cpp -> ripple.app
-        src/test/app/Import_test.cpp -> test.app
-    """
-    parts = file_path.split("/")
-
-    if len(parts) >= 3:
-        level = f"{parts[1]}/{parts[2]}"
-    elif len(parts) >= 2:
-        level = f"{parts[1]}/toplevel"
-    else:
-        level = file_path
-
-    # If the "level" indicates a file, cut off the filename
-    if "." in level.split("/")[-1]:
-        # Use the "toplevel" label as a workaround for `sort`
-        # inconsistencies between different utility versions
-        level = level.rsplit("/", 1)[0] + "/toplevel"
-
-    return level.replace("/", ".")
-
-
-def extract_include_level(include_line):
-    """
-    Extract the include path from an #include directive.
-    Gets the first two directory components from the include path.
-    Equivalent to bash: cut -d/ -f 1,2
-
-    Examples:
-        #include <ripple/basics/base_uint.h> -> ripple.basics
-        #include "ripple/app/main/Application.h" -> ripple.app
-    """
-    match = INCLUDE_PATH_PATTERN.search(include_line)
-    if not match:
-        return None
-
-    include_path = match.group(1)
-    parts = include_path.split("/")
-
-    if len(parts) >= 2:
-        include_level = f"{parts[0]}/{parts[1]}"
-    else:
-        include_level = include_path
-
-    # If the "includelevel" indicates a file, cut off the filename
-    if "." in include_level.split("/")[-1]:
-        include_level = include_level.rsplit("/", 1)[0] + "/toplevel"
-
-    return include_level.replace("/", ".")
-
-
-def find_repository_directories(start_path, depth_limit=10):
-    """
-    Find the repository root by looking for src or include folders.
-    Walks up the directory tree from the start path.
-    """
-    current = start_path.resolve()
-
-    for _ in range(depth_limit):
-        src_path = current / "src"
-        include_path = current / "include"
-        has_src = src_path.exists()
-        has_include = include_path.exists()
-
-        if has_src or has_include:
-            dirs = []
-            if has_src:
-                dirs.append(src_path)
-            if has_include:
-                dirs.append(include_path)
-            return current, dirs
-
-        parent = current.parent
-        if parent == current:
-            break
-        current = parent
-
-    raise RuntimeError(
-        "Could not find repository root. "
-        "Expected to find a directory containing 'src' and/or 'include' folders."
-    )
-
-
-def main():
-    script_dir = Path(__file__).parent.resolve()
-    os.chdir(script_dir)
-
-    # Clean up and create results directory.
-    results_dir = script_dir / "results"
-    if results_dir.exists():
-        import shutil
-
-        shutil.rmtree(results_dir)
-    results_dir.mkdir()
-
-    # Find the repository root.
-    try:
-        repo_root, scan_dirs = find_repository_directories(script_dir)
-        print(f"Found repository root: {repo_root}")
-        for scan_dir in scan_dirs:
-            print(f"  Scanning: {scan_dir.relative_to(repo_root)}")
-    except RuntimeError as e:
-        print(f"Error: {e}", file=sys.stderr)
-        sys.exit(1)
-
-    # Find all #include directives.
-    print("\nScanning for raw includes...")
-    raw_includes = []
-    rawincludes_file = results_dir / "rawincludes.txt"
-
-    with open(rawincludes_file, "w", buffering=8192) as raw_f:
-        for dir_path in scan_dirs:
-            for file_path in dir_path.rglob("*"):
-                if not file_path.is_file():
-                    continue
-                try:
-                    rel_path_str = str(file_path.relative_to(repo_root))
-                    with open(
-                        file_path, "r", encoding="utf-8", errors="ignore", buffering=8192
-                    ) as f:
-                        for line in f:
-                            if "#include" not in line or "boost" in line:
-                                continue
-                            if INCLUDE_PATTERN.match(line):
-                                line_stripped = line.strip()
-                                entry = f"{rel_path_str}:{line_stripped}\n"
-                                print(entry, end="")
-                                raw_f.write(entry)
-                                raw_includes.append((rel_path_str, line_stripped))
-                except Exception as e:
-                    print(f"Error reading {file_path}: {e}", file=sys.stderr)
-
-    # Build levelization paths and count directly.
-    print("Build levelization paths")
-    path_counts = defaultdict(int)
-
-    for file_path, include_line in raw_includes:
-        include_level = extract_include_level(include_line)
-        if not include_level:
-            continue
-        level = get_level(file_path)
-        if level != include_level:
-            path_counts[(level, include_level)] += 1
-
-    # Sort and deduplicate paths.
-    print("Sort and deduplicate paths")
-    sorted_items = sorted(
-        path_counts.items(),
-        key=lambda x: (dictionary_sort_key(x[0][0]), dictionary_sort_key(x[0][1])),
-    )
-
-    paths_file = results_dir / "paths.txt"
-    with open(paths_file, "w") as f:
-        for (level, include_level), count in sorted_items:
-            line = f"{count:7} {level} {include_level}\n"
-            print(line.rstrip())
-            f.write(line)
-
-    # Split into flat-file database.
-    print("Split into flat-file database")
-    includes_dir = results_dir / "includes"
-    includedby_dir = results_dir / "includedby"
-    includes_dir.mkdir()
-    includedby_dir.mkdir()
-
-    includes_data = defaultdict(list)
-    includedby_data = defaultdict(list)
-
-    for (level, include_level), count in sorted_items:
-        includes_data[level].append((include_level, count))
-        includedby_data[include_level].append((level, count))
-
-    for level in sorted(includes_data.keys(), key=dictionary_sort_key):
-        with open(includes_dir / level, "w") as f:
-            for include_level, count in includes_data[level]:
-                line = f"{include_level} {count}\n"
-                print(line.rstrip())
-                f.write(line)
-
-    for include_level in sorted(includedby_data.keys(), key=dictionary_sort_key):
-        with open(includedby_dir / include_level, "w") as f:
-            for level, count in includedby_data[include_level]:
-                line = f"{level} {count}\n"
-                print(line.rstrip())
-                f.write(line)
-
-    # Search for loops.
-    print("Search for loops")
-    loops_file = results_dir / "loops.txt"
-    ordering_file = results_dir / "ordering.txt"
-
-    # Pre-load all include files into memory for fast lookup.
-    includes_cache = {}
-    includes_lookup = {}
-
-    for include_file in sorted(includes_dir.iterdir(), key=lambda p: p.name):
-        if not include_file.is_file():
-            continue
-        includes_cache[include_file.name] = []
-        includes_lookup[include_file.name] = {}
-        with open(include_file, "r") as f:
-            for line in f:
-                parts = line.strip().split()
-                if len(parts) >= 2:
-                    name, count = parts[0], int(parts[1])
-                    includes_cache[include_file.name].append((name, count))
-                    includes_lookup[include_file.name][name] = count
-
-    loops_found = set()
-
-    with open(loops_file, "w", buffering=8192) as loops_f, open(
-        ordering_file, "w", buffering=8192
-    ) as ordering_f:
-        for source in sorted(includes_cache.keys()):
-            for include, include_freq in includes_cache[source]:
-                if include not in includes_lookup:
-                    continue
-
-                source_freq = includes_lookup[include].get(source)
-
-                if source_freq is not None:
-                    loop_key = tuple(sorted([source, include]))
-                    if loop_key in loops_found:
-                        continue
-                    loops_found.add(loop_key)
-
-                    loops_f.write(f"Loop: {source} {include}\n")
-
-                    diff = include_freq - source_freq
-                    if diff > 3:
-                        loops_f.write(f"  {source} > {include}\n\n")
-                    elif diff < -3:
-                        loops_f.write(f"  {include} > {source}\n\n")
-                    elif source_freq == include_freq:
-                        loops_f.write(f"  {include} == {source}\n\n")
-                    else:
-                        loops_f.write(f"  {include} ~= {source}\n\n")
-                else:
-                    ordering_f.write(f"{source} > {include}\n")
-
-    # Print results.
-    print("\nOrdering:")
-    with open(ordering_file, "r") as f:
-        print(f.read(), end="")
-
-    print("\nLoops:")
-    with open(loops_file, "r") as f:
-        print(f.read(), end="")
-
-
-if __name__ == "__main__":
-    main()

Builds/levelization/levelization.sh

@@ -0,0 +1,130 @@
+#!/bin/bash
+
+# Usage: levelization.sh
+# This script takes no parameters, reads no environment variables,
+# and can be run from any directory, as long as it is in the expected
+# location in the repo.
+
+pushd $( dirname $0 )
+
+if [ -v PS1 ]
+then
+  # if the shell is interactive, clean up any flotsam before analyzing
+  git clean -ix
+fi
+
+# Ensure all sorting is ASCII-order consistently across platforms.
+export LANG=C
+
+rm -rfv results
+mkdir results
+includes="$( pwd )/results/rawincludes.txt"
+pushd ../..
+echo Raw includes:
+grep -r '^[ ]*#include.*/.*\.h' include src | \
+    grep -v boost | tee ${includes}
+popd
+pushd results
+
+oldifs=${IFS}
+IFS=:
+mkdir includes
+mkdir includedby
+echo Build levelization paths
+exec 3< ${includes} # open rawincludes.txt for input
+while read -r -u 3 file include
+do
+    level=$( echo ${file} | cut -d/ -f 2,3 )
+    # If the "level" indicates a file, cut off the filename
+    if [[ "${level##*.}" != "${level}" ]]
+    then
+        # Use the "toplevel" label as a workaround for `sort`
+        # inconsistencies between different utility versions
+        level="$( dirname ${level} )/toplevel"
+    fi
+    level=$( echo ${level} | tr '/' '.' )
+
+    includelevel=$( echo ${include} | sed 's/.*["<]//; s/[">].*//' | \
+        cut -d/ -f 1,2 )
+    if [[ "${includelevel##*.}" != "${includelevel}" ]]
+    then
+        # Use the "toplevel" label as a workaround for `sort`
+        # inconsistencies between different utility versions
+        includelevel="$( dirname ${includelevel} )/toplevel"
+    fi
+    includelevel=$( echo ${includelevel} | tr '/' '.' )
+
+    if [[ "$level" != "$includelevel" ]]
+    then
+        echo $level $includelevel | tee -a paths.txt
+    fi
+done
+echo Sort and dedup paths
+sort -ds paths.txt | uniq -c | tee sortedpaths.txt
+mv sortedpaths.txt paths.txt
+exec 3>&- #close fd 3
+IFS=${oldifs}
+unset oldifs
+
+echo Split into flat-file database
+exec 4<paths.txt # open paths.txt for input
+while read -r -u 4 count level include
+do
+    echo ${include} ${count} | tee -a includes/${level}
+    echo ${level} ${count} | tee -a includedby/${include}
+done
+exec 4>&- #close fd 4
+
+loops="$( pwd )/loops.txt"
+ordering="$( pwd )/ordering.txt"
+pushd includes
+echo Search for loops
+# Redirect stdout to a file
+exec 4>&1
+exec 1>"${loops}"
+for source in *
+do
+  if [[ -f "$source" ]]
+  then
+    exec 5<"${source}" # open for input
+    while read -r -u 5 include includefreq
+    do
+      if [[ -f $include ]]
+      then
+        if grep -q -w $source $include
+        then
+          if grep -q -w "Loop: $include $source" "${loops}"
+          then
+            continue
+          fi
+          sourcefreq=$( grep -w $source $include | cut -d\  -f2 )
+          echo "Loop: $source $include"
+          # If the counts are close, indicate that the two modules are
+          # on the same level, though they shouldn't be
+          if [[ $(( $includefreq - $sourcefreq )) -gt 3 ]]
+          then
+              echo -e "  $source > $include\n"
+          elif [[ $(( $sourcefreq - $includefreq )) -gt 3 ]]
+          then
+              echo -e "  $include > $source\n"
+          elif [[ $sourcefreq -eq $includefreq ]]
+          then
+              echo -e "  $include == $source\n"
+          else
+              echo -e "  $include ~= $source\n"
+          fi
+        else
+          echo "$source > $include" >> "${ordering}"
+        fi
+      fi
+    done
+    exec 5>&- #close fd 5
+  fi
+done
+exec 1>&4 #close fd 1
+exec 4>&- #close fd 4
+cat "${ordering}"
+cat "${loops}"
+popd
+popd
+popd

Builds/levelization/results/loops.txt

@@ -10,6 +10,9 @@ Loop: test.jtx test.toplevel
 Loop: test.jtx test.unit_test
   test.unit_test == test.jtx
 
+Loop: xrpl.hook xrpld.app
+  xrpld.app > xrpl.hook
+
 Loop: xrpl.protocol xrpld.app
   xrpld.app > xrpl.protocol
 

Builds/levelization/results/ordering.txt

@@ -150,13 +150,11 @@ xrpl.resource > xrpl.protocol
 xrpl.server > xrpl.basics
 xrpl.server > xrpl.json
 xrpl.server > xrpl.protocol
-xrpld.app > quickjs.toplevel
 xrpld.app > test.unit_test
 xrpld.app > xrpl.basics
 xrpld.app > xrpld.conditions
 xrpld.app > xrpld.consensus
 xrpld.app > xrpld.perflog
-xrpld.app > xrpl.hook
 xrpld.app > xrpl.json
 xrpld.app > xrpl.resource
 xrpld.conditions > xrpl.basics

CMakeLists.txt

@@ -109,7 +109,7 @@ find_package(lz4 REQUIRED)
 find_package(LibArchive REQUIRED)
 find_package(SOCI REQUIRED)
 find_package(SQLite3 REQUIRED)
-
+include(deps/WasmEdge)
 option(rocksdb "Enable RocksDB" ON)
 if(rocksdb)
   find_package(RocksDB REQUIRED)
@@ -118,13 +118,9 @@ if(rocksdb)
   )
   target_link_libraries(ripple_libs INTERFACE RocksDB::rocksdb)
 endif()
-
 find_package(nudb REQUIRED)
 find_package(date REQUIRED)
 find_package(xxHash REQUIRED)
-find_package(magic_enum REQUIRED)
-
-include(deps/WasmEdge) 
   if(TARGET nudb::core)
   set(nudb nudb::core)
 elseif(TARGET NuDB::nudb)
@@ -136,17 +132,16 @@ target_link_libraries(ripple_libs INTERFACE ${nudb})
 
 target_link_libraries(ripple_libs INTERFACE
   ed25519::ed25519
-  LibArchive::LibArchive
   lz4::lz4
   OpenSSL::Crypto
   OpenSSL::SSL
+  # Ripple::grpc_pbufs
+  # Ripple::pbufs
   secp256k1::secp256k1
   soci::soci
   SQLite::SQLite3
 )
 
-include(deps/quickjs)
-
 if(coverage)
   include(RippledCov)
 endif()

CONTRIBUTING.md

@@ -57,12 +57,12 @@ Ensure that your code compiles according to the build instructions in the
 [`documentation`](https://docs.xahau.network/infrastructure/building-xahau).
 If you create new source files, they must go under `src/ripple`.
 You will need to add them to one of the
-[source lists](./Builds/CMake/RippledCore.cmake) in CMake.
+[source lists](./cmake/RippledCore.cmake) in CMake.
 
 Please write tests for your code.
 If you create new test source files, they must go under `src/test`.
 You will need to add them to one of the
-[source lists](./Builds/CMake/RippledCore.cmake) in CMake.
+[source lists](./cmake/RippledCore.cmake) in CMake.
 If your test can be run offline, in under 60 seconds, then it can be an
 automatic test run by `rippled --unittest`.
 Otherwise, it must be a manual test.

README.md

@@ -12,7 +12,7 @@ The server software that powers Xahau is called `xahaud` and is available in thi
 
 ### Build from Source
 
-* [Read the build instructions in our documentation](https://xahau.network/docs/infrastructure/build-xahaud/)
+* [Read the build instructions in our documentation](https://xahau.network/infrastructure/building-xahau)
 * If you encounter any issues, please [open an issue](https://github.com/xahau/xahaud/issues)
 
 ## Highlights of Xahau

bin/physical.sh

@@ -2,7 +2,7 @@
 
 set -o errexit
 
-marker_base=f62f74da10c5936c64bd16cd509a8b68f1464e41
+marker_base=34be0ce4fef20c978df2923c29321ad6cc17facc
 marker_commit=${1:-${marker_base}}
 
 if [ $(git merge-base ${marker_commit} ${marker_base}) != ${marker_base} ]; then

build-core.sh

@@ -51,9 +51,10 @@ export CMAKE_STATIC_LINKER_FLAGS="-static-libstdc++"
 
 git config --global --add safe.directory /io &&
 git checkout src/libxrpl/protocol/BuildInfo.cpp &&
-sed -i s/\"0.0.0\"/\"$(date +%Y).$(date +%-m).$(date +%-d)-$(git rev-parse --abbrev-ref HEAD)$(if [ -n "$4" ]; then echo "+$4"; fi)\"/g src/libxrpl/protocol/BuildInfo.cpp  &&
+sed -i s/\"0.0.0\"/\"$(date +%Y).$(date +%-m).$(date +%-d)-$(git rev-parse --abbrev-ref HEAD)$(if [ -n "$4" ]; then echo "+$4"; fi)\"/g src/libxrpl/protocol/BuildInfo.cpp &&
 conan export external/snappy --version 1.1.10 --user xahaud --channel stable &&
 conan export external/soci --version 4.0.3 --user xahaud --channel stable &&
+conan export external/wasmedge --version 0.11.2 --user xahaud --channel stable &&
 cd release-build &&
 # Install dependencies - tool_requires in conanfile.py handles glibc 2.28 compatibility
 # for build tools (protoc, grpc plugins, b2) in HBB environment
@@ -71,7 +72,6 @@ cmake .. -G Ninja \
   -Dxrpld=TRUE \
   -Dtests=TRUE &&
 ccache -z &&
-ccache -p &&
 ninja -j $3 && echo "=== Re-running final link with verbose output ===" && rm -f rippled && ninja -v rippled &&
 ccache -s &&
 strip -s rippled &&

cfg/genesis.json

@@ -62,8 +62,7 @@
           "3C43D9A973AA4443EF3FC38E42DD306160FBFFDAB901CD8BAA15D09F2597EB87",
           "0285B7E5E08E1A8E4C15636F0591D87F73CB6A7B6452A932AD72BBC8E5D1CBE3",
           "6E739F4F8B07BED29FC9FF440DA3C301CD14A180DF45819F658FEC2F7DE31427",
-          "36799EA497B1369B170805C078AEFE6188345F9B3E324C21E9CA3FF574E3C3D6",
-          "DD4F86291F142A20761B32B4D0CE4291F86CA33F0B46F0D04171482FBA52E536"
+          "36799EA497B1369B170805C078AEFE6188345F9B3E324C21E9CA3FF574E3C3D6"
         ],
         "Flags": 0,
         "LedgerEntryType": "Amendments",

cfg/xahaud-example.cfg

@@ -394,7 +394,7 @@
 #   true - enables compression
 #   false - disables compression [default].
 #
-#   The rippled server can save bandwidth by compressing its peer-to-peer communications, 
+#   The xahaud server can save bandwidth by compressing its peer-to-peer communications, 
 #   at a cost of greater CPU usage. If you enable link compression, 
 #   the server automatically compresses communications with peer servers
 #   that also have link compression enabled.
@@ -477,19 +477,6 @@
 #
 #
 #
-# [sntp_servers]
-#
-#   IP address or domain of NTP servers to use for time synchronization.
-#
-#   These NTP servers are suitable for xahaud servers located in the United
-#   States:
-#      time.windows.com
-#      time.apple.com
-#      time.nist.gov
-#      pool.ntp.org
-#
-#
-#
 # [max_transactions]
 #
 #   Configure the maximum number of transactions to have in the job queue
@@ -954,12 +941,6 @@
 #
 #       path                Location to store the database
 #
-#   Required keys for RWDB:
-#
-#       online_delete       Required. RWDB stores data in memory and will
-#                           grow unbounded without online_delete. See the
-#                           online_delete section below.
-#
 #   Optional keys
 #
 #       cache_size          Size of cache for database records. Default is 16384.
@@ -1450,7 +1431,7 @@
 #
 #       ETL commands for Clio. We recommend setting secure_gateway
 #       in this section to a comma-separated list of the addresses
-#       of your Clio servers, in order to bypass rippled's rate limiting.
+#       of your Clio servers, in order to bypass xahaud's rate limiting.
 #
 #   This port is commented out but can be enabled by removing
 #   the '#' from each corresponding line including the entry under [server]
@@ -1524,13 +1505,10 @@ secure_gateway = 127.0.0.1
 #    when the node has approximately two times the "online_delete" value of
 #    ledgers. No external administrative command is required to initiate
 #    deletion.
-[ledger_history]
-256
-
 [node_db]
 type=NuDB
 path=/opt/xahaud/db/nudb
-online_delete=256
+online_delete=512
 advisory_delete=0
 
 [database_path]
@@ -1542,18 +1520,7 @@ advisory_delete=0
 [debug_logfile]
 /var/log/xahaud/debug.log
 
-[sntp_servers]
-time.windows.com
-time.apple.com
-time.nist.gov
-pool.ntp.org
-
-# Use the following [ips] section for the main network:
-[ips]
-bacab.alloy.ee 21337
-hubs.xahau.as16089.net 21337
-
-# To use the Xahau Test Network
+# To use the Xahau test network
 # (see https://xahau.network/docs/infrastructure/installing-xahaud),
 # use the following [ips] section:
 # [ips]
@@ -1579,10 +1546,3 @@ validators-xahau.txt
 # set to ssl_verify to 0.
 [ssl_verify]
 1
-
-# Define which network xahaud is connecting to
-# 21337 for the Main Xahau Network
-# 21338 for the Test Xahau Network
-[network_id]
-21337
-# 21338

cfg/xahaud-standalone.cfg

@@ -1,4 +1,4 @@
-# standalone: ./xahaud -a --ledgerfile cfg/genesis.json --conf cfg/xahaud-standalone.cfg
+# standalone: ./xahaud -a --ledgerfile config/genesis.json --conf config/xahaud-standalone.cfg
 [server]
 port_rpc_admin_local
 port_ws_public
@@ -154,4 +154,3 @@ D686F2538F410C9D0D856788E98E3579595DAF7B38D38887F81ECAC934B06040 HooksUpdate1
 EDB4EE4C524E16BDD91D9A529332DED08DCAAA51CC6DC897ACFA1A0ED131C5B6 fix240819
 8063140E9260799D6716756B891CEC3E7006C4E4F277AB84670663A88F94B9C4 fixPageCap
 88693F108C3CD8A967F3F4253A32DEF5E35F9406ACD2A11B88B11D90865763A9 fix240911
-DD4F86291F142A20761B32B4D0CE4291F86CA33F0B46F0D04171482FBA52E536 JsHooks

cmake/CodeCoverage.cmake

@@ -380,7 +380,6 @@ function(setup_target_for_coverage_gcovr)
         ${GCOVR_PATH}
         --gcov-executable ${GCOV_TOOL}
         --gcov-ignore-parse-errors=negative_hits.warn_once_per_file
-        --gcov-ignore-parse-errors=suspicious_hits.warn_once_per_file
         -r ${BASEDIR}
         ${GCOVR_ADDITIONAL_ARGS}
         ${GCOVR_EXCLUDE_ARGS}

cmake/RippledCore.cmake

@@ -54,11 +54,9 @@ add_library(xrpl.imports.main INTERFACE)
 target_link_libraries(xrpl.imports.main
   INTERFACE
     LibArchive::LibArchive
-    magic_enum::magic_enum
     OpenSSL::Crypto
     Ripple::boost
     wasmedge::wasmedge
-    NIH::quickjs
     Ripple::opts
     Ripple::syslibs
     absl::random_random
@@ -70,17 +68,6 @@ target_link_libraries(xrpl.imports.main
     $<$<BOOL:${voidstar}>:antithesis-sdk-cpp>
 )
 
-# date-tz for enhanced logging (always linked, code is #ifdef guarded)
-if(TARGET date::date-tz)
-  target_link_libraries(xrpl.imports.main INTERFACE date::date-tz)
-endif()
-
-# BEAST_ENHANCED_LOGGING: enable for Debug builds OR when explicitly requested
-# Uses generator expression so it works with multi-config generators (Xcode, VS, Ninja Multi-Config)
-target_compile_definitions(xrpl.imports.main INTERFACE
-  $<$<OR:$<CONFIG:Debug>,$<BOOL:${BEAST_ENHANCED_LOGGING}>>:BEAST_ENHANCED_LOGGING=1>
-)
-
 include(add_module)
 include(target_link_modules)
 
@@ -91,6 +78,12 @@ target_link_libraries(xrpl.libxrpl.beast PUBLIC
   xrpl.libpb
 )
 
+# Conditionally add enhanced logging source when BEAST_ENHANCED_LOGGING is enabled
+if(DEFINED BEAST_ENHANCED_LOGGING AND BEAST_ENHANCED_LOGGING)
+  target_sources(xrpl.libxrpl.beast PRIVATE
+    src/libxrpl/beast/utility/src/beast_EnhancedLogging.cpp)
+endif()
+
 # Level 02
 add_module(xrpl basics)
 target_link_libraries(xrpl.libxrpl.basics PUBLIC xrpl.libxrpl.beast)

cmake/RippledInstall.cmake

@@ -6,7 +6,6 @@ include(create_symbolic_link)
 
 install (
   TARGETS
-    quickjs
     common
     opts
     ripple_syslibs

cmake/deps/Boost.cmake

@@ -1,4 +1,4 @@
-find_package(Boost 1.86 REQUIRED
+find_package(Boost 1.83 REQUIRED
   COMPONENTS
     chrono
     container
@@ -7,7 +7,6 @@ find_package(Boost 1.86 REQUIRED
     date_time
     filesystem
     json
-    json
     program_options
     regex
     system
@@ -32,6 +31,7 @@ target_link_libraries(ripple_boost
     Boost::date_time
     Boost::filesystem
     Boost::json
+    Boost::iostreams
     Boost::program_options
     Boost::regex
     Boost::system

cmake/deps/quickjs.cmake

@@ -1,52 +0,0 @@
-# QuickJS source files
-set(QUICKJS_SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/libutf.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/qsort_r.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/tutf8e.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/vector.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/char-utils.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/buffer-utils.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/utils.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/ringbuffer.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/libregexp.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/quickjs.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/libregexp.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/libunicode.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/cutils.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/quickjs-libc.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/libbf.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/quickjs-textcode.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/quickjs-internal.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/debug.c
-)
-
-# QuickJS include directories
-set(QUICKJS_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs)
-
-# RHTODO: Fix this to be dynamic
-set(QUICKJS_VERSION "2023-01-01")
-
-# QuickJS compile definitions
-set(QUICKJS_COMPILE_DEFINITIONS
-    _GNU_SOURCE
-    CONFIG_VERSION="${QUICKJS_VERSION}"
-    CONFIG_BIGNUM
-)
-
-# Create static library
-add_library(quickjs STATIC ${QUICKJS_SOURCES})
-target_include_directories(quickjs
-  PUBLIC
-    $<BUILD_INTERFACE:${QUICKJS_INCLUDE_DIRS}>
-    $<INSTALL_INTERFACE:include/quickjs>
-)
-target_compile_definitions(quickjs PUBLIC ${QUICKJS_COMPILE_DEFINITIONS})
-
-add_library(NIH::quickjs ALIAS quickjs)
-target_link_libraries(ripple_libs INTERFACE NIH::quickjs)
-
-install(
-    FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/quickjs/*.h
-    DESTINATION include/quickjs
-)

cmake/soci_patch.cmake

@@ -8,7 +8,7 @@
 # those warnings.
 if (RIPPLED_SOURCE)
   execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different
-      ${RIPPLED_SOURCE}/Builds/CMake/SociConfig.cmake.patched
+      ${RIPPLED_SOURCE}/cmake/SociConfig.cmake.patched
       cmake/SociConfig.cmake )
 endif ()
 

conanfile.py

@@ -29,7 +29,6 @@ class Xrpl(ConanFile):
         'date/3.0.3',
         'grpc/1.50.1',
         'libarchive/3.7.6',
-        'magic_enum/0.9.5',
         'nudb/2.0.8',
         'openssl/3.6.0',
         'soci/4.0.3@xahaud/stable',
@@ -51,9 +50,9 @@ class Xrpl(ConanFile):
         'static': True,
         'tests': False,
         'unity': False,
-        'xrpld': False,
         'with_wasmedge': True,
         'tool_requires_b2': False,
+        'xrpld': False,
 
         'date/*:header_only': False,
         'grpc/*:shared': False,
@@ -100,7 +99,6 @@ class Xrpl(ConanFile):
             self.version = match.group(1)
 
     def build_requirements(self):
-        # These provide build tools (protoc, grpc plugins) that run during build
         self.tool_requires('grpc/1.50.1')
         # Explicitly require b2 (e.g. for building from source for glibc compatibility)
         if self.options.tool_requires_b2:
@@ -111,13 +109,14 @@ class Xrpl(ConanFile):
             self.options['boost/*'].visibility = 'global'
 
     def requirements(self):
+        # Force boost version for all dependencies to avoid conflicts
+        self.requires('boost/1.86.0', override=True)
+        self.requires('lz4/1.10.0', force=True)
+        self.requires('protobuf/3.21.9', force=True)
         # Force sqlite3 version to avoid conflicts with soci
         self.requires('sqlite3/3.47.0', override=True)
         # Force our custom snappy build for all dependencies
         self.requires('snappy/1.1.10@xahaud/stable', override=True)
-        # Force boost version for all dependencies to avoid conflicts
-        self.requires('boost/1.86.0', override=True)
-        self.requires('lz4/1.10.0', force=True)
 
         if self.options.with_wasmedge:
             self.requires('wasmedge/0.11.2@xahaud/stable')

docs/build/environment.md

@@ -11,11 +11,11 @@ platforms: Linux, macOS, or Windows.
 Package ecosystems vary across Linux distributions,
 so there is no one set of instructions that will work for every Linux user.
 These instructions are written for Ubuntu 22.04.
-They are largely copied from the [script][1] used to configure a Docker
+They are largely copied from the [script][1] used to configure our Docker
 container for continuous integration.
 That script handles many more responsibilities.
 These instructions are just the bare minimum to build one configuration of
-xahaud.
+rippled.
 You can check that codebase for other Linux distributions and versions.
 If you cannot find yours there,
 then we hope that these instructions can at least guide you in the right

docs/build/install.md

@@ -1,30 +1,159 @@
-Comprehensive instructions for installing and running xahaud are available on the [https://Xahau.Network](https://xahau.network/docs/infrastructure/installing-xahaud) documentation website.
+This document contains instructions for installing rippled.
+The APT package manager is common on Debian-based Linux distributions like
+Ubuntu,
+while the YUM package manager is common on Red Hat-based Linux distributions
+like CentOS.
+Installing from source is an option for all platforms,
+and the only supported option for installing custom builds.
 
-## Create the Runtime Environment
-xahaud can be [built from source](../../BUILD.md) or installed using the binary files available from [https://build.xahau.tech](https://build.xahau.tech/). After obtaining a working xahaud binary, users will need to provide a suitable runtime environment. The following setup can be used for Linux or Docker environments.
 
-1. Create or download two configuration files: the main xahaud.cfg configuration file and a second validators-xahau.txt file defining which validators or UNL list publishers are trusted. The default location for these files in this xahaud repository is `cfg/`.
-2. Provide a directory structure that is congruent with the contents of xahaud.cfg. This will include a location for logfiles, such as `/var/log/xahaud/`, as well as database files, `/opt/xahaud/db/`. Configuration files are, by default, sourced from `/etc/xahaud/`. It is possible to provide a symbolic link, if users wish to store configuration files elsewhere.
-3. If desired, created a xahaud user and group, and change ownership of the binary and directories. Servers used for validating nodes should use the most restrictive permissions possible for `xahaud.cfg`, as the validation token is stored therein.
-4. If desired, create a systemd service file: `/etc/systemd/system/xahaud.service`, enabling xahaud to run as a daemon. Alternately, run: `/path/to/binary/xahaud --conf=/path/to/xahaud.cfg`.
+## From source
+
+From a source build, you can install rippled and libxrpl using CMake's
+`--install` mode:
 
-## Example systemd Service File
 ```
-[Unit]
-Description=Xahaud Daemon
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-Type=simple
-ExecStart=/path/to/xahaud --silent --conf /path/to/xahaud.cfg
-Restart=on-failure
-User=xahaud
-Group=xahaud
-LimitNOFILE=65536
-
-[Install]
-WantedBy=multi-user.target
+cmake --install . --prefix /opt/local
 ```
 
-After the systemd service file is installed, it must be loaded with: `systemctl daemon-reload`. xahaud can then be enabled: `systemctl enable --now xahaud`.
+The default [prefix][1] is typically `/usr/local` on Linux and macOS and
+`C:/Program Files/rippled` on Windows.
+
+[1]: https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX.html
+
+
+## With the APT package manager
+
+1. Update repositories:
+
+        sudo apt update -y
+
+2. Install utilities:
+
+        sudo apt install -y apt-transport-https ca-certificates wget gnupg
+
+3. Add Ripple's package-signing GPG key to your list of trusted keys:
+
+        sudo mkdir /usr/local/share/keyrings/
+        wget -q -O - "https://repos.ripple.com/repos/api/gpg/key/public" | gpg --dearmor > ripple-key.gpg
+        sudo mv ripple-key.gpg /usr/local/share/keyrings
+
+
+4. Check the fingerprint of the newly-added key:
+
+        gpg /usr/local/share/keyrings/ripple-key.gpg
+
+    The output should include an entry for Ripple such as the following:
+
+        gpg: WARNING: no command supplied.  Trying to guess what you mean ...
+        pub   rsa3072 2019-02-14 [SC] [expires: 2026-02-17]
+            C0010EC205B35A3310DC90DE395F97FFCCAFD9A2
+        uid           TechOps Team at Ripple <techops+rippled@ripple.com>
+        sub   rsa3072 2019-02-14 [E] [expires: 2026-02-17]
+
+
+    In particular, make sure that the fingerprint matches. (In the above example, the fingerprint is on the third line, starting with `C001`.)
+
+4. Add the appropriate Ripple repository for your operating system version:
+
+        echo "deb [signed-by=/usr/local/share/keyrings/ripple-key.gpg] https://repos.ripple.com/repos/rippled-deb focal stable" | \
+            sudo tee -a /etc/apt/sources.list.d/ripple.list
+
+    The above example is appropriate for **Ubuntu 20.04 Focal Fossa**. For other operating systems, replace the word `focal` with one of the following:
+
+    - `jammy` for **Ubuntu 22.04 Jammy Jellyfish**
+    - `bionic` for **Ubuntu 18.04 Bionic Beaver**
+    - `bullseye` for **Debian 11 Bullseye**
+    - `buster` for **Debian 10 Buster**
+
+    If you want access to development or pre-release versions of `rippled`, use one of the following instead of `stable`:
+
+    - `unstable` - Pre-release builds ([`release` branch](https://github.com/ripple/rippled/tree/release))
+    - `nightly` - Experimental/development builds ([`develop` branch](https://github.com/ripple/rippled/tree/develop))
+
+    **Warning:** Unstable and nightly builds may be broken at any time. Do not use these builds for production servers.
+
+5. Fetch the Ripple repository.
+
+        sudo apt -y update
+
+6. Install the `rippled` software package:
+
+        sudo apt -y install rippled
+
+7. Check the status of the `rippled` service:
+
+        systemctl status rippled.service
+
+    The `rippled` service should start automatically. If not, you can start it manually:
+
+        sudo systemctl start rippled.service
+
+8. Optional: allow `rippled` to bind to privileged ports.
+
+    This allows you to serve incoming API requests on port 80 or 443. (If you want to do so, you must also update the config file's port settings.)
+
+        sudo setcap 'cap_net_bind_service=+ep' /opt/ripple/bin/rippled
+
+
+## With the YUM package manager
+
+1. Install the Ripple RPM repository:
+
+    Choose the appropriate RPM repository for the stability of releases you want:
+
+    - `stable` for the latest production release (`master` branch)
+    - `unstable` for pre-release builds (`release` branch)
+    - `nightly` for experimental/development builds (`develop` branch)
+
+    *Stable*
+
+        cat << REPOFILE | sudo tee /etc/yum.repos.d/ripple.repo
+        [ripple-stable]
+        name=XRP Ledger Packages
+        enabled=1
+        gpgcheck=0
+        repo_gpgcheck=1
+        baseurl=https://repos.ripple.com/repos/rippled-rpm/stable/
+        gpgkey=https://repos.ripple.com/repos/rippled-rpm/stable/repodata/repomd.xml.key
+        REPOFILE
+
+    *Unstable*
+
+        cat << REPOFILE | sudo tee /etc/yum.repos.d/ripple.repo
+        [ripple-unstable]
+        name=XRP Ledger Packages
+        enabled=1
+        gpgcheck=0
+        repo_gpgcheck=1
+        baseurl=https://repos.ripple.com/repos/rippled-rpm/unstable/
+        gpgkey=https://repos.ripple.com/repos/rippled-rpm/unstable/repodata/repomd.xml.key
+        REPOFILE
+
+    *Nightly*
+
+        cat << REPOFILE | sudo tee /etc/yum.repos.d/ripple.repo
+        [ripple-nightly]
+        name=XRP Ledger Packages
+        enabled=1
+        gpgcheck=0
+        repo_gpgcheck=1
+        baseurl=https://repos.ripple.com/repos/rippled-rpm/nightly/
+        gpgkey=https://repos.ripple.com/repos/rippled-rpm/nightly/repodata/repomd.xml.key
+        REPOFILE
+
+2. Fetch the latest repo updates:
+
+        sudo yum -y update
+
+3. Install the new `rippled` package:
+
+        sudo yum install -y rippled
+
+4. Configure the `rippled` service to start on boot:
+
+        sudo systemctl enable rippled.service
+
+5. Start the `rippled` service:
+
+        sudo systemctl start rippled.service

hook/extern.h

@@ -329,12 +329,5 @@ meta_slot(uint32_t slot_no);
 extern int64_t
 xpop_slot(uint32_t slot_no_tx, uint32_t slot_no_meta);
 
-extern int64_t
-prepare(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t read_ptr,
-    uint32_t read_len);
-
 #define HOOK_EXTERN
 #endif  // HOOK_EXTERN

hook/generate_extern.sh

@@ -27,8 +27,8 @@ APPLY_HOOK="$SCRIPT_DIR/../include/xrpl/hook/hook_api.macro"
                 next;
             }
             
-            # Look for comment lines that start with // int64_t or // int32_t
-            if (line ~ /^[[:space:]]*\/\/[[:space:]]*(int64_t|int32_t)[[:space:]]+[a-zA-Z_][a-zA-Z0-9_]*[[:space:]]*\(/) {
+            # Look for comment lines that start with // and contain function signature
+            if (line ~ /^[[:space:]]*\/\/[[:space:]]*[a-zA-Z_][a-zA-Z0-9_]*[[:space:]]+[a-zA-Z_][a-zA-Z0-9_]*[[:space:]]*\(/) {
                 # Remove leading // and trim
                 sub(/^[[:space:]]*\/\/[[:space:]]*/, "", line);
                 line = trim(line);

hook/generate_lsflags.sh

@@ -1,82 +0,0 @@
-#!/bin/bash
-set -eu
-
-SCRIPT_DIR=$(dirname "$0")
-SCRIPT_DIR=$(cd "$SCRIPT_DIR" && pwd)
-
-RIPPLED_ROOT="$SCRIPT_DIR/../include/xrpl"
-LEDGER_FORMATS="$RIPPLED_ROOT/protocol/LedgerFormats.h"
-
-echo '// Generated using generate_lsflags.sh'
-echo ''
-echo '#ifndef HOOKLSFLAGS_INCLUDED'
-echo '#define HOOKLSFLAGS_INCLUDED 1'
-echo ''
-awk '
-    function ltrim(s) { sub(/^[[:space:]]+/, "", s); return s }
-    function rtrim(s) { sub(/[[:space:]]+$/, "", s); return s }
-    function trim(s) { return rtrim(ltrim(s)) }
-
-    function flush_group() {
-        if (entry_count > 0 && group != "") {
-            printf "enum %s {\n", group
-            for (i = 1; i <= entry_count; i++) {
-                printf "    %s,\n", entries[i]
-            }
-            printf "};\n"
-        }
-        delete entries
-        entry_count = 0
-    }
-
-    /enum LedgerSpecificFlags \{/ { inside = 1; next }
-    inside && /^\};/ { inside = 0; flush_group(); next }
-    !inside { next }
-
-    # Group header comments: // ltFOO or // remarks
-    /^[[:space:]]*\/\/[[:space:]]*(lt[A-Z_]+|remarks)[[:space:]]*$/ {
-        flush_group()
-        line = $0
-        sub(/.*\/\/[[:space:]]*/, "", line)
-        group = trim(line)
-        next
-    }
-
-    # Skip pure comment lines (not group headers)
-    /^[[:space:]]*\/\// { next }
-
-    # Skip blank lines
-    /^[[:space:]]*$/ { next }
-
-    # Accumulate flag lines (handle multi-line values)
-    {
-        line = $0
-        # Strip inline comments
-        sub(/\/\/.*/, "", line)
-        line = trim(line)
-        if (line == "") next
-
-        if (pending != "") {
-            pending = pending " " line
-        } else {
-            pending = line
-        }
-
-        # If line ends with comma, the entry is complete
-        if (pending ~ /,$/) {
-            # Remove trailing comma
-            sub(/,$/, "", pending)
-            entries[++entry_count] = pending
-            pending = ""
-        }
-    }
-
-    BEGIN {
-        inside = 0
-        group = ""
-        pending = ""
-        entry_count = 0
-    }
-' "$LEDGER_FORMATS"
-echo ''
-echo '#endif // HOOKLSFLAGS_INCLUDED'

hook/generate_txflags.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-set -eu
-
-SCRIPT_DIR=$(dirname "$0")
-SCRIPT_DIR=$(cd "$SCRIPT_DIR" && pwd)
-
-RIPPLED_ROOT="$SCRIPT_DIR/../include/xrpl"
-TX_FLAGS="$RIPPLED_ROOT/protocol/TxFlags.h"
-
-echo '// Generated using generate_txflags.sh'
-echo '#include "ls_flags.h"'
-echo '#include <stdint.h>'
-echo ''
-cat "$TX_FLAGS" |
-    awk '
-        /^[[:space:]]*enum / {
-            if (count > 0) print ""
-            inside = 1
-            count++
-        }
-        inside {
-            print
-            if (/};/) inside = 0
-        }
-    '

hook/genesis/build_xahau_h.sh

@@ -1,203 +0,0 @@
-#!/bin/bash
-
-# build_xahau_h.sh
-# Builds genesis hook WASMs and updates xahau.h with hex arrays
-
-set -euo pipefail
-
-# Color codes for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-NC='\033[0m' # No Color
-
-# Script directory and path constants
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-XAHAU_H="${SCRIPT_DIR}/../../include/xrpl/hook/xahau.h"
-TEMP_DIR="${SCRIPT_DIR}/.temp"
-
-# Hook file mappings (space-separated: name:file)
-HOOK_FILES=(
-    "GovernanceHook:govern.wasm"
-    "RewardHook:reward.wasm"
-    # "MintHook:mint.wasm"
-)
-
-# Cleanup function
-cleanup() {
-    local exit_code=$?
-    if [ ${exit_code} -eq 0 ] && [ -d "${TEMP_DIR}" ]; then
-        rm -rf "${TEMP_DIR}"
-    elif [ ${exit_code} -ne 0 ]; then
-        echo -e "${RED}Error: Script failed with exit code ${exit_code}${NC}" >&2
-        if [ -d "${TEMP_DIR}" ]; then
-            echo -e "${YELLOW}Temp files preserved at: ${TEMP_DIR}${NC}" >&2
-        fi
-    fi
-    exit ${exit_code}
-}
-
-trap cleanup EXIT INT TERM
-
-# Tool verification
-echo -e "${BLUE}==> Checking required tools...${NC}"
-REQUIRED_TOOLS=("make" "xxd" "sed" "clang-format" "wasm-opt")
-for tool in "${REQUIRED_TOOLS[@]}"; do
-    if ! command -v "${tool}" &> /dev/null; then
-        echo -e "${RED}Error: Required tool '${tool}' not found${NC}" >&2
-        exit 1
-    fi
-    echo -e "${GREEN}    ✓ ${tool}${NC}"
-done
-
-# Verify wasm-opt version is exactly 100
-WASM_OPT_VERSION=$(wasm-opt --version | grep -oE '[0-9]+' | head -1)
-if [ "${WASM_OPT_VERSION}" != "100" ]; then
-    echo -e "${RED}Error: wasm-opt version must be 100, but found ${WASM_OPT_VERSION}${NC}" >&2
-    exit 1
-fi
-echo -e "${GREEN}    ✓ wasm-opt version 100${NC}"
-
-# Verify xahau.h exists
-if [ ! -f "${XAHAU_H}" ]; then
-    echo -e "${RED}Error: xahau.h not found at ${XAHAU_H}${NC}" >&2
-    exit 1
-fi
-
-# Create temp directory
-mkdir -p "${TEMP_DIR}"
-
-# Build all WASM files
-echo -e "${BLUE}==> Building WASM files with 'make all'...${NC}"
-cd "${SCRIPT_DIR}"
-make all
-echo -e "${GREEN}    Build completed successfully${NC}"
-
-# Function to convert WASM to hex array
-wasm_to_hex_array() {
-    local wasm_file="$1"
-    local indent="    "
-
-    if [ ! -f "${wasm_file}" ]; then
-        echo -e "${RED}Error: WASM file not found: ${wasm_file}${NC}" >&2
-        return 1
-    fi
-
-    # Convert to hex with xxd, format with sed
-    xxd -p -u -c 10 "${wasm_file}" | \
-        sed 's/../0x&U,/g' | \
-        sed "s/^/${indent}/g" | \
-        sed '$ s/,$//'
-}
-
-# Function to update hook array in xahau.h
-update_hook_array() {
-    local hook_name="$1"
-    local hex_array="$2"
-    local temp_file="${TEMP_DIR}/xahau.h.tmp"
-
-    echo -e "${BLUE}==> Updating ${hook_name}...${NC}"
-
-    # Check if hook already exists
-    if grep -q "static const std::vector<uint8_t> ${hook_name} = {" "${XAHAU_H}"; then
-        echo -e "${YELLOW}    Replacing existing ${hook_name}${NC}"
-
-        # Use awk to replace the array content
-        awk -v hook="${hook_name}" -v hex="${hex_array}" '
-        BEGIN { in_array=0 }
-        {
-            if ($0 ~ "static const std::vector<uint8_t> " hook " = {") {
-                print $0
-                print hex
-                in_array=1
-                next
-            }
-            if (in_array && $0 ~ /};/) {
-                print "};"
-                in_array=0
-                next
-            }
-            if (!in_array) {
-                print $0
-            }
-        }
-        ' "${XAHAU_H}" > "${temp_file}"
-
-        mv "${temp_file}" "${XAHAU_H}"
-    else
-        echo -e "${YELLOW}    Adding new ${hook_name}${NC}"
-
-        # Find the position before #endif and add the new hook
-        awk -v hook="${hook_name}" -v hex="${hex_array}" '
-        {
-            if ($0 ~ /#endif.*XAHAU_GENESIS_HOOKS/) {
-                print ""
-                print "static const std::vector<uint8_t> " hook " = {"
-                print hex
-                print "};"
-                print ""
-                print $0
-            } else {
-                print $0
-            }
-        }
-        ' "${XAHAU_H}" > "${temp_file}"
-
-        mv "${temp_file}" "${XAHAU_H}"
-    fi
-
-    echo -e "${GREEN}    ✓ ${hook_name} updated${NC}"
-}
-
-# Process each hook
-for hook_entry in "${HOOK_FILES[@]}"; do
-    hook_name="${hook_entry%%:*}"
-    wasm_file="${SCRIPT_DIR}/${hook_entry##*:}"
-
-    echo -e "${BLUE}==> Converting ${wasm_file} to hex array...${NC}"
-    hex_array=$(wasm_to_hex_array "${wasm_file}")
-
-    if [ $? -ne 0 ]; then
-        echo -e "${RED}Error: Failed to convert ${wasm_file}${NC}" >&2
-        exit 1
-    fi
-
-    echo -e "${GREEN}    Conversion successful ($(echo "${hex_array}" | wc -l) lines)${NC}"
-
-    update_hook_array "${hook_name}" "${hex_array}"
-done
-
-# Format with clang-format
-echo -e "${BLUE}==> Formatting with clang-format...${NC}"
-cp "${XAHAU_H}" "${TEMP_DIR}/xahau.h.before_format"
-clang-format -i "${XAHAU_H}"
-echo -e "${GREEN}    Formatting completed${NC}"
-
-# Verification
-echo -e "${BLUE}==> Verifying changes...${NC}"
-for hook_entry in "${HOOK_FILES[@]}"; do
-    hook_name="${hook_entry%%:*}"
-    if grep -q "static const std::vector<uint8_t> ${hook_name} = {" "${XAHAU_H}"; then
-        echo -e "${GREEN}    ✓ ${hook_name} found in xahau.h${NC}"
-    else
-        echo -e "${RED}    ✗ ${hook_name} NOT found in xahau.h${NC}" >&2
-        exit 1
-    fi
-done
-
-# Show summary
-echo ""
-echo -e "${GREEN}========================================${NC}"
-echo -e "${GREEN}Successfully updated xahau.h${NC}"
-echo -e "${GREEN}========================================${NC}"
-echo -e "Updated hooks:"
-for hook_entry in "${HOOK_FILES[@]}"; do
-    hook_name="${hook_entry%%:*}"
-    wasm_file="${SCRIPT_DIR}/${hook_entry##*:}"
-    size=$(wc -c < "${wasm_file}" | tr -d ' ')
-    echo -e "  - ${hook_name}: ${size} bytes"
-done
-echo ""
-echo -e "File location: ${XAHAU_H}"
-echo ""

hook/genesis/headers/error.h

@@ -1,46 +0,0 @@
-// For documentation please see: https://xrpl-hooks.readme.io/reference/
-// Generated using generate_error.sh
-#ifndef HOOK_ERROR_CODES
-#define SUCCESS 0
-#define OUT_OF_BOUNDS -1
-#define INTERNAL_ERROR -2
-#define TOO_BIG -3
-#define TOO_SMALL -4
-#define DOESNT_EXIST -5
-#define NO_FREE_SLOTS -6
-#define INVALID_ARGUMENT -7
-#define ALREADY_SET -8
-#define PREREQUISITE_NOT_MET -9
-#define FEE_TOO_LARGE -10
-#define EMISSION_FAILURE -11
-#define TOO_MANY_NONCES -12
-#define TOO_MANY_EMITTED_TXN -13
-#define NOT_IMPLEMENTED -14
-#define INVALID_ACCOUNT -15
-#define GUARD_VIOLATION -16
-#define INVALID_FIELD -17
-#define PARSE_ERROR -18
-#define RC_ROLLBACK -19
-#define RC_ACCEPT -20
-#define NO_SUCH_KEYLET -21
-#define NOT_AN_ARRAY -22
-#define NOT_AN_OBJECT -23
-#define INVALID_FLOAT -10024
-#define DIVISION_BY_ZERO -25
-#define MANTISSA_OVERSIZED -26
-#define MANTISSA_UNDERSIZED -27
-#define EXPONENT_OVERSIZED -28
-#define EXPONENT_UNDERSIZED -29
-#define OVERFLOW -30
-#define NOT_IOU_AMOUNT -31
-#define NOT_AN_AMOUNT -32
-#define CANT_RETURN_NEGATIVE -33
-#define NOT_AUTHORIZED -34
-#define PREVIOUS_FAILURE_PREVENTS_RETRY -35
-#define TOO_MANY_PARAMS -36
-#define INVALID_TXN -37
-#define RESERVE_INSUFFICIENT -38
-#define COMPLEX_NOT_SUPPORTED -39
-#define DOES_NOT_MATCH -40
-#define HOOK_ERROR_CODES
-#endif //HOOK_ERROR_CODES

hook/genesis/headers/extern.h

@@ -1,352 +0,0 @@
-// For documentation please see: https://xrpl-hooks.readme.io/reference/
-// Generated using generate_extern.sh
-#include <stdint.h>
-#ifndef HOOK_EXTERN
-
-extern int32_t __attribute__((noduplicate))
-_g(uint32_t guard_id, uint32_t maxiter);
-
-extern int64_t
-accept(uint32_t read_ptr, uint32_t read_len, int64_t error_code);
-
-extern int64_t
-emit(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t read_ptr,
-    uint32_t read_len);
-
-extern int64_t
-etxn_burden(void);
-
-extern int64_t
-etxn_details(uint32_t write_ptr, uint32_t write_len);
-
-extern int64_t
-etxn_fee_base(uint32_t read_ptr, uint32_t read_len);
-
-extern int64_t
-etxn_generation(void);
-
-extern int64_t
-etxn_nonce(uint32_t write_ptr, uint32_t write_len);
-
-extern int64_t
-etxn_reserve(uint32_t count);
-
-extern int64_t
-fee_base(void);
-
-extern int64_t
-float_compare(int64_t float1, int64_t float2, uint32_t mode);
-
-extern int64_t
-float_divide(int64_t float1, int64_t float2);
-
-extern int64_t
-float_exponent(int64_t float1);
-
-extern int64_t
-float_exponent_set(int64_t float1, int32_t exponent);
-
-extern int64_t
-float_int(int64_t float1, uint32_t decimal_places, uint32_t abs);
-
-extern int64_t
-float_invert(int64_t float1);
-
-extern int64_t
-float_log(int64_t float1);
-
-extern int64_t
-float_mantissa(int64_t float1);
-
-extern int64_t
-float_mantissa_set(int64_t float1, int64_t mantissa);
-
-extern int64_t
-float_mulratio(
-    int64_t float1,
-    uint32_t round_up,
-    uint32_t numerator,
-    uint32_t denominator);
-
-extern int64_t
-float_multiply(int64_t float1, int64_t float2);
-
-extern int64_t
-float_negate(int64_t float1);
-
-extern int64_t
-float_one(void);
-
-extern int64_t
-float_root(int64_t float1, uint32_t n);
-
-extern int64_t
-float_set(int32_t exponent, int64_t mantissa);
-
-extern int64_t
-float_sign(int64_t float1);
-
-extern int64_t
-float_sign_set(int64_t float1, uint32_t negative);
-
-extern int64_t
-float_sto(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t cread_ptr,
-    uint32_t cread_len,
-    uint32_t iread_ptr,
-    uint32_t iread_len,
-    int64_t float1,
-    uint32_t field_code);
-
-extern int64_t
-float_sto_set(uint32_t read_ptr, uint32_t read_len);
-
-extern int64_t
-float_sum(int64_t float1, int64_t float2);
-
-extern int64_t
-hook_account(uint32_t write_ptr, uint32_t write_len);
-
-extern int64_t
-hook_again(void);
-
-extern int64_t
-hook_hash(uint32_t write_ptr, uint32_t write_len, int32_t hook_no);
-
-extern int64_t
-hook_param(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t read_ptr,
-    uint32_t read_len);
-
-extern int64_t
-otxn_param(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t read_ptr,
-    uint32_t read_len);
-
-extern int64_t
-hook_param_set(
-    uint32_t read_ptr,
-    uint32_t read_len,
-    uint32_t kread_ptr,
-    uint32_t kread_len,
-    uint32_t hread_ptr,
-    uint32_t hread_len);
-
-extern int64_t
-hook_pos(void);
-
-extern int64_t
-hook_skip(uint32_t read_ptr, uint32_t read_len, uint32_t flags);
-
-extern int64_t
-ledger_keylet(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t lread_ptr,
-    uint32_t lread_len,
-    uint32_t hread_ptr,
-    uint32_t hread_len);
-
-extern int64_t
-ledger_last_hash(uint32_t write_ptr, uint32_t write_len);
-
-extern int64_t
-ledger_last_time(void);
-
-extern int64_t
-ledger_nonce(uint32_t write_ptr, uint32_t write_len);
-
-extern int64_t
-ledger_seq(void);
-
-extern int64_t
-meta_slot(uint32_t slot_no);
-
-extern int64_t
-otxn_burden(void);
-
-extern int64_t
-otxn_field(uint32_t write_ptr, uint32_t write_len, uint32_t field_id);
-
-extern int64_t
-otxn_field_txt(uint32_t write_ptr, uint32_t write_len, uint32_t field_id);
-
-extern int64_t
-otxn_generation(void);
-
-extern int64_t
-otxn_id(uint32_t write_ptr, uint32_t write_len, uint32_t flags);
-
-extern int64_t
-otxn_slot(uint32_t slot_no);
-
-extern int64_t
-otxn_type(void);
-
-extern int64_t
-rollback(uint32_t read_ptr, uint32_t read_len, int64_t error_code);
-
-extern int64_t
-slot(uint32_t write_ptr, uint32_t write_len, uint32_t slot);
-
-extern int64_t
-slot_clear(uint32_t slot);
-
-extern int64_t
-slot_count(uint32_t slot);
-
-extern int64_t
-slot_float(uint32_t slot_no);
-
-extern int64_t
-slot_id(uint32_t write_ptr, uint32_t write_len, uint32_t slot);
-
-extern int64_t
-slot_set(uint32_t read_ptr, uint32_t read_len, uint32_t slot);
-
-extern int64_t
-slot_size(uint32_t slot);
-
-extern int64_t
-slot_subarray(uint32_t parent_slot, uint32_t array_id, uint32_t new_slot);
-
-extern int64_t
-slot_subfield(uint32_t parent_slot, uint32_t field_id, uint32_t new_slot);
-
-extern int64_t
-slot_type(uint32_t slot_no, uint32_t flags);
-
-extern int64_t
-state(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t kread_ptr,
-    uint32_t kread_len);
-
-extern int64_t
-state_foreign(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t kread_ptr,
-    uint32_t kread_len,
-    uint32_t nread_ptr,
-    uint32_t nread_len,
-    uint32_t aread_ptr,
-    uint32_t aread_len);
-
-extern int64_t
-state_foreign_set(
-    uint32_t read_ptr,
-    uint32_t read_len,
-    uint32_t kread_ptr,
-    uint32_t kread_len,
-    uint32_t nread_ptr,
-    uint32_t nread_len,
-    uint32_t aread_ptr,
-    uint32_t aread_len);
-
-extern int64_t
-state_set(
-    uint32_t read_ptr,
-    uint32_t read_len,
-    uint32_t kread_ptr,
-    uint32_t kread_len);
-
-extern int64_t
-sto_emplace(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t sread_ptr,
-    uint32_t sread_len,
-    uint32_t fread_ptr,
-    uint32_t fread_len,
-    uint32_t field_id);
-
-extern int64_t
-sto_erase(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t read_ptr,
-    uint32_t read_len,
-    uint32_t field_id);
-
-extern int64_t
-sto_subarray(uint32_t read_ptr, uint32_t read_len, uint32_t array_id);
-
-extern int64_t
-sto_subfield(uint32_t read_ptr, uint32_t read_len, uint32_t field_id);
-
-extern int64_t
-sto_validate(uint32_t tread_ptr, uint32_t tread_len);
-
-extern int64_t
-trace(
-    uint32_t mread_ptr,
-    uint32_t mread_len,
-    uint32_t dread_ptr,
-    uint32_t dread_len,
-    uint32_t as_hex);
-
-extern int64_t
-trace_float(uint32_t read_ptr, uint32_t read_len, int64_t float1);
-
-extern int64_t
-trace_num(uint32_t read_ptr, uint32_t read_len, int64_t number);
-
-extern int64_t
-trace_slot(uint32_t read_ptr, uint32_t read_len, uint32_t slot);
-
-extern int64_t
-util_accid(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t read_ptr,
-    uint32_t read_len);
-
-extern int64_t
-util_keylet(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t keylet_type,
-    uint32_t a,
-    uint32_t b,
-    uint32_t c,
-    uint32_t d,
-    uint32_t e,
-    uint32_t f);
-
-extern int64_t
-util_raddr(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t read_ptr,
-    uint32_t read_len);
-
-extern int64_t
-util_sha512h(
-    uint32_t write_ptr,
-    uint32_t write_len,
-    uint32_t read_ptr,
-    uint32_t read_len);
-
-extern int64_t
-util_verify(
-    uint32_t dread_ptr,
-    uint32_t dread_len,
-    uint32_t sread_ptr,
-    uint32_t sread_len,
-    uint32_t kread_ptr,
-    uint32_t kread_len);
-
-extern int64_t xpop_slot(uint32_t, uint32_t);
-#define HOOK_EXTERN
-#endif  // HOOK_EXTERN

hook/genesis/headers/hookapi.h

@@ -1,50 +0,0 @@
-/**
- * Hook API include file
- *
- * Note to the reader:
- * This include defines two types of things: external functions and macros
- * Functions are used sparingly because a non-inlining compiler may produce
- * undesirable output.
- *
- * Find documentation here: https://xrpl-hooks.readme.io/reference/
- */
-
-#ifndef HOOKAPI_INCLUDED
-#define HOOKAPI_INCLUDED 1
-
-#define KEYLET_HOOK 1
-#define KEYLET_HOOK_STATE 2
-#define KEYLET_ACCOUNT 3
-#define KEYLET_AMENDMENTS 4
-#define KEYLET_CHILD 5
-#define KEYLET_SKIP 6
-#define KEYLET_FEES 7
-#define KEYLET_NEGATIVE_UNL 8
-#define KEYLET_LINE 9
-#define KEYLET_OFFER 10
-#define KEYLET_QUALITY 11
-#define KEYLET_EMITTED_DIR 12
-#define KEYLET_TICKET 13
-#define KEYLET_SIGNERS 14
-#define KEYLET_CHECK 15
-#define KEYLET_DEPOSIT_PREAUTH 16
-#define KEYLET_UNCHECKED 17
-#define KEYLET_OWNER_DIR 18
-#define KEYLET_PAGE 19
-#define KEYLET_ESCROW 20
-#define KEYLET_PAYCHAN 21
-#define KEYLET_EMITTED 22
-#define KEYLET_NFT_OFFER 23
-#define KEYLET_HOOK_DEFINITION 24
-
-#define COMPARE_EQUAL 1U
-#define COMPARE_LESS 2U
-#define COMPARE_GREATER 4U
-
-#include "error.h"
-#include "extern.h"
-#include "sfcodes.h"
-#include "macro.h"
-#include "types.h"
-
-#endif

hook/genesis/headers/macro.h

@@ -1,671 +0,0 @@
-/**
- * These are helper macros for writing hooks, all of them are optional as is including hookmacro.h at all
- */
-
-#include <stdint.h>
-#include "hookapi.h"
-#include "sfcodes.h"
-
-#ifndef HOOKMACROS_INCLUDED
-#define HOOKMACROS_INCLUDED 1
-
-
-#ifdef NDEBUG
-#define DEBUG 0
-#else
-#define DEBUG 1
-#endif
-
-#define TRACEVAR(v) if (DEBUG) trace_num((uint32_t)(#v), (uint32_t)(sizeof(#v) - 1), (int64_t)v);
-#define TRACEHEX(v) if (DEBUG) trace((uint32_t)(#v), (uint32_t)(sizeof(#v) - 1), (uint32_t)(v), (uint32_t)(sizeof(v)), 1);
-#define TRACEXFL(v) if (DEBUG) trace_float((uint32_t)(#v), (uint32_t)(sizeof(#v) - 1), (int64_t)v);
-#define TRACESTR(v) if (DEBUG) trace((uint32_t)(#v), (uint32_t)(sizeof(#v) - 1), (uint32_t)(v), sizeof(v), 0);
-
-// hook developers should use this guard macro, simply GUARD(<maximum iterations>)
-#define GUARD(maxiter) _g((1ULL << 31U) + __LINE__, (maxiter)+1)
-#define GUARDM(maxiter, n) _g(( (1ULL << 31U) + (__LINE__ << 16) + n), (maxiter)+1)
-
-#define SBUF(str) (uint32_t)(str), sizeof(str)
-
-#define REQUIRE(cond, str)\
-{\
-    if (!(cond))\
-        rollback(SBUF(str), __LINE__);\
-}
-
-// make a report buffer as a c-string
-// provide a name for a buffer to declare (buf)
-// provide a static string
-// provide an integer to print after the string
-#define RBUF(buf, out_len, str, num)\
-unsigned char buf[sizeof(str) + 21];\
-int out_len = 0;\
-{\
-    int i = 0;\
-    for (; GUARDM(sizeof(str),1),i < sizeof(str); ++i)\
-        (buf)[i] = str[i];\
-    if ((buf)[sizeof(str)-1] == 0) i--;\
-    if ((num) < 0) (buf)[i++] = '-';\
-    uint64_t unsigned_num = (uint64_t)( (num) < 0 ? (num) * -1 : (num) );\
-    uint64_t j = 10000000000000000000ULL;\
-    int start = 1;\
-    for (; GUARDM(20,2), unsigned_num > 0 && j > 0; j /= 10)\
-    {\
-        unsigned char digit = ( unsigned_num / j ) % 10;\
-        if (digit == 0 && start)\
-            continue;\
-        start = 0;\
-        (buf)[i++] = '0' + digit;\
-    }\
-    (buf)[i] = '\0';\
-    out_len = i;\
-}
-
-#define RBUF2(buff, out_len, str, num, str2, num2)\
-unsigned char buff[sizeof(str) + sizeof(str2) + 42];\
-int out_len = 0;\
-{\
-    unsigned char* buf = buff;\
-    int i = 0;\
-    for (; GUARDM(sizeof(str),1),i < sizeof(str); ++i)\
-        (buf)[i] = str[i];\
-    if ((buf)[sizeof(str)-1] == 0) i--;\
-    if ((num) < 0) (buf)[i++] = '-';\
-    uint64_t unsigned_num = (uint64_t)( (num) < 0 ? (num) * -1 : (num) );\
-    uint64_t j = 10000000000000000000ULL;\
-    int start = 1;\
-    for (; GUARDM(20,2), unsigned_num > 0 && j > 0; j /= 10)\
-    {\
-        unsigned char digit = ( unsigned_num / j ) % 10;\
-        if (digit == 0 && start)\
-            continue;\
-        start = 0;\
-        (buf)[i++] = '0' + digit;\
-    }\
-    buf += i;\
-    out_len += i;\
-    i = 0;\
-    for (; GUARDM(sizeof(str2),3),i < sizeof(str2); ++i)\
-        (buf)[i] = str2[i];\
-    if ((buf)[sizeof(str2)-1] == 0) i--;\
-    if ((num2) < 0) (buf)[i++] = '-';\
-    unsigned_num = (uint64_t)( (num2) < 0 ? (num2) * -1 : (num2) );\
-    j = 10000000000000000000ULL;\
-    start = 1;\
-    for (; GUARDM(20,4), unsigned_num > 0 && j > 0; j /= 10)\
-    {\
-        unsigned char digit = ( unsigned_num / j ) % 10;\
-        if (digit == 0 && start)\
-            continue;\
-        start = 0;\
-        (buf)[i++] = '0' + digit;\
-    }\
-    (buf)[i] = '\0';\
-    out_len += i;\
-}
-
-#define CLEARBUF(b)\
-{\
-    for (int x = 0; GUARD(sizeof(b)), x < sizeof(b); ++x)\
-        b[x] = 0;\
-}
-
-// returns an in64_t, negative if error, non-negative if valid drops
-#define AMOUNT_TO_DROPS(amount_buffer)\
-     (((amount_buffer)[0] >> 7) ? -2 : (\
-     ((((uint64_t)((amount_buffer)[0])) & 0xb00111111) << 56) +\
-      (((uint64_t)((amount_buffer)[1])) << 48) +\
-      (((uint64_t)((amount_buffer)[2])) << 40) +\
-      (((uint64_t)((amount_buffer)[3])) << 32) +\
-      (((uint64_t)((amount_buffer)[4])) << 24) +\
-      (((uint64_t)((amount_buffer)[5])) << 16) +\
-      (((uint64_t)((amount_buffer)[6])) <<  8) +\
-      (((uint64_t)((amount_buffer)[7])))))
-
-#define SUB_OFFSET(x) ((int32_t)(x >> 32))
-#define SUB_LENGTH(x) ((int32_t)(x & 0xFFFFFFFFULL))
-
-#define BUFFER_EQUAL_20(buf1, buf2)\
-    (\
-        *(((uint64_t*)(buf1)) + 0) == *(((uint64_t*)(buf2)) + 0) &&\
-        *(((uint64_t*)(buf1)) + 1) == *(((uint64_t*)(buf2)) + 1) &&\
-        *(((uint32_t*)(buf1)) + 4) == *(((uint32_t*)(buf2)) + 4))
-
-#define BUFFER_EQUAL_32(buf1, buf2)\
-    (\
-        *(((uint64_t*)(buf1)) + 0) == *(((uint64_t*)(buf2)) + 0) &&\
-        *(((uint64_t*)(buf1)) + 1) == *(((uint64_t*)(buf2)) + 1) &&\
-        *(((uint64_t*)(buf1)) + 2) == *(((uint64_t*)(buf2)) + 2) &&\
-        *(((uint64_t*)(buf1)) + 3) == *(((uint64_t*)(buf2)) + 3))
-
-
-// when using this macro buf1len may be dynamic but buf2len must be static
-// provide n >= 1 to indicate how many times the macro will be hit on the line of code
-// e.g. if it is in a loop that loops 10 times n = 10
-
-#define BUFFER_EQUAL_GUARD(output, buf1, buf1len, buf2, buf2len, n)\
-{\
-    output = ((buf1len) == (buf2len) ? 1 : 0);\
-    for (int x = 0; GUARDM( (buf2len) * (n), 1 ), output && x < (buf2len);\
-         ++x)\
-        output = *(((uint8_t*)(buf1)) + x) == *(((uint8_t*)(buf2)) + x);\
-}
-
-#define BUFFER_SWAP(x,y)\
-{\
-    uint8_t* z = x;\
-    x = y;\
-    y = z;\
-}
-
-#define ACCOUNT_COMPARE(compare_result, buf1, buf2)\
-{\
-    compare_result = 0;\
-    for (int i = 0; GUARD(20), i < 20; ++i)\
-    {\
-        if (buf1[i] > buf2[i])\
-        {\
-            compare_result = 1;\
-            break;\
-        }\
-        else if (buf1[i] < buf2[i])\
-        {\
-            compare_result = -1;\
-            break;\
-        }\
-    }\
-}
-
-#define BUFFER_EQUAL_STR_GUARD(output, buf1, buf1len, str, n)\
-    BUFFER_EQUAL_GUARD(output, buf1, buf1len, str, (sizeof(str)-1), n)
-
-#define BUFFER_EQUAL_STR(output, buf1, buf1len, str)\
-    BUFFER_EQUAL_GUARD(output, buf1, buf1len, str, (sizeof(str)-1), 1)
-
-#define BUFFER_EQUAL(output, buf1, buf2, compare_len)\
-    BUFFER_EQUAL_GUARD(output, buf1, compare_len, buf2, compare_len, 1)
-
-#define UINT16_TO_BUF(buf_raw, i)\
-{\
-    unsigned char* buf = (unsigned char*)buf_raw;\
-    buf[0] = (((uint64_t)i) >> 8) & 0xFFUL;\
-    buf[1] = (((uint64_t)i) >> 0) & 0xFFUL;\
-}
-
-#define UINT16_FROM_BUF(buf)\
-    (((uint64_t)((buf)[0]) <<  8) +\
-     ((uint64_t)((buf)[1]) <<  0))
-
-#define UINT32_TO_BUF(buf_raw, i)\
-{\
-    unsigned char* buf = (unsigned char*)buf_raw;\
-    buf[0] = (((uint64_t)i) >> 24) & 0xFFUL;\
-    buf[1] = (((uint64_t)i) >> 16) & 0xFFUL;\
-    buf[2] = (((uint64_t)i) >>  8) & 0xFFUL;\
-    buf[3] = (((uint64_t)i) >>  0) & 0xFFUL;\
-}
-
-
-#define UINT32_FROM_BUF(buf)\
-    (((uint64_t)((buf)[0]) << 24) +\
-     ((uint64_t)((buf)[1]) << 16) +\
-     ((uint64_t)((buf)[2]) <<  8) +\
-     ((uint64_t)((buf)[3]) <<  0))
-
-#define UINT64_TO_BUF(buf_raw, i)\
-{\
-    unsigned char* buf = (unsigned char*)buf_raw;\
-    buf[0] = (((uint64_t)i) >> 56) & 0xFFUL;\
-    buf[1] = (((uint64_t)i) >> 48) & 0xFFUL;\
-    buf[2] = (((uint64_t)i) >> 40) & 0xFFUL;\
-    buf[3] = (((uint64_t)i) >> 32) & 0xFFUL;\
-    buf[4] = (((uint64_t)i) >> 24) & 0xFFUL;\
-    buf[5] = (((uint64_t)i) >> 16) & 0xFFUL;\
-    buf[6] = (((uint64_t)i) >>  8) & 0xFFUL;\
-    buf[7] = (((uint64_t)i) >>  0) & 0xFFUL;\
-}
-
-
-#define UINT64_FROM_BUF(buf)\
-    (((uint64_t)((buf)[0]) << 56) +\
-     ((uint64_t)((buf)[1]) << 48) +\
-     ((uint64_t)((buf)[2]) << 40) +\
-     ((uint64_t)((buf)[3]) << 32) +\
-     ((uint64_t)((buf)[4]) << 24) +\
-     ((uint64_t)((buf)[5]) << 16) +\
-     ((uint64_t)((buf)[6]) <<  8) +\
-     ((uint64_t)((buf)[7]) <<  0))
-
-
-#define INT64_FROM_BUF(buf)\
-   ((((uint64_t)((buf)[0] & 0x7FU) << 56) +\
-     ((uint64_t)((buf)[1]) << 48) +\
-     ((uint64_t)((buf)[2]) << 40) +\
-     ((uint64_t)((buf)[3]) << 32) +\
-     ((uint64_t)((buf)[4]) << 24) +\
-     ((uint64_t)((buf)[5]) << 16) +\
-     ((uint64_t)((buf)[6]) <<  8) +\
-     ((uint64_t)((buf)[7]) <<  0)) * (buf[0] & 0x80U ? -1 : 1))
-
-#define INT64_TO_BUF(buf_raw, i)\
-{\
-    unsigned char* buf = (unsigned char*)buf_raw;\
-    buf[0] = (((uint64_t)i) >> 56) & 0x7FUL;\
-    buf[1] = (((uint64_t)i) >> 48) & 0xFFUL;\
-    buf[2] = (((uint64_t)i) >> 40) & 0xFFUL;\
-    buf[3] = (((uint64_t)i) >> 32) & 0xFFUL;\
-    buf[4] = (((uint64_t)i) >> 24) & 0xFFUL;\
-    buf[5] = (((uint64_t)i) >> 16) & 0xFFUL;\
-    buf[6] = (((uint64_t)i) >>  8) & 0xFFUL;\
-    buf[7] = (((uint64_t)i) >>  0) & 0xFFUL;\
-    if (i < 0) buf[0] |= 0x80U;\
-}
-
-#define ttPAYMENT 0
-#define ttESCROW_CREATE 1
-#define ttESCROW_FINISH 2
-#define ttACCOUNT_SET 3
-#define ttESCROW_CANCEL 4
-#define ttREGULAR_KEY_SET 5
-#define ttOFFER_CREATE 7
-#define ttOFFER_CANCEL 8
-#define ttTICKET_CREATE 10
-#define ttSIGNER_LIST_SET 12
-#define ttPAYCHAN_CREATE 13
-#define ttPAYCHAN_FUND 14
-#define ttPAYCHAN_CLAIM 15
-#define ttCHECK_CREATE 16
-#define ttCHECK_CASH 17
-#define ttCHECK_CANCEL 18
-#define ttDEPOSIT_PREAUTH 19
-#define ttTRUST_SET 20
-#define ttACCOUNT_DELETE 21
-#define ttHOOK_SET 22
-#define ttNFTOKEN_MINT 25
-#define ttNFTOKEN_BURN 26
-#define ttNFTOKEN_CREATE_OFFER 27
-#define ttNFTOKEN_CANCEL_OFFER 28
-#define ttNFTOKEN_ACCEPT_OFFER 29
-#define ttURITOKEN_MINT 45
-#define ttURITOKEN_BURN 46
-#define ttURITOKEN_BUY 47
-#define ttURITOKEN_CREATE_SELL_OFFER 48
-#define ttURITOKEN_CANCEL_SELL_OFFER 49
-#define ttCLAIM_REWARD 98
-#define ttINVOKE 99
-#define ttAMENDMENT 100
-#define ttFEE 101
-#define ttUNL_MODIFY 102
-#define ttEMIT_FAILURE 103
-#define tfCANONICAL 0x80000000UL
-
-#define atACCOUNT 1U
-#define atOWNER 2U
-#define atDESTINATION 3U
-#define atISSUER 4U
-#define atAUTHORIZE 5U
-#define atUNAUTHORIZE 6U
-#define atTARGET 7U
-#define atREGULARKEY 8U
-#define atPSEUDOCALLBACK 9U
-
-#define amAMOUNT 1U
-#define amBALANCE 2U
-#define amLIMITAMOUNT 3U
-#define amTAKERPAYS 4U
-#define amTAKERGETS 5U
-#define amLOWLIMIT 6U
-#define amHIGHLIMIT 7U
-#define amFEE 8U
-#define amSENDMAX 9U
-#define amDELIVERMIN 10U
-#define amMINIMUMOFFER 16U
-#define amRIPPLEESCROW 17U
-#define amDELIVEREDAMOUNT 18U
-
-/**
- * RH NOTE -- PAY ATTENTION
- *
- * ALL 'ENCODE' MACROS INCREMENT BUF_OUT
- * THIS IS TO MAKE CHAINING EASY
- * BUF_OUT IS A SACRIFICIAL POINTER
- *
- * 'ENCODE' MACROS WITH CONSTANTS HAVE
- * ALIASING TO ASSIST YOU WITH ORDER
- * _TYPECODE_FIELDCODE_ENCODE_MACRO
- * TO PRODUCE A SERIALIZED OBJECT
- * IN CANONICAL FORMAT YOU MUST ORDER
- * FIRST BY TYPE CODE THEN BY FIELD CODE
- *
- * ALL 'PREPARE' MACROS PRESERVE POINTERS
- *
- **/
-
-
-#define ENCODE_TL_SIZE 49
-#define ENCODE_TL(buf_out, tlamt, amount_type)\
-{\
-        uint8_t uat = amount_type; \
-        buf_out[0] = 0x60U +(uat & 0x0FU ); \
-        for (int i = 1; GUARDM(48, 1), i < 49; ++i)\
-            buf_out[i] = tlamt[i-1];\
-        buf_out += ENCODE_TL_SIZE;\
-}
-#define _06_XX_ENCODE_TL(buf_out, drops, amount_type )\
-    ENCODE_TL(buf_out, drops, amount_type );
-#define ENCODE_TL_AMOUNT(buf_out, drops )\
-    ENCODE_TL(buf_out, drops, amAMOUNT );
-#define _06_01_ENCODE_TL_AMOUNT(buf_out, drops )\
-    ENCODE_TL_AMOUNT(buf_out, drops );
-
-
-// Encode drops to serialization format
-// consumes 9 bytes
-#define ENCODE_DROPS_SIZE 9
-#define ENCODE_DROPS(buf_out, drops, amount_type ) \
-    {\
-        uint8_t uat = amount_type; \
-        uint64_t udrops = drops; \
-        buf_out[0] = 0x60U +(uat & 0x0FU ); \
-        buf_out[1] = 0b01000000 + (( udrops >> 56 ) & 0b00111111 ); \
-        buf_out[2] = (udrops >> 48) & 0xFFU; \
-        buf_out[3] = (udrops >> 40) & 0xFFU; \
-        buf_out[4] = (udrops >> 32) & 0xFFU; \
-        buf_out[5] = (udrops >> 24) & 0xFFU; \
-        buf_out[6] = (udrops >> 16) & 0xFFU; \
-        buf_out[7] = (udrops >>  8) & 0xFFU; \
-        buf_out[8] = (udrops >>  0) & 0xFFU; \
-        buf_out += ENCODE_DROPS_SIZE; \
-    }
-
-#define _06_XX_ENCODE_DROPS(buf_out, drops, amount_type )\
-    ENCODE_DROPS(buf_out, drops, amount_type );
-
-#define ENCODE_DROPS_AMOUNT(buf_out, drops )\
-    ENCODE_DROPS(buf_out, drops, amAMOUNT );
-#define _06_01_ENCODE_DROPS_AMOUNT(buf_out, drops )\
-    ENCODE_DROPS_AMOUNT(buf_out, drops );
-
-#define ENCODE_DROPS_FEE(buf_out, drops )\
-    ENCODE_DROPS(buf_out, drops, amFEE );
-#define _06_08_ENCODE_DROPS_FEE(buf_out, drops )\
-    ENCODE_DROPS_FEE(buf_out, drops );
-
-#define ENCODE_TT_SIZE 3
-#define ENCODE_TT(buf_out, tt )\
-    {\
-        uint8_t utt = tt;\
-        buf_out[0] = 0x12U;\
-        buf_out[1] =(utt >> 8 ) & 0xFFU;\
-        buf_out[2] =(utt >> 0 ) & 0xFFU;\
-        buf_out += ENCODE_TT_SIZE; \
-    }
-#define _01_02_ENCODE_TT(buf_out, tt)\
-    ENCODE_TT(buf_out, tt);
-
-
-#define ENCODE_ACCOUNT_SIZE 22
-#define ENCODE_ACCOUNT(buf_out, account_id, account_type)\
-    {\
-        uint8_t uat = account_type;\
-        buf_out[0] = 0x80U + uat;\
-        buf_out[1] = 0x14U;\
-        *(uint64_t*)(buf_out +  2) = *(uint64_t*)(account_id +  0);\
-        *(uint64_t*)(buf_out + 10) = *(uint64_t*)(account_id +  8);\
-        *(uint32_t*)(buf_out + 18) = *(uint32_t*)(account_id + 16);\
-        buf_out += ENCODE_ACCOUNT_SIZE;\
-    }
-#define _08_XX_ENCODE_ACCOUNT(buf_out, account_id, account_type)\
-    ENCODE_ACCOUNT(buf_out, account_id, account_type);
-
-#define ENCODE_ACCOUNT_SRC_SIZE 22
-#define ENCODE_ACCOUNT_SRC(buf_out, account_id)\
-    ENCODE_ACCOUNT(buf_out, account_id, atACCOUNT);
-#define _08_01_ENCODE_ACCOUNT_SRC(buf_out, account_id)\
-    ENCODE_ACCOUNT_SRC(buf_out, account_id);
-
-#define ENCODE_ACCOUNT_DST_SIZE 22
-#define ENCODE_ACCOUNT_DST(buf_out, account_id)\
-    ENCODE_ACCOUNT(buf_out, account_id, atDESTINATION);
-#define _08_03_ENCODE_ACCOUNT_DST(buf_out, account_id)\
-    ENCODE_ACCOUNT_DST(buf_out, account_id);
-
-#define ENCODE_ACCOUNT_OWNER_SIZE 22
-#define ENCODE_ACCOUNT_OWNER(buf_out, account_id) \
-    ENCODE_ACCOUNT(buf_out, account_id, atOWNER);
-#define _08_02_ENCODE_ACCOUNT_OWNER(buf_out, account_id) \
-    ENCODE_ACCOUNT_OWNER(buf_out, account_id);
-
-#define ENCODE_UINT32_COMMON_SIZE 5U
-#define ENCODE_UINT32_COMMON(buf_out, i, field)\
-    {\
-        uint32_t ui = i; \
-        uint8_t uf = field; \
-        buf_out[0] = 0x20U +(uf & 0x0FU); \
-        buf_out[1] =(ui >> 24 ) & 0xFFU; \
-        buf_out[2] =(ui >> 16 ) & 0xFFU; \
-        buf_out[3] =(ui >>  8 ) & 0xFFU; \
-        buf_out[4] =(ui >>  0 ) & 0xFFU; \
-        buf_out += ENCODE_UINT32_COMMON_SIZE; \
-    }
-#define _02_XX_ENCODE_UINT32_COMMON(buf_out, i, field)\
-    ENCODE_UINT32_COMMON(buf_out, i, field)\
-
-#define ENCODE_UINT32_UNCOMMON_SIZE 6U
-#define ENCODE_UINT32_UNCOMMON(buf_out, i, field)\
-    {\
-        uint32_t ui = i; \
-        uint8_t uf = field; \
-        buf_out[0] = 0x20U; \
-        buf_out[1] = uf; \
-        buf_out[2] =(ui >> 24 ) & 0xFFU; \
-        buf_out[3] =(ui >> 16 ) & 0xFFU; \
-        buf_out[4] =(ui >>  8 ) & 0xFFU; \
-        buf_out[5] =(ui >>  0 ) & 0xFFU; \
-        buf_out += ENCODE_UINT32_UNCOMMON_SIZE; \
-    }
-#define _02_XX_ENCODE_UINT32_UNCOMMON(buf_out, i, field)\
-    ENCODE_UINT32_UNCOMMON(buf_out, i, field)\
-
-#define ENCODE_LLS_SIZE 6U
-#define ENCODE_LLS(buf_out, lls )\
-    ENCODE_UINT32_UNCOMMON(buf_out, lls, 0x1B );
-#define _02_27_ENCODE_LLS(buf_out, lls )\
-    ENCODE_LLS(buf_out, lls );
-
-#define ENCODE_FLS_SIZE 6U
-#define ENCODE_FLS(buf_out, fls )\
-    ENCODE_UINT32_UNCOMMON(buf_out, fls, 0x1A );
-#define _02_26_ENCODE_FLS(buf_out, fls )\
-    ENCODE_FLS(buf_out, fls );
-
-#define ENCODE_TAG_SRC_SIZE 5
-#define ENCODE_TAG_SRC(buf_out, tag )\
-    ENCODE_UINT32_COMMON(buf_out, tag, 0x3U );
-#define _02_03_ENCODE_TAG_SRC(buf_out, tag )\
-    ENCODE_TAG_SRC(buf_out, tag );
-
-#define ENCODE_TAG_DST_SIZE 5
-#define ENCODE_TAG_DST(buf_out, tag )\
-    ENCODE_UINT32_COMMON(buf_out, tag, 0xEU );
-#define _02_14_ENCODE_TAG_DST(buf_out, tag )\
-    ENCODE_TAG_DST(buf_out, tag );
-
-#define ENCODE_SEQUENCE_SIZE 5
-#define ENCODE_SEQUENCE(buf_out, sequence )\
-    ENCODE_UINT32_COMMON(buf_out, sequence, 0x4U );
-#define _02_04_ENCODE_SEQUENCE(buf_out, sequence )\
-    ENCODE_SEQUENCE(buf_out, sequence );
-
-#define ENCODE_FLAGS_SIZE 5
-#define ENCODE_FLAGS(buf_out, tag )\
-    ENCODE_UINT32_COMMON(buf_out, tag, 0x2U );
-#define _02_02_ENCODE_FLAGS(buf_out, tag )\
-    ENCODE_FLAGS(buf_out, tag );
-
-#define ENCODE_SIGNING_PUBKEY_SIZE 35
-#define ENCODE_SIGNING_PUBKEY(buf_out, pkey )\
-    {\
-        buf_out[0] = 0x73U;\
-        buf_out[1] = 0x21U;\
-        *(uint64_t*)(buf_out +  2) = *(uint64_t*)(pkey +  0);\
-        *(uint64_t*)(buf_out + 10) = *(uint64_t*)(pkey +  8);\
-        *(uint64_t*)(buf_out + 18) = *(uint64_t*)(pkey + 16);\
-        *(uint64_t*)(buf_out + 26) = *(uint64_t*)(pkey + 24);\
-        buf[34] = pkey[32];\
-        buf_out += ENCODE_SIGNING_PUBKEY_SIZE;\
-    }
-
-#define _07_03_ENCODE_SIGNING_PUBKEY(buf_out, pkey )\
-    ENCODE_SIGNING_PUBKEY(buf_out, pkey );
-
-#define ENCODE_SIGNING_PUBKEY_NULL_SIZE 2
-#define ENCODE_SIGNING_PUBKEY_NULL(buf_out )\
-    {\
-        *buf_out++ = 0x73U;\
-        *buf_out++ = 0x00U;\
-    }
-
-#define _07_03_ENCODE_SIGNING_PUBKEY_NULL(buf_out )\
-    ENCODE_SIGNING_PUBKEY_NULL(buf_out );
-
-
-#define _0E_0E_ENCODE_HOOKOBJ(buf_out, hhash)\
-{\
-        uint8_t* hook0 = (hhash);\
-        *buf_out++ = 0xEEU;   /* hook obj start */ \
-        if (hook0 == 0) /* noop */\
-        {\
-            /* do nothing */ \
-        }\
-        else\
-        {\
-            *buf_out++ = 0x22U; /* flags = override */\
-            *buf_out++ = 0x00U;\
-            *buf_out++ = 0x00U;\
-            *buf_out++ = 0x00U;\
-            *buf_out++ = 0x01U;\
-            if (hook0 == 0xFFFFFFFFUL) /* delete operation */ \
-            {\
-                *buf_out++ = 0x7BU; /* empty createcode */ \
-                *buf_out++ = 0x00U;\
-            }\
-            else\
-            {\
-                *buf_out++ = 0x50U; /* HookHash */\
-                *buf_out++ = 0x1FU;\
-                uint64_t* d = (uint64_t*)buf_out;\
-                uint64_t* s = (uint64_t*)hook0;\
-                *d++ = *s++;\
-                *d++ = *s++;\
-                *d++ = *s++;\
-                *d++ = *s++;\
-                buf_out+=32;\
-            }\
-        }\
-        *buf_out++ = 0xE1U;\
-}
-
-#define PREPARE_HOOKSET(buf_out_master, maxlen, h, sizeout)\
-    {\
-        uint8_t* buf_out = (buf_out_master);                                            \
-        uint8_t acc[20];                                                                \
-        uint32_t cls = (uint32_t)ledger_seq();                                          \
-        hook_account(SBUF(acc));                                                        \
-        _01_02_ENCODE_TT                   (buf_out, ttHOOK_SET                     );  \
-        _02_02_ENCODE_FLAGS                (buf_out, tfCANONICAL                    );  \
-        _02_04_ENCODE_SEQUENCE             (buf_out, 0                              );  \
-        _02_26_ENCODE_FLS                  (buf_out, cls + 1                        );  \
-        _02_27_ENCODE_LLS                  (buf_out, cls + 5                        );  \
-        uint8_t* fee_ptr = buf_out;                                                     \
-        _06_08_ENCODE_DROPS_FEE            (buf_out, 0                              );  \
-        _07_03_ENCODE_SIGNING_PUBKEY_NULL  (buf_out                                 );  \
-        _08_01_ENCODE_ACCOUNT_SRC          (buf_out, acc                            );  \
-        uint32_t remaining_size = (maxlen) - (buf_out - (buf_out_master));              \
-        int64_t edlen = etxn_details((uint32_t)buf_out, remaining_size);                \
-        buf_out += edlen;                                                               \
-        *buf_out++ = 0xFBU;   /* hook array start */                                    \
-        _0E_0E_ENCODE_HOOKOBJ               (buf_out, h[0]);                           \
-        _0E_0E_ENCODE_HOOKOBJ               (buf_out, h[1]);                           \
-        _0E_0E_ENCODE_HOOKOBJ               (buf_out, h[2]);                           \
-        _0E_0E_ENCODE_HOOKOBJ               (buf_out, h[3]);                           \
-        _0E_0E_ENCODE_HOOKOBJ               (buf_out, h[4]);                           \
-        _0E_0E_ENCODE_HOOKOBJ               (buf_out, h[5]);                           \
-        _0E_0E_ENCODE_HOOKOBJ               (buf_out, h[6]);                           \
-        _0E_0E_ENCODE_HOOKOBJ               (buf_out, h[7]);                           \
-        _0E_0E_ENCODE_HOOKOBJ               (buf_out, h[8]);                           \
-        _0E_0E_ENCODE_HOOKOBJ               (buf_out, h[9]);                           \
-        *buf_out++ = 0xF1U;  /* hook array end */                                       \
-        sizeout = (buf_out - (buf_out_master));                                         \
-        int64_t fee = etxn_fee_base(buf_out_master, sizeout);                           \
-        _06_08_ENCODE_DROPS_FEE            (fee_ptr, fee                            );  \
-    }
-
-#ifdef HAS_CALLBACK
-#define PREPARE_PAYMENT_SIMPLE_SIZE 270U
-#else
-#define PREPARE_PAYMENT_SIMPLE_SIZE 248U
-#endif
-
-#define PREPARE_PAYMENT_SIMPLE(buf_out_master, drops_amount_raw, to_address, dest_tag_raw, src_tag_raw)\
-    {\
-        uint8_t* buf_out = buf_out_master;\
-        uint8_t acc[20];\
-        uint64_t drops_amount = (drops_amount_raw);\
-        uint32_t dest_tag = (dest_tag_raw);\
-        uint32_t src_tag = (src_tag_raw);\
-        uint32_t cls = (uint32_t)ledger_seq();\
-        hook_account(SBUF(acc));\
-        _01_02_ENCODE_TT                   (buf_out, ttPAYMENT                      );      /* uint16  | size   3 */ \
-        _02_02_ENCODE_FLAGS                (buf_out, tfCANONICAL                    );      /* uint32  | size   5 */ \
-        _02_03_ENCODE_TAG_SRC              (buf_out, src_tag                        );      /* uint32  | size   5 */ \
-        _02_04_ENCODE_SEQUENCE             (buf_out, 0                              );      /* uint32  | size   5 */ \
-        _02_14_ENCODE_TAG_DST              (buf_out, dest_tag                       );      /* uint32  | size   5 */ \
-        _02_26_ENCODE_FLS                  (buf_out, cls + 1                        );      /* uint32  | size   6 */ \
-        _02_27_ENCODE_LLS                  (buf_out, cls + 5                        );      /* uint32  | size   6 */ \
-        _06_01_ENCODE_DROPS_AMOUNT         (buf_out, drops_amount                   );      /* amount  | size   9 */ \
-        uint8_t* fee_ptr = buf_out;\
-        _06_08_ENCODE_DROPS_FEE            (buf_out, 0                              );      /* amount  | size   9 */ \
-        _07_03_ENCODE_SIGNING_PUBKEY_NULL  (buf_out                                 );      /* pk      | size  35 */ \
-        _08_01_ENCODE_ACCOUNT_SRC          (buf_out, acc                            );      /* account | size  22 */ \
-        _08_03_ENCODE_ACCOUNT_DST          (buf_out, to_address                     );      /* account | size  22 */ \
-        int64_t edlen = etxn_details((uint32_t)buf_out, PREPARE_PAYMENT_SIMPLE_SIZE);       /* emitdet | size 1?? */ \
-        int64_t fee = etxn_fee_base(buf_out_master, PREPARE_PAYMENT_SIMPLE_SIZE);                                    \ 
-        _06_08_ENCODE_DROPS_FEE            (fee_ptr, fee                            );                               \
-    }
-
-#ifdef HAS_CALLBACK
-#define PREPARE_PAYMENT_SIMPLE_TRUSTLINE_SIZE 309
-#else
-#define PREPARE_PAYMENT_SIMPLE_TRUSTLINE_SIZE 287
-#endif
-#define PREPARE_PAYMENT_SIMPLE_TRUSTLINE(buf_out_master, tlamt, to_address, dest_tag_raw, src_tag_raw)\
-    {\
-        uint8_t* buf_out = buf_out_master;\
-        uint8_t acc[20];\
-        uint32_t dest_tag = (dest_tag_raw);\
-        uint32_t src_tag = (src_tag_raw);\
-        uint32_t cls = (uint32_t)ledger_seq();\
-        hook_account(SBUF(acc));\
-        _01_02_ENCODE_TT                   (buf_out, ttPAYMENT                      );      /* uint16  | size   3 */ \
-        _02_02_ENCODE_FLAGS                (buf_out, tfCANONICAL                    );      /* uint32  | size   5 */ \
-        _02_03_ENCODE_TAG_SRC              (buf_out, src_tag                        );      /* uint32  | size   5 */ \
-        _02_04_ENCODE_SEQUENCE             (buf_out, 0                              );      /* uint32  | size   5 */ \
-        _02_14_ENCODE_TAG_DST              (buf_out, dest_tag                       );      /* uint32  | size   5 */ \
-        _02_26_ENCODE_FLS                  (buf_out, cls + 1                        );      /* uint32  | size   6 */ \
-        _02_27_ENCODE_LLS                  (buf_out, cls + 5                        );      /* uint32  | size   6 */ \
-        _06_01_ENCODE_TL_AMOUNT            (buf_out, tlamt                          );      /* amount  | size  48 */ \
-        uint8_t* fee_ptr = buf_out;\
-        _06_08_ENCODE_DROPS_FEE            (buf_out, 0                              );      /* amount  | size   9 */ \
-        _07_03_ENCODE_SIGNING_PUBKEY_NULL  (buf_out                                 );      /* pk      | size  35 */ \
-        _08_01_ENCODE_ACCOUNT_SRC          (buf_out, acc                            );      /* account | size  22 */ \
-        _08_03_ENCODE_ACCOUNT_DST          (buf_out, to_address                     );      /* account | size  22 */ \
-        etxn_details((uint32_t)buf_out, PREPARE_PAYMENT_SIMPLE_TRUSTLINE_SIZE);             /* emitdet | size 1?? */  \
-        int64_t fee = etxn_fee_base(buf_out_master, PREPARE_PAYMENT_SIMPLE_TRUSTLINE_SIZE);                          \ 
-        _06_08_ENCODE_DROPS_FEE            (fee_ptr, fee                            );                               \
-    }
-
-
-
-#endif
-

hook/genesis/headers/sfcodes.h

@@ -1,215 +0,0 @@
-// For documentation please see: https://xrpl-hooks.readme.io/reference/
-// Generated using generate_sfcodes.sh
-#define sfCloseResolution ((16U << 16U) + 1U)
-#define sfMethod ((16U << 16U) + 2U)
-#define sfTransactionResult ((16U << 16U) + 3U)
-#define sfTickSize ((16U << 16U) + 16U)
-#define sfUNLModifyDisabling ((16U << 16U) + 17U)
-#define sfHookResult ((16U << 16U) + 18U)
-#define sfLedgerEntryType ((1U << 16U) + 1U)
-#define sfTransactionType ((1U << 16U) + 2U)
-#define sfSignerWeight ((1U << 16U) + 3U)
-#define sfTransferFee ((1U << 16U) + 4U)
-#define sfVersion ((1U << 16U) + 16U)
-#define sfHookStateChangeCount ((1U << 16U) + 17U)
-#define sfHookEmitCount ((1U << 16U) + 18U)
-#define sfHookExecutionIndex ((1U << 16U) + 19U)
-#define sfHookApiVersion ((1U << 16U) + 20U)
-#define sfNetworkID ((2U << 16U) + 1U)
-#define sfFlags ((2U << 16U) + 2U)
-#define sfSourceTag ((2U << 16U) + 3U)
-#define sfSequence ((2U << 16U) + 4U)
-#define sfPreviousTxnLgrSeq ((2U << 16U) + 5U)
-#define sfLedgerSequence ((2U << 16U) + 6U)
-#define sfCloseTime ((2U << 16U) + 7U)
-#define sfParentCloseTime ((2U << 16U) + 8U)
-#define sfSigningTime ((2U << 16U) + 9U)
-#define sfExpiration ((2U << 16U) + 10U)
-#define sfTransferRate ((2U << 16U) + 11U)
-#define sfWalletSize ((2U << 16U) + 12U)
-#define sfOwnerCount ((2U << 16U) + 13U)
-#define sfDestinationTag ((2U << 16U) + 14U)
-#define sfHighQualityIn ((2U << 16U) + 16U)
-#define sfHighQualityOut ((2U << 16U) + 17U)
-#define sfLowQualityIn ((2U << 16U) + 18U)
-#define sfLowQualityOut ((2U << 16U) + 19U)
-#define sfQualityIn ((2U << 16U) + 20U)
-#define sfQualityOut ((2U << 16U) + 21U)
-#define sfStampEscrow ((2U << 16U) + 22U)
-#define sfBondAmount ((2U << 16U) + 23U)
-#define sfLoadFee ((2U << 16U) + 24U)
-#define sfOfferSequence ((2U << 16U) + 25U)
-#define sfFirstLedgerSequence ((2U << 16U) + 26U)
-#define sfLastLedgerSequence ((2U << 16U) + 27U)
-#define sfTransactionIndex ((2U << 16U) + 28U)
-#define sfOperationLimit ((2U << 16U) + 29U)
-#define sfReferenceFeeUnits ((2U << 16U) + 30U)
-#define sfReserveBase ((2U << 16U) + 31U)
-#define sfReserveIncrement ((2U << 16U) + 32U)
-#define sfSetFlag ((2U << 16U) + 33U)
-#define sfClearFlag ((2U << 16U) + 34U)
-#define sfSignerQuorum ((2U << 16U) + 35U)
-#define sfCancelAfter ((2U << 16U) + 36U)
-#define sfFinishAfter ((2U << 16U) + 37U)
-#define sfSignerListID ((2U << 16U) + 38U)
-#define sfSettleDelay ((2U << 16U) + 39U)
-#define sfTicketCount ((2U << 16U) + 40U)
-#define sfTicketSequence ((2U << 16U) + 41U)
-#define sfNFTokenTaxon ((2U << 16U) + 42U)
-#define sfMintedNFTokens ((2U << 16U) + 43U)
-#define sfBurnedNFTokens ((2U << 16U) + 44U)
-#define sfHookStateCount ((2U << 16U) + 45U)
-#define sfEmitGeneration ((2U << 16U) + 46U)
-#define sfLockCount ((2U << 16U) + 47U)
-#define sfRewardTime ((2U << 16U) + 98U)
-#define sfRewardLgrFirst ((2U << 16U) + 99U)
-#define sfRewardLgrLast ((2U << 16U) + 100U)
-#define sfIndexNext ((3U << 16U) + 1U)
-#define sfIndexPrevious ((3U << 16U) + 2U)
-#define sfBookNode ((3U << 16U) + 3U)
-#define sfOwnerNode ((3U << 16U) + 4U)
-#define sfBaseFee ((3U << 16U) + 5U)
-#define sfExchangeRate ((3U << 16U) + 6U)
-#define sfLowNode ((3U << 16U) + 7U)
-#define sfHighNode ((3U << 16U) + 8U)
-#define sfDestinationNode ((3U << 16U) + 9U)
-#define sfCookie ((3U << 16U) + 10U)
-#define sfServerVersion ((3U << 16U) + 11U)
-#define sfNFTokenOfferNode ((3U << 16U) + 12U)
-#define sfEmitBurden ((3U << 16U) + 13U)
-#define sfHookInstructionCount ((3U << 16U) + 17U)
-#define sfHookReturnCode ((3U << 16U) + 18U)
-#define sfReferenceCount ((3U << 16U) + 19U)
-#define sfRewardAccumulator ((3U << 16U) + 100U)
-#define sfEmailHash ((4U << 16U) + 1U)
-#define sfTakerPaysCurrency ((10U << 16U) + 1U)
-#define sfTakerPaysIssuer ((10U << 16U) + 2U)
-#define sfTakerGetsCurrency ((10U << 16U) + 3U)
-#define sfTakerGetsIssuer ((10U << 16U) + 4U)
-#define sfLedgerHash ((5U << 16U) + 1U)
-#define sfParentHash ((5U << 16U) + 2U)
-#define sfTransactionHash ((5U << 16U) + 3U)
-#define sfAccountHash ((5U << 16U) + 4U)
-#define sfPreviousTxnID ((5U << 16U) + 5U)
-#define sfLedgerIndex ((5U << 16U) + 6U)
-#define sfWalletLocator ((5U << 16U) + 7U)
-#define sfRootIndex ((5U << 16U) + 8U)
-#define sfAccountTxnID ((5U << 16U) + 9U)
-#define sfNFTokenID ((5U << 16U) + 10U)
-#define sfEmitParentTxnID ((5U << 16U) + 11U)
-#define sfEmitNonce ((5U << 16U) + 12U)
-#define sfEmitHookHash ((5U << 16U) + 13U)
-#define sfBookDirectory ((5U << 16U) + 16U)
-#define sfInvoiceID ((5U << 16U) + 17U)
-#define sfNickname ((5U << 16U) + 18U)
-#define sfAmendment ((5U << 16U) + 19U)
-#define sfHookOn ((5U << 16U) + 20U)
-#define sfDigest ((5U << 16U) + 21U)
-#define sfChannel ((5U << 16U) + 22U)
-#define sfConsensusHash ((5U << 16U) + 23U)
-#define sfCheckID ((5U << 16U) + 24U)
-#define sfValidatedHash ((5U << 16U) + 25U)
-#define sfPreviousPageMin ((5U << 16U) + 26U)
-#define sfNextPageMin ((5U << 16U) + 27U)
-#define sfNFTokenBuyOffer ((5U << 16U) + 28U)
-#define sfNFTokenSellOffer ((5U << 16U) + 29U)
-#define sfHookStateKey ((5U << 16U) + 30U)
-#define sfHookHash ((5U << 16U) + 31U)
-#define sfHookNamespace ((5U << 16U) + 32U)
-#define sfHookSetTxnID ((5U << 16U) + 33U)
-#define sfOfferID ((5U << 16U) + 34U)
-#define sfEscrowID ((5U << 16U) + 35U)
-#define sfURITokenID ((5U << 16U) + 36U)
-#define sfAmount ((6U << 16U) + 1U)
-#define sfBalance ((6U << 16U) + 2U)
-#define sfLimitAmount ((6U << 16U) + 3U)
-#define sfTakerPays ((6U << 16U) + 4U)
-#define sfTakerGets ((6U << 16U) + 5U)
-#define sfLowLimit ((6U << 16U) + 6U)
-#define sfHighLimit ((6U << 16U) + 7U)
-#define sfFee ((6U << 16U) + 8U)
-#define sfSendMax ((6U << 16U) + 9U)
-#define sfDeliverMin ((6U << 16U) + 10U)
-#define sfMinimumOffer ((6U << 16U) + 16U)
-#define sfRippleEscrow ((6U << 16U) + 17U)
-#define sfDeliveredAmount ((6U << 16U) + 18U)
-#define sfNFTokenBrokerFee ((6U << 16U) + 19U)
-#define sfHookCallbackFee ((6U << 16U) + 20U)
-#define sfLockedBalance ((6U << 16U) + 21U)
-#define sfPublicKey ((7U << 16U) + 1U)
-#define sfMessageKey ((7U << 16U) + 2U)
-#define sfSigningPubKey ((7U << 16U) + 3U)
-#define sfTxnSignature ((7U << 16U) + 4U)
-#define sfURI ((7U << 16U) + 5U)
-#define sfSignature ((7U << 16U) + 6U)
-#define sfDomain ((7U << 16U) + 7U)
-#define sfFundCode ((7U << 16U) + 8U)
-#define sfRemoveCode ((7U << 16U) + 9U)
-#define sfExpireCode ((7U << 16U) + 10U)
-#define sfCreateCode ((7U << 16U) + 11U)
-#define sfMemoType ((7U << 16U) + 12U)
-#define sfMemoData ((7U << 16U) + 13U)
-#define sfMemoFormat ((7U << 16U) + 14U)
-#define sfFulfillment ((7U << 16U) + 16U)
-#define sfCondition ((7U << 16U) + 17U)
-#define sfMasterSignature ((7U << 16U) + 18U)
-#define sfUNLModifyValidator ((7U << 16U) + 19U)
-#define sfValidatorToDisable ((7U << 16U) + 20U)
-#define sfValidatorToReEnable ((7U << 16U) + 21U)
-#define sfHookStateData ((7U << 16U) + 22U)
-#define sfHookReturnString ((7U << 16U) + 23U)
-#define sfHookParameterName ((7U << 16U) + 24U)
-#define sfHookParameterValue ((7U << 16U) + 25U)
-#define sfBlob ((7U << 16U) + 26U)
-#define sfAccount ((8U << 16U) + 1U)
-#define sfOwner ((8U << 16U) + 2U)
-#define sfDestination ((8U << 16U) + 3U)
-#define sfIssuer ((8U << 16U) + 4U)
-#define sfAuthorize ((8U << 16U) + 5U)
-#define sfUnauthorize ((8U << 16U) + 6U)
-#define sfRegularKey ((8U << 16U) + 8U)
-#define sfNFTokenMinter ((8U << 16U) + 9U)
-#define sfEmitCallback ((8U << 16U) + 10U)
-#define sfHookAccount ((8U << 16U) + 16U)
-#define sfIndexes ((19U << 16U) + 1U)
-#define sfHashes ((19U << 16U) + 2U)
-#define sfAmendments ((19U << 16U) + 3U)
-#define sfNFTokenOffers ((19U << 16U) + 4U)
-#define sfHookNamespaces ((19U << 16U) + 5U)
-#define sfPaths ((18U << 16U) + 1U)
-#define sfTransactionMetaData ((14U << 16U) + 2U)
-#define sfCreatedNode ((14U << 16U) + 3U)
-#define sfDeletedNode ((14U << 16U) + 4U)
-#define sfModifiedNode ((14U << 16U) + 5U)
-#define sfPreviousFields ((14U << 16U) + 6U)
-#define sfFinalFields ((14U << 16U) + 7U)
-#define sfNewFields ((14U << 16U) + 8U)
-#define sfTemplateEntry ((14U << 16U) + 9U)
-#define sfMemo ((14U << 16U) + 10U)
-#define sfSignerEntry ((14U << 16U) + 11U)
-#define sfNFToken ((14U << 16U) + 12U)
-#define sfEmitDetails ((14U << 16U) + 13U)
-#define sfHook ((14U << 16U) + 14U)
-#define sfSigner ((14U << 16U) + 16U)
-#define sfMajority ((14U << 16U) + 18U)
-#define sfDisabledValidator ((14U << 16U) + 19U)
-#define sfEmittedTxn ((14U << 16U) + 20U)
-#define sfHookExecution ((14U << 16U) + 21U)
-#define sfHookDefinition ((14U << 16U) + 22U)
-#define sfHookParameter ((14U << 16U) + 23U)
-#define sfHookGrant ((14U << 16U) + 24U)
-#define sfSigners ((15U << 16U) + 3U)
-#define sfSignerEntries ((15U << 16U) + 4U)
-#define sfTemplate ((15U << 16U) + 5U)
-#define sfNecessary ((15U << 16U) + 6U)
-#define sfSufficient ((15U << 16U) + 7U)
-#define sfAffectedNodes ((15U << 16U) + 8U)
-#define sfMemos ((15U << 16U) + 9U)
-#define sfNFTokens ((15U << 16U) + 10U)
-#define sfHooks ((15U << 16U) + 11U)
-#define sfMajorities ((15U << 16U) + 16U)
-#define sfDisabledValidators ((15U << 16U) + 17U)
-#define sfHookExecutions ((15U << 16U) + 18U)
-#define sfHookParameters ((15U << 16U) + 19U)
-#define sfHookGrants ((15U << 16U) + 20U)
-#define sfActiveValidators ((15U << 16U) + 95U)

hook/genesis/headers/types.h

@@ -1,239 +0,0 @@
-#include <stdint.h>
-
-// 8 byte-int = 1 bytes
-#define SFL_CLOSERESOLUTION 1
-#define SFL_METHOD 1
-#define SFL_TRANSACTIONRESULT 1
-#define SFL_TICKSIZE 1
-#define SFL_UNLMODIFYDISABLING 1
-#define SFL_HOOKRESULT 1
-// 16 byte-int = 2 bytes
-#define SFL_LEDGERENTRYTYPE 2
-#define SFL_TRANSACTIONTYPE 2
-#define SFL_SIGNERWEIGHT 2
-#define SFL_TRANSFERFEE 2
-#define SFL_VERSION 2
-#define SFL_HOOKSTATECHANGECOUNT 2
-#define SFL_HOOKEMITCOUNT 2
-#define SFL_HOOKEXECUTIONINDEX 2
-#define SFL_HOOKAPIVERSION 2
-// 32 byte-int = 4 bytes
-#define SFL_NETWORKID 4
-#define SFL_FLAGS 4
-#define SFL_SOURCETAG 4
-#define SFL_SEQUENCE 4
-#define SFL_PREVIOUSTXNLGRSEQ 4
-#define SFL_LEDGERSEQUENCE 4
-#define SFL_CLOSETIME 4
-#define SFL_PARENTCLOSETIME 4
-#define SFL_SIGNINGTIME 4
-#define SFL_EXPIRATION 4
-#define SFL_TRANSFERRATE 4
-#define SFL_WALLETSIZE 4
-#define SFL_OWNERCOUNT 4
-#define SFL_DESTINATIONTAG 4
-#define SFL_HIGHQUALITYIN 4
-#define SFL_HIGHQUALITYOUT 4
-#define SFL_LOWQUALITYIN 4
-#define SFL_LOWQUALITYOUT 4
-#define SFL_QUALITYIN 4
-#define SFL_QUALITYOUT 4
-#define SFL_STAMPESCROW 4
-#define SFL_BONDAMOUNT 4
-#define SFL_LOADFEE 4
-#define SFL_OFFERSEQUENCE 4
-#define SFL_FIRSTLEDGERSEQUENCE 4
-#define SFL_LASTLEDGERSEQUENCE 4
-#define SFL_TRANSACTIONINDEX 4
-#define SFL_OPERATIONLIMIT 4
-#define SFL_REFERENCEFEEUNITS 4
-#define SFL_RESERVEBASE 4
-#define SFL_RESERVEINCREMENT 4
-#define SFL_SETFLAG 4
-#define SFL_CLEARFLAG 4
-#define SFL_SIGNERQUORUM 4
-#define SFL_CANCELAFTER 4
-#define SFL_FINISHAFTER 4
-#define SFL_SIGNERLISTID 4
-#define SFL_SETTLEDELAY 4
-#define SFL_TICKETCOUNT 4
-#define SFL_TICKETSEQUENCE 4
-#define SFL_NFTOKENTAXON 4
-#define SFL_MINTEDNFTOKENS 4
-#define SFL_BURNEDNFTOKENS 4
-#define SFL_HOOKSTATECOUNT 4
-#define SFL_EMITGENERATION 4
-#define SFL_LOCKCOUNT 4
-#define SFL_REWARDTIME 4
-#define SFL_REWARDLGRFIRST 4
-#define SFL_REWARDLGRLAST 4
-#define SFL_FIRSTNFTOKENSEQUENCE 4
-// 64 byte-int = 8 bytes
-#define SFL_INDEX_NEXT 8
-#define SFL_INDEX_PREVIOUS 8
-#define SFL_BOOK_NODE 8
-#define SFL_OWNER_NODE 8
-#define SFL_BASE_FEE 8
-#define SFL_EXCHANGE_RATE 8
-#define SFL_LOW_NODE 8
-#define SFL_HIGH_NODE 8
-#define SFL_DESTINATION_NODE 8
-#define SFL_COOKIE 8
-#define SFL_SERVER_VERSION 8
-#define SFL_EMIT_BURDEN 8
-#define SFL_NFTOKEN_OFFER_NODE 8
-#define SFL_HOOK_INSTRUCTION_COUNT 8
-#define SFL_HOOK_RETURN_CODE 8
-#define SFL_REFERENCE_COUNT 8
-#define SFL_REWARD_ACCUMULATOR 8
-// 128 byte-int = 4 bytes
-#define SFL_EMAIL_HASH 128
-// 160 byte-int = 4 bytes
-#define SFL_TAKER_PAYS_CURRENCY 160
-#define SFL_TAKER_PAYS_ISSUER 160
-#define SFL_TAKER_GETS_CURRENCY 160
-#define SFL_TAKER_GETS_ISSUER 160
-// 256 byte-int = ??? bytes
-#define SFL_LEDGER_HASH 256
-#define SFL_PARENT_HASH 256
-#define SFL_TRANSACTION_HASH 256
-#define SFL_ACCOUNT_HASH 256
-#define SFL_HOOK_ON 256
-#define SFL_PREVIOUS_TXN_ID 256
-#define SFL_LEDGER_INDEX 256
-#define SFL_WALLET_LOCATOR 256
-#define SFL_ROOT_INDEX 256
-#define SFL_ACCOUNT_TXN_ID 256
-#define SFL_NFTOKEN_ID 256
-#define SFL_EMIT_PARENT_TXN_ID 256
-#define SFL_EMIT_NONCE 256
-#define SFL_EMIT_HOOK_HASH 256
-// 256 byte-int = ??? bytes
-#define SFL_BOOK_DIRECTORY 256
-#define SFL_INVOICE_ID 256
-#define SFL_NICKNAME 256
-#define SFL_AMENDMENT 256
-#define SFL_DIGEST 256
-#define SFL_CHANNEL 256
-#define SFL_CONSENSUS_HASH 256
-#define SFL_CHECK_ID 256
-#define SFL_VALIDATED_HASH 256
-#define SFL_PREVIOUS_PAGE_MIN 256
-#define SFL_NEXT_PAGE_MIN 256
-#define SFL_NFTOKEN_BUY_OFFER 256
-#define SFL_NFTOKEN_SELL_OFFER 256
-#define SFL_HOOK_STATE_KEY 256
-#define SFL_HOOK_HASH 256
-#define SFL_HOOK_NAMESPACE 256
-#define SFL_HOOK_SET_TXN_ID 256
-#define SFL_OFFER_ID 256
-#define SFL_ESCROW_ID 256
-#define SFL_URITOKEN_ID 256
-// 20 bytes
-#define SFL_AMOUNT 20
-#define SFL_BALANCE 20
-#define SFL_LIMIT_AMOUNT 20
-#define SFL_TAKER_PAYS 20
-#define SFL_TAKER_GETS 20
-#define SFL_LOW_LIMIT 20
-#define SFL_HIGH_LIMIT 20
-#define SFL_FEE 20
-#define SFL_SEND_MAX 20
-#define SFL_DELIVER_MIN 20
-#define SFL_LOCKED_BALANCE 20
-// Unimplemented
-#define SFL_AMOUNT_MINIMUM_OFFER 8
-#define SFL_AMOUNT_RIPPLE_ESCROW 8
-#define SFL_AMOUNT_DELIVERED_AMOUNT 8
-#define SFL_AMOUNT_NFTOKEN_BROKER_FEE 8
-#define SFL_AMOUNT_HOOK_CALLBACK_FEE 8
-#define SFL_AMOUNT_BASE_FEE_DROPS 8
-#define SFL_AMOUNT_RESERVE_BASE_DROPS 8
-#define SFL_AMOUNT_RESERVE_INCREMENT_DROPS 8
-// Unimplemented
-#define SFL_VL_PUBLIC_KEY 64
-#define SFL_VL_MESSAGE_KEY 64
-#define SFL_VL_SIGNING_PUB_KEY 64
-// Unimplemented
-#define SFL_VL_TXN_SIGNATURE 96
-// Unimplemented
-#define SFL_VL_URI 256
-// Unimplemented
-#define SFL_VL_SIGNATURE 96
-// Unimplemented
-#define SFL_VL_DOMAIN 256
-#define SFL_VL_FUND_CODE 256
-#define SFL_VL_REMOVE_CODE 256
-#define SFL_VL_EXPIRE_CODE 256
-#define SFL_VL_CREATE_CODE 256
-#define SFL_VL_MEMO_TYPE 256
-#define SFL_VL_MEMO_DATA 256
-#define SFL_VL_MEMO_FORMAT 256
-#define SFL_VL_FULFILLMENT 256
-#define SFL_VL_CONDITION 256
-// Unimplemented
-#define SFL_VL_MASTER_SIGNATURE 96
-// Unimplemented
-#define SFL_VL_UNL_MODIFY_VALIDATOR 256
-#define SFL_VL_VALIDATOR_TO_DISABLE 256
-#define SFL_VL_VALIDATOR_TO_RE_ENABLE 256
-#define SFL_VL_HOOK_STATE_DATA 256
-#define SFL_VL_HOOK_RETURN_STRING 256
-#define SFL_VL_HOOK_PARAMETER_NAME 256
-#define SFL_VL_HOOK_PARAMETER_VALUE 256
-#define SFL_VL_BLOB 256
-// 20 bytes
-#define SFL_ACCOUNT 20
-#define SFL_OWNER 20
-#define SFL_DESTINATION 20
-#define SFL_ISSUER 20
-#define SFL_AUTHORIZE 20
-#define SFL_UNAUTHORIZE 20
-#define SFL_REGULAR_KEY 20
-#define SFL_NFTOKEN_MINTER 20
-#define SFL_EMIT_CALLBACK 20
-#define SFL_HOOK_ACCOUNT 20
-#define SFL_NFTOKEN_MINTER 20
-// Unimplemented
-#define SFL_PATHS 1
-// Unimplemented
-#define SFL_VECTOR256_INDEXES 32
-#define SFL_VECTOR256_HASHES 32
-#define SFL_VECTOR256_AMENDMENTS 32
-#define SFL_VECTOR256_NFTOKEN_OFFERS 32
-#define SFL_VECTOR256_HOOK_NAMESPACES 32
-// Unimplemented
-#define SFL_TRANSACTION_META_DATA 1
-#define SFL_CREATED_NODE 1
-#define SFL_DELETED_NODE 1
-#define SFL_MODIFIED_NODE 1
-#define SFL_PREVIOUS_FIELDS 1
-#define SFL_FINAL_FIELDS 1
-#define SFL_NEW_FIELDS 1
-#define SFL_TEMPLATE_ENTRY 1
-#define SFL_MEMO 1
-#define SFL_SIGNER_ENTRY 1
-#define SFL_NFTOKEN 1
-#define SFL_EMIT_DETAILS 1
-#define SFL_HOOK 1
-#define SFL_SIGNER 1
-#define SFL_MAJORITY 1
-#define SFL_DISABLED_VALIDATOR 1
-#define SFL_EMITTED_TXN 1
-#define SFL_HOOK_EXECUTION 1
-#define SFL_HOOK_DEFINITION 1
-#define SFL_HOOK_PARAMETER 1
-#define SFL_HOOK_GRANT 1
-#define SFL_SIGNERS 1
-#define SFL_SIGNER_ENTRIES 1
-#define SFL_TEMPLATE 1
-#define SFL_NECESSARY 1
-#define SFL_SUFFICIENT 1
-#define SFL_AFFECTED_NODES 1
-#define SFL_MEMOS 1
-#define SFL_NFTOKENS 1
-#define SFL_HOOKS 1
-#define SFL_MAJORITIES 1
-#define SFL_DISABLED_VALIDATORS 1
-#define SFL_HOOK_EXECUTIONS 1
-#define SFL_HOOK_EXECUTION 1

hook/genesis/makefile

@@ -1,9 +1,9 @@
 all: reward govern mint
 accept:
-	wasmcc accept.c -o accept.wasm -Oz -Wl,--allow-undefined  -I./headers
+	wasmcc accept.c -o accept.wasm -Oz -Wl,--allow-undefined  -I../
 	hook-cleaner accept.wasm
 reward:
-	wasmcc reward.c -o reward.wasm -Oz -Wl,--allow-undefined  -I./headers
+	wasmcc reward.c -o reward.wasm -Oz -Wl,--allow-undefined  -I../
 	wasm-opt reward.wasm -o reward.wasm \
 		--shrink-level=100000000 \
 		--coalesce-locals-learning \
@@ -58,7 +58,7 @@ reward:
 	hook-cleaner reward.wasm
 	guard_checker reward.wasm
 govern:
-	wasmcc govern.c -o govern.wasm -Oz -Wl,--allow-undefined  -I./headers
+	wasmcc govern.c -o govern.wasm -Oz -Wl,--allow-undefined  -I../
 	wasm-opt govern.wasm -o govern.wasm \
 		--shrink-level=100000000 \
 		--coalesce-locals-learning \
@@ -113,7 +113,7 @@ govern:
 	hook-cleaner govern.wasm
 	guard_checker govern.wasm
 mint:
-	wasmcc mint.c -o mint.wasm -Oz -Wl,--allow-undefined  -I./headers
+	wasmcc mint.c -o mint.wasm -Oz -Wl,--allow-undefined  -I../
 	wasm-opt mint.wasm -o mint.wasm \
 		--shrink-level=100000000 \
 		--coalesce-locals-learning \
@@ -142,5 +142,5 @@ mint:
 	hook-cleaner mint.wasm
 	guard_checker mint.wasm
 nftoken:
-	wasmcc nftoken.c -o nftoken.wasm -Oz -Wl,--allow-undefined  -I./headers
+	wasmcc nftoken.c -o nftoken.wasm -Oz -Wl,--allow-undefined  -I../
 	hook-cleaner nftoken.wasm

hook/hookapi.h

@@ -49,7 +49,4 @@
 #include "macro.h"
 #include "tts.h"
 
-#include "ls_flags.h"
-#include "tx_flags.h"
-
 #endif

hook/ls_flags.h

@@ -1,75 +0,0 @@
-// Generated using generate_lsflags.sh
-
-#ifndef HOOKLSFLAGS_INCLUDED
-#define HOOKLSFLAGS_INCLUDED 1
-
-enum ltACCOUNT_ROOT {
-    lsfPasswordSpent = 0x00010000,
-    lsfRequireDestTag = 0x00020000,
-    lsfRequireAuth = 0x00040000,
-    lsfDisallowXRP = 0x00080000,
-    lsfDisableMaster = 0x00100000,
-    lsfNoFreeze = 0x00200000,
-    lsfGlobalFreeze = 0x00400000,
-    lsfDefaultRipple = 0x00800000,
-    lsfDepositAuth = 0x01000000,
-    lsfTshCollect = 0x02000000,
-    lsfDisallowIncomingNFTokenOffer = 0x04000000,
-    lsfDisallowIncomingCheck = 0x08000000,
-    lsfDisallowIncomingPayChan = 0x10000000,
-    lsfDisallowIncomingTrustline = 0x20000000,
-    lsfURITokenIssuer = 0x40000000,
-    lsfDisallowIncomingRemit = 0x80000000,
-    lsfAllowTrustLineClawback = 0x00001000,
-};
-enum ltOFFER {
-    lsfPassive = 0x00010000,
-    lsfSell = 0x00020000,
-};
-enum ltRIPPLE_STATE {
-    lsfLowReserve = 0x00010000,
-    lsfHighReserve = 0x00020000,
-    lsfLowAuth = 0x00040000,
-    lsfHighAuth = 0x00080000,
-    lsfLowNoRipple = 0x00100000,
-    lsfHighNoRipple = 0x00200000,
-    lsfLowFreeze = 0x00400000,
-    lsfHighFreeze = 0x00800000,
-    lsfLowDeepFreeze = 0x02000000,
-    lsfHighDeepFreeze = 0x04000000,
-    lsfAMMNode = 0x01000000,
-};
-enum ltSIGNER_LIST {
-    lsfOneOwnerCount = 0x00010000,
-};
-enum ltDIR_NODE {
-    lsfNFTokenBuyOffers = 0x00000001,
-    lsfNFTokenSellOffers = 0x00000002,
-    lsfEmittedDir = 0x00000004,
-};
-enum ltNFTOKEN_OFFER {
-    lsfSellNFToken = 0x00000001,
-};
-enum ltURI_TOKEN {
-    lsfBurnable = 0x00000001,
-};
-enum remarks {
-    lsfImmutable = 1,
-};
-enum ltMPTOKEN_ISSUANCE {
-    lsfMPTLocked = 0x00000001,
-    lsfMPTCanLock = 0x00000002,
-    lsfMPTRequireAuth = 0x00000004,
-    lsfMPTCanEscrow = 0x00000008,
-    lsfMPTCanTrade = 0x00000010,
-    lsfMPTCanTransfer = 0x00000020,
-    lsfMPTCanClawback = 0x00000040,
-};
-enum ltMPTOKEN {
-    lsfMPTAuthorized = 0x00000002,
-};
-enum ltCREDENTIAL {
-    lsfAccepted = 0x00010000,
-};
-
-#endif // HOOKLSFLAGS_INCLUDED

hook/sfcodes.h

@@ -152,13 +152,11 @@
 #define sfEscrowID ((5U << 16U) + 35U)
 #define sfURITokenID ((5U << 16U) + 36U)
 #define sfDomainID ((5U << 16U) + 37U)
-#define sfHookOnOutgoing ((5U << 16U) + 93U)
-#define sfHookOnIncoming ((5U << 16U) + 94U)
-#define sfCron ((5U << 16U) + 95U)
-#define sfHookCanEmit ((5U << 16U) + 96U)
-#define sfEmittedTxnID ((5U << 16U) + 97U)
-#define sfGovernanceMarks ((5U << 16U) + 98U)
 #define sfGovernanceFlags ((5U << 16U) + 99U)
+#define sfGovernanceMarks ((5U << 16U) + 98U)
+#define sfEmittedTxnID ((5U << 16U) + 97U)
+#define sfHookCanEmit ((5U << 16U) + 96U)
+#define sfCron ((5U << 16U) + 95U)
 #define sfNumber ((9U << 16U) + 1U)
 #define sfAmount ((6U << 16U) + 1U)
 #define sfBalance ((6U << 16U) + 2U)
@@ -274,6 +272,7 @@
 #define sfDisabledValidator ((14U << 16U) + 19U)
 #define sfEmittedTxn ((14U << 16U) + 20U)
 #define sfHookExecution ((14U << 16U) + 21U)
+#define sfHookDefinition ((14U << 16U) + 22U)
 #define sfHookParameter ((14U << 16U) + 23U)
 #define sfHookGrant ((14U << 16U) + 24U)
 #define sfVoteEntry ((14U << 16U) + 25U)
@@ -314,9 +313,9 @@
 #define sfAuthorizeCredentials ((15U << 16U) + 26U)
 #define sfUnauthorizeCredentials ((15U << 16U) + 27U)
 #define sfAcceptedCredentials ((15U << 16U) + 28U)
-#define sfAmounts ((15U << 16U) + 92U)
-#define sfHookEmissions ((15U << 16U) + 93U)
-#define sfImportVLKeys ((15U << 16U) + 94U)
-#define sfActiveValidators ((15U << 16U) + 95U)
-#define sfGenesisMints ((15U << 16U) + 96U)
 #define sfRemarks ((15U << 16U) + 97U)
+#define sfGenesisMints ((15U << 16U) + 96U)
+#define sfActiveValidators ((15U << 16U) + 95U)
+#define sfImportVLKeys ((15U << 16U) + 94U)
+#define sfHookEmissions ((15U << 16U) + 93U)
+#define sfAmounts ((15U << 16U) + 92U)

hook/tx_flags.h

@@ -1,117 +0,0 @@
-// Generated using generate_txflags.sh
-#include "ls_flags.h"
-#include <stdint.h>
-
-enum UniversalFlags : uint32_t {
-    tfFullyCanonicalSig = 0x80000000,
-};
-
-enum AccountSetFlags : uint32_t {
-    tfRequireDestTag = 0x00010000,
-    tfOptionalDestTag = 0x00020000,
-    tfRequireAuth = 0x00040000,
-    tfOptionalAuth = 0x00080000,
-    tfDisallowXRP = 0x00100000,
-    tfAllowXRP = 0x00200000,
-};
-
-enum AccountFlags : uint32_t {
-    asfRequireDest = 1,
-    asfRequireAuth = 2,
-    asfDisallowXRP = 3,
-    asfDisableMaster = 4,
-    asfAccountTxnID = 5,
-    asfNoFreeze = 6,
-    asfGlobalFreeze = 7,
-    asfDefaultRipple = 8,
-    asfDepositAuth = 9,
-    asfAuthorizedNFTokenMinter = 10,
-    asfTshCollect = 11,
-    asfDisallowIncomingNFTokenOffer = 12,
-    asfDisallowIncomingCheck = 13,
-    asfDisallowIncomingPayChan = 14,
-    asfDisallowIncomingTrustline = 15,
-    asfDisallowIncomingRemit = 16,
-    asfAllowTrustLineClawback = 17,
-};
-
-enum OfferCreateFlags : uint32_t {
-    tfPassive = 0x00010000,
-    tfImmediateOrCancel = 0x00020000,
-    tfFillOrKill = 0x00040000,
-    tfSell = 0x00080000,
-};
-
-enum PaymentFlags : uint32_t {
-    tfNoRippleDirect = 0x00010000,
-    tfPartialPayment = 0x00020000,
-    tfLimitQuality = 0x00040000,
-};
-
-enum TrustSetFlags : uint32_t {
-    tfSetfAuth = 0x00010000,
-    tfSetNoRipple = 0x00020000,
-    tfClearNoRipple = 0x00040000,
-    tfSetFreeze = 0x00100000,
-    tfClearFreeze = 0x00200000,
-    tfSetDeepFreeze = 0x00400000,
-    tfClearDeepFreeze = 0x00800000
-};
-
-enum EnableAmendmentFlags : uint32_t {
-    tfGotMajority = 0x00010000,
-    tfLostMajority = 0x00020000,
-    tfTestSuite = 0x80000000,
-};
-
-enum PaymentChannelClaimFlags : uint32_t {
-    tfRenew = 0x00010000,
-    tfClose = 0x00020000,
-};
-
-enum NFTokenMintFlags : uint32_t {
-    tfBurnable = 0x00000001,
-    tfOnlyXRP = 0x00000002,
-    tfTrustLine = 0x00000004,
-    tfTransferable = 0x00000008,
-    tfMutable = 0x00000010,
-    tfStrongTSH = 0x00008000,
-};
-
-enum MPTokenIssuanceCreateFlags : uint32_t {
-    tfMPTCanLock = lsfMPTCanLock,
-    tfMPTRequireAuth = lsfMPTRequireAuth,
-    tfMPTCanEscrow = lsfMPTCanEscrow,
-    tfMPTCanTrade = lsfMPTCanTrade,
-    tfMPTCanTransfer = lsfMPTCanTransfer,
-    tfMPTCanClawback = lsfMPTCanClawback,
-};
-
-enum MPTokenAuthorizeFlags : uint32_t {
-    tfMPTUnauthorize = 0x00000001,
-};
-
-enum MPTokenIssuanceSetFlags : uint32_t {
-    tfMPTLock = 0x00000001,
-    tfMPTUnlock = 0x00000002,
-};
-
-enum NFTokenCreateOfferFlags : uint32_t {
-    tfSellNFToken = 0x00000001,
-};
-
-enum ClaimRewardFlags : uint32_t {
-    tfOptOut = 0x00000001,
-};
-
-enum CronSetFlags : uint32_t {
-    tfCronUnset = 0x00000001,
-};
-
-enum AMMClawbackFlags : uint32_t {
-    tfClawTwoAssets = 0x00000001,
-};
-
-enum BridgeModifyFlags : uint32_t {
-    tfClearAccountCreateAmount = 0x00010000,
-};

include/xrpl/basics/Expected.h

@@ -138,14 +138,14 @@ public:
     template <typename U>
         requires std::convertible_to<U, T>
     constexpr Expected(U&& r)
-        : Base(boost::outcome_v2::in_place_type_t<T>{}, std::forward<U>(r))
+        : Base(boost::outcome_v2::success(T(std::forward<U>(r))))
     {
     }
 
     template <typename U>
         requires std::convertible_to<U, E> && (!std::is_reference_v<U>)
     constexpr Expected(Unexpected<U> e)
-        : Base(boost::outcome_v2::in_place_type_t<E>{}, std::move(e.value()))
+        : Base(boost::outcome_v2::failure(E(std::move(e.value()))))
     {
     }
 

include/xrpl/hook/Enum.h

@@ -14,7 +14,6 @@
 // Override uint256, Feature and Rules for guard checker build
 #define uint256 std::string
 #define featureHooksUpdate1 "1"
-#define featureHooksUpdate2 "1"
 #define fix20250131 "1"
 namespace hook_api {
 struct Rules
@@ -264,11 +263,8 @@ enum hook_log_code : uint16_t {
     SECTIONS_OUT_OF_SEQUENCE =
         85,  // the wasm contained sections out of sequence
     CUSTOM_SECTION_DISALLOWED =
-        86,                // the wasm contained a custom section (id=0)
-    INTERNAL_ERROR = 87,   // an internal error described by the log text
-    JS_TEST_FAILURE = 88,  // smoke test of js bytecode failed
-    JS_FEE_MISSING = 89,
-    JS_FEE_OUT_OF_RANGE = 90,
+        86,               // the wasm contained a custom section (id=0)
+    INTERNAL_ERROR = 87,  // an internal error described by the log text
     // RH NOTE: only HookSet msgs got log codes, possibly all Hook log lines
     // should get a code?
 };
@@ -394,15 +390,6 @@ enum ExitType : uint8_t {
     WASM_ERROR = 1,
     ROLLBACK = 2,
     ACCEPT = 3,
-    JSVM_ERROR = 4,
-    LEDGER_ERROR =
-        5,  // if the ledger contained for example a nonsense hookapi number
-    INSTRUCTION_LIMIT_REACHED = 6,
-};
-
-enum CodeType : uint8_t {
-    WASM = 0,
-    JS = 1,
 };
 
 const uint16_t max_state_modifications = 256;
@@ -436,10 +423,6 @@ getImportWhitelist(Rules const& rules)
     if (AMENDMENT == uint256{} || rules.enabled(AMENDMENT)) \
         whitelist[#FUNCTION_NAME] = {                       \
             RETURN_TYPE, HOOK_WRAP_PARAMS PARAMS_TUPLE};
-#define JSHOOK_API_DEFINITION(                           \
-    RETURN_TYPE, FUNCTION_NAME, PARAMS_TUPLE, AMENDMENT) \
-    {                                                    \
-    }
 
 #include "hook_api.macro"
 

include/xrpl/hook/HookAPI.h

@@ -58,9 +58,6 @@ public:
     // sto_erase(): same as sto_emplace with field_object = nullopt
 
     /// etxn APIs
-    Expected<Bytes, HookReturnCode>
-    prepare(Slice const& txBlob) const;
-
     Expected<std::shared_ptr<Transaction>, HookReturnCode>
     emit(Slice const& txBlob) const;
 

include/xrpl/hook/Macro.h

@@ -67,7 +67,6 @@
 #define SEP_int32_t LPAREN int32_t COMMA
 #define SEP_uint64_t LPAREN uint64_t COMMA
 #define SEP_int64_t LPAREN int64_t COMMA
-#define SEP_JSValue LPAREN JSValue COMMA
 
 #define VAL_uint32_t WasmEdge_ValueGetI32(in[_stack++])
 #define VAL_int32_t WasmEdge_ValueGetI32(in[_stack++])
@@ -90,82 +89,7 @@
 
 #define WASM_VAL_TYPE(T, b) CAT2(TYP_, T)
 
-#define HALF_COUNT(...) \
-    HALF_COUNT_IMPL(    \
-        __VA_ARGS__,    \
-        16,             \
-        16,             \
-        15,             \
-        15,             \
-        14,             \
-        14,             \
-        13,             \
-        13,             \
-        12,             \
-        12,             \
-        11,             \
-        11,             \
-        10,             \
-        10,             \
-        9,              \
-        9,              \
-        8,              \
-        8,              \
-        7,              \
-        7,              \
-        6,              \
-        6,              \
-        5,              \
-        5,              \
-        4,              \
-        4,              \
-        3,              \
-        3,              \
-        2,              \
-        2,              \
-        1,              \
-        1,              \
-        0,              \
-        0)
-
-#define HALF_COUNT_IMPL( \
-    _1,                  \
-    _2,                  \
-    _3,                  \
-    _4,                  \
-    _5,                  \
-    _6,                  \
-    _7,                  \
-    _8,                  \
-    _9,                  \
-    _10,                 \
-    _11,                 \
-    _12,                 \
-    _13,                 \
-    _14,                 \
-    _15,                 \
-    _16,                 \
-    _17,                 \
-    _18,                 \
-    _19,                 \
-    _20,                 \
-    _21,                 \
-    _22,                 \
-    _23,                 \
-    _24,                 \
-    _25,                 \
-    _26,                 \
-    _27,                 \
-    _28,                 \
-    _29,                 \
-    _30,                 \
-    _31,                 \
-    _32,                 \
-    N,                   \
-    ...)                 \
-    N
-
-#define DECLARE_WASM_FUNCTION(R, F, ...)                         \
+#define DECLARE_HOOK_FUNCTION(R, F, ...)                         \
     R F(hook::HookContext& hookCtx,                              \
         WasmEdge_CallingFrameContext const& frameCtx __VA_OPT__( \
             COMMA __VA_ARGS__));                                 \
@@ -179,12 +103,7 @@
     extern WasmEdge_FunctionTypeContext* WasmFunctionType##F;    \
     extern WasmEdge_String WasmFunctionName##F;
 
-#define DECLARE_JS_FUNCTION(R, F, ...)                                        \
-    extern JSValue JSFunction##F(                                             \
-        JSContext* ctx, JSValueConst this_val, int argc, JSValueConst* argv); \
-    const int JSFunctionParamCount##F = __VA_OPT__(HALF_COUNT(__VA_ARGS__) +) 0;
-
-#define DEFINE_WASM_FUNCTION(R, F, ...)                             \
+#define DEFINE_HOOK_FUNCTION(R, F, ...)                             \
     WasmEdge_Result hook_api::WasmFunction##F(                      \
         void* data_ptr,                                             \
         const WasmEdge_CallingFrameContext* frameCtx,               \
@@ -221,43 +140,7 @@
         WasmEdge_CallingFrameContext const& frameCtx __VA_OPT__(    \
             COMMA __VA_ARGS__))
 
-#define VAR_JSASSIGN(T, V)          \
-    if (_stack >= argc)             \
-        returnJS(INVALID_ARGUMENT); \
-    T& V = argv[_stack++]
-
-#define FORWARD_JS_FUNCTION_CALL(F, ac, av) \
-    hook_api::JSFunction##F(ctx, this_val, ac, av)
-
-#define DEFINE_JS_FUNCTION(R, F, ...)                                        \
-    JSValue hook_api::JSFunction##F(                                         \
-        JSContext* ctx, JSValueConst this_val, int argc, JSValueConst* argv) \
-    {                                                                        \
-        __VA_OPT__(int _stack = 0;)                                          \
-        __VA_OPT__(FOR_VARS(VAR_JSASSIGN, 2, __VA_ARGS__);)
-
-#define JS_HOOK_SETUP()                                                 \
-    JSRuntime* rt = JS_GetRuntime(ctx);                                 \
-    hook::HookContext& hookCtx =                                        \
-        *reinterpret_cast<hook::HookContext*>(JS_GetRuntimeOpaque(rt)); \
-    [[maybe_unused]] ApplyContext& applyCtx = hookCtx.applyCtx;         \
-    [[maybe_unused]] auto& view = applyCtx.view();                      \
-    [[maybe_unused]] auto j = applyCtx.app.journal("View");             \
-    [[maybe_unused]] auto& api = hookCtx.api();                         \
-    try                                                                 \
-    {
-#define JS_HOOK_TEARDOWN()                                        \
-    }                                                             \
-    catch (const std::exception& e)                               \
-    {                                                             \
-        JLOG(hookCtx.applyCtx.app.journal("View").error())        \
-            << "HookError[" << HC_ACC() << "]: (JS) " << __func__ \
-            << " threw uncaught exception, what=" << e.what();    \
-        return JS_NewInt64(ctx, INTERNAL_ERROR);                  \
-    }                                                             \
-    }
-
-#define WASM_HOOK_SETUP()                                            \
+#define HOOK_SETUP()                                                 \
     try                                                              \
     {                                                                \
         [[maybe_unused]] ApplyContext& applyCtx = hookCtx.applyCtx;  \
@@ -274,14 +157,14 @@
         if (!memoryCtx || !memory || !memory_length)                 \
             return INTERNAL_ERROR;
 
-#define WASM_HOOK_TEARDOWN()                                        \
-    }                                                               \
-    catch (const std::exception& e)                                 \
-    {                                                               \
-        JLOG(hookCtx.applyCtx.app.journal("View").error())          \
-            << "HookError[" << HC_ACC() << "]: (WASM) " << __func__ \
-            << " threw uncaught exception, what=" << e.what();      \
-        return INTERNAL_ERROR;                                      \
+#define HOOK_TEARDOWN()                                        \
+    }                                                          \
+    catch (const std::exception& e)                            \
+    {                                                          \
+        JLOG(hookCtx.applyCtx.app.journal("View").error())     \
+            << "HookError[" << HC_ACC() << "]: " << __func__   \
+            << " threw uncaught exception, what=" << e.what(); \
+        return INTERNAL_ERROR;                                 \
     }
 
 #define WRITE_WASM_MEMORY(                                                  \
@@ -375,28 +258,6 @@
                                                     : RC_ROLLBACK);            \
     }
 
-#define HOOK_EXIT_JS(error_msg, error_code, exit_type)                      \
-    {                                                                       \
-        int64_t val = 0;                                                    \
-        if (JS_IsNumber(error_code))                                        \
-            JS_ToInt64(ctx, &val, error_code);                              \
-        hookCtx.result.exitCode = val;                                      \
-        hookCtx.result.exitType = exit_type;                                \
-        if (JS_IsString(error_msg))                                         \
-        {                                                                   \
-            size_t len;                                                     \
-            const char* cstr = JS_ToCStringLen(ctx, &len, error_msg);       \
-            if (len > 256)                                                  \
-                len = 256;                                                  \
-            hookCtx.result.exitReason = std::string(cstr, len);             \
-            JS_FreeCString(ctx, cstr);                                      \
-        }                                                                   \
-        return JS_Exit(                                                     \
-            ctx,                                                            \
-            exit_type == hook_api::ExitType::ACCEPT ? "HookExit Accept"     \
-                                                    : "HookExit Rollback"); \
-    }
-
 #define WRITE_WASM_MEMORY_OR_RETURN_AS_INT64(                            \
     write_ptr_in, write_len_in, data_ptr_in, data_len_in, is_account_in) \
     {                                                                    \

include/xrpl/hook/hook_api.macro

@@ -7,559 +7,311 @@ HOOK_API_DEFINITION(
 HOOK_API_DEFINITION(
   int64_t, accept, (uint32_t, uint32_t, int64_t),
   uint256{})
-// function accept(error_msg: string, error_code: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, accept, (JSValue, JSValue),
-  uint256{})
 
 // int64_t rollback(uint32_t read_ptr, uint32_t read_len, int64_t error_code);
 HOOK_API_DEFINITION(
   int64_t, rollback, (uint32_t, uint32_t, int64_t),
   uint256{})
-// function rollback(error_msg: string, error_code: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, rollback, (JSValue, JSValue),
-  uint256{})
 
 // int64_t util_raddr(uint32_t write_ptr, uint32_t write_len, uint32_t read_ptr, uint32_t read_len);
 HOOK_API_DEFINITION(
   int64_t, util_raddr, (uint32_t, uint32_t, uint32_t, uint32_t),
   uint256{})
-// function util_raddr(acc_id:string): string
-JSHOOK_API_DEFINITION(
-  JSValue, util_raddr, (JSValue),
-  uint256{})
 
 // int64_t util_accid(uint32_t write_ptr, uint32_t write_len, uint32_t read_ptr, uint32_t read_len);
 HOOK_API_DEFINITION(
   int64_t, util_accid, (uint32_t, uint32_t, uint32_t, uint32_t),
   uint256{})
-// function util_accid(acc_id:string): string
-JSHOOK_API_DEFINITION(
-  JSValue, util_accid, (JSValue),
-  uint256{})
 
 // int64_t util_verify(uint32_t dread_ptr, uint32_t dread_len, uint32_t sread_ptr, uint32_t sread_len, uint32_t kread_ptr, uint32_t kread_len);
 HOOK_API_DEFINITION(
   int64_t, util_verify, (uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t),
   uint256{})
-// function util_verify(data:string, sig: string, pubkey: string): number
-JSHOOK_API_DEFINITION(
-  JSValue, util_verify, (JSValue, JSValue, JSValue),
-  uint256{})
 
 // int64_t util_sha512h(uint32_t write_ptr, uint32_t write_len, uint32_t read_ptr, uint32_t read_len);
 HOOK_API_DEFINITION(
   int64_t, util_sha512h, (uint32_t, uint32_t, uint32_t, uint32_t),
   uint256{})
-// function util_sha512h(data: string): number
-JSHOOK_API_DEFINITION(
-  JSValue, util_sha512h, (JSValue),
-  uint256{})
 
 // int64_t util_keylet(uint32_t write_ptr, uint32_t write_len, uint32_t keylet_type, uint32_t a, uint32_t b, uint32_t c, uint32_t d, uint32_t e, uint32_t f);
 HOOK_API_DEFINITION(
   int64_t, util_keylet, (uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t),
   uint256{})
-// function util_keylet(keylet_type: number, keylet_data: string): number
-JSHOOK_API_DEFINITION(
-  JSValue, util_keylet, (JSValue, JSValue),
-  uint256{})
 
 // int64_t sto_validate(uint32_t tread_ptr, uint32_t tread_len);
 HOOK_API_DEFINITION(
   int64_t, sto_validate, (uint32_t, uint32_t),
   uint256{})
-// function sto_validate(sto: string): number
-JSHOOK_API_DEFINITION(
-  JSValue, sto_validate, (JSValue),
-  uint256{})
 
 // int64_t sto_subfield(uint32_t read_ptr, uint32_t read_len, uint32_t field_id);
 HOOK_API_DEFINITION(
   int64_t, sto_subfield, (uint32_t, uint32_t, uint32_t),
   uint256{})
-// function sto_subfield(sto: string, field_id: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, sto_subfield, (JSValue, JSValue),
-  uint256{})
 
 // int64_t sto_subarray(uint32_t read_ptr, uint32_t read_len, uint32_t array_id);
 HOOK_API_DEFINITION(
   int64_t, sto_subarray, (uint32_t, uint32_t, uint32_t),
   uint256{})
-// function sto_subarray(sto: string, array_id: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, sto_subarray, (JSValue, JSValue),
-  uint256{})
 
 // int64_t sto_emplace(uint32_t write_ptr, uint32_t write_len, uint32_t sread_ptr, uint32_t sread_len, uint32_t fread_ptr, uint32_t fread_len, uint32_t field_id);
 HOOK_API_DEFINITION(
   int64_t, sto_emplace, (uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t),
   uint256{})
-// function sto_emplace(sto: string, field_bytes: number, field_id: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, sto_emplace, (JSValue, JSValue, JSValue),
-  uint256{})
 
 // int64_t sto_erase(uint32_t write_ptr, uint32_t write_len, uint32_t read_ptr, uint32_t read_len, uint32_t field_id);
 HOOK_API_DEFINITION(
   int64_t, sto_erase, (uint32_t, uint32_t, uint32_t, uint32_t, uint32_t),
   uint256{})
-// function sto_erase(sto: string, field_id: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, sto_erase, (JSValue, JSValue),
-  uint256{})
 
 // int64_t etxn_burden();
 HOOK_API_DEFINITION(
   int64_t, etxn_burden, (),
   uint256{})
-// function etxn_burden(): number
-JSHOOK_API_DEFINITION(
-  JSValue, etxn_burden, (),
-  uint256{})
 
 // int64_t etxn_details(uint32_t write_ptr, uint32_t write_len);
 HOOK_API_DEFINITION(
   int64_t, etxn_details, (uint32_t, uint32_t),
   uint256{})
-// function etxn_details(): number
-JSHOOK_API_DEFINITION(
-  JSValue, etxn_details, (),
-  uint256{})
 
 // int64_t etxn_fee_base(uint32_t read_ptr, uint32_t read_len);
 HOOK_API_DEFINITION(
   int64_t, etxn_fee_base, (uint32_t, uint32_t),
   uint256{})
-// function etxn_fee_base(txblob: string): number
-JSHOOK_API_DEFINITION(
-  JSValue, etxn_fee_base, (JSValue),
-  uint256{})
 
 // int64_t etxn_reserve(uint32_t count);
 HOOK_API_DEFINITION(
   int64_t, etxn_reserve, (uint32_t),
   uint256{})
-// function etxn_reserve(count: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, etxn_reserve, (JSValue),
-  uint256{})
 
 // int64_t etxn_generation();
 HOOK_API_DEFINITION(
   int64_t, etxn_generation, (),
   uint256{})
-// function etxn_generation(): number
-JSHOOK_API_DEFINITION(
-  JSValue, etxn_generation, (),
-  uint256{})
 
 // int64_t etxn_nonce(uint32_t write_ptr, uint32_t write_len);
 HOOK_API_DEFINITION(
   int64_t, etxn_nonce, (uint32_t, uint32_t),
   uint256{})
-// function etxn_nonce(): number
-JSHOOK_API_DEFINITION(
-  JSValue, etxn_nonce, (),
-  uint256{})
 
 // int64_t emit(uint32_t write_ptr, uint32_t write_len, uint32_t read_ptr, uint32_t read_len);
 HOOK_API_DEFINITION(
   int64_t, emit, (uint32_t, uint32_t, uint32_t, uint32_t),
   uint256{})
-// function emit(txn: string): number
-JSHOOK_API_DEFINITION(
-  JSValue, emit, (JSValue),
-  uint256{})
 
 // int64_t float_set(int32_t exponent, int64_t mantissa);
 HOOK_API_DEFINITION(
   int64_t, float_set, (int32_t, int64_t),
   uint256{})
-// function float_set(e: number, m: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, float_set, (JSValue, JSValue),
-  uint256{})
 
 // int64_t float_multiply(int64_t float1, int64_t float2);
 HOOK_API_DEFINITION(
   int64_t, float_multiply, (int64_t, int64_t),
   uint256{})
-// function float_multiply(f1: number, f2: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, float_multiply, (JSValue, JSValue),
-  uint256{})
 
 // int64_t float_mulratio(int64_t float1, uint32_t round_up, uint32_t numerator, uint32_t denominator);
 HOOK_API_DEFINITION(
   int64_t, float_mulratio, (int64_t, uint32_t, uint32_t, uint32_t),
   uint256{})
-// function float_mulratio(f1: number, round_up: number, numerator: number, denominator: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, float_mulratio, (JSValue, JSValue, JSValue, JSValue),
-  uint256{})
 
 // int64_t float_negate(int64_t float1);
 HOOK_API_DEFINITION(
   int64_t, float_negate, (int64_t),
   uint256{})
-// function float_negate(f1: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, float_negate, (JSValue),
-  uint256{})
 
 // int64_t float_compare(int64_t float1, int64_t float2, uint32_t mode);
 HOOK_API_DEFINITION(
   int64_t, float_compare, (int64_t, int64_t, uint32_t),
   uint256{})
-// function float_compare(f1: number, f2: number, mode: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, float_compare, (JSValue, JSValue, JSValue),
-  uint256{})
 
 // int64_t float_sum(int64_t float1, int64_t float2);
 HOOK_API_DEFINITION(
   int64_t, float_sum, (int64_t, int64_t),
   uint256{})
-// function float_sum(f1: number, f2: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, float_sum, (JSValue, JSValue),
-  uint256{})
 
 // int64_t float_sto(uint32_t write_ptr, uint32_t write_len, uint32_t cread_ptr, uint32_t cread_len, uint32_t iread_ptr, uint32_t iread_len, int64_t float1, uint32_t field_code);
 HOOK_API_DEFINITION(
   int64_t, float_sto, (uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, int64_t, uint32_t),
   uint256{})
-// function float_sto(cur: string, isu: string, float1: number, field_code: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, float_sto, (JSValue, JSValue, JSValue, JSValue),
-  uint256{})
 
 // int64_t float_sto_set(uint32_t read_ptr, uint32_t read_len);
 HOOK_API_DEFINITION(
   int64_t, float_sto_set, (uint32_t, uint32_t),
   uint256{})
-// function float_sto_set(buf: string): number
-JSHOOK_API_DEFINITION(
-  JSValue, float_sto_set, (JSValue),
-  uint256{})
 
 // int64_t float_invert(int64_t float1);
 HOOK_API_DEFINITION(
   int64_t, float_invert, (int64_t),
   uint256{})
-// function float_invert(f1: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, float_invert, (JSValue),
-  uint256{})
 
 // int64_t float_divide(int64_t float1, int64_t float2);
 HOOK_API_DEFINITION(
   int64_t, float_divide, (int64_t, int64_t),
   uint256{})
-// function float_divide(f1: number, f2: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, float_divide, (JSValue, JSValue),
-  uint256{})
 
 // int64_t float_one();
 HOOK_API_DEFINITION(
   int64_t, float_one, (),
   uint256{})
-// function float_one(): number
-JSHOOK_API_DEFINITION(
-  JSValue, float_one, (),
-  uint256{})
 
 // int64_t float_mantissa(int64_t float1);
 HOOK_API_DEFINITION(
   int64_t, float_mantissa, (int64_t),
   uint256{})
-// function float_mantissa(f1: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, float_mantissa, (JSValue),
-  uint256{})
 
 // int64_t float_sign(int64_t float1);
 HOOK_API_DEFINITION(
   int64_t, float_sign, (int64_t),
   uint256{})
-// function float_sign(f1: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, float_sign, (JSValue),
-  uint256{})
 
 // int64_t float_int(int64_t float1, uint32_t decimal_places, uint32_t abs);
 HOOK_API_DEFINITION(
   int64_t, float_int, (int64_t, uint32_t, uint32_t),
   uint256{})
-// function float_int(f1: number, decimal_places: number, abs: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, float_int, (JSValue, JSValue, JSValue),
-  uint256{})
 
 // int64_t float_log(int64_t float1);
 HOOK_API_DEFINITION(
   int64_t, float_log, (int64_t),
   uint256{})
-// function float_log(f1: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, float_log, (JSValue),
-  uint256{})
 
 // int64_t float_root(int64_t float1, uint32_t n);
 HOOK_API_DEFINITION(
   int64_t, float_root, (int64_t, uint32_t),
   uint256{})
-// function float_root(f1: number, n: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, float_root, (JSValue, JSValue),
-  uint256{})
 
 // int64_t fee_base();
 HOOK_API_DEFINITION(
   int64_t, fee_base, (),
   uint256{})
-// function fee_base(): number
-JSHOOK_API_DEFINITION(
-  JSValue, fee_base, (),
-  uint256{})
 
 // int64_t ledger_seq();
 HOOK_API_DEFINITION(
   int64_t, ledger_seq, (),
   uint256{})
-// function ledger_seq(): number
-JSHOOK_API_DEFINITION(
-  JSValue, ledger_seq, (),
-  uint256{})
 
 // int64_t ledger_last_time();
 HOOK_API_DEFINITION(
   int64_t, ledger_last_time, (),
   uint256{})
-// function ledger_last_time(): number
-JSHOOK_API_DEFINITION(
-  JSValue, ledger_last_time, (),
-  uint256{})
 
 // int64_t ledger_last_hash(uint32_t write_ptr, uint32_t write_len);
 HOOK_API_DEFINITION(
   int64_t, ledger_last_hash, (uint32_t, uint32_t),
   uint256{})
-// function ledger_last_hash(): number
-JSHOOK_API_DEFINITION(
-  JSValue, ledger_last_hash, (),
-  uint256{})
 
 // int64_t ledger_nonce(uint32_t write_ptr, uint32_t write_len);
 HOOK_API_DEFINITION(
   int64_t, ledger_nonce, (uint32_t, uint32_t),
   uint256{})
-// function ledger_nonce(): number
-JSHOOK_API_DEFINITION(
-  JSValue, ledger_nonce, (),
-  uint256{})
 
 // int64_t ledger_keylet(uint32_t write_ptr, uint32_t write_len, uint32_t lread_ptr, uint32_t lread_len, uint32_t hread_ptr, uint32_t hread_len);
 HOOK_API_DEFINITION(
   int64_t, ledger_keylet, (uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t),
   uint256{})
-// function ledger_keylet(low: string, high: string): number
-JSHOOK_API_DEFINITION(
-  JSValue, ledger_keylet, (JSValue, JSValue),
-  uint256{})
 
 // int64_t hook_account(uint32_t write_ptr, uint32_t write_len);
 HOOK_API_DEFINITION(
   int64_t, hook_account, (uint32_t, uint32_t),
   uint256{})
-// function hook_account(): number
-JSHOOK_API_DEFINITION(
-  JSValue, hook_account, (),
-  uint256{})
 
 // int64_t hook_hash(uint32_t write_ptr, uint32_t write_len, int32_t hook_no);
 HOOK_API_DEFINITION(
   int64_t, hook_hash, (uint32_t, uint32_t, int32_t),
   uint256{})
-// function hook_hash(hook_no: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, hook_hash, (JSValue),
-  uint256{})
 
 // int64_t hook_param_set(uint32_t read_ptr, uint32_t read_len, uint32_t kread_ptr, uint32_t kread_len, uint32_t hread_ptr, uint32_t hread_len);
 HOOK_API_DEFINITION(
   int64_t, hook_param_set, (uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t),
   uint256{})
-// function hook_param_set(value: string, key: string, hash: string): number
-JSHOOK_API_DEFINITION(
-  JSValue, hook_param_set, (JSValue, JSValue, JSValue),
-  uint256{})
 
 // int64_t hook_param(uint32_t write_ptr, uint32_t write_len, uint32_t read_ptr, uint32_t read_len);
 HOOK_API_DEFINITION(
   int64_t, hook_param, (uint32_t, uint32_t, uint32_t, uint32_t),
   uint256{})
-// function hook_param(key: string): number
-JSHOOK_API_DEFINITION(
-  JSValue, hook_param, (JSValue),
-  uint256{})
 
 // int64_t hook_again();
 HOOK_API_DEFINITION(
   int64_t, hook_again, (),
   uint256{})
-// function hook_again(): number
-JSHOOK_API_DEFINITION(
-  JSValue, hook_again, (),
-  uint256{})
 
 // int64_t hook_skip(uint32_t read_ptr, uint32_t read_len, uint32_t flags);
 HOOK_API_DEFINITION(
   int64_t, hook_skip, (uint32_t, uint32_t, uint32_t),
   uint256{})
-// function hook_skip(hhash: string, flags: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, hook_skip, (JSValue, JSValue),
-  uint256{})
 
 // int64_t hook_pos();
 HOOK_API_DEFINITION(
   int64_t, hook_pos, (),
   uint256{})
-// function hook_pos(): number
-JSHOOK_API_DEFINITION(
-  JSValue, hook_pos, (),
-  uint256{})
 
 // int64_t slot(uint32_t write_ptr, uint32_t write_len, uint32_t slot);
 HOOK_API_DEFINITION(
   int64_t, slot, (uint32_t, uint32_t, uint32_t),
   uint256{})
-// function slot(slot_no: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, slot, (JSValue),
-  uint256{})
 
 // int64_t slot_clear(uint32_t slot);
 HOOK_API_DEFINITION(
   int64_t, slot_clear, (uint32_t),
   uint256{})
-// function slot_clear(slot_no: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, slot_clear, (JSValue),
-  uint256{})
 
 // int64_t slot_count(uint32_t slot);
 HOOK_API_DEFINITION(
   int64_t, slot_count, (uint32_t),
   uint256{})
-// function slot_count(slot_no: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, slot_count, (JSValue),
-  uint256{})
 
 // int64_t slot_set(uint32_t read_ptr, uint32_t read_len, uint32_t slot);
 HOOK_API_DEFINITION(
   int64_t, slot_set, (uint32_t, uint32_t, uint32_t),
   uint256{})
-// function slot_set(kl: string, slot_no: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, slot_set, (JSValue, JSValue),
-  uint256{})
 
 // int64_t slot_size(uint32_t slot);
 HOOK_API_DEFINITION(
   int64_t, slot_size, (uint32_t),
   uint256{})
-// function slot_size(slot_no: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, slot_size, (JSValue),
-  uint256{})
 
 // int64_t slot_subarray(uint32_t parent_slot, uint32_t array_id, uint32_t new_slot);
 HOOK_API_DEFINITION(
   int64_t, slot_subarray, (uint32_t, uint32_t, uint32_t),
   uint256{})
-// function slot_subarray(parent_slot_no: number, array_id: number, new_slot: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, slot_subarray, (JSValue, JSValue, JSValue),
-  uint256{})
 
 // int64_t slot_subfield(uint32_t parent_slot, uint32_t field_id, uint32_t new_slot);
 HOOK_API_DEFINITION(
   int64_t, slot_subfield, (uint32_t, uint32_t, uint32_t),
   uint256{})
-// function slot_subfield(parent_slot_no: number, field_id: number, new_slot: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, slot_subfield, (JSValue, JSValue, JSValue),
-  uint256{})
 
 // int64_t slot_type(uint32_t slot_no, uint32_t flags);
 HOOK_API_DEFINITION(
   int64_t, slot_type, (uint32_t, uint32_t),
   uint256{})
-// function slot_type(slot_no: number, flags: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, slot_type, (JSValue, JSValue),
-  uint256{})
 
 // int64_t slot_float(uint32_t slot_no);
 HOOK_API_DEFINITION(
   int64_t, slot_float, (uint32_t),
   uint256{})
-// function slot_float(slot_no: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, slot_float, (JSValue),
-  uint256{})
 
 // int64_t state_set(uint32_t read_ptr, uint32_t read_len, uint32_t kread_ptr, uint32_t kread_len);
 HOOK_API_DEFINITION(
   int64_t, state_set, (uint32_t, uint32_t, uint32_t, uint32_t),
   uint256{})
-// function state_set(val: string, key: string): number
-JSHOOK_API_DEFINITION(
-  JSValue, state_set, (JSValue, JSValue),
-  uint256{})
 
 // int64_t state_foreign_set(uint32_t read_ptr, uint32_t read_len, uint32_t kread_ptr, uint32_t kread_len, uint32_t nread_ptr, uint32_t nread_len, uint32_t aread_ptr, uint32_t aread_len);
 HOOK_API_DEFINITION(
   int64_t, state_foreign_set, (uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t),
   uint256{})
-// function state_foreign_set(val: string, key: string, ns: string, accid: string): number
-JSHOOK_API_DEFINITION(
-  JSValue, state_foreign_set, (JSValue, JSValue, JSValue, JSValue),
-  uint256{})
 
 // int64_t state(uint32_t write_ptr, uint32_t write_len, uint32_t kread_ptr, uint32_t kread_len);
 HOOK_API_DEFINITION(
   int64_t, state, (uint32_t, uint32_t, uint32_t, uint32_t),
   uint256{})
-// function state(key: string): number
-JSHOOK_API_DEFINITION(
-  JSValue, state, (JSValue),
-  uint256{})
 
 // int64_t state_foreign(uint32_t write_ptr, uint32_t write_len, uint32_t kread_ptr, uint32_t kread_len, uint32_t nread_ptr, uint32_t nread_len, uint32_t aread_ptr, uint32_t aread_len);
 HOOK_API_DEFINITION(
   int64_t, state_foreign, (uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t),
   uint256{})
-// function state_foreign(key: string, ns: string, accid: string): number
-JSHOOK_API_DEFINITION(
-  JSValue, state_foreign, (JSValue, JSValue, JSValue),
-  uint256{})
 
 // int64_t trace(uint32_t mread_ptr, uint32_t mread_len, uint32_t dread_ptr, uint32_t dread_len, uint32_t as_hex);
 HOOK_API_DEFINITION(
   int64_t, trace, (uint32_t, uint32_t, uint32_t, uint32_t, uint32_t),
   uint256{})
-// function trace(msg: string, data: string, as_hex: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, trace, (JSValue, JSValue, JSValue),
-  uint256{})
 
 // int64_t trace_num(uint32_t read_ptr, uint32_t read_len, int64_t number);
 HOOK_API_DEFINITION(
@@ -575,108 +327,43 @@ HOOK_API_DEFINITION(
 HOOK_API_DEFINITION(
   int64_t, otxn_burden, (),
   uint256{})
-// function otxn_burden(): number
-JSHOOK_API_DEFINITION(
-  JSValue, otxn_burden, (),
-  uint256{})
 
 // int64_t otxn_field(uint32_t write_ptr, uint32_t write_len, uint32_t field_id);
 HOOK_API_DEFINITION(
   int64_t, otxn_field, (uint32_t, uint32_t, uint32_t),
   uint256{})
-// function otxn_field(field_id: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, otxn_field, (JSValue),
-  uint256{})
 
 // int64_t otxn_generation();
 HOOK_API_DEFINITION(
   int64_t, otxn_generation, (),
   uint256{})
-// function otxn_generation(): number
-JSHOOK_API_DEFINITION(
-  JSValue, otxn_generation, (),
-  uint256{})
 
 // int64_t otxn_id(uint32_t write_ptr, uint32_t write_len, uint32_t flags);
 HOOK_API_DEFINITION(
   int64_t, otxn_id, (uint32_t, uint32_t, uint32_t),
   uint256{})
-// function otxn_id(flags: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, otxn_id, (JSValue),
-  uint256{})
 
 // int64_t otxn_type();
 HOOK_API_DEFINITION(
   int64_t, otxn_type, (),
   uint256{})
-// function otxn_type(): number
-JSHOOK_API_DEFINITION(
-  JSValue, otxn_type, (),
-  uint256{})
 
 // int64_t otxn_slot(uint32_t slot_no);
 HOOK_API_DEFINITION(
   int64_t, otxn_slot, (uint32_t),
   uint256{})
-// function otxn_slot(slot_no: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, otxn_slot, (JSValue),
-  uint256{})
 
 // int64_t otxn_param(uint32_t write_ptr, uint32_t write_len, uint32_t read_ptr, uint32_t read_len);
 HOOK_API_DEFINITION(
   int64_t, otxn_param, (uint32_t, uint32_t, uint32_t, uint32_t),
   uint256{})
-// function otxn_param(param_key: string): number
-JSHOOK_API_DEFINITION(
-  JSValue, otxn_param, (JSValue),
-  uint256{})
 
 // int64_t meta_slot(uint32_t slot_no);
 HOOK_API_DEFINITION(
   int64_t, meta_slot, (uint32_t),
   uint256{})
-// function meta_slot(slot_no: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, meta_slot, (JSValue),
-  uint256{})
 
 // int64_t xpop_slot(uint32_t slot_no_tx, uint32_t slot_no_meta);
 HOOK_API_DEFINITION(
   int64_t, xpop_slot, (uint32_t, uint32_t),
   featureHooksUpdate1)
-// function xpop_slot(slot_no_tx: number, slot_no_meta: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, xpop_slot, (JSValue, JSValue),
-  uint256{})
-
-// int64_t prepare(uint32_t write_ptr, uint32_t write_len, uint32_t read_ptr, uint32_t read_len);
-HOOK_API_DEFINITION(
-  int64_t, prepare, (uint32_t, uint32_t, uint32_t, uint32_t),
-  featureHooksUpdate2)
-// function prepare(tmpl: string): number
-JSHOOK_API_DEFINITION(
-  JSValue, prepare, (JSValue),
-  uint256{})
-
-// function otxn_json(): number
-JSHOOK_API_DEFINITION(
-  JSValue, otxn_json, (),
-  uint256{})
-
-// function slot_json(slot_no: number): number
-JSHOOK_API_DEFINITION(
-  JSValue, slot_json, (JSValue),
-  uint256{})
-
-// function sto_to_json(sto_in: string): number
-JSHOOK_API_DEFINITION(
-  JSValue, sto_to_json, (JSValue),
-  uint256{})
-
-// function sto_from_json(json_in: string): number
-JSHOOK_API_DEFINITION(
-  JSValue, sto_from_json, (JSValue),
-  uint256{})

include/xrpl/protocol/Feature.h

@@ -80,7 +80,7 @@ namespace detail {
 // Feature.cpp. Because it's only used to reserve storage, and determine how
 // large to make the FeatureBitset, it MAY be larger. It MUST NOT be less than
 // the actual number of amendments. A LogicError on startup will verify this.
-static constexpr std::size_t numFeatures = 116;
+static constexpr std::size_t numFeatures = 111;
 
 /** Amendments that this server supports and the default voting behavior.
    Whether they are enabled depends on the Rules defined in the validated

include/xrpl/protocol/IOUAmount.h

@@ -97,12 +97,6 @@ public:
 
     static IOUAmount
     minPositiveAmount();
-
-    friend std::ostream&
-    operator<<(std::ostream& os, IOUAmount const& x)
-    {
-        return os << to_string(x);
-    }
 };
 
 inline IOUAmount::IOUAmount(beast::Zero)

include/xrpl/protocol/Import.h

@@ -20,8 +20,8 @@
 #ifndef RIPPLE_PROTOCOL_IMPORT_H_INCLUDED
 #define RIPPLE_PROTOCOL_IMPORT_H_INCLUDED
 
+// #include <ripple/basics/Log.h>
 #include <xrpld/app/misc/Manifest.h>
-#include <xrpl/basics/Log.h>
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/basics/base64.h>
 #include <xrpl/json/json_reader.h>

include/xrpl/protocol/LedgerFormats.h

@@ -147,9 +147,8 @@ enum LedgerSpecificFlags {
         0x40000000,               // True, has minted tokens in the past
     lsfDisallowIncomingRemit =    // True, no remits allowed to this account
         0x80000000,
-    // 0x0004000 is available
-    lsfAllowTrustLineClawback =
-        0x00001000,               // True, enable clawback
+    lsfAllowTrustLineClawback = 
+        0x00001000,               // True, enable clawback 
 
     // ltOFFER
     lsfPassive = 0x00010000,
@@ -164,10 +163,10 @@ enum LedgerSpecificFlags {
     lsfHighNoRipple = 0x00200000,
     lsfLowFreeze = 0x00400000,      // True, low side has set freeze flag
     lsfHighFreeze = 0x00800000,     // True, high side has set freeze flag
+    lsfAMMNode = 0x01000000,        // True, trust line to AMM. Used by client
+                                    // apps to identify payments via AMM.
     lsfLowDeepFreeze = 0x02000000,  // True, low side has set deep freeze flag
     lsfHighDeepFreeze = 0x04000000, // True, high side has set deep freeze flag
-    lsfAMMNode = 0x01000000,     // True, trust line to AMM. Used by client
-                                 // apps to identify payments via AMM.
 
     // ltSIGNER_LIST
     lsfOneOwnerCount = 0x00010000,  // True, uses only one OwnerCount

include/xrpl/protocol/Rules.h

@@ -28,9 +28,6 @@
 
 namespace ripple {
 
-bool
-isFeatureEnabled(uint256 const& feature);
-
 class DigestAwareReadView;
 
 /** Rules controlling protocol behavior. */

include/xrpl/protocol/TER.h

@@ -362,7 +362,6 @@ enum TECcodes : TERUnderlyingType {
     tecARRAY_TOO_LARGE = 197,
     tecLOCKED = 198,
     tecBAD_CREDENTIALS = 199,
-    tecINVALID_HOOK_API_VERSION = 200,
     tecLAST_POSSIBLE_ENTRY = 255,
 };
 

include/xrpl/protocol/TxFlags.h

@@ -125,14 +125,14 @@ enum TrustSetFlags : uint32_t {
     tfSetFreeze = 0x00100000,
     tfClearFreeze = 0x00200000,
     tfSetDeepFreeze = 0x00400000,
-    tfClearDeepFreeze = 0x00800000
+    tfClearDeepFreeze = 0x00800000,
 };
 constexpr std::uint32_t tfTrustSetMask =
     ~(tfUniversal | tfSetfAuth | tfSetNoRipple | tfClearNoRipple | tfSetFreeze |
       tfClearFreeze | tfSetDeepFreeze | tfClearDeepFreeze);
 
 // EnableAmendment flags:
-enum EnableAmendmentFlags : uint32_t {
+enum EnableAmendmentFlags : std::uint32_t {
     tfGotMajority = 0x00010000,
     tfLostMajority = 0x00020000,
     tfTestSuite = 0x80000000,

include/xrpl/protocol/detail/features.macro

@@ -24,16 +24,11 @@
 #error "undefined macro: XRPL_FIX"
 #endif
 
-// clang-format off
-
 // Add new amendments to the top of this list.
 // Keep it sorted in reverse chronological order.
 // If you add an amendment here, then do not forget to increment `numFeatures`
 // in include/xrpl/protocol/Feature.h.
 
-XRPL_FEATURE(JSHooks,                    Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (IOULockedBalanceInvariant,  Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (ImportIssuer,               Supported::yes, VoteBehavior::DefaultYes)
 XRPL_FEATURE(HookAPISerializedType240,   Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(PermissionedDomains,        Supported::no,  VoteBehavior::DefaultNo)
 XRPL_FEATURE(DynamicNFT,                 Supported::no,  VoteBehavior::DefaultNo)
@@ -56,18 +51,16 @@ XRPL_FEATURE(DID,                        Supported::no,  VoteBehavior::DefaultNo
 XRPL_FIX    (DisallowIncomingV1,         Supported::yes, VoteBehavior::DefaultYes)
 XRPL_FEATURE(XChainBridge,               Supported::no,  VoteBehavior::DefaultNo)
 XRPL_FEATURE(AMM,                        Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (ReducedOffersV1,            Supported::yes, VoteBehavior::DefaultYes)
-XRPL_FEATURE(HooksUpdate2,               Supported::yes, VoteBehavior::DefaultNo);
-XRPL_FEATURE(HookOnV2,                   Supported::yes, VoteBehavior::DefaultNo);
-XRPL_FIX    (HookAPI20251128,            Supported::yes, VoteBehavior::DefaultYes);
-XRPL_FIX    (CronStacking,               Supported::yes, VoteBehavior::DefaultYes);
-XRPL_FEATURE(ExtendedHookState,          Supported::yes, VoteBehavior::DefaultNo);
-XRPL_FIX    (InvalidTxFlags,             Supported::yes, VoteBehavior::DefaultYes);
-XRPL_FEATURE(Cron,                       Supported::yes, VoteBehavior::DefaultNo);
-XRPL_FEATURE(IOUIssuerWeakTSH,           Supported::yes, VoteBehavior::DefaultNo);
-XRPL_FEATURE(DeepFreeze,                 Supported::yes, VoteBehavior::DefaultNo);
-XRPL_FIX    (ProvisionalDoubleThreading, Supported::yes, VoteBehavior::DefaultYes);
+XRPL_FIX    (HookAPI20251128,            Supported::yes, VoteBehavior::DefaultYes)
+XRPL_FIX    (CronStacking,               Supported::yes, VoteBehavior::DefaultYes)
+XRPL_FEATURE(ExtendedHookState,          Supported::yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(Cron,                       Supported::yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (InvalidTxFlags,             Supported::yes, VoteBehavior::DefaultYes)
+XRPL_FEATURE(IOUIssuerWeakTSH,           Supported::yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(DeepFreeze,                 Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(Clawback,                   Supported::yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (ReducedOffersV1,            Supported::yes, VoteBehavior::DefaultYes)
+XRPL_FIX    (ProvisionalDoubleThreading, Supported::yes, VoteBehavior::DefaultYes)
 XRPL_FIX    (RewardClaimFlags,           Supported::yes, VoteBehavior::DefaultYes)
 XRPL_FEATURE(HookCanEmit,                Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (20250131,                   Supported::yes, VoteBehavior::DefaultYes)
@@ -150,4 +143,3 @@ XRPL_FIX    (NFTokenDirV1,          Supported::yes, VoteBehavior::Obsolete)
 XRPL_FEATURE(NonFungibleTokensV1,   Supported::yes, VoteBehavior::Obsolete)
 XRPL_FEATURE(CryptoConditionsSuite, Supported::yes, VoteBehavior::Obsolete)
 
-// clang-format on

include/xrpl/protocol/detail/ledger_entries.macro

@@ -65,7 +65,7 @@ LEDGER_ENTRY_DUPLICATE(ltCRON, 0x0041, Cron, cron, ({
     {sfRepeatCount,          soeREQUIRED},
     {sfOwnerNode,            soeREQUIRED},
     {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
+    {sfPreviousTxnLgrSeq,    soeREQUIRED}
 }))
 
 /** A ledger object which describes a check.
@@ -94,8 +94,6 @@ LEDGER_ENTRY(ltCHECK, 0x0043, Check, check, ({
 LEDGER_ENTRY(ltHOOK_DEFINITION, 'D', HookDefinition, hook_definition, ({
     {sfHookHash,             soeREQUIRED},
     {sfHookOn,               soeREQUIRED},
-    {sfHookOnIncoming,       soeOPTIONAL},
-    {sfHookOnOutgoing,       soeOPTIONAL},
     {sfHookCanEmit,          soeOPTIONAL},
     {sfHookNamespace,        soeREQUIRED},
     {sfHookParameters,       soeREQUIRED},
@@ -132,8 +130,6 @@ LEDGER_ENTRY(ltHOOK, 'H', Hook, hook, ({
 
 /** The ledger object which records the last (and largest) sequence for a validator list key
   * as used in the Import amendment
-  
-  \sa keylet::import_vlseq
   */
 LEDGER_ENTRY(ltIMPORT_VLSEQ, 0x0049, ImportVLSequence, import_vlseq, ({
     {sfPublicKey,            soeREQUIRED},

include/xrpl/protocol/detail/sfields.macro

@@ -210,13 +210,11 @@ TYPED_SFIELD(sfOfferID,                  UINT256,   34)
 TYPED_SFIELD(sfEscrowID,                 UINT256,   35)
 TYPED_SFIELD(sfURITokenID,               UINT256,   36)
 TYPED_SFIELD(sfDomainID,                 UINT256,   37)
-TYPED_SFIELD(sfHookOnOutgoing,           UINT256,   93)
-TYPED_SFIELD(sfHookOnIncoming,           UINT256,   94)
-TYPED_SFIELD(sfCron,                     UINT256,   95)
-TYPED_SFIELD(sfHookCanEmit,              UINT256,   96)
-TYPED_SFIELD(sfEmittedTxnID,             UINT256,   97)
-TYPED_SFIELD(sfGovernanceMarks,          UINT256,   98)
 TYPED_SFIELD(sfGovernanceFlags,          UINT256,   99)
+TYPED_SFIELD(sfGovernanceMarks,          UINT256,   98)
+TYPED_SFIELD(sfEmittedTxnID,             UINT256,   97)
+TYPED_SFIELD(sfHookCanEmit,              UINT256,   96)
+TYPED_SFIELD(sfCron,                     UINT256,   95)
 
 // number (common)
 TYPED_SFIELD(sfNumber,                   NUMBER,     1)
@@ -367,7 +365,7 @@ UNTYPED_SFIELD(sfMajority,               OBJECT,    18)
 UNTYPED_SFIELD(sfDisabledValidator,      OBJECT,    19)
 UNTYPED_SFIELD(sfEmittedTxn,             OBJECT,    20)
 UNTYPED_SFIELD(sfHookExecution,          OBJECT,    21)
-                                                 // 22 unused
+UNTYPED_SFIELD(sfHookDefinition,         OBJECT,    22)
 UNTYPED_SFIELD(sfHookParameter,          OBJECT,    23)
 UNTYPED_SFIELD(sfHookGrant,              OBJECT,    24)
 UNTYPED_SFIELD(sfVoteEntry,              OBJECT,    25)
@@ -416,9 +414,9 @@ UNTYPED_SFIELD(sfAuthAccounts,           ARRAY,     25)
 UNTYPED_SFIELD(sfAuthorizeCredentials,   ARRAY,     26)
 UNTYPED_SFIELD(sfUnauthorizeCredentials, ARRAY,     27)
 UNTYPED_SFIELD(sfAcceptedCredentials,    ARRAY,     28)
-UNTYPED_SFIELD(sfAmounts,                ARRAY,     92)
-UNTYPED_SFIELD(sfHookEmissions,          ARRAY,     93)
-UNTYPED_SFIELD(sfImportVLKeys,           ARRAY,     94)
-UNTYPED_SFIELD(sfActiveValidators,       ARRAY,     95)
-UNTYPED_SFIELD(sfGenesisMints,           ARRAY,     96)
 UNTYPED_SFIELD(sfRemarks,                ARRAY,     97)
+UNTYPED_SFIELD(sfGenesisMints,           ARRAY,     96)
+UNTYPED_SFIELD(sfActiveValidators,       ARRAY,     95)
+UNTYPED_SFIELD(sfImportVLKeys,           ARRAY,     94)
+UNTYPED_SFIELD(sfHookEmissions,          ARRAY,     93)
+UNTYPED_SFIELD(sfAmounts,                ARRAY,     92)

include/xrpl/protocol/detail/transactions.macro

@@ -513,6 +513,7 @@ TRANSACTION(ttCRON_SET, 93, CronSet, ({
     {sfStartTime, soeOPTIONAL},
 }))
 
+
 /* A note attaching transactor that allows the owner or issuer (on a object by object basis) to attach remarks */
 TRANSACTION(ttREMARKS_SET, 94, SetRemarks, ({
     {sfObjectID, soeREQUIRED},

include/xrpl/protocol/jss.h

@@ -78,8 +78,6 @@ JSS(HookCanEmit);         // field
 JSS(HookHash);            // field
 JSS(HookNamespace);       // field
 JSS(HookOn);              // field
-JSS(HookOnIncoming);      // field
-JSS(HookOnOutgoing);      // field
 JSS(Hooks);               // field
 JSS(HookGrants);          // field
 JSS(HookParameters);      // field
@@ -97,7 +95,6 @@ JSS(Invalid);                  //
 JSS(Issuer);                   // in: Credential transactions
 JSS(InvoiceID);                // field
 JSS(LastLedgerSequence);       // in: TransactionSign; field
-JSS(FirstLedgerSequence);      // in: TransactionSign; field
 JSS(LastUpdateTime);           // field.
 JSS(LimitAmount);              // field.
 JSS(NetworkID);                // field.
@@ -122,7 +119,6 @@ JSS(Signer);                   // field.
 JSS(Signers);                  // field.
 JSS(HookStateData);            // field.
 JSS(HookStateKey);             // field.
-JSS(EmitDetails);              // field.
 JSS(SigningPubKey);            // field.
 JSS(Subject);                  // in: Credential transactions
 JSS(TakerGets);                // field.

release-builder.sh

@@ -129,9 +129,6 @@ ENV CMAKE_EXE_LINKER_FLAGS="-static-libstdc++"
 ENV LLVM_DIR=/usr/lib64/llvm14/lib/cmake/llvm
 ENV WasmEdge_LIB=/usr/local/lib64/libwasmedge.a
 
-ENV CC='ccache gcc'
-ENV CXX='ccache g++'
-
 # Install LLD
 RUN /hbb_exe/activate-exec bash -c "source /opt/rh/gcc-toolset-11/enable && \
     cd /tmp && \
@@ -196,7 +193,6 @@ ENV PATH=/usr/local/bin:$PATH
 RUN /hbb_exe/activate-exec bash -c "ccache -M 100G && \
     ccache -o cache_dir=/cache/ccache && \
     ccache -o compiler_check=content && \
-    ccache -o direct_mode=true && \
     mkdir -p ~/.conan2 /cache/conan2 /cache/conan2_download /cache/conan2_sources && \
     echo 'core.cache:storage_path=/cache/conan2' > ~/.conan2/global.conf && \
     echo 'core.download:download_cache=/cache/conan2_download' >> ~/.conan2/global.conf && \

src/libxrpl/basics/Log.cpp

@@ -22,11 +22,11 @@
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/chrono.h>
 #include <xrpl/basics/contract.h>
+#include <xrpl/beast/utility/instrumentation.h>
 #ifdef BEAST_ENHANCED_LOGGING
 #include <xrpl/beast/utility/EnhancedLogging.h>
 #include <date/tz.h>
 #endif
-#include <xrpl/beast/utility/instrumentation.h>
 #include <boost/algorithm/string.hpp>
 #include <cassert>
 #include <cstring>

src/libxrpl/protocol/Indexes.cpp

@@ -31,8 +31,6 @@
 
 namespace ripple {
 
-#define LEDGER_NAMESPACE2(value1, value2) (uint16_t(value1) << 8) | value2
-
 /** Type-specific prefix for calculating ledger indices.
 
     The identifier for a given object within the ledger is calculated based
@@ -82,14 +80,14 @@ enum class LedgerNameSpace : std::uint16_t {
     UNL_REPORT = 'R',
     CRON = 'L',
     AMM = 'A',
-    BRIDGE = LEDGER_NAMESPACE2(0x01, 'H'),
+    BRIDGE = 'H',
     XCHAIN_CLAIM_ID = 'Q',
     XCHAIN_CREATE_ACCOUNT_CLAIM_ID = 'K',
-    DID = LEDGER_NAMESPACE2(0x01, 'I'),
-    ORACLE = LEDGER_NAMESPACE2(0x01, 'R'),
+    DID = 'I',
+    ORACLE = 'R',
     MPTOKEN_ISSUANCE = '~',
     MPTOKEN = 't',
-    CREDENTIAL = LEDGER_NAMESPACE2(0x01, 'D'),
+    CREDENTIAL = 'D',
     PERMISSIONED_DOMAIN = 'm',
 
     // No longer used or supported. Left here to reserve the space

src/libxrpl/protocol/InnerObjectFormats.cpp

@@ -87,6 +87,17 @@ InnerObjectFormats::InnerObjectFormats()
          {sfEmittedTxnID, soeREQUIRED},
          {sfEmitNonce, soeOPTIONAL}});
 
+    add(sfHookDefinition.jsonName,
+        sfHookDefinition.getCode(),
+        {{sfCreateCode, soeREQUIRED},
+         {sfHookNamespace, soeREQUIRED},
+         {sfHookParameters, soeREQUIRED},
+         {sfHookOn, soeREQUIRED},
+         {sfHookCanEmit, soeOPTIONAL},
+         {sfHookApiVersion, soeREQUIRED},
+         {sfFlags, soeREQUIRED},
+         {sfFee, soeREQUIRED}});
+
     add(sfHook.jsonName,
         sfHook.getCode(),
         {{sfHookHash, soeOPTIONAL},
@@ -95,11 +106,8 @@ InnerObjectFormats::InnerObjectFormats()
          {sfHookNamespace, soeOPTIONAL},
          {sfHookParameters, soeOPTIONAL},
          {sfHookOn, soeOPTIONAL},
-         {sfHookOnIncoming, soeOPTIONAL},
-         {sfHookOnOutgoing, soeOPTIONAL},
          {sfHookCanEmit, soeOPTIONAL},
          {sfHookApiVersion, soeOPTIONAL},
-         {sfFee, soeOPTIONAL},
          {sfFlags, soeOPTIONAL}});
 
     add(sfHookGrant.jsonName,

src/libxrpl/protocol/Rules.cpp

@@ -153,12 +153,4 @@ Rules::operator!=(Rules const& other) const
 {
     return !(*this == other);
 }
-
-bool
-isFeatureEnabled(uint256 const& feature)
-{
-    auto const& rules = getCurrentTransactionRules();
-    return rules && rules->enabled(feature);
-}
-
 }  // namespace ripple

src/libxrpl/protocol/TER.cpp

@@ -124,7 +124,6 @@ transResults()
         MAKE_ERROR(tecARRAY_TOO_LARGE,               "Array is too large."),
         MAKE_ERROR(tecLOCKED,                        "Fund is locked."),
         MAKE_ERROR(tecBAD_CREDENTIALS,               "Bad credentials."),
-        MAKE_ERROR(tecINVALID_HOOK_API_VERSION,      "Invalid field for current hook API version."),
 
         MAKE_ERROR(tefALREADY,                     "The exact transaction was already in this ledger."),
         MAKE_ERROR(tefBAD_ADD_AUTH,                "Not authorized to add account."),

src/quickjs/buffer-utils.c

@@ -1,820 +0,0 @@
-#include "defines.h"
-#include "char-utils.h"
-#include "buffer-utils.h"
-#include "utils.h"
-#ifdef _WIN32
-#include <windows.h>
-#elif defined(HAVE_TERMIOS_H)
-#include <termios.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#endif
-#include "debug.h"
-
-/**
- * \addtogroup buffer-utils
- * @{
- */
-size_t
-ansi_length(const char* str, size_t len) {
-  size_t i, n = 0, p;
-  for(i = 0; i < len;) {
-    if(str[i] == 0x1b && (p = ansi_skip(&str[i], len - i)) > 0) {
-      i += p;
-      continue;
-    }
-    n++;
-    i++;
-  }
-  return n;
-}
-
-size_t
-ansi_skip(const char* str, size_t len) {
-  size_t pos = 0;
-  if(str[pos] == 0x1b) {
-    if(++pos < len && str[pos] == '[') {
-      while(++pos < len)
-        if(is_alphanumeric_char(str[pos]))
-          break;
-      if(++pos < len && str[pos] == '~')
-        ++pos;
-      return pos;
-    }
-  }
-  return 0;
-}
-
-size_t
-ansi_truncate(const char* str, size_t len, size_t limit) {
-  size_t i, n = 0, p;
-  for(i = 0; i < len;) {
-    if((p = ansi_skip(&str[i], len - i)) > 0) {
-      i += p;
-      continue;
-    }
-    n += is_escape_char(str[i]) ? 2 : 1;
-
-    i++;
-    if(n > limit)
-      break;
-  }
-  return i;
-}
-
-int64_t
-array_search(void* a, size_t m, size_t elsz, void* needle) {
-  char* ptr = a;
-  int64_t n, ret;
-  n = m / elsz;
-  for(ret = 0; ret < n; ret++) {
-    if(!memcmp(ptr, needle, elsz))
-      return ret;
-
-    ptr += elsz;
-  }
-  return -1;
-}
-
-char*
-str_escape(const char* s) {
-  DynBuf dbuf;
-  dbuf_init2(&dbuf, 0, 0);
-  dbuf_put_escaped(&dbuf, s, strlen(s));
-  dbuf_0(&dbuf);
-  return (char*)dbuf.buf;
-}
-
-char*
-byte_escape(const void* s, size_t n) {
-  DynBuf dbuf;
-  dbuf_init2(&dbuf, 0, 0);
-  dbuf_put_escaped(&dbuf, s, n);
-  dbuf_0(&dbuf);
-  return (char*)dbuf.buf;
-}
-
-size_t
-byte_findb(const void* haystack, size_t hlen, const void* what, size_t wlen) {
-  size_t i, last;
-  const char* s = (const char*)haystack;
-  if(hlen < wlen)
-    return hlen;
-  last = hlen - wlen;
-  for(i = 0; i <= last; i++) {
-    if(byte_equal(s, wlen, what))
-      return i;
-    s++;
-  }
-  return hlen;
-}
-
-size_t
-byte_finds(const void* haystack, size_t hlen, const char* what) {
-  return byte_findb(haystack, hlen, what, strlen(what));
-}
-
-size_t
-byte_equal(const void* s, size_t n, const void* t) {
-  return memcmp(s, t, n) == 0;
-}
-
-void
-byte_copy(void* out, size_t len, const void* in) {
-  char* s = (char*)out;
-  const char* t = (const char*)in;
-  size_t i;
-  for(i = 0; i < len; ++i)
-    s[i] = t[i];
-}
-
-void
-byte_copyr(void* out, size_t len, const void* in) {
-  char* s = (char*)out + len;
-  const char* t = (const char*)in;
-  const char* u = t + len;
-
-  for(;;) {
-    if(t >= u)
-      break;
-    --u;
-    --s;
-    *s = *u;
-  }
-}
-
-size_t
-byte_rchrs(const char* in, size_t len, const char needles[], size_t nn) {
-  const char *s = in, *end = in + len, *found = 0;
-  size_t i;
-  for(; s < end; s++) {
-    for(i = 0; i < nn; ++i) {
-      if(*s == needles[i])
-        found = s;
-    }
-  }
-  return (size_t)((found ? found : s) - in);
-}
-
-char*
-dbuf_at_n(const DynBuf* db, size_t i, size_t* n, char sep) {
-  size_t p, l = 0;
-  for(p = 0; p < db->size; ++p) {
-    if(l == i) {
-      *n = byte_chr((const char*)&db->buf[p], db->size - p, sep);
-      return (char*)&db->buf[p];
-    }
-    if(db->buf[p] == sep)
-      ++l;
-  }
-  *n = 0;
-  return 0;
-}
-
-const char*
-dbuf_last_line(DynBuf* db, size_t* len) {
-  size_t i;
-
-  if((i = byte_rchr(db->buf, db->size, '\n')) < db->size)
-    i++;
-  else
-    i = 0;
-
-  if(len)
-    *len = db->size - i;
-
-  return (const char*)&db->buf[i];
-}
-
-int
-dbuf_prepend(DynBuf* s, const uint8_t* data, size_t len) {
-  int ret;
-  if(!(ret = dbuf_reserve_start(s, len)))
-    memcpy(s->buf, data, len);
-
-  return 0;
-}
-
-void
-dbuf_put_colorstr(DynBuf* db, const char* str, const char* color, int with_color) {
-  if(with_color)
-    dbuf_putstr(db, color);
-
-  dbuf_putstr(db, str);
-  if(with_color)
-    dbuf_putstr(db, COLOR_NONE);
-}
-
-void
-dbuf_put_escaped_pred(DynBuf* db, const char* str, size_t len, int (*pred)(int)) {
-  size_t i = 0, j;
-  char c;
-
-  while(i < len) {
-    if((j = predicate_find(&str[i], len - i, pred))) {
-      dbuf_append(db, (const uint8_t*)&str[i], j);
-      i += j;
-    }
-
-    if(i == len)
-      break;
-
-    dbuf_putc(db, '\\');
-
-    if(str[i] == 0x1b) {
-      dbuf_append(db, (const uint8_t*)"x1b", 3);
-    } else {
-      int r = pred(str[i]);
-
-      dbuf_putc(db, (r > 1 && r <= 127) ? r : (c = escape_char_letter(str[i])) ? c : str[i]);
-
-      if(r == 'u' || r == 'x')
-        dbuf_printf(db, r == 'u' ? "%04x" : "%02x", str[i]);
-    }
-
-    i++;
-  }
-}
-
-const uint8_t escape_url_tab[256] = {
-    '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%',  '%', '%', '%',
-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0x5c, 0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   '%',
-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,
-    '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%', '%',  '%', '%', '%',
-};
-
-const uint8_t escape_noquote_tab[256] = {
-    'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 0x62, 0x74, 0x6e, 0x76, 0x66, 0x72, 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x',
-    'x', 'x', 'x', 'x', 0,   0,   0,   0,   0,    0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0,    0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0x5c, 0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0,    0,    0,    0,    0,    0,    0,   'x', 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0,    0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0,    0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   'u', 'u', 'u', 'u', 'u',
-    'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u',  'u',  'u',  'u',  'u',  'u',  'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u',
-};
-
-const uint8_t escape_singlequote_tab[256] = {
-    'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 0x62, 0x74, 0x6e, 0x76, 0x66, 0x72, 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x',
-    'x', 'x', 'x', 'x', 0,   0,   0,   0,   0,    0,    0,    0x27, 0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0,    0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0x5c, 0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0,    0,    0,    0,    0,    0,    0,   'x', 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0,    0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0,    0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   'u', 'u', 'u', 'u', 'u',
-    'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u',  'u',  'u',  'u',  'u',  'u',  'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u',
-};
-
-const uint8_t escape_doublequote_tab[256] = {
-    'x', 'x', 'x', 'x', 'x', 'x', 'x',  'x', 0x62, 0x74, 0x6e, 0x76, 0x66, 0x72, 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x',
-
-    'x', 'x', 'x', 'x', 0,   0,   0x22, 0,   0,    0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,    0,   0,    0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,    0,   0x5c, 0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,    0,   0,    0,    0,    0,    0,    0,    0,   'x', 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,    0,   0,    0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,    0,   0,    0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   'u', 'u', 'u', 'u', 'u',
-    'u', 'u', 'u', 'u', 'u', 'u', 'u',  'u', 'u',  'u',  'u',  'u',  'u',  'u',  'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u',
-};
-
-const uint8_t escape_backquote_tab[256] = {
-    'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 0x62, 0x74, 0,   0x76, 0x66, 0,   'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x',
-    'x', 'x', 'x', 'x', 0,   0,   0,   0,   0x24, 0,    0,   0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0,    0,    0,   0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0x5c, 0,    0,   0,    0x60, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0,    0,    0,   0,    0,    0,   0,   'x', 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0,    0,    0,   0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0,    0,    0,   0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   'u', 'u', 'u', 'u', 'u',
-    'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u',  'u',  'u', 'u',  'u',  'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u',
-};
-
-void
-dbuf_put_escaped_table(DynBuf* db, const char* str, size_t len, const uint8_t table[256]) {
-  size_t i = 0, clen;
-  int32_t c;
-  const uint8_t *pos, *end, *next;
-
-  for(pos = (const uint8_t*)str, end = pos + len; pos < end; pos = next) {
-    uint8_t r, ch;
-
-    if((c = unicode_from_utf8(pos, end - pos, &next)) < 0)
-      break;
-    clen = next - pos;
-    ch = c;
-    r = (clen >= 2 || c > 0xff) ? 'u' : table[c];
-
-    if(r == 'u' && clen > 1 && (c & 0xffffff00) == 0) {
-      r = 'x';
-      // ch = c >> 8;
-    }
-
-    if(r == '%') {
-      static const char hexdigits[] = "0123456789ABCDEF";
-
-      dbuf_putc(db, '%');
-      dbuf_putc(db, hexdigits[c >> 4]);
-      dbuf_putc(db, hexdigits[c & 0xf]);
-    } else if(c == 0x1b) {
-      dbuf_putstr(db, "\\x1b");
-    } else if(r == 'u') {
-      dbuf_printf(db, c > 0xffff ? "\\u{%X}" : "\\u%04x", c);
-    } else if(r == 'x') {
-      dbuf_printf(db, "\\x%02x", ch);
-    } else if(r) {
-      dbuf_putc(db, '\\');
-      dbuf_putc(db, (r > 1 && r <= 127) ? r : (c = escape_char_letter(ch)) ? c : ch);
-    } else {
-      dbuf_put(db, pos, next - pos);
-    }
-
-    i++;
-  }
-}
-
-void
-dbuf_put_unescaped_pred(DynBuf* db, const char* str, size_t len, int (*pred)(const char*, size_t*)) {
-  size_t i = 0, j;
-  // char c;
-
-  while(i < len) {
-    int r = 0;
-    if((j = byte_chr(&str[i], len - i, '\\'))) {
-      dbuf_append(db, (const uint8_t*)&str[i], j);
-      i += j;
-    }
-    if(i == len)
-      break;
-    size_t n = 1;
-
-    if(pred) {
-      r = pred(&str[i + 1], &n);
-
-      if(!r && n == 1)
-        dbuf_putc(db, '\\');
-    }
-
-    if(r >= 0)
-      dbuf_putc(db, /*n > 1 ||*/ r ? /*(r > 1 && r < 256) ?*/ r : str[i]);
-    i += n;
-  }
-}
-
-static inline int
-hexdigit(char c) {
-  if(c >= '0' && c <= '9')
-    return c - '0';
-
-  if(c >= 'a' && c <= 'f')
-    c -= 32;
-
-  if(c >= 'A' && c <= 'F')
-    return c - 'A' + 10;
-
-  return -1;
-}
-
-void
-dbuf_put_unescaped_table(DynBuf* db, const char* str, size_t len, const uint8_t table[256]) {
-  size_t i = 0, j;
-  char escape_char = table == escape_url_tab ? '%' : '\\';
-
-  while(i < len) {
-    if((j = byte_chr(&str[i], len - i, escape_char))) {
-      dbuf_append(db, (const uint8_t*)&str[i], j);
-      i += j;
-    }
-
-    if(i == len)
-      break;
-
-    if(escape_char == '%') {
-      int hi = hexdigit(str[i + 1]), lo = hexdigit(str[i + 2]);
-      uint8_t c = (hi << 4) | (lo & 0xf);
-      dbuf_putc(db, c);
-
-      i += 2;
-
-    } else {
-      ++i;
-
-      uint8_t c;
-
-      switch(str[i]) {
-        case 'b': c = '\b'; break;
-        case 't': c = '\t'; break;
-        case 'n': c = '\n'; break;
-        case 'v': c = '\v'; break;
-        case 'f': c = '\f'; break;
-        case 'r': c = '\r'; break;
-        default: c = str[i]; break;
-      }
-
-      uint8_t r = table[c];
-
-      if(!(r && r != 'x' && r != 'u')) {
-        dbuf_putc(db, '\\');
-        dbuf_putc(db, c);
-      } else {
-        dbuf_putc(db, str[i] == r ? c : r);
-      }
-    }
-
-    ++i;
-  }
-}
-
-void
-dbuf_put_escaped(DynBuf* db, const char* str, size_t len) {
-  return dbuf_put_escaped_table(db, str, len, escape_noquote_tab);
-}
-
-void
-dbuf_put_value(DynBuf* db, JSContext* ctx, JSValueConst value) {
-  const char* str;
-  size_t len;
-  str = JS_ToCStringLen(ctx, &len, value);
-  dbuf_append(db, str, len);
-  JS_FreeCString(ctx, str);
-}
-
-void
-dbuf_put_uint32(DynBuf* db, uint32_t num) {
-  char buf[FMT_ULONG];
-  dbuf_put(db, (const uint8_t*)buf, fmt_ulong(buf, num));
-}
-
-void
-dbuf_put_atom(DynBuf* db, JSContext* ctx, JSAtom atom) {
-  const char* str;
-  str = JS_AtomToCString(ctx, atom);
-  dbuf_putstr(db, str);
-  JS_FreeCString(ctx, str);
-}
-
-int
-dbuf_reserve_start(DynBuf* s, size_t len) {
-  if(unlikely((s->size + len) > s->allocated_size)) {
-    if(dbuf_realloc(s, s->size + len))
-      return -1;
-  }
-  if(s->size > 0)
-    memcpy(s->buf + len, s->buf, s->size);
-
-  s->size += len;
-  return 0;
-}
-
-uint8_t*
-dbuf_reserve(DynBuf* s, size_t len) {
-  if(unlikely((s->size + len) > s->allocated_size))
-    if(dbuf_realloc(s, s->size + len))
-      return 0;
-
-  return &s->buf[s->size];
-}
-
-size_t
-dbuf_token_pop(DynBuf* db, char delim) {
-  size_t n, p, len;
-  len = db->size;
-  for(n = db->size; n > 0;) {
-    if((p = byte_rchr(db->buf, n, delim)) == n) {
-      db->size = 0;
-      break;
-    }
-    if(p > 0 && db->buf[p - 1] == '\\') {
-      n = p - 1;
-      continue;
-    }
-    db->size = p;
-    break;
-  }
-  return len - db->size;
-}
-
-size_t
-dbuf_token_push(DynBuf* db, const char* str, size_t len, char delim) {
-  size_t pos;
-  if(db->size)
-    dbuf_putc(db, delim);
-
-  pos = db->size;
-  dbuf_put_escaped_pred(db, str, len, is_dot_char);
-  return db->size - pos;
-}
-
-JSValue
-dbuf_tostring_free(DynBuf* s, JSContext* ctx) {
-  JSValue r;
-  r = JS_NewStringLen(ctx, s->buf ? (const char*)s->buf : "", s->buf ? s->size : 0);
-  dbuf_free(s);
-  return r;
-}
-
-ssize_t
-dbuf_load(DynBuf* s, const char* filename) {
-  FILE* fp;
-  size_t nbytes = 0;
-  if((fp = fopen(filename, "rb"))) {
-    char buf[4096];
-    size_t r;
-    while(!feof(fp)) {
-      if((r = fread(buf, 1, sizeof(buf), fp)) == 0) {
-        fclose(fp);
-        return -1;
-      }
-      dbuf_put(s, (uint8_t const*)buf, r);
-      nbytes += r;
-    }
-    fclose(fp);
-  }
-  return nbytes;
-}
-
-int
-dbuf_vprintf(DynBuf* s, const char* fmt, va_list ap) {
-
-  s->size += vsnprintf((char*)(s->buf + s->size), s->allocated_size - s->size, fmt, ap);
-
-  return 0;
-}
-
-InputBuffer
-js_input_buffer(JSContext* ctx, JSValueConst value) {
-  InputBuffer ret = {{{0, 0}}, 0, &input_buffer_free_default, JS_UNDEFINED, {0, INT64_MAX}};
-
-  if(js_is_typedarray(ctx, value)) {
-    ret.value = offset_typedarray(&ret.range, value, ctx);
-  } else if(js_is_arraybuffer(ctx, value) || js_is_sharedarraybuffer(ctx, value)) {
-    ret.value = JS_DupValue(ctx, value);
-  }
-
-  if(js_is_arraybuffer(ctx, ret.value) || js_is_sharedarraybuffer(ctx, ret.value)) {
-    block_arraybuffer(&ret.block, ret.value, ctx);
-  } else {
-    JS_ThrowTypeError(ctx, "Invalid type (%s) for input buffer", js_value_typestr(ctx, ret.value));
-    JS_FreeValue(ctx, ret.value);
-    ret.value = JS_EXCEPTION;
-  }
-
-  return ret;
-}
-
-#undef free
-
-InputBuffer
-js_input_chars(JSContext* ctx, JSValueConst value) {
-  InputBuffer ret = {{{0, 0}}, 0, &input_buffer_free_default, JS_UNDEFINED, OFFSET_INIT()};
-
-  if(JS_IsString(value)) {
-    ret.data = (uint8_t*)JS_ToCStringLen(ctx, &ret.size, value);
-    ret.value = JS_DupValue(ctx, value);
-    ret.free = &input_buffer_free_default;
-  } else {
-    ret = js_input_buffer(ctx, value);
-  }
-
-  return ret;
-}
-
-InputBuffer
-js_input_args(JSContext* ctx, int argc, JSValueConst argv[]) {
-  InputBuffer input = js_input_chars(ctx, argv[0]);
-
-  if(argc > 1)
-    js_offset_length(ctx, input.size, argc - 1, argv + 1, &input.range);
-
-  return input;
-}
-
-InputBuffer
-js_output_args(JSContext* ctx, int argc, JSValueConst argv[]) {
-  InputBuffer output = js_input_buffer(ctx, argv[0]);
-
-  if(argc > 1)
-    js_offset_length(ctx, output.size, argc - 1, argv + 1, &output.range);
-
-  return output;
-}
-
-BOOL
-input_buffer_valid(const InputBuffer* in) {
-  return !JS_IsException(in->value);
-}
-
-InputBuffer
-input_buffer_clone(const InputBuffer* in, JSContext* ctx) {
-  InputBuffer ret = js_input_buffer(ctx, in->value);
-
-  ret.pos = in->pos;
-  ret.size = in->size;
-  ret.free = in->free;
-
-  return ret;
-}
-
-void
-input_buffer_dump(const InputBuffer* in, DynBuf* db) {
-  dbuf_printf(db, "(InputBuffer){ .data = %p, .size = %lu, .pos = %lu, .free = %p }", in->data, (unsigned long)in->size, (unsigned long)in->pos, in->free);
-}
-
-void
-input_buffer_free(InputBuffer* in, JSContext* ctx) {
-  if(in->data) {
-    in->free(ctx, (const char*)in->data, in->value);
-    in->data = 0;
-    in->size = 0;
-    in->pos = 0;
-    in->value = JS_UNDEFINED;
-  }
-}
-
-const uint8_t*
-input_buffer_peek(InputBuffer* in, size_t* lenp) {
-  input_buffer_peekc(in, lenp);
-  return input_buffer_data(in) + in->pos;
-}
-
-const uint8_t*
-input_buffer_get(InputBuffer* in, size_t* lenp) {
-  const uint8_t* ret = input_buffer_peek(in, lenp);
-
-  in->pos += *lenp;
-
-  return ret;
-}
-
-const char*
-input_buffer_currentline(InputBuffer* in, size_t* len) {
-  size_t i;
-
-  if((i = byte_rchr(input_buffer_data(in), in->pos, '\n')) < in->pos)
-    i++;
-
-  if(len)
-    *len = in->pos - i;
-
-  return (const char*)&input_buffer_data(in)[i];
-}
-
-size_t
-input_buffer_column(InputBuffer* in, size_t* len) {
-  size_t i;
-
-  if((i = byte_rchr(input_buffer_data(in), in->pos, '\n')) < in->pos)
-    i++;
-
-  return in->pos - i;
-}
-
-int
-js_offset_length(JSContext* ctx, int64_t size, int argc, JSValueConst argv[], OffsetLength* off_len_p) {
-  int ret = 0;
-  int64_t off = 0, len = size;
-
-  if(argc >= 1 && JS_IsNumber(argv[0])) {
-    if(!JS_ToInt64(ctx, &off, argv[0]))
-      ret = 1;
-
-    if(argc >= 2 && JS_IsNumber(argv[1]))
-      if(!JS_ToInt64(ctx, &len, argv[1]))
-        ret = 2;
-
-    if(size && off != size)
-      off = ((off % size) + size) % size;
-
-    if(len >= 0)
-      len = MIN_NUM(len, size - off);
-    else
-      len = size - off;
-
-    if(off_len_p) {
-      off_len_p->offset = off;
-      off_len_p->length = len;
-    }
-  }
-
-  return ret;
-}
-
-int
-js_index_range(JSContext* ctx, int64_t size, int argc, JSValueConst argv[], IndexRange* idx_rng_p) {
-  int ret = 0;
-  int64_t start = 0, end = size;
-
-  if(argc >= 1 && JS_IsNumber(argv[0])) {
-    if(!JS_ToInt64(ctx, &start, argv[0]))
-      ret = 1;
-
-    if(argc >= 2 && JS_IsNumber(argv[1]))
-      if(!JS_ToInt64(ctx, &end, argv[1]))
-        ret = 2;
-
-    if(size > 0) {
-      start = ((start % size) + size) % size;
-      end = ((end % size) + size) % size;
-    }
-
-    if(end > size)
-      end = size;
-
-    if(idx_rng_p) {
-      idx_rng_p->start = start;
-      idx_rng_p->end = end;
-    }
-  }
-
-  return ret;
-}
-
-int
-screen_size(int size[2]) {
-#ifdef _WIN32
-  CONSOLE_SCREEN_BUFFER_INFO csbi;
-
-  GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi);
-  size[0] = csbi.srWindow.Right - csbi.srWindow.Left + 1;
-  size[1] = csbi.srWindow.Bottom - csbi.srWindow.Top + 1;
-  return 0;
-
-#elif defined(HAVE_TERMIOS_H)
-  {
-    struct winsize w = {.ws_col = -1, .ws_row = -1};
-
-    if(isatty(STDIN_FILENO))
-      ioctl(STDIN_FILENO, TIOCGWINSZ, &w);
-    else if(isatty(STDOUT_FILENO))
-      ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
-    else if(isatty(STDERR_FILENO))
-      ioctl(STDERR_FILENO, TIOCGWINSZ, &w);
-
-    size[0] = w.ws_col;
-    size[1] = w.ws_row;
-    return 0;
-  }
-#else
-  size[0] = 80;
-  size[1] = 25;
-  return 0;
-#endif
-  return -1;
-}
-
-#undef js_realloc_rt
-void
-js_dbuf_allocator(JSContext* ctx, DynBuf* s) {
-  dbuf_init2(s, JS_GetRuntime(ctx), (DynBufReallocFunc*)js_realloc_rt);
-}
-
-inline int
-input_buffer_peekc(InputBuffer* in, size_t* lenp) {
-  const uint8_t *pos, *end, *next;
-  int cp;
-  pos = input_buffer_data(in) + in->pos;
-  end = input_buffer_data(in) + input_buffer_length(in);
-  cp = unicode_from_utf8(pos, end - pos, &next);
-
-  *lenp = next - pos;
-
-  return cp;
-}
-
-inline int
-input_buffer_putc(InputBuffer* in, unsigned int c, JSContext* ctx) {
-  int len;
-
-  if(in->pos + UTF8_CHAR_LEN_MAX > in->size)
-    if(block_realloc(&in->block, in->pos + UTF8_CHAR_LEN_MAX, ctx))
-      return -1;
-
-  len = unicode_to_utf8(&in->data[in->pos], c);
-
-  in->pos += len;
-
-  return len;
-}
-
-size_t
-dbuf_bitflags(DynBuf* db, uint32_t bits, const char* const names[]) {
-  size_t i, n = 0;
-  for(i = 0; i < sizeof(bits) * 8; i++) {
-    if(bits & (1 << i)) {
-      size_t len = strlen(names[i]);
-      if(n) {
-        n++;
-        dbuf_putstr(db, "|");
-      }
-      dbuf_append(db, names[i], len);
-      n += len;
-    }
-  }
-  return n;
-}
-
-/**
- * @}
- */

src/quickjs/buffer-utils.h

@@ -1,348 +0,0 @@
-#ifndef BUFFER_UTILS_H
-#define BUFFER_UTILS_H
-
-#include <quickjs.h>
-#include <cutils.h>
-#include <stdarg.h>
-
-#include "char-utils.h"
-
-/**
- * \defgroup buffer-utils buffer-utils: Buffer Utilities
- * @{
- */
-int64_t array_search(void* a, size_t m, size_t elsz, void* needle);
-#define array_contains(a, m, elsz, needle) (array_search((a), (m), (elsz), (needle)) != -1)
-
-size_t ansi_length(const char*, size_t);
-size_t ansi_skip(const char*, size_t);
-size_t ansi_truncate(const char*, size_t, size_t limit);
-int64_t array_search(void*, size_t, size_t elsz, void* needle);
-char* str_escape(const char*);
-
-char* byte_escape(const void*, size_t);
-size_t byte_findb(const void*, size_t, const void* what, size_t wlen);
-size_t byte_finds(const void*, size_t, const char* what);
-size_t byte_equal(const void* s, size_t n, const void* t);
-void byte_copy(void* out, size_t len, const void* in);
-void byte_copyr(void* out, size_t len, const void* in);
-size_t byte_rchrs(const char* in, size_t len, const char needles[], size_t nn);
-
-#define DBUF_INIT_0() \
-  (DynBuf) { 0, 0, 0, 0, 0, 0 }
-#define DBUF_INIT_CTX(ctx) \
-  (DynBuf) { 0, 0, 0, 0, (DynBufReallocFunc*)js_realloc_rt, JS_GetRuntime(ctx) }
-
-extern const uint8_t escape_url_tab[256], escape_noquote_tab[256], escape_singlequote_tab[256], escape_doublequote_tab[256], escape_backquote_tab[256];
-
-char* dbuf_at_n(const DynBuf*, size_t, size_t* n, char sep);
-const char* dbuf_last_line(DynBuf*, size_t*);
-int dbuf_prepend(DynBuf*, const uint8_t*, size_t len);
-void dbuf_put_colorstr(DynBuf*, const char*, const char* color, int with_color);
-void dbuf_put_escaped_pred(DynBuf*, const char*, size_t len, int (*pred)(int));
-void dbuf_put_escaped_table(DynBuf*, const char*, size_t len, const uint8_t table[256]);
-void dbuf_put_unescaped_table(DynBuf* db, const char* str, size_t len, const uint8_t table[256]);
-void dbuf_put_unescaped_pred(DynBuf*, const char*, size_t len, int (*pred)());
-void dbuf_put_escaped(DynBuf*, const char*, size_t len);
-void dbuf_put_value(DynBuf*, JSContext*, JSValue value);
-void dbuf_put_uint32(DynBuf* db, uint32_t num);
-void dbuf_put_atom(DynBuf* db, JSContext* ctx, JSAtom atom);
-int dbuf_reserve_start(DynBuf*, size_t);
-uint8_t* dbuf_reserve(DynBuf*, size_t);
-size_t dbuf_token_pop(DynBuf*, char);
-size_t dbuf_token_push(DynBuf*, const char*, size_t len, char delim);
-JSValue dbuf_tostring_free(DynBuf*, JSContext*);
-ssize_t dbuf_load(DynBuf*, const char*);
-int dbuf_vprintf(DynBuf*, const char*, va_list);
-
-int screen_size(int size[2]);
-
-static inline int
-dbuf_putm(DynBuf* db, ...) {
-  int r = 0;
-  va_list a;
-  const char* s;
-  va_start(a, db);
-  while((s = va_arg(a, char*)))
-    if(dbuf_putstr(db, s))
-      return -1;
-  va_end(a);
-  return r;
-}
-
-#define dbuf_append(d, x, n) dbuf_put((d), (const uint8_t*)(x), (n))
-
-static inline size_t
-dbuf_count(DynBuf* db, int ch) {
-  return byte_count(db->buf, db->size, ch);
-}
-
-static inline void
-dbuf_0(DynBuf* db) {
-  dbuf_putc(db, '\0');
-  db->size--;
-}
-
-static inline void
-dbuf_zero(DynBuf* db) {
-  dbuf_realloc(db, 0);
-  db->size = 0;
-}
-
-size_t dbuf_bitflags(DynBuf* db, uint32_t bits, const char* const names[]);
-
-#define js_dbuf_init(ctx, buf) dbuf_init2((buf), (ctx), (realloc_func*)&utils_js_realloc)
-#define js_dbuf_init_rt(rt, buf) dbuf_init2((buf), (rt), (realloc_func*)&utils_js_realloc_rt)
-
-void js_dbuf_allocator(JSContext* ctx, DynBuf* s);
-
-typedef struct {
-  uint8_t* base;
-  size_t size;
-} MemoryBlock;
-
-static inline void
-block_init(MemoryBlock* mb) {
-  mb->base = 0;
-  mb->size = 0;
-}
-
-/* clang-format off */
-static inline void* block_data(const MemoryBlock* mb) { return mb->base; }
-static inline size_t block_length(const MemoryBlock* mb) { return mb->size; }
-static inline void* block_begin(const MemoryBlock* mb) { return mb->base; }
-static inline void* block_end(const MemoryBlock* mb) { return mb->base + mb->size; }
-/* clang-format on */
-
-static inline BOOL
-block_arraybuffer(MemoryBlock* mb, JSValueConst ab, JSContext* ctx) {
-  mb->base = JS_GetArrayBuffer(ctx, &mb->size, ab);
-  return mb->base != 0;
-}
-
-typedef struct {
-  uint8_t *start, *end;
-} PointerRange;
-
-static inline void
-range_init(PointerRange* pr) {
-  pr->end = pr->start = 0;
-}
-
-static inline PointerRange
-range_from(const MemoryBlock* mb) {
-  return (PointerRange){mb->base, mb->base + mb->size};
-}
-
-typedef struct {
-  int64_t start, end;
-} IndexRange;
-
-typedef struct {
-  int64_t offset, length;
-} OffsetLength;
-
-#define OFFSET_INIT() \
-  (OffsetLength) { 0, INT64_MAX }
-
-static inline void
-offset_init(OffsetLength* ol) {
-  ol->offset = 0;
-  ol->length = INT64_MAX;
-}
-
-static inline BOOL
-offset_is_default(const OffsetLength* ol) {
-  return ol->offset == 0 && ol->length == INT64_MAX;
-}
-
-static inline void*
-offset_data(const OffsetLength* ol, const void* x) {
-  return (uint8_t*)x + ol->offset;
-}
-
-static inline size_t
-offset_size(const OffsetLength* ol, size_t n) {
-  if(ol->length == -1)
-    return (signed long)n - ol->offset;
-  return MIN_NUM(ol->length, (signed long)n - ol->offset);
-}
-
-static inline MemoryBlock
-offset_block(const OffsetLength* ol, const void* x, size_t n) {
-  return (MemoryBlock){offset_data(ol, x), offset_size(ol, n)};
-}
-
-static inline PointerRange
-offset_range(const OffsetLength* ol, const void* x, size_t n) {
-  MemoryBlock mb = offset_block(ol, x, n);
-  return range_from(&mb);
-}
-
-static inline OffsetLength
-offset_slice(const OffsetLength ol, int64_t start, int64_t end) {
-  if(start < 0)
-    start = ol.length + (start % ol.length);
-  else if(start > ol.length)
-    start = ol.length;
-  if(end < 0)
-    end = ol.length + (end % ol.length);
-  else if(end > ol.length)
-    end = ol.length;
-
-  return (OffsetLength){start, end - start};
-}
-
-static inline OffsetLength
-offset_offset(const OffsetLength* ol, const OffsetLength* by) {
-  OffsetLength ret;
-  ret.offset = ol->offset + by->offset;
-  ret.length = MIN_NUM(by->length, ol->length - by->offset);
-  return ret;
-}
-
-static inline OffsetLength
-offset_from_indexrange(const IndexRange* ir) {
-  OffsetLength ret;
-  ret.offset = ir->start;
-  ret.length = ir->end - ir->start;
-  return ret;
-}
-
-static inline JSValue
-offset_typedarray(OffsetLength* ol, JSValueConst array, JSContext* ctx) {
-  JSValue ret;
-  size_t offset, length;
-
-  ret = JS_GetTypedArrayBuffer(ctx, array, &offset, &length, NULL);
-
-  if(!JS_IsException(ret)) {
-    ol->offset = offset;
-    ol->length = length;
-  }
-
-  return ret;
-}
-
-static inline IndexRange
-indexrange_from_offset(const OffsetLength* ol) {
-  IndexRange ret;
-  ret.start = ol->offset;
-  ret.end = ol->offset + ol->length;
-  return ret;
-}
-
-static inline MemoryBlock
-block_range(const MemoryBlock* mb, const OffsetLength* range) {
-  MemoryBlock ret;
-  ret.base = mb->base + range->offset;
-  ret.size = MIN_NUM((size_t)range->length, mb->size - range->offset);
-  return ret;
-}
-
-static inline int
-block_realloc(MemoryBlock* mb, size_t new_size, JSContext* ctx) {
-  if((mb->base = js_realloc(ctx, mb->base, new_size))) {
-    mb->size = new_size;
-    return 0;
-  }
-  return -1;
-}
-
-typedef struct InputBuffer {
-  union {
-    MemoryBlock block;
-    struct {
-      uint8_t* data;
-      size_t size;
-    };
-  };
-  size_t pos;
-  void (*free)(JSContext*, const char*, JSValue);
-  JSValue value;
-  OffsetLength range;
-} InputBuffer;
-
-static inline void
-input_buffer_free_default(JSContext* ctx, const char* str, JSValue val) {
-  if(JS_IsString(val))
-    JS_FreeCString(ctx, str);
-
-  if(!JS_IsUndefined(val))
-    JS_FreeValue(ctx, val);
-}
-
-InputBuffer js_input_buffer(JSContext* ctx, JSValueConst value);
-InputBuffer js_input_chars(JSContext* ctx, JSValueConst value);
-InputBuffer js_input_args(JSContext* ctx, int argc, JSValueConst argv[]);
-InputBuffer js_output_args(JSContext* ctx, int argc, JSValueConst argv[]);
-
-InputBuffer input_buffer_clone(const InputBuffer* in, JSContext* ctx);
-BOOL input_buffer_valid(const InputBuffer* in);
-void input_buffer_dump(const InputBuffer* in, DynBuf* db);
-void input_buffer_free(InputBuffer* in, JSContext* ctx);
-
-static inline uint8_t*
-input_buffer_data(const InputBuffer* in) {
-  return offset_data(&in->range, in->data);
-}
-
-static inline size_t
-input_buffer_length(const InputBuffer* in) {
-  return offset_size(&in->range, in->size);
-}
-
-static inline MemoryBlock
-input_buffer_block(InputBuffer* in) {
-  return (MemoryBlock){input_buffer_data(in), input_buffer_length(in)};
-}
-
-static inline MemoryBlock*
-input_buffer_blockptr(InputBuffer* in) {
-  return &in->block;
-}
-
-const uint8_t* input_buffer_get(InputBuffer* in, size_t* lenp);
-const uint8_t* input_buffer_peek(InputBuffer* in, size_t* lenp);
-const char* input_buffer_currentline(InputBuffer*, size_t* len);
-size_t input_buffer_column(InputBuffer*, size_t* len);
-
-int input_buffer_peekc(InputBuffer* in, size_t* lenp);
-int input_buffer_putc(InputBuffer*, unsigned int, JSContext*);
-
-static inline int
-input_buffer_getc(InputBuffer* in) {
-  size_t n;
-  int ret;
-  ret = input_buffer_peekc(in, &n);
-  in->pos += n;
-  return ret;
-}
-
-static inline void*
-input_buffer_begin(const InputBuffer* in) {
-  return input_buffer_data(in);
-}
-
-static inline void*
-input_buffer_end(const InputBuffer* in) {
-  return input_buffer_data(in) + input_buffer_length(in);
-}
-
-static inline BOOL
-input_buffer_eof(const InputBuffer* in) {
-  return in->pos == input_buffer_length(in);
-}
-
-static inline size_t
-input_buffer_remain(const InputBuffer* in) {
-  return input_buffer_length(in) - in->pos;
-}
-
-int js_offset_length(JSContext*, int64_t size, int argc, JSValueConst argv[], OffsetLength* off_len_p);
-int js_index_range(JSContext*, int64_t size, int argc, JSValueConst argv[], IndexRange* idx_rng_p);
-
-/**
- * @}
- */
-#endif /* defined(BUFFER_UTILS) */

src/quickjs/char-utils.c

@@ -1,578 +0,0 @@
-#include "char-utils.h"
-#include "libutf.h"
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MSYS__)
-#include <winnls.h>
-#include <windows.h>
-#include <wchar.h>
-#endif
-
-/**
- * \addtogroup char-utils
- * @{
- */
-size_t
-token_length(const char* str, size_t len, char delim) {
-  const char *s, *e;
-  size_t pos;
-
-  for(s = str, e = s + len; s < e; s += pos + 1) {
-    pos = byte_chr(s, e - s, delim);
-
-    if(s + pos == e)
-      break;
-
-    if(pos == 0 || s[pos - 1] != '\\') {
-      s += pos;
-      break;
-    }
-  }
-
-  return s - str;
-}
-
-size_t
-fmt_ulong(char* dest, uint32_t i) {
-  uint32_t len, tmp, len2;
-
-  for(len = 1, tmp = i; tmp > 9; ++len)
-    tmp /= 10;
-
-  if(dest)
-    for(tmp = i, dest += len, len2 = len + 1; --len2; tmp /= 10)
-      *--dest = (char)((tmp % 10) + '0');
-
-  return len;
-}
-
-size_t
-fmt_longlong(char* dest, int64_t i) {
-  if(i < 0) {
-    if(dest)
-      *dest++ = '-';
-    return fmt_ulonglong(dest, (uint64_t)-i) + 1;
-  }
-
-  return fmt_ulonglong(dest, (uint64_t)i);
-}
-
-size_t
-fmt_ulonglong(char* dest, uint64_t i) {
-  size_t len;
-  uint64_t tmp, len2;
-
-  for(len = 1, tmp = i; tmp > 9ll; ++len)
-    tmp /= 10ll;
-
-  if(dest)
-    for(tmp = i, dest += len, len2 = len + 1; --len2; tmp /= 10ll)
-      *--dest = (tmp % 10ll) + '0';
-
-  return len;
-}
-
-#define tohex(c) (char)((c) >= 10 ? (c)-10 + 'a' : (c) + '0')
-
-size_t
-fmt_xlonglong(char* dest, uint64_t i) {
-  uint64_t len, tmp;
-
-  for(len = 1, tmp = i; tmp > 15ll; ++len)
-    tmp >>= 4ll;
-
-  if(dest)
-    for(tmp = i, dest += len;;) {
-      *--dest = tohex(tmp & 15ll);
-
-      if(!(tmp >>= 4ll))
-        break;
-    }
-
-  return len;
-}
-
-size_t
-fmt_xlonglong0(char* dest, uint64_t num, size_t n) {
-  size_t i = 0, len;
-
-  if((len = fmt_xlonglong(NULL, num)) < n) {
-    len = n - len;
-
-    while(i < len)
-      dest[i++] = '0';
-  }
-
-  i += fmt_xlonglong(&dest[i], num);
-  return i;
-}
-
-size_t
-fmt_8long(char* dest, uint32_t i) {
-  uint32_t len, tmp;
-
-  /* first count the number of bytes needed */
-  for(len = 1, tmp = i; tmp > 7; ++len)
-    tmp >>= 3;
-
-  if(dest)
-    for(tmp = i, dest += len;;) {
-      *--dest = (char)((tmp & 7) + '0');
-
-      if(!(tmp >>= 3))
-        break;
-    }
-
-  return len;
-}
-
-#define tohex(c) (char)((c) >= 10 ? (c)-10 + 'a' : (c) + '0')
-
-size_t
-fmt_xlong(char* dest, uint32_t i) {
-  uint32_t len, tmp;
-
-  /* first count the number of bytes needed */
-  for(len = 1, tmp = i; tmp > 15; ++len)
-    tmp >>= 4;
-
-  if(dest)
-    for(tmp = i, dest += len;;) {
-      *--dest = tohex(tmp & 15);
-
-      if(!(tmp >>= 4))
-        break;
-    }
-
-  return len;
-}
-
-size_t
-fmt_xlong0(char* dest, uint32_t num, size_t n) {
-  size_t i = 0, len;
-
-  if((len = fmt_xlong(NULL, num)) < n) {
-    len = n - len;
-
-    while(i < len)
-      dest[i++] = '0';
-  }
-
-  i += fmt_xlong(&dest[i], num);
-  return i;
-}
-
-size_t
-scan_ushort(const char* src, uint16_t* dest) {
-  const char* cur;
-  uint16_t l;
-
-  for(cur = src, l = 0; *cur >= '0' && *cur <= '9'; ++cur) {
-    uint32_t tmp = l * 10ul + *cur - '0';
-
-    if((uint16_t)tmp != tmp)
-      break;
-
-    l = tmp;
-  }
-
-  if(cur > src)
-    *dest = l;
-
-  return (size_t)(cur - src);
-}
-
-size_t
-scan_uint(const char* src, uint32_t* dest) {
-  uint64_t u64;
-  size_t r = scan_ulonglong(src, &u64);
-  *dest = u64;
-  return r;
-}
-
-size_t
-scan_int(const char* src, int32_t* dest) {
-  int64_t i64;
-  size_t r = scan_longlong(src, &i64);
-  *dest = i64;
-  return r;
-}
-
-#ifndef MAXLONG
-#define MAXLONG (((uint32_t)-1) >> 1)
-#endif
-
-size_t
-scan_longlong(const char* src, int64_t* dest) {
-  size_t i, o;
-  uint64_t l;
-  char c = src[0];
-  unsigned int neg = c == '-';
-  o = c == '-' || c == '+';
-
-  if((i = scan_ulonglong(src + o, &l))) {
-    if(i > 0ll && l > MAXLONG + neg) {
-      l /= 10ll;
-      --i;
-    }
-
-    if(i + o)
-      *dest = (int64_t)(c == '-' ? -l : l);
-
-    return i + o;
-  }
-
-  return 0;
-}
-
-size_t
-scan_ulonglong(const char* src, uint64_t* dest) {
-  const char* tmp = src;
-  uint64_t l = 0;
-  unsigned char c;
-
-  while((c = (unsigned char)(*tmp - '0')) < 10) {
-    uint64_t n;
-    n = l << 3ll;
-
-    if((n >> 3ll) != l)
-      break;
-
-    if(n + (l << 1ll) < n)
-      break;
-
-    n += l << 1ll;
-
-    if(n + c < n)
-      break;
-
-    l = n + c;
-    ++tmp;
-  }
-
-  if(tmp - src)
-    *dest = l;
-
-  return (size_t)(tmp - src);
-}
-
-size_t
-scan_xlonglong(const char* src, uint64_t* dest) {
-  const char* tmp = src;
-  int64_t l = 0;
-  unsigned char c;
-
-  while((c = scan_fromhex(*tmp)) < 16) {
-    l = (l << 4) + c;
-    ++tmp;
-  }
-
-  *dest = l;
-  return tmp - src;
-}
-
-size_t
-scan_8longn(const char* src, size_t n, uint32_t* dest) {
-  const char* tmp = src;
-  uint32_t l = 0;
-  unsigned char c;
-
-  while(n-- > 0 && (c = (unsigned char)(*tmp - '0')) < 8) {
-    if(l >> (sizeof(l) * 8 - 3))
-      break;
-
-    l = l * 8 + c;
-    ++tmp;
-  }
-
-  *dest = l;
-  return (size_t)(tmp - src);
-}
-
-size_t
-scan_whitenskip(const char* s, size_t limit) {
-  const char *t, *u;
-
-  for(t = s, u = t + limit; t < u; ++t)
-    if(!is_whitespace_char(*t))
-      break;
-
-  return (size_t)(t - s);
-}
-
-size_t
-scan_nonwhitenskip(const char* s, size_t limit) {
-  const char *t, *u;
-
-  for(t = s, u = t + limit; t < u; ++t)
-    if(is_whitespace_char(*t))
-      break;
-
-  return (size_t)(t - s);
-}
-
-size_t
-scan_line(const char* s, size_t limit) {
-  const char *t, *u;
-
-  for(t = s, u = s + limit; t < u; ++t)
-    if(*t == '\n' || *t == '\r')
-      break;
-
-  return (size_t)(t - s);
-}
-
-size_t
-scan_lineskip(const char* s, size_t limit) {
-  const char *t, *u;
-
-  for(t = s, u = s + limit; t < u; ++t)
-    if(*t == '\n') {
-      ++t;
-      break;
-    }
-
-  return (size_t)(t - s);
-}
-
-size_t
-scan_lineskip_escaped(const char* s, size_t limit) {
-  const char *t, *u;
-
-  for(t = s, u = s + limit; t < u; ++t) {
-    if(*t == '\\') {
-      ++t;
-      continue;
-    }
-    if(*t == '\n') {
-      ++t;
-      break;
-    }
-  }
-
-  return (size_t)(t - s);
-}
-
-size_t
-scan_eolskip(const char* s, size_t limit) {
-  size_t n = 0;
-
-  if(n + 1 < limit && s[0] == '\r' && s[1] == '\n')
-    n += 2;
-  else if(n < limit && s[0] == '\n')
-    n += 1;
-
-  return n;
-}
-
-size_t
-utf8_strlen(const void* in, size_t len) {
-  const uint8_t *pos, *end, *next;
-  size_t i = 0;
-
-  for(pos = (const uint8_t*)in, end = pos + len; pos < end; pos = next, ++i)
-    unicode_from_utf8(pos, end - pos, &next);
-
-  return i;
-}
-
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MSYS__)
-wchar_t*
-utf8_towcs(const char* s) {
-  int len = (int)strlen(s);
-  int n = MultiByteToWideChar(CP_UTF8, 0, s, len, NULL, 0);
-  wchar_t* ret;
-
-  if((ret = (wchar_t*)malloc((n + 1) * sizeof(wchar_t)))) {
-    MultiByteToWideChar(CP_UTF8, 0, s, len, ret, n);
-    ret[n] = L'\0';
-  }
-
-  return ret;
-}
-
-char*
-utf8_fromwcs(const wchar_t* wstr) {
-  int len = (int)wcslen(wstr);
-  int n = WideCharToMultiByte(CP_UTF8, 0, wstr, len, NULL, 0, NULL, NULL);
-  char* ret;
-
-  if((ret = malloc((n + 1)))) {
-    WideCharToMultiByte(CP_UTF8, 0, wstr, len, ret, n, NULL, NULL);
-    ret[n] = '\0';
-  }
-
-  return ret;
-}
-#endif
-
-BOOL
-utf16_multiword(const void* in) {
-  const uint16_t* p16 = in;
-  LibutfC16Type type = libutf_c16_type(p16[0]);
-
-  return !((LIBUTF_UTF16_NOT_SURROGATE == type) || (LIBUTF_UTF16_SURROGATE_HIGH != type || LIBUTF_UTF16_SURROGATE_LOW != libutf_c16_type(p16[1])));
-}
-
-int
-case_lowerc(int c) {
-  if(c >= 'A' && c <= 'Z')
-    c += 'a' - 'A';
-
-  return c;
-}
-
-int
-case_starts(const char* a, const char* b) {
-  const char *s, *t;
-
-  for(s = a, t = b;; ++s, ++t) {
-    unsigned char x, y;
-
-    if(!*t)
-      return 1;
-
-    x = case_lowerc(*s);
-    y = case_lowerc(*t);
-
-    if(x != y)
-      break;
-
-    if(!x)
-      break;
-  }
-
-  return 0;
-}
-
-int
-case_diffb(const void* S, size_t len, const void* T) {
-  unsigned char x, y;
-  const char *s, *t;
-
-  for(s = (const char*)S, t = (const char*)T; len > 0;) {
-    --len;
-    x = case_lowerc(*s);
-    y = case_lowerc(*t);
-
-    ++s;
-    ++t;
-
-    if(x != y)
-      return ((int)(unsigned int)x) - ((int)(unsigned int)y);
-  }
-
-  return 0;
-}
-
-size_t
-case_findb(const void* haystack, size_t hlen, const void* what, size_t wlen) {
-  size_t i, last;
-  const char* s = haystack;
-
-  if(hlen < wlen)
-    return hlen;
-
-  last = hlen - wlen;
-
-  for(i = 0; i <= last; i++, s++)
-    if(!case_diffb(s, wlen, what))
-      return i;
-
-  return hlen;
-}
-
-size_t
-case_finds(const void* haystack, const char* what) {
-  return case_findb(haystack, strlen(haystack), what, strlen(what));
-}
-
-ssize_t
-write_file(const char* file, const void* buf, size_t len) {
-  FILE* f;
-  ssize_t ret = -1;
-
-  if((f = fopen(file, "w+")))
-    switch(fwrite(buf, len, 1, f)) {
-      case 1: {
-        ret = len;
-        break;
-      }
-    }
-
-  fflush(f);
-  ret = ftell(f);
-  fclose(f);
-
-  return ret;
-}
-
-ssize_t
-puts_file(const char* file, const char* s) {
-  return write_file(file, s, strlen(s));
-}
-
-size_t
-u64toa(char* x, uint64_t num, int base) {
-  size_t len = 0;
-  uint64_t n = num;
-
-  do {
-    n /= base;
-    len++;
-    x++;
-  } while(n != 0);
-
-  *x-- = '\0';
-
-  do {
-    char c = num % base;
-    num /= base;
-
-    if(c >= 10)
-      c += 'a' - '0' - 10;
-    *x-- = c + '0';
-  } while(num != 0);
-
-  return len;
-}
-
-size_t
-i64toa(char* x, int64_t num, int base) {
-  size_t pos = 0, len;
-
-  if(num < 0) {
-    x[pos++] = '-';
-    num = -num;
-  }
-
-  len = u64toa(&x[pos], num, base);
-
-  return pos + len;
-}
-
-size_t
-str_findb(const char* s1, const char* x, size_t n) {
-  const char* b;
-  size_t i, j, len = strlen(s1);
-
-  if(len >= n) {
-    size_t end = len - n + 1;
-
-    for(i = 0; i < end; i++) {
-      b = &s1[i];
-
-      for(j = 0; x[j] == b[j];)
-        if(++j == n)
-          return i;
-    }
-  }
-
-  return len;
-}
-
-size_t
-str_find(const void* s, const void* what) {
-  return str_findb(s, what, strlen(what));
-}
-/**
- * @}
- */

src/quickjs/char-utils.h

@@ -1,441 +0,0 @@
-#ifndef CHAR_UTILS_H
-#define CHAR_UTILS_H
-
-#include <cutils.h>
-#include <string.h>
-#include "debug.h"
-
-/**
- * \defgroup char-utils char-utils: Character Utilities
- * @{
- */
-#define is_control_char(c) ((c) == '\a' || (c) == '\b' || (c) == '\t' || (c) == '\n' || (c) == '\v' || (c) == '\f' || (c) == '\r')
-#define is_alphanumeric_char(c) (((c) >= 'A' && (c) <= 'Z') || ((c) >= 'a' && (c) <= 'z'))
-
-#define is_digit_char(c) ((c) >= '0' && (c) <= '9')
-#define is_print_char(c) ((c) >= ' ' && (c) <= '\x7f')
-#define is_newline_char(c) ((c) == '\n')
-#define is_identifier_char(c) (is_alphanumeric_char(c) || is_digit_char(c) || (c) == '$' || (c) == '_')
-#define is_whitespace_char(c) ((c) == ' ' || (c) == '\t' || (c) == '\v' || (c) == '\n' || (c) == '\r')
-
-#define str_equal(s, t) (!strcmp((s), (t)))
-
-static inline int
-escape_char_pred(int c) {
-  static const unsigned char table[256] = {
-      'x', 'x', 'x', 'x', 'x', 'x',  'x', 'x', 0x62, 0x74, 0x6e, 0x76, 0x66, 0x72, 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x',
-      'x', 'x', 'x', 0,   0,   0,    0,   0,   0,    0,    0x27, 0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,    0,   0,   0,    0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0x5c, 0,   0,   0,    0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,    0,   0,   0,    0,    0,    'x',  0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,    0,   0,   0,    0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,    0,   0,   0,    0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,    0,   0,   0,    0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,    0,   0,   0,    0,    0,    0,    0,    0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  };
-
-  return table[(unsigned char)c];
-}
-
-static inline int
-unescape_char_pred(int c) {
-  switch(c) {
-    case 'b': return 8;
-    case 'f': return 12;
-    case 'n': return 10;
-    case 'r': return 13;
-    case 't': return 9;
-    case 'v': return 11;
-    case '\'': return 39;
-    case '\\': return 92;
-  }
-
-  return 0;
-}
-
-static inline int
-is_escape_char(int c) {
-  return is_control_char(c) || c == '\\' || c == '\'' || c == 0x1b || c == 0;
-}
-
-static inline int
-is_backslash_char(int c) {
-  return c == '\\';
-}
-
-//#define is_dot_char(c) ((c) == '.')0
-//#define is_backslash_char(c) ((c) == '\\')
-
-static inline int
-is_dot_char(int c) {
-  return c == '.';
-}
-
-static inline int
-is_identifier(const char* str) {
-  if(!((*str >= 'A' && *str <= 'Z') || (*str >= 'a' && *str <= 'z') || *str == '$' || *str == '_'))
-    return 0;
-
-  while(*++str)
-    if(!is_identifier_char(*str))
-      return 0;
-
-  return 1;
-}
-
-static inline int
-is_integer(const char* str) {
-  if(*str == '-')
-    ++str;
-
-  if(!(*str >= '1' && *str <= '9') && !(*str == '0' && str[1] == '\0'))
-    return 0;
-
-  while(*++str)
-    if(!is_digit_char(*str))
-      return 0;
-
-  return 1;
-}
-
-static inline size_t
-byte_count(const void* s, size_t n, char c) {
-  const uint8_t* t;
-  uint8_t ch = (uint8_t)c;
-  size_t count;
-
-  for(t = (uint8_t*)s, count = 0; n; ++t, --n)
-    if(*t == ch)
-      ++count;
-
-  return count;
-}
-
-static inline size_t
-byte_chr(const void* str, size_t len, char c) {
-  const char* s = memchr(str, c, len);
-
-  if(s)
-    return s - (const char*)str;
-
-  return len;
-}
-
-static inline size_t
-byte_rchr(const void* haystack, size_t len, char needle) {
-  const char *s, *t;
-
-  for(s = (const char*)haystack, t = s + len;;) {
-    --t;
-
-    if(s > t)
-      break;
-
-    if(*t == needle)
-      return (size_t)(t - s);
-  }
-
-  return len;
-}
-
-/*size_t
-byte_rchr(const void* str, size_t len, char c) {
-  const char* s = memrchr(str, c, len);
-  if(s)
-    return s - (const char*)str;
-  return len;
-}*/
-
-static inline size_t
-byte_chrs(const void* str, size_t len, const char needle[], size_t nl) {
-  const char *s, *t;
-
-  for(s = str, t = s + len; s != t; s++)
-    if(byte_chr(needle, nl, *s) < nl)
-      break;
-
-  return s - (const char*)str;
-}
-
-static inline int
-byte_diff(const void* a, size_t len, const void* b) {
-  size_t i;
-
-  for(i = 0; i < len; ++i) {
-    int r = ((unsigned char*)a)[i] - ((unsigned char*)b)[i];
-
-    if(r)
-      return r;
-  }
-
-  return 0;
-}
-
-static inline int
-byte_diff2(const char* a, size_t alen, const char* b, size_t blen) {
-
-  if(alen < blen)
-    return -b[alen];
-
-  if(blen < alen)
-    return a[blen];
-
-  return byte_diff(a, alen, b);
-}
-
-static inline size_t
-str_chr(const char* in, char needle) {
-  const char *t, c = needle;
-
-  for(t = in; *t; ++t)
-    if(*t == c)
-      break;
-
-  return (size_t)(t - in);
-}
-
-static inline size_t
-str_chrs(const char* in, const char needles[], size_t nn) {
-  const char* t;
-  size_t i;
-
-  for(t = in; *t; ++t)
-    for(i = 0; i < nn; i++)
-      if(*t == needles[i])
-        return (size_t)(t - in);
-
-  return (size_t)(t - in);
-}
-
-static inline size_t
-str_rchr(const char* s, char needle) {
-  const char *in, *found = 0;
-
-  for(in = s; *in; ++in)
-    if(*in == needle)
-      found = in;
-
-  return (size_t)((found ? found : in) - s);
-}
-
-static inline size_t
-str_rchrs(const char* in, const char needles[], size_t nn) {
-  const char *s, *found = 0;
-  size_t i;
-
-  for(s = in; *s; ++s)
-    for(i = 0; i < nn; ++i)
-      if(*s == needles[i])
-        found = s;
-
-  return (size_t)((found ? found : s) - in);
-}
-
-static inline int
-str_endb(const char* a, const char* x, size_t n) {
-  size_t alen = strlen(a);
-  a += alen - n;
-
-  return alen >= n && !memcmp(a, x, n);
-}
-
-/* str_ends returns 1 if the b is a suffix of a, 0 otherwise */
-static inline int
-str_ends(const char* a, const char* b) {
-  return str_endb(a, b, strlen(b));
-}
-
-static inline int
-str_startb(const char* a, const char* x, size_t len) {
-  size_t i;
-
-  for(i = 0;; i++) {
-    if(i == len)
-      return 1;
-    if(a[i] != x[i])
-      break;
-  }
-
-  return 0;
-}
-
-static inline int
-str_start(const char* a, const char* b) {
-  return str_startb(a, b, strlen(b));
-}
-
-#define str_contains(s, needle) (!!strchr((s), (needle)))
-
-char* str_escape(const char*);
-
-static inline size_t
-str_count(const char* s, char c) {
-  size_t i, count = 0;
-
-  for(i = 0; s[i]; i++)
-    if(s[i] == c)
-      ++count;
-
-  return count;
-}
-
-static inline size_t
-str_copy(char* out, const char* in) {
-  char* s;
-
-  for(s = out; (*s = *in); ++s)
-    ++in;
-
-  return (size_t)(s - out);
-}
-
-static inline size_t
-str_copyn(char* out, const char* in, size_t n) {
-  char* s;
-
-  for(s = out; n-- && (*s = *in); ++s)
-    ++in;
-
-  *s = '\0';
-  return (size_t)(s - out);
-}
-
-static inline char*
-str_ndup(const char* s, size_t n) {
-  char* r = malloc(n + 1);
-
-  if(r == NULL)
-    return NULL;
-
-  memcpy(r, s, n);
-  r[n] = '\0';
-  return r;
-}
-
-size_t str_findb(const char*, const char*, size_t);
-size_t str_find(const void*, const void*);
-
-static inline size_t
-predicate_find(const char* str, size_t len, int (*pred)(int32_t)) {
-  size_t pos;
-
-  for(pos = 0; pos < len; pos++)
-    if(pred(str[pos]))
-      break;
-
-  return pos;
-}
-
-static inline size_t
-lookup_find(const char* str, size_t len, const char table[256]) {
-  size_t pos;
-
-  for(pos = 0; pos < len; pos++)
-    if(table[(unsigned char)str[pos]])
-      break;
-
-  return pos;
-}
-
-static inline char
-escape_char_letter(char c) {
-  switch(c) {
-    case '\0': return '0';
-    case '\a': return 'a';
-    case '\b': return 'b';
-    case '\t': return 't';
-    case '\n': return 'n';
-    case '\v': return 'v';
-    case '\f': return 'f';
-    case '\r': return 'r';
-    case '\\': return '\\';
-    case '\'': return '\'';
-  }
-
-  return 0;
-}
-
-#define FMT_LONG 41  /* enough space to hold -2^127 in decimal, plus \0 */
-#define FMT_ULONG 40 /* enough space to hold 2^128 - 1 in decimal, plus \0 */
-#define FMT_8LONG 44 /* enough space to hold 2^128 - 1 in octal, plus \0 */
-#define FMT_XLONG 33 /* enough space to hold 2^128 - 1 in hexadecimal, plus \0 */
-
-size_t token_length(const char*, size_t, char delim);
-size_t fmt_ulong(char*, uint32_t);
-size_t scan_ushort(const char*, uint16_t*);
-size_t fmt_longlong(char*, int64_t);
-size_t fmt_ulonglong(char*, uint64_t);
-size_t fmt_xlonglong(char*, uint64_t);
-size_t fmt_xlonglong0(char*, uint64_t, size_t);
-size_t fmt_8long(char* dest, uint32_t i);
-size_t fmt_xlong(char* dest, uint32_t num);
-size_t fmt_xlong0(char* dest, uint32_t num, size_t n);
-size_t scan_longlong(const char*, int64_t*);
-size_t scan_int(const char*, int32_t*);
-size_t scan_uint(const char*, uint32_t*);
-size_t scan_ulonglong(const char*, uint64_t*);
-size_t scan_xlonglong(const char*, uint64_t*);
-size_t scan_8longn(const char*, size_t, uint32_t* dest);
-size_t scan_whitenskip(const char*, size_t);
-size_t scan_nonwhitenskip(const char*, size_t);
-size_t scan_line(const char*, size_t);
-size_t scan_lineskip(const char*, size_t);
-size_t scan_lineskip_escaped(const char*, size_t);
-size_t scan_eolskip(const char*, size_t);
-size_t utf8_strlen(const void*, size_t);
-wchar_t* utf8_towcs(const char*);
-char* utf8_fromwcs(const wchar_t*);
-BOOL utf16_multiword(const void*);
-int case_lowerc(int);
-int case_starts(const char*, const char*);
-int case_diffb(const void*, size_t, const void* T);
-size_t case_findb(const void*, size_t, const void* what, size_t wlen);
-size_t case_finds(const void*, const char*);
-
-static inline int
-scan_fromhex(unsigned char c) {
-  c -= '0';
-
-  if(c <= 9)
-    return c;
-
-  c &= ~0x20;
-  c -= 'A' - '0';
-
-  if(c < 6)
-    return c + 10;
-
-  return -1;
-}
-
-static inline size_t
-scan_8long(const char* src, uint32_t* dest) {
-  return scan_8longn(src, (size_t)-1, dest);
-}
-
-static inline size_t
-utf8_charlen(const char* in, size_t len) {
-  const uint8_t* next = (const void*)in;
-  int r = unicode_from_utf8((const uint8_t*)in, len, &next);
-  return r == -1 ? 0 : next - (const uint8_t*)in;
-}
-
-static inline int
-utf8_charcode(const char* in, size_t len) {
-  const uint8_t* next = (const void*)in;
-  int r = unicode_from_utf8((const uint8_t*)in, len, &next);
-  return next > in ? r : -1;
-}
-
-BOOL utf16_multiword(const void*);
-
-ssize_t write_file(const char* file, const void* buf, size_t len);
-ssize_t puts_file(const char* file, const char* s);
-
-size_t u64toa(char*, uint64_t num, int base);
-size_t i64toa(char*, int64_t num, int base);
-
-/**
- * @}
- */
-#endif /* defined(CHAR_UTILS_H) */

src/quickjs/cutils.c

@@ -1,631 +0,0 @@
-/*
- * C utilities
- *
- * Copyright (c) 2017 Fabrice Bellard
- * Copyright (c) 2018 Charlie Gordon
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-
-#include "cutils.h"
-
-void pstrcpy(char *buf, int buf_size, const char *str)
-{
-    int c;
-    char *q = buf;
-
-    if (buf_size <= 0)
-        return;
-
-    for(;;) {
-        c = *str++;
-        if (c == 0 || q >= buf + buf_size - 1)
-            break;
-        *q++ = c;
-    }
-    *q = '\0';
-}
-
-/* strcat and truncate. */
-char *pstrcat(char *buf, int buf_size, const char *s)
-{
-    int len;
-    len = strlen(buf);
-    if (len < buf_size)
-        pstrcpy(buf + len, buf_size - len, s);
-    return buf;
-}
-
-int strstart(const char *str, const char *val, const char **ptr)
-{
-    const char *p, *q;
-    p = str;
-    q = val;
-    while (*q != '\0') {
-        if (*p != *q)
-            return 0;
-        p++;
-        q++;
-    }
-    if (ptr)
-        *ptr = p;
-    return 1;
-}
-
-int has_suffix(const char *str, const char *suffix)
-{
-    size_t len = strlen(str);
-    size_t slen = strlen(suffix);
-    return (len >= slen && !memcmp(str + len - slen, suffix, slen));
-}
-
-/* Dynamic buffer package */
-
-static void *dbuf_default_realloc(void *opaque, void *ptr, size_t size)
-{
-    return realloc(ptr, size);
-}
-
-void dbuf_init2(DynBuf *s, void *opaque, DynBufReallocFunc *realloc_func)
-{
-    memset(s, 0, sizeof(*s));
-    if (!realloc_func)
-        realloc_func = dbuf_default_realloc;
-    s->opaque = opaque;
-    s->realloc_func = realloc_func;
-}
-
-void dbuf_init(DynBuf *s)
-{
-    dbuf_init2(s, NULL, NULL);
-}
-
-/* return < 0 if error */
-int dbuf_realloc(DynBuf *s, size_t new_size)
-{
-    size_t size;
-    uint8_t *new_buf;
-    if (new_size > s->allocated_size) {
-        if (s->error)
-            return -1;
-        size = s->allocated_size * 3 / 2;
-        if (size > new_size)
-            new_size = size;
-        new_buf = s->realloc_func(s->opaque, s->buf, new_size);
-        if (!new_buf) {
-            s->error = TRUE;
-            return -1;
-        }
-        s->buf = new_buf;
-        s->allocated_size = new_size;
-    }
-    return 0;
-}
-
-int dbuf_write(DynBuf *s, size_t offset, const uint8_t *data, size_t len)
-{
-    size_t end;
-    end = offset + len;
-    if (dbuf_realloc(s, end))
-        return -1;
-    memcpy(s->buf + offset, data, len);
-    if (end > s->size)
-        s->size = end;
-    return 0;
-}
-
-int dbuf_put(DynBuf *s, const uint8_t *data, size_t len)
-{
-    if (unlikely((s->size + len) > s->allocated_size)) {
-        if (dbuf_realloc(s, s->size + len))
-            return -1;
-    }
-    memcpy_no_ub(s->buf + s->size, data, len);
-    s->size += len;
-    return 0;
-}
-
-int dbuf_put_self(DynBuf *s, size_t offset, size_t len)
-{
-    if (unlikely((s->size + len) > s->allocated_size)) {
-        if (dbuf_realloc(s, s->size + len))
-            return -1;
-    }
-    memcpy(s->buf + s->size, s->buf + offset, len);
-    s->size += len;
-    return 0;
-}
-
-int dbuf_putc(DynBuf *s, uint8_t c)
-{
-    return dbuf_put(s, &c, 1);
-}
-
-int dbuf_putstr(DynBuf *s, const char *str)
-{
-    return dbuf_put(s, (const uint8_t *)str, strlen(str));
-}
-
-int __attribute__((format(printf, 2, 3))) dbuf_printf(DynBuf *s,
-                                                      const char *fmt, ...)
-{
-    va_list ap;
-    char buf[128];
-    int len;
-
-    va_start(ap, fmt);
-    len = vsnprintf(buf, sizeof(buf), fmt, ap);
-    va_end(ap);
-    if (len < sizeof(buf)) {
-        /* fast case */
-        return dbuf_put(s, (uint8_t *)buf, len);
-    } else {
-        if (dbuf_realloc(s, s->size + len + 1))
-            return -1;
-        va_start(ap, fmt);
-        vsnprintf((char *)(s->buf + s->size), s->allocated_size - s->size,
-                  fmt, ap);
-        va_end(ap);
-        s->size += len;
-    }
-    return 0;
-}
-
-void dbuf_free(DynBuf *s)
-{
-    /* we test s->buf as a fail safe to avoid crashing if dbuf_free()
-       is called twice */
-    if (s->buf) {
-        s->realloc_func(s->opaque, s->buf, 0);
-    }
-    memset(s, 0, sizeof(*s));
-}
-
-/* Note: at most 31 bits are encoded. At most UTF8_CHAR_LEN_MAX bytes
-   are output. */
-int unicode_to_utf8(uint8_t *buf, unsigned int c)
-{
-    uint8_t *q = buf;
-
-    if (c < 0x80) {
-        *q++ = c;
-    } else {
-        if (c < 0x800) {
-            *q++ = (c >> 6) | 0xc0;
-        } else {
-            if (c < 0x10000) {
-                *q++ = (c >> 12) | 0xe0;
-            } else {
-                if (c < 0x00200000) {
-                    *q++ = (c >> 18) | 0xf0;
-                } else {
-                    if (c < 0x04000000) {
-                        *q++ = (c >> 24) | 0xf8;
-                    } else if (c < 0x80000000) {
-                        *q++ = (c >> 30) | 0xfc;
-                        *q++ = ((c >> 24) & 0x3f) | 0x80;
-                    } else {
-                        return 0;
-                    }
-                    *q++ = ((c >> 18) & 0x3f) | 0x80;
-                }
-                *q++ = ((c >> 12) & 0x3f) | 0x80;
-            }
-            *q++ = ((c >> 6) & 0x3f) | 0x80;
-        }
-        *q++ = (c & 0x3f) | 0x80;
-    }
-    return q - buf;
-}
-
-static const unsigned int utf8_min_code[5] = {
-    0x80, 0x800, 0x10000, 0x00200000, 0x04000000,
-};
-
-static const unsigned char utf8_first_code_mask[5] = {
-    0x1f, 0xf, 0x7, 0x3, 0x1,
-};
-
-/* return -1 if error. *pp is not updated in this case. max_len must
-   be >= 1. The maximum length for a UTF8 byte sequence is 6 bytes. */
-int unicode_from_utf8(const uint8_t *p, int max_len, const uint8_t **pp)
-{
-    int l, c, b, i;
-
-    c = *p++;
-    if (c < 0x80) {
-        *pp = p;
-        return c;
-    }
-    switch(c) {
-    case 0xc0: case 0xc1: case 0xc2: case 0xc3:
-    case 0xc4: case 0xc5: case 0xc6: case 0xc7:
-    case 0xc8: case 0xc9: case 0xca: case 0xcb:
-    case 0xcc: case 0xcd: case 0xce: case 0xcf:
-    case 0xd0: case 0xd1: case 0xd2: case 0xd3:
-    case 0xd4: case 0xd5: case 0xd6: case 0xd7:
-    case 0xd8: case 0xd9: case 0xda: case 0xdb:
-    case 0xdc: case 0xdd: case 0xde: case 0xdf:
-        l = 1;
-        break;
-    case 0xe0: case 0xe1: case 0xe2: case 0xe3:
-    case 0xe4: case 0xe5: case 0xe6: case 0xe7:
-    case 0xe8: case 0xe9: case 0xea: case 0xeb:
-    case 0xec: case 0xed: case 0xee: case 0xef:
-        l = 2;
-        break;
-    case 0xf0: case 0xf1: case 0xf2: case 0xf3:
-    case 0xf4: case 0xf5: case 0xf6: case 0xf7:
-        l = 3;
-        break;
-    case 0xf8: case 0xf9: case 0xfa: case 0xfb:
-        l = 4;
-        break;
-    case 0xfc: case 0xfd:
-        l = 5;
-        break;
-    default:
-        return -1;
-    }
-    /* check that we have enough characters */
-    if (l > (max_len - 1))
-        return -1;
-    c &= utf8_first_code_mask[l - 1];
-    for(i = 0; i < l; i++) {
-        b = *p++;
-        if (b < 0x80 || b >= 0xc0)
-            return -1;
-        c = (c << 6) | (b & 0x3f);
-    }
-    if (c < utf8_min_code[l - 1])
-        return -1;
-    *pp = p;
-    return c;
-}
-
-#if 0
-
-#if defined(EMSCRIPTEN) || defined(__ANDROID__)
-
-static void *rqsort_arg;
-static int (*rqsort_cmp)(const void *, const void *, void *);
-
-static int rqsort_cmp2(const void *p1, const void *p2)
-{
-    return rqsort_cmp(p1, p2, rqsort_arg);
-}
-
-/* not reentrant, but not needed with emscripten */
-void rqsort(void *base, size_t nmemb, size_t size,
-            int (*cmp)(const void *, const void *, void *),
-            void *arg)
-{
-    rqsort_arg = arg;
-    rqsort_cmp = cmp;
-    qsort(base, nmemb, size, rqsort_cmp2);
-}
-
-#endif
-
-#else
-
-typedef void (*exchange_f)(void *a, void *b, size_t size);
-typedef int (*cmp_f)(const void *, const void *, void *opaque);
-
-static void exchange_bytes(void *a, void *b, size_t size) {
-    uint8_t *ap = (uint8_t *)a;
-    uint8_t *bp = (uint8_t *)b;
-
-    while (size-- != 0) {
-        uint8_t t = *ap;
-        *ap++ = *bp;
-        *bp++ = t;
-    }
-}
-
-static void exchange_one_byte(void *a, void *b, size_t size) {
-    uint8_t *ap = (uint8_t *)a;
-    uint8_t *bp = (uint8_t *)b;
-    uint8_t t = *ap;
-    *ap = *bp;
-    *bp = t;
-}
-
-static void exchange_int16s(void *a, void *b, size_t size) {
-    uint16_t *ap = (uint16_t *)a;
-    uint16_t *bp = (uint16_t *)b;
-
-    for (size /= sizeof(uint16_t); size-- != 0;) {
-        uint16_t t = *ap;
-        *ap++ = *bp;
-        *bp++ = t;
-    }
-}
-
-static void exchange_one_int16(void *a, void *b, size_t size) {
-    uint16_t *ap = (uint16_t *)a;
-    uint16_t *bp = (uint16_t *)b;
-    uint16_t t = *ap;
-    *ap = *bp;
-    *bp = t;
-}
-
-static void exchange_int32s(void *a, void *b, size_t size) {
-    uint32_t *ap = (uint32_t *)a;
-    uint32_t *bp = (uint32_t *)b;
-
-    for (size /= sizeof(uint32_t); size-- != 0;) {
-        uint32_t t = *ap;
-        *ap++ = *bp;
-        *bp++ = t;
-    }
-}
-
-static void exchange_one_int32(void *a, void *b, size_t size) {
-    uint32_t *ap = (uint32_t *)a;
-    uint32_t *bp = (uint32_t *)b;
-    uint32_t t = *ap;
-    *ap = *bp;
-    *bp = t;
-}
-
-static void exchange_int64s(void *a, void *b, size_t size) {
-    uint64_t *ap = (uint64_t *)a;
-    uint64_t *bp = (uint64_t *)b;
-
-    for (size /= sizeof(uint64_t); size-- != 0;) {
-        uint64_t t = *ap;
-        *ap++ = *bp;
-        *bp++ = t;
-    }
-}
-
-static void exchange_one_int64(void *a, void *b, size_t size) {
-    uint64_t *ap = (uint64_t *)a;
-    uint64_t *bp = (uint64_t *)b;
-    uint64_t t = *ap;
-    *ap = *bp;
-    *bp = t;
-}
-
-static void exchange_int128s(void *a, void *b, size_t size) {
-    uint64_t *ap = (uint64_t *)a;
-    uint64_t *bp = (uint64_t *)b;
-
-    for (size /= sizeof(uint64_t) * 2; size-- != 0; ap += 2, bp += 2) {
-        uint64_t t = ap[0];
-        uint64_t u = ap[1];
-        ap[0] = bp[0];
-        ap[1] = bp[1];
-        bp[0] = t;
-        bp[1] = u;
-    }
-}
-
-static void exchange_one_int128(void *a, void *b, size_t size) {
-    uint64_t *ap = (uint64_t *)a;
-    uint64_t *bp = (uint64_t *)b;
-    uint64_t t = ap[0];
-    uint64_t u = ap[1];
-    ap[0] = bp[0];
-    ap[1] = bp[1];
-    bp[0] = t;
-    bp[1] = u;
-}
-
-static inline exchange_f exchange_func(const void *base, size_t size) {
-    switch (((uintptr_t)base | (uintptr_t)size) & 15) {
-    case 0:
-        if (size == sizeof(uint64_t) * 2)
-            return exchange_one_int128;
-        else
-            return exchange_int128s;
-    case 8:
-        if (size == sizeof(uint64_t))
-            return exchange_one_int64;
-        else
-            return exchange_int64s;
-    case 4:
-    case 12:
-        if (size == sizeof(uint32_t))
-            return exchange_one_int32;
-        else
-            return exchange_int32s;
-    case 2:
-    case 6:
-    case 10:
-    case 14:
-        if (size == sizeof(uint16_t))
-            return exchange_one_int16;
-        else
-            return exchange_int16s;
-    default:
-        if (size == 1)
-            return exchange_one_byte;
-        else
-            return exchange_bytes;
-    }
-}
-
-static void heapsortx(void *base, size_t nmemb, size_t size, cmp_f cmp, void *opaque)
-{
-    uint8_t *basep = (uint8_t *)base;
-    size_t i, n, c, r;
-    exchange_f swap = exchange_func(base, size);
-
-    if (nmemb > 1) {
-        i = (nmemb / 2) * size;
-        n = nmemb * size;
-
-        while (i > 0) {
-            i -= size;
-            for (r = i; (c = r * 2 + size) < n; r = c) {
-                if (c < n - size && cmp(basep + c, basep + c + size, opaque) <= 0)
-                    c += size;
-                if (cmp(basep + r, basep + c, opaque) > 0)
-                    break;
-                swap(basep + r, basep + c, size);
-            }
-        }
-        for (i = n - size; i > 0; i -= size) {
-            swap(basep, basep + i, size);
-
-            for (r = 0; (c = r * 2 + size) < i; r = c) {
-                if (c < i - size && cmp(basep + c, basep + c + size, opaque) <= 0)
-                    c += size;
-                if (cmp(basep + r, basep + c, opaque) > 0)
-                    break;
-                swap(basep + r, basep + c, size);
-            }
-        }
-    }
-}
-
-static inline void *med3(void *a, void *b, void *c, cmp_f cmp, void *opaque)
-{
-    return cmp(a, b, opaque) < 0 ?
-        (cmp(b, c, opaque) < 0 ? b : (cmp(a, c, opaque) < 0 ? c : a )) :
-        (cmp(b, c, opaque) > 0 ? b : (cmp(a, c, opaque) < 0 ? a : c ));
-}
-
-/* pointer based version with local stack and insertion sort threshhold */
-void rqsort(void *base, size_t nmemb, size_t size, cmp_f cmp, void *opaque)
-{
-    struct { uint8_t *base; size_t count; int depth; } stack[50], *sp = stack;
-    uint8_t *ptr, *pi, *pj, *plt, *pgt, *top, *m;
-    size_t m4, i, lt, gt, span, span2;
-    int c, depth;
-    exchange_f swap = exchange_func(base, size);
-    exchange_f swap_block = exchange_func(base, size | 128);
-
-    if (nmemb < 2 || size <= 0)
-        return;
-
-    sp->base = (uint8_t *)base;
-    sp->count = nmemb;
-    sp->depth = 0;
-    sp++;
-
-    while (sp > stack) {
-        sp--;
-        ptr = sp->base;
-        nmemb = sp->count;
-        depth = sp->depth;
-
-        while (nmemb > 6) {
-            if (++depth > 50) {
-                /* depth check to ensure worst case logarithmic time */
-                heapsortx(ptr, nmemb, size, cmp, opaque);
-                nmemb = 0;
-                break;
-            }
-            /* select median of 3 from 1/4, 1/2, 3/4 positions */
-            /* should use median of 5 or 9? */
-            m4 = (nmemb >> 2) * size;
-            m = med3(ptr + m4, ptr + 2 * m4, ptr + 3 * m4, cmp, opaque);
-            swap(ptr, m, size);  /* move the pivot to the start or the array */
-            i = lt = 1;
-            pi = plt = ptr + size;
-            gt = nmemb;
-            pj = pgt = top = ptr + nmemb * size;
-            for (;;) {
-                while (pi < pj && (c = cmp(ptr, pi, opaque)) >= 0) {
-                    if (c == 0) {
-                        swap(plt, pi, size);
-                        lt++;
-                        plt += size;
-                    }
-                    i++;
-                    pi += size;
-                }
-                while (pi < (pj -= size) && (c = cmp(ptr, pj, opaque)) <= 0) {
-                    if (c == 0) {
-                        gt--;
-                        pgt -= size;
-                        swap(pgt, pj, size);
-                    }
-                }
-                if (pi >= pj)
-                    break;
-                swap(pi, pj, size);
-                i++;
-                pi += size;
-            }
-            /* array has 4 parts:
-             * from 0 to lt excluded: elements identical to pivot
-             * from lt to pi excluded: elements smaller than pivot
-             * from pi to gt excluded: elements greater than pivot
-             * from gt to n excluded: elements identical to pivot
-             */
-            /* move elements identical to pivot in the middle of the array: */
-            /* swap values in ranges [0..lt[ and [i-lt..i[
-               swapping the smallest span between lt and i-lt is sufficient
-             */
-            span = plt - ptr;
-            span2 = pi - plt;
-            lt = i - lt;
-            if (span > span2)
-                span = span2;
-            swap_block(ptr, pi - span, span);
-            /* swap values in ranges [gt..top[ and [i..top-(top-gt)[
-               swapping the smallest span between top-gt and gt-i is sufficient
-             */
-            span = top - pgt;
-            span2 = pgt - pi;
-            pgt = top - span2;
-            gt = nmemb - (gt - i);
-            if (span > span2)
-                span = span2;
-            swap_block(pi, top - span, span);
-
-            /* now array has 3 parts:
-             * from 0 to lt excluded: elements smaller than pivot
-             * from lt to gt excluded: elements identical to pivot
-             * from gt to n excluded: elements greater than pivot
-             */
-            /* stack the larger segment and keep processing the smaller one
-               to minimize stack use for pathological distributions */
-            if (lt > nmemb - gt) {
-                sp->base = ptr;
-                sp->count = lt;
-                sp->depth = depth;
-                sp++;
-                ptr = pgt;
-                nmemb -= gt;
-            } else {
-                sp->base = pgt;
-                sp->count = nmemb - gt;
-                sp->depth = depth;
-                sp++;
-                nmemb = lt;
-            }
-        }
-        /* Use insertion sort for small fragments */
-        for (pi = ptr + size, top = ptr + nmemb * size; pi < top; pi += size) {
-            for (pj = pi; pj > ptr && cmp(pj - size, pj, opaque) > 0; pj -= size)
-                swap(pj, pj - size, size);
-        }
-    }
-}
-
-#endif

src/quickjs/cutils.h

@@ -1,341 +0,0 @@
-/*
- * C utilities
- *
- * Copyright (c) 2017 Fabrice Bellard
- * Copyright (c) 2018 Charlie Gordon
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef CUTILS_H
-#define CUTILS_H
-
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-
-#define likely(x)       __builtin_expect(!!(x), 1)
-#define unlikely(x)     __builtin_expect(!!(x), 0)
-#define force_inline inline __attribute__((always_inline))
-#define no_inline __attribute__((noinline))
-#define __maybe_unused __attribute__((unused))
-
-#define xglue(x, y) x ## y
-#define glue(x, y) xglue(x, y)
-#define stringify(s)    tostring(s)
-#define tostring(s)     #s
-
-#ifndef offsetof
-#define offsetof(type, field) ((size_t) &((type *)0)->field)
-#endif
-#ifndef countof
-#define countof(x) (sizeof(x) / sizeof((x)[0]))
-#endif
-#ifndef container_of
-/* return the pointer of type 'type *' containing 'ptr' as field 'member' */
-#define container_of(ptr, type, member) ((type *)((uint8_t *)(ptr) - offsetof(type, member)))
-#endif
-
-typedef int BOOL;
-
-#ifndef FALSE
-enum {
-    FALSE = 0,
-    TRUE = 1,
-};
-#endif
-
-void pstrcpy(char *buf, int buf_size, const char *str);
-char *pstrcat(char *buf, int buf_size, const char *s);
-int strstart(const char *str, const char *val, const char **ptr);
-int has_suffix(const char *str, const char *suffix);
-
-/* Prevent UB when n == 0 and (src == NULL or dest == NULL) */
-static inline void memcpy_no_ub(void *dest, const void *src, size_t n) {
-    if (n)
-        memcpy(dest, src, n);
-}
-
-static inline int max_int(int a, int b)
-{
-    if (a > b)
-        return a;
-    else
-        return b;
-}
-
-static inline int min_int(int a, int b)
-{
-    if (a < b)
-        return a;
-    else
-        return b;
-}
-
-static inline uint32_t max_uint32(uint32_t a, uint32_t b)
-{
-    if (a > b)
-        return a;
-    else
-        return b;
-}
-
-static inline uint32_t min_uint32(uint32_t a, uint32_t b)
-{
-    if (a < b)
-        return a;
-    else
-        return b;
-}
-
-static inline int64_t max_int64(int64_t a, int64_t b)
-{
-    if (a > b)
-        return a;
-    else
-        return b;
-}
-
-static inline int64_t min_int64(int64_t a, int64_t b)
-{
-    if (a < b)
-        return a;
-    else
-        return b;
-}
-
-/* WARNING: undefined if a = 0 */
-static inline int clz32(unsigned int a)
-{
-    return __builtin_clz(a);
-}
-
-/* WARNING: undefined if a = 0 */
-static inline int clz64(uint64_t a)
-{
-    return __builtin_clzll(a);
-}
-
-/* WARNING: undefined if a = 0 */
-static inline int ctz32(unsigned int a)
-{
-    return __builtin_ctz(a);
-}
-
-/* WARNING: undefined if a = 0 */
-static inline int ctz64(uint64_t a)
-{
-    return __builtin_ctzll(a);
-}
-
-struct __attribute__((packed)) packed_u64 {
-    uint64_t v;
-};
-
-struct __attribute__((packed)) packed_u32 {
-    uint32_t v;
-};
-
-struct __attribute__((packed)) packed_u16 {
-    uint16_t v;
-};
-
-static inline uint64_t get_u64(const uint8_t *tab)
-{
-    return ((const struct packed_u64 *)tab)->v;
-}
-
-static inline int64_t get_i64(const uint8_t *tab)
-{
-    return (int64_t)((const struct packed_u64 *)tab)->v;
-}
-
-static inline void put_u64(uint8_t *tab, uint64_t val)
-{
-    ((struct packed_u64 *)tab)->v = val;
-}
-
-static inline uint32_t get_u32(const uint8_t *tab)
-{
-    return ((const struct packed_u32 *)tab)->v;
-}
-
-static inline int32_t get_i32(const uint8_t *tab)
-{
-    return (int32_t)((const struct packed_u32 *)tab)->v;
-}
-
-static inline void put_u32(uint8_t *tab, uint32_t val)
-{
-    ((struct packed_u32 *)tab)->v = val;
-}
-
-static inline uint32_t get_u16(const uint8_t *tab)
-{
-    return ((const struct packed_u16 *)tab)->v;
-}
-
-static inline int32_t get_i16(const uint8_t *tab)
-{
-    return (int16_t)((const struct packed_u16 *)tab)->v;
-}
-
-static inline void put_u16(uint8_t *tab, uint16_t val)
-{
-    ((struct packed_u16 *)tab)->v = val;
-}
-
-static inline uint32_t get_u8(const uint8_t *tab)
-{
-    return *tab;
-}
-
-static inline int32_t get_i8(const uint8_t *tab)
-{
-    return (int8_t)*tab;
-}
-
-static inline void put_u8(uint8_t *tab, uint8_t val)
-{
-    *tab = val;
-}
-
-#ifndef bswap16
-static inline uint16_t bswap16(uint16_t x)
-{
-    return (x >> 8) | (x << 8);
-}
-#endif
-
-#ifndef bswap32
-static inline uint32_t bswap32(uint32_t v)
-{
-    return ((v & 0xff000000) >> 24) | ((v & 0x00ff0000) >>  8) |
-        ((v & 0x0000ff00) <<  8) | ((v & 0x000000ff) << 24);
-}
-#endif
-
-#ifndef bswap64
-static inline uint64_t bswap64(uint64_t v)
-{
-    return ((v & ((uint64_t)0xff << (7 * 8))) >> (7 * 8)) |
-        ((v & ((uint64_t)0xff << (6 * 8))) >> (5 * 8)) |
-        ((v & ((uint64_t)0xff << (5 * 8))) >> (3 * 8)) |
-        ((v & ((uint64_t)0xff << (4 * 8))) >> (1 * 8)) |
-        ((v & ((uint64_t)0xff << (3 * 8))) << (1 * 8)) |
-        ((v & ((uint64_t)0xff << (2 * 8))) << (3 * 8)) |
-        ((v & ((uint64_t)0xff << (1 * 8))) << (5 * 8)) |
-        ((v & ((uint64_t)0xff << (0 * 8))) << (7 * 8));
-}
-#endif
-
-/* XXX: should take an extra argument to pass slack information to the caller */
-typedef void *DynBufReallocFunc(void *opaque, void *ptr, size_t size);
-
-typedef struct DynBuf {
-    uint8_t *buf;
-    size_t size;
-    size_t allocated_size;
-    BOOL error; /* true if a memory allocation error occurred */
-    DynBufReallocFunc *realloc_func;
-    void *opaque; /* for realloc_func */
-} DynBuf;
-
-void dbuf_init(DynBuf *s);
-void dbuf_init2(DynBuf *s, void *opaque, DynBufReallocFunc *realloc_func);
-int dbuf_realloc(DynBuf *s, size_t new_size);
-int dbuf_write(DynBuf *s, size_t offset, const uint8_t *data, size_t len);
-int dbuf_put(DynBuf *s, const uint8_t *data, size_t len);
-int dbuf_put_self(DynBuf *s, size_t offset, size_t len);
-int dbuf_putc(DynBuf *s, uint8_t c);
-int dbuf_putstr(DynBuf *s, const char *str);
-static inline int dbuf_put_u16(DynBuf *s, uint16_t val)
-{
-    return dbuf_put(s, (uint8_t *)&val, 2);
-}
-static inline int dbuf_put_u32(DynBuf *s, uint32_t val)
-{
-    return dbuf_put(s, (uint8_t *)&val, 4);
-}
-static inline int dbuf_put_u64(DynBuf *s, uint64_t val)
-{
-    return dbuf_put(s, (uint8_t *)&val, 8);
-}
-int __attribute__((format(printf, 2, 3))) dbuf_printf(DynBuf *s,
-                                                      const char *fmt, ...);
-void dbuf_free(DynBuf *s);
-static inline BOOL dbuf_error(DynBuf *s) {
-    return s->error;
-}
-static inline void dbuf_set_error(DynBuf *s)
-{
-    s->error = TRUE;
-}
-
-#define UTF8_CHAR_LEN_MAX 6
-
-int unicode_to_utf8(uint8_t *buf, unsigned int c);
-int unicode_from_utf8(const uint8_t *p, int max_len, const uint8_t **pp);
-
-static inline BOOL is_surrogate(uint32_t c)
-{
-    return (c >> 11) == (0xD800 >> 11); // 0xD800-0xDFFF
-}
-
-static inline BOOL is_hi_surrogate(uint32_t c)
-{
-    return (c >> 10) == (0xD800 >> 10); // 0xD800-0xDBFF
-}
-
-static inline BOOL is_lo_surrogate(uint32_t c)
-{
-    return (c >> 10) == (0xDC00 >> 10); // 0xDC00-0xDFFF
-}
-
-static inline uint32_t get_hi_surrogate(uint32_t c)
-{
-    return (c >> 10) - (0x10000 >> 10) + 0xD800;
-}
-
-static inline uint32_t get_lo_surrogate(uint32_t c)
-{
-    return (c & 0x3FF) | 0xDC00;
-}
-
-static inline uint32_t from_surrogate(uint32_t hi, uint32_t lo)
-{
-    return 0x10000 + 0x400 * (hi - 0xD800) + (lo - 0xDC00);
-}
-
-static inline int from_hex(int c)
-{
-    if (c >= '0' && c <= '9')
-        return c - '0';
-    else if (c >= 'A' && c <= 'F')
-        return c - 'A' + 10;
-    else if (c >= 'a' && c <= 'f')
-        return c - 'a' + 10;
-    else
-        return -1;
-}
-
-void rqsort(void *base, size_t nmemb, size_t size,
-            int (*cmp)(const void *, const void *, void *),
-            void *arg);
-
-#endif  /* CUTILS_H */

src/quickjs/debug.c

@@ -1,483 +0,0 @@
-#define _IN_DEBUG_C 1
-#include "debug.h"
-#include <quickjs.h>
-#include <list.h>
-#include <cutils.h>
-#include <assert.h>
-#include "defines.h"
-#include <string.h>
-#include <stdlib.h>
-
-/**
- * \addtogroup debug
- * @{
- */
-struct alloc_block {
-  struct list_head link;
-  const char* file;
-  int line;
-  size_t size;
-};
-
-#define ALLOC_BLOCK_SIZE sizeof(struct alloc_block)
-#define ALLOC_BLOCK(p) (((struct alloc_block*)(p)) - 1)
-#define ALLOC_PTR struct alloc_block*
-
-#undef malloc
-#undef calloc
-#undef realloc
-#undef strdup
-#undef free
-#undef js_malloc
-#undef js_mallocz
-#undef js_realloc
-#undef js_strdup
-#undef js_strndup
-#undef js_free
-#undef js_malloc_usable_size
-#undef js_malloc_rt
-#undef js_mallocz_rt
-#undef js_realloc_rt
-#undef js_free_rt
-#undef js_malloc_usable_size_rt
-
-thread_local struct list_head alloc_block_list = {0, 0};
-
-static inline void
-add_to_list(struct list_head* el, struct list_head* head) {
-  if(alloc_block_list.prev == 0 && alloc_block_list.next == 0)
-    init_list_head(&alloc_block_list);
-
-  list_add_tail(el, head);
-}
-
-int64_t
-check_pointer(void* p) {
-  ALLOC_PTR ptr = ALLOC_BLOCK(p);
-  struct list_head* link;
-  int64_t ret = 0;
-  list_for_each(link, &alloc_block_list) {
-    if(link == &ptr->link)
-      return ret;
-    ret++;
-  }
-  // assert(0);
-  return -1;
-}
-
-void*
-debug_malloc(size_t n, const char* file, int line) {
-  ALLOC_PTR ptr;
-
-  if((ptr = malloc(n + ALLOC_BLOCK_SIZE))) {
-    ptr->file = file;
-    ptr->line = line;
-    ptr->size = n;
-
-    add_to_list(&ptr->link, &alloc_block_list);
-    return &ptr[1];
-  }
-  return 0;
-}
-
-void*
-debug_calloc(size_t m, size_t n, const char* file, int line) {
-  ALLOC_PTR ptr;
-
-  m *= n;
-  n = 1;
-
-  if((ptr = calloc(m + ALLOC_BLOCK_SIZE, 1))) {
-    ptr->file = file;
-    ptr->line = line;
-    ptr->size = n;
-
-    add_to_list(&ptr->link, &alloc_block_list);
-    return &ptr[1];
-  }
-  return 0;
-}
-
-void*
-debug_realloc(void* p, size_t n, const char* file, int line) {
-  ALLOC_PTR ptr;
-
-  if(p) {
-
-    check_pointer(p);
-
-    ptr = ALLOC_BLOCK(p);
-    list_del(&ptr->link);
-
-    if(n == 0) {
-      free(ptr);
-      return 0;
-    }
-
-    ptr = realloc(ptr, n + ALLOC_BLOCK_SIZE);
-  } else {
-    ptr = malloc(n + ALLOC_BLOCK_SIZE);
-  }
-
-  if(ptr) {
-    ptr->file = file;
-    ptr->line = line;
-    ptr->size = n;
-
-    add_to_list(&ptr->link, &alloc_block_list);
-    return &ptr[1];
-  }
-  return 0;
-}
-
-void*
-debug_strdup(const char* s, const char* file, int line) {
-  ALLOC_PTR ptr;
-  size_t len = strlen(s);
-
-  if((ptr = malloc(len + 1 + ALLOC_BLOCK_SIZE))) {
-    ptr->file = file;
-    ptr->line = line;
-    ptr->size = len + 1;
-
-    add_to_list(&ptr->link, &alloc_block_list);
-
-    memcpy(&ptr[1], s, len + 1);
-    return &ptr[1];
-  }
-  return 0;
-}
-
-void
-debug_free(void* p, const char* file, int line) {
-  ALLOC_PTR ptr = ALLOC_BLOCK(p);
-
-  list_del(&ptr->link);
-
-  memset(ptr, 0xff, ALLOC_BLOCK_SIZE);
-
-  free(ptr);
-}
-
-void*
-debug_js_malloc(JSContext* ctx, size_t n, const char* file, int line) {
-  ALLOC_PTR ptr;
-
-  if((ptr = js_malloc(ctx, n + ALLOC_BLOCK_SIZE))) {
-    ptr->file = file;
-    ptr->line = line;
-    ptr->size = n;
-
-    add_to_list(&ptr->link, &alloc_block_list);
-    return &ptr[1];
-  }
-  return 0;
-}
-
-void*
-debug_js_mallocz(JSContext* ctx, size_t n, const char* file, int line) {
-  ALLOC_PTR ptr;
-
-  if((ptr = js_mallocz(ctx, n + ALLOC_BLOCK_SIZE))) {
-    ptr->file = file;
-    ptr->line = line;
-    ptr->size = n;
-
-    add_to_list(&ptr->link, &alloc_block_list);
-    return &ptr[1];
-  }
-  return 0;
-}
-
-void*
-debug_js_realloc(JSContext* ctx, void* p, size_t n, const char* file, int line) {
-  ALLOC_PTR ptr;
-
-  if(p) {
-
-    check_pointer(p);
-
-    ptr = ALLOC_BLOCK(p);
-    list_del(&ptr->link);
-
-    if(n == 0) {
-      js_free(ctx, ptr);
-      return 0;
-    }
-
-    ptr = js_realloc(ctx, ptr, n + ALLOC_BLOCK_SIZE);
-  } else {
-    ptr = js_malloc(ctx, n + ALLOC_BLOCK_SIZE);
-  }
-
-  if(ptr) {
-    ptr->file = file;
-    ptr->line = line;
-    ptr->size = n;
-
-    add_to_list(&ptr->link, &alloc_block_list);
-    return &ptr[1];
-  }
-  return 0;
-}
-
-void*
-debug_js_realloc2(JSContext* ctx, void* p, size_t size, size_t* pslack, const char* file, int line) {
-  void* ptr;
-
-  if((ptr = debug_js_realloc(ctx, p, size, file, line))) {
-    if(pslack) {
-      size_t new_size = debug_js_malloc_usable_size(ctx, ptr, file, line);
-      *pslack = (new_size > size) ? new_size - size : 0;
-    }
-  }
-  return ptr;
-}
-
-void*
-debug_js_strdup(JSContext* ctx, const char* s, const char* file, int line) {
-  ALLOC_PTR ptr;
-  size_t len = strlen(s);
-
-  if((ptr = js_malloc(ctx, len + 1 + ALLOC_BLOCK_SIZE))) {
-    char* p = (char*)&ptr[1];
-    ptr->file = file;
-    ptr->line = line;
-    ptr->size = len + 1;
-
-    add_to_list(&ptr->link, &alloc_block_list);
-
-    memcpy(p, s, len + 1);
-    return p;
-  }
-  return 0;
-}
-
-void*
-debug_js_strndup(JSContext* ctx, const char* s, size_t len, const char* file, int line) {
-  ALLOC_PTR ptr;
-
-  if((ptr = js_malloc(ctx, len + 1 + ALLOC_BLOCK_SIZE))) {
-    char* p = (char*)&ptr[1];
-    ptr->file = file;
-    ptr->line = line;
-    ptr->size = len + 1;
-
-    add_to_list(&ptr->link, &alloc_block_list);
-
-    memcpy(p, s, len);
-    p[len] = '\0';
-
-    return p;
-  }
-  return 0;
-}
-
-size_t
-debug_js_malloc_usable_size(JSContext* ctx, const void* p, const char* file, int line) {
-  ALLOC_PTR ptr = ALLOC_BLOCK(p);
-
-  return js_malloc_usable_size(ctx, ptr) - ALLOC_BLOCK_SIZE;
-}
-
-void
-debug_js_free(JSContext* ctx, void* p, const char* file, int line) {
-  ALLOC_PTR ptr;
-
-  check_pointer(p);
-  ptr = ALLOC_BLOCK(p);
-  list_del(&ptr->link);
-
-  memset(ptr, 0xff, ALLOC_BLOCK_SIZE);
-
-  js_free(ctx, ptr);
-}
-
-void*
-debug_js_malloc_rt(JSRuntime* rt, size_t n, const char* file, int line) {
-  ALLOC_PTR ptr;
-
-  if((ptr = js_malloc_rt(rt, n + ALLOC_BLOCK_SIZE))) {
-    ptr->file = file;
-    ptr->line = line;
-    ptr->size = n;
-
-    add_to_list(&ptr->link, &alloc_block_list);
-    return &ptr[1];
-  }
-  return 0;
-}
-
-void*
-debug_js_mallocz_rt(JSRuntime* rt, size_t n, const char* file, int line) {
-  ALLOC_PTR ptr;
-
-  if((ptr = js_mallocz_rt(rt, n + ALLOC_BLOCK_SIZE))) {
-    ptr->file = file;
-    ptr->line = line;
-    ptr->size = n;
-
-    add_to_list(&ptr->link, &alloc_block_list);
-    return &ptr[1];
-  }
-  return 0;
-}
-
-void*
-debug_js_realloc_rt(JSRuntime* rt, void* p, size_t n, const char* file, int line) {
-  ALLOC_PTR ptr;
-
-  if(p) {
-    check_pointer(p);
-
-    ptr = ALLOC_BLOCK(p);
-    list_del(&ptr->link);
-    if(n == 0) {
-      js_free_rt(rt, ptr);
-      return 0;
-    }
-    ptr = js_realloc_rt(rt, ptr, n + ALLOC_BLOCK_SIZE);
-  } else {
-    ptr = js_malloc_rt(rt, n + ALLOC_BLOCK_SIZE);
-  }
-
-  if(ptr) {
-    ptr->file = file;
-    ptr->line = line;
-    ptr->size = n;
-
-    add_to_list(&ptr->link, &alloc_block_list);
-    return &ptr[1];
-  }
-  return 0;
-}
-
-size_t
-debug_js_malloc_usable_size_rt(JSRuntime* rt, const void* p, const char* file, int line) {
-  ALLOC_PTR ptr = ALLOC_BLOCK(p);
-
-  return js_malloc_usable_size_rt(rt, ptr) - ALLOC_BLOCK_SIZE;
-}
-
-void
-debug_js_free_rt(JSRuntime* rt, void* p, const char* file, int line) {
-  ALLOC_PTR ptr;
-  check_pointer(p);
-
-  ptr = ALLOC_BLOCK(p);
-
-  // printf("debug_js_free_rt %p\n", p);
-
-  list_del(&ptr->link);
-
-  memset(ptr, 0xff, ALLOC_BLOCK_SIZE);
-
-  js_free_rt(rt, ptr);
-}
-
-#undef malloc
-#undef calloc
-#undef realloc
-#undef strdup
-#undef free
-#undef js_malloc
-#undef js_mallocz
-#undef js_realloc
-#undef js_strdup
-#undef js_strndup
-#undef js_malloc_usable_size
-#undef js_free
-#undef js_malloc_rt
-#undef js_mallocz_rt
-#undef js_realloc_rt
-#undef js_malloc_usable_size_rt
-#undef js_free_rt
-
-void*
-orig_malloc(size_t size) {
-  return malloc(size);
-}
-
-void*
-orig_calloc(size_t nelem, size_t elemsz) {
-  return calloc(nelem, elemsz);
-}
-
-void*
-orig_realloc(void* ptr, size_t size) {
-  return realloc(ptr, size);
-}
-
-void*
-orig_strdup(const char* str) {
-  return strdup(str);
-}
-
-void
-orig_free(void* ptr) {
-  free(ptr);
-}
-
-void*
-orig_js_malloc(JSContext* ctx, size_t size) {
-  return js_malloc(ctx, size);
-}
-
-void*
-orig_js_mallocz(JSContext* ctx, size_t size) {
-  return js_mallocz(ctx, size);
-}
-
-void*
-orig_js_realloc(JSContext* ctx, void* p, size_t size) {
-  return js_realloc(ctx, p, size);
-}
-
-void*
-orig_js_strdup(JSContext* ctx, const char* str) {
-  return js_strdup(ctx, str);
-}
-
-void*
-orig_js_strndup(JSContext* ctx, const char* str, size_t size) {
-  return js_strndup(ctx, str, size);
-}
-
-size_t
-orig_js_malloc_usable_size(JSContext* ctx, const void* p) {
-  return js_malloc_usable_size(ctx, p);
-}
-
-void
-orig_js_free(JSContext* ctx, void* p) {
-  return js_free(ctx, p);
-}
-
-void*
-orig_js_malloc_rt(JSRuntime* rt, size_t size) {
-  return js_malloc_rt(rt, size);
-}
-
-void*
-orig_js_mallocz_rt(JSRuntime* rt, size_t size) {
-  return js_mallocz_rt(rt, size);
-}
-
-void*
-orig_js_realloc_rt(JSRuntime* rt, void* p, size_t size) {
-  return js_realloc_rt(rt, p, size);
-}
-
-size_t
-orig_js_malloc_usable_size_rt(JSRuntime* rt, const void* p) {
-  return js_malloc_usable_size_rt(rt, p);
-}
-
-void
-orig_js_free_rt(JSRuntime* rt, void* p) {
-  return js_free_rt(rt, p);
-}
-
-/**
- * @}
- */

src/quickjs/debug.h

@@ -1,165 +0,0 @@
-#ifndef DEBUG_H
-#define DEBUG_H
-
-#include <quickjs.h>
-#include <cutils.h>
-#include "defines.h"
-
-#ifndef QUICKJS_H
-#error "quickjs.h not included"
-#endif
-
-/**
- * \defgroup debug debug: Debugging helpers
- * @{
- */
-
-extern thread_local struct list_head alloc_block_list;
-
-int64_t check_pointer(void*);
-void* debug_malloc(size_t, const char*, int);
-void* debug_calloc(size_t, size_t, const char*, int line);
-void* debug_realloc(void*, size_t, const char*, int line);
-void* debug_strdup(const char*, const char*, int);
-void debug_free(void*, const char*, int);
-void* debug_js_malloc(JSContext*, size_t, const char*, int line);
-void* debug_js_mallocz(JSContext*, size_t, const char*, int line);
-void* debug_js_realloc(JSContext*, void*, size_t, const char* file, int line);
-void* debug_js_realloc2(JSContext*, void*, size_t, size_t* pslack, const char* file, int line);
-void* debug_js_strdup(JSContext*, const char*, const char*, int line);
-void* debug_js_strndup(JSContext*, const char*, size_t, const char* file, int line);
-size_t debug_js_malloc_usable_size(JSContext*, const void*, const char*, int line);
-void debug_js_free(JSContext*, void*, const char*, int line);
-void* debug_js_malloc_rt(JSRuntime*, size_t, const char*, int line);
-void* debug_js_mallocz_rt(JSRuntime*, size_t, const char*, int line);
-void* debug_js_realloc_rt(JSRuntime*, void*, size_t, const char* file, int line);
-size_t debug_js_malloc_usable_size_rt(JSRuntime*, const void*, const char*, int line);
-void debug_js_free_rt(JSRuntime*, void*, const char*, int line);
-
-#if !defined(_IN_DEBUG_C)
-
-#if defined(DEBUG_ALLOC)
-#define malloc(size) debug_malloc(size, __FILE__, __LINE__)
-#define calloc(nelem, size) debug_calloc(nelem, size, __FILE__, __LINE__)
-#define realloc(ptr, size) debug_realloc(ptr, size, __FILE__, __LINE__)
-#define strdup(str) debug_strdup(str, __FILE__, __LINE__)
-#define free(ptr) debug_free(ptr, __FILE__, __LINE__)
-#define js_malloc(ctx, size) debug_js_malloc(ctx, size, __FILE__, __LINE__)
-#define js_mallocz(ctx, size) debug_js_mallocz(ctx, size, __FILE__, __LINE__)
-#define js_realloc(ctx, ptr, size) debug_js_realloc(ctx, ptr, size, __FILE__, __LINE__)
-#define js_strdup(ctx, str) debug_js_strdup(ctx, str, __FILE__, __LINE__)
-#define js_strndup(ctx, str, len) debug_js_strndup(ctx, str, len, __FILE__, __LINE__)
-#define js_free(ctx, ptr) debug_js_free(ctx, ptr, __FILE__, __LINE__)
-#define js_malloc_usable_size(ctx, ptr) debug_js_malloc_usable_size(ctx, ptr, __FILE__, __LINE__)
-#define js_malloc_rt(rt, size) debug_js_malloc_rt(rt, size, __FILE__, __LINE__)
-#define js_mallocz_rt(rt, size) debug_js_mallocz_rt(rt, size, __FILE__, __LINE__)
-#define js_realloc_rt(rt, ptr, size) debug_js_realloc_rt(rt, ptr, size, __FILE__, __LINE__)
-#define js_malloc_usable_size_rt(rt, ptr) debug_js_malloc_usable_size_rt(rt, ptr, __FILE__, __LINE__)
-#define js_free_rt(rt, ptr) debug_js_free_rt(rt, ptr, __FILE__, __LINE__)
-#endif
-
-#ifdef DEBUG_ALLOC
-#define realloc_helper(name) \
-  void* name(void* ptr, size_t size) { \
-    if(ptr == 0) \
-      return debug_malloc(size, __FILE__, __LINE__); \
-    if(size == 0) \
-      return debug_free(ptr, __FILE__, __LINE__); \
-    return debug_realloc(ptr, size, __FILE__, __LINE__); \
-  }
-#define realloc2_helper(name) \
-  void* name(void* opaque, void* ptr, size_t size) { \
-    if(ptr == 0) \
-      return debug_malloc(size, __FILE__, __LINE__); \
-    if(size == 0) { \
-      debug_free(ptr, __FILE__, __LINE__); \
-      return 0; \
-    } \
-    return debug_realloc(ptr, size, __FILE__, __LINE__); \
-  }
-#define js_realloc_helper(name) \
-  void* name(JSContext* ctx, void* ptr, size_t size) { \
-    if(ptr == 0) \
-      return debug_js_malloc(ctx, size, __FILE__, __LINE__); \
-    if(size == 0) { \
-      debug_js_free(ctx, ptr, __FILE__, __LINE__); \
-      return 0; \
-    } \
-    return debug_js_realloc(ctx, ptr, size, __FILE__, __LINE__); \
-  }
-#define js_realloc_rt_helper(name) \
-  void* name(JSRuntime* rt, void* ptr, size_t size) { \
-    if(ptr == 0) \
-      return debug_js_malloc_rt(rt, size, __FILE__, __LINE__); \
-    if(size == 0) { \
-      debug_js_free_rt(rt, ptr, __FILE__, __LINE__); \
-      return 0; \
-    } \
-    return debug_js_realloc_rt(rt, ptr, size, __FILE__, __LINE__); \
-  }
-#else
-#define realloc_helper(name) \
-  void* name(void* ptr, size_t size) { \
-    if(ptr == 0) \
-      return malloc(size); \
-    if(size == 0) { \
-      free(ptr); \
-      return 0; \
-    } \
-    return realloc(ptr, size); \
-  }
-#define realloc2_helper(name) \
-  void* name(void* opaque, void* ptr, size_t size) { \
-    if(ptr == 0) \
-      return malloc(size); \
-    if(size == 0) { \
-      free(ptr); \
-      return 0; \
-    } \
-    return realloc(ptr, size); \
-  }
-#define js_realloc_helper(name) \
-  void* name(JSContext* ctx, void* ptr, size_t size) { \
-    if(ptr == 0) \
-      return orig_js_malloc(ctx, size); \
-    if(size == 0) { \
-      orig_js_free(ctx, ptr); \
-      return 0; \
-    } \
-    return orig_js_realloc(ctx, ptr, size); \
-  }
-#define js_realloc_rt_helper(name) \
-  void* name(JSRuntime* rt, void* ptr, size_t size) { \
-    if(ptr == 0) \
-      return orig_js_malloc_rt(rt, size); \
-    if(size == 0) { \
-      orig_js_free_rt(rt, ptr); \
-      return 0; \
-    } \
-    return orig_js_realloc_rt(rt, ptr, size); \
-  }
-#endif
-#endif
-
-void* orig_malloc(size_t);
-void* orig_calloc(size_t, size_t);
-void* orig_realloc(void*, size_t);
-void* orig_strdup(const char*);
-void orig_free(void*);
-void* orig_js_malloc(JSContext*, size_t);
-void* orig_js_mallocz(JSContext*, size_t);
-void* orig_js_realloc(JSContext*, void*, size_t);
-void* orig_js_strdup(JSContext*, const char*);
-void* orig_js_strndup(JSContext*, const char*, size_t);
-size_t orig_js_malloc_usable_size(JSContext*, const void*);
-void orig_js_free(JSContext*, void*);
-void* orig_js_malloc_rt(JSRuntime*, size_t);
-void* orig_js_mallocz_rt(JSRuntime*, size_t);
-void* orig_js_realloc_rt(JSRuntime*, void*, size_t);
-size_t orig_js_malloc_usable_size_rt(JSRuntime*, const void*);
-void orig_js_free_rt(JSRuntime*, void*);
-
-/**
- * @}
- */
-#endif /* defined(DEBUG_H) */

src/quickjs/defines.h

@@ -1,181 +0,0 @@
-#ifndef DEFINES_H
-#define DEFINES_H
-
-/**
- * \defgroup defines defines: Preprocessor definitions
- * @{
- */
-
-#ifdef _WIN32
-#include <io.h>
-#define FD_TO_SOCKET(fd) ((SOCKET)_get_osfhandle((fd)))
-#define SOCKET_TO_FD(fh) (_open_osfhandle((intptr_t)(fh), O_RDWR | O_BINARY))
-#else
-#define FD_TO_SOCKET(fd) (fd)
-#define SOCKET_TO_FD(fh) (fh)
-#endif
-
-#ifndef offsetof
-#define offsetof(type, field) ((size_t) & ((type*)0)->field)
-#endif
-
-#ifndef inrange
-#define inrange(value, min, max) ((value) >= (min) && (value) <= (max))
-#endif
-
-#define trim_dotslash(str) (!strncmp((str), "./", 2) ? (str) + 2 : (str))
-
-#ifndef thread_local
-#ifdef _Thread_local
-#define thread_local _Thread_local
-#elif defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#define thread_local __thread
-#elif defined(_WIN32)
-#define thread_local __declspec(thread)
-#else
-#error No TLS implementation found.
-#endif
-#endif
-
-#if defined(__GNUC__) || defined(__clang__)
-#define PACK __attribute__((packed))
-#define ENDPACK
-#else
-#define PACK #pragma pack(push, 1)
-#define ENDPACK #pragma pack(pop)
-#endif
-
-#define JS_CGETSET_ENUMERABLE_DEF(prop_name, fgetter, fsetter, magic_num) \
-  { \
-    .name = prop_name, .prop_flags = JS_PROP_ENUMERABLE | JS_PROP_CONFIGURABLE, .def_type = JS_DEF_CGETSET_MAGIC, .magic = magic_num, .u = { \
-      .getset = {.get = {.getter_magic = fgetter}, .set = {.setter_magic = fsetter}} \
-    } \
-  }
-
-#define JS_CGETSET_MAGIC_FLAGS_DEF(prop_name, fgetter, fsetter, magic_num, flags) \
-  { \
-    .name = prop_name, .prop_flags = flags, .def_type = JS_DEF_CGETSET_MAGIC, .magic = magic_num, .u = { \
-      .getset = {.get = {.getter_magic = fgetter}, .set = {.setter_magic = fsetter}} \
-    } \
-  }
-
-#define JS_CFUNC_DEF_FLAGS(prop_name, length, func1, flags) \
-  { \
-    .name = prop_name, .prop_flags = flags, .def_type = JS_DEF_CFUNC, .magic = 0, .u = {.func = {length, JS_CFUNC_generic, {.generic = func1}} } \
-  }
-
-#define JS_CONSTANT_FLAGS(name, flags) JS_PROP_INT32_DEF(#name, name, (flags))
-#define JS_CONSTANT(name) JS_PROP_INT32_DEF(#name, name, JS_PROP_CONFIGURABLE | JS_PROP_ENUMERABLE)
-#define JS_CONSTANT_NONENUMERABLE(name) JS_PROP_INT32_DEF(#name, name, JS_PROP_CONFIGURABLE)
-
-#ifdef JS_SHARED_LIBRARY
-#if defined(_WIN32) || defined(__MINGW32__)
-#define VISIBLE __declspec(dllexport)
-#define HIDDEN
-#else
-#define VISIBLE __attribute__((visibility("default")))
-#define HIDDEN __attribute__((visibility("hidden")))
-#endif
-#else
-#define VISIBLE
-#define HIDDEN
-#endif
-
-#ifndef MAX_NUM
-#define MAX_NUM(a, b) ((a) > (b) ? (a) : (b))
-#endif
-#ifndef MIN_NUM
-#define MIN_NUM(a, b) ((a) < (b) ? (a) : (b))
-#endif
-#ifndef ABS_NUM
-#define ABS_NUM(n) ((n) < 0 ? -(n) : (n))
-#endif
-#ifndef MOD_NUM
-#define MOD_NUM(n, divisor) ((((n) % (divisor)) + (divisor)) % (divisor))
-#endif
-#ifndef SIGN_NUM
-#define SIGN_NUM(n) ((n) < 0)
-#endif
-
-#define COLOR_BLACK "\x1b[0;30m"
-#define COLOR_RED "\x1b[0;31m"
-#define COLOR_GREEN "\x1b[0;32m"
-#define COLOR_BROWN "\x1b[0;33m"
-#define COLOR_BLUE "\x1b[0;34m"
-#define COLOR_PURPLE "\x1b[0;35m"
-#define COLOR_MARINE "\x1b[0;36m"
-#define COLOR_LIGHTGRAY "\x1b[0;37m"
-#define COLOR_GRAY "\x1b[1;30m"
-#define COLOR_NONE "\x1b[0m"
-
-#define COLOR_LIGHTRED "\x1b[1;31m"
-
-#define COLOR_LIGHTGREEN "\x1b[1;32m"
-#define COLOR_YELLOW "\x1b[1;33m"
-#define COLOR_LIGHTBLUE "\x1b[1;34m"
-#define COLOR_MAGENTA "\x1b[1;35m"
-#define COLOR_CYAN "\x1b[1;36m"
-#define COLOR_WHITE "\x1b[1;37m"
-
-#define BGCOLOR_RED "\x1b[48;5;124m"
-#define BGCOLOR_BLUE "\x1b[48;5;20m"
-#define BGCOLOR_YELLOW "\x1b[48;5;214m"
-#define BGCOLOR_GREEN "\x1b[48;5;28m"
-#define BGCOLOR_PINK "\x1b[48;5;165m"
-
-#define JS_VALUE_FREE(ctx, value) \
-  do { \
-    JS_FreeValue((ctx), (value)); \
-    (value) = JS_UNDEFINED; \
-  } while(0);
-#define JS_VALUE_FREE_RT(ctx, value) \
-  do { \
-    JS_FreeValueRT((ctx), (value)); \
-    (value) = JS_UNDEFINED; \
-  } while(0);
-
-#if 0
-#define js_object_tmpmark_set(value) \
-  do { \
-    ((uint8_t*)JS_VALUE_GET_OBJ((value)))[5] |= 0x40; \
-  } while(0);
-#define js_object_tmpmark_clear(value) \
-  do { \
-    ((uint8_t*)JS_VALUE_GET_OBJ((value)))[5] &= ~0x40; \
-  } while(0);
-#define js_object_tmpmark_isset(value) (((uint8_t*)JS_VALUE_GET_OBJ((value)))[5] & 0x40)
-#else
-#define js_object_tmpmark_set(value) \
-  do { \
-    JS_VALUE_GET_OBJ((value))->tmp_mark |= 0x40; \
-  } while(0);
-#define js_object_tmpmark_clear(value) \
-  do { \
-    JS_VALUE_GET_OBJ((value))->tmp_mark &= ~0x40; \
-  } while(0);
-#define js_object_tmpmark_isset(value) (JS_VALUE_GET_OBJ((value))->tmp_mark & 0x40)
-#endif
-
-#define js_runtime_exception_set(rt, value) \
-  do { \
-    *(JSValue*)((uint8_t*)(rt) + 216) = value; \
-  } while(0);
-#define js_runtime_exception_get(rt) (*(JSValue*)((uint8_t*)(rt) + 216))
-#define js_runtime_exception_clear(rt) \
-  do { \
-    if(!JS_IsNull(js_runtime_exception_get(rt))) \
-      JS_FreeValueRT((rt), js_runtime_exception_get(rt)); \
-    js_runtime_exception_set(rt, JS_NULL); \
-  } while(0)
-
-#define JS_ATOM_TAG_INT (1U << 31)
-#define JS_ATOM_MAX_INT (JS_ATOM_TAG_INT - 1)
-
-#define JS_ATOM_ISINT(i) ((JSAtom)((i)&JS_ATOM_TAG_INT))
-#define JS_ATOM_FROMINT(i) ((JSAtom)((i)&JS_ATOM_MAX_INT) | JS_ATOM_TAG_INT)
-#define JS_ATOM_TOINT(i) (unsigned int)(((JSAtom)(i) & (~(JS_ATOM_TAG_INT))))
-
-/**
- * @}
- */
-#endif /* defined(DEFINES_H) */

src/quickjs/hello.c

@@ -1,45 +0,0 @@
-/* File generated automatically by the QuickJS compiler. */
-
-#include "quickjs-libc.h"
-
-const uint32_t qjsc_hello_size = 87;
-
-const uint8_t qjsc_hello[87] = {
- 0x43, 0x04, 0x0e, 0x63, 0x6f, 0x6e, 0x73, 0x6f,
- 0x6c, 0x65, 0x06, 0x6c, 0x6f, 0x67, 0x16, 0x48,
- 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72,
- 0x6c, 0x64, 0x22, 0x65, 0x78, 0x61, 0x6d, 0x70,
- 0x6c, 0x65, 0x73, 0x2f, 0x68, 0x65, 0x6c, 0x6c,
- 0x6f, 0x2e, 0x6a, 0x73, 0x0c, 0x00, 0x06, 0x00,
- 0xa2, 0x01, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00,
- 0x14, 0x01, 0xa4, 0x01, 0x00, 0x00, 0x00, 0x38,
- 0xe3, 0x00, 0x00, 0x00, 0x42, 0xe4, 0x00, 0x00,
- 0x00, 0x04, 0xe5, 0x00, 0x00, 0x00, 0x24, 0x01,
- 0x00, 0xcf, 0x28, 0xcc, 0x03, 0x01, 0x00,
-};
-
-static JSContext *JS_NewCustomContext(JSRuntime *rt)
-{
-  JSContext *ctx = JS_NewContextRaw(rt);
-  if (!ctx)
-    return NULL;
-  JS_AddIntrinsicBaseObjects(ctx);
-  return ctx;
-}
-
-int main(int argc, char **argv)
-{
-  JSRuntime *rt;
-  JSContext *ctx;
-  rt = JS_NewRuntime();
-  js_std_set_worker_new_context_func(JS_NewCustomContext);
-  js_std_init_handlers(rt);
-  ctx = JS_NewCustomContext(rt);
-  js_std_add_helpers(ctx, argc, argv);
-  js_std_eval_binary(ctx, qjsc_hello, qjsc_hello_size, 0);
-  js_std_loop(ctx);
-  js_std_free_handlers(rt);
-  JS_FreeContext(ctx);
-  JS_FreeRuntime(rt);
-  return 0;
-}

src/quickjs/iso_8859_1.h

@@ -1,27 +0,0 @@
-
-#ifndef TUTF8E_ISO_8859_1_H
-#define TUTF8E_ISO_8859_1_H
-
-#include <tutf8e.h>
-
-static inline int tutf8e_iso_8859_1_string_length(const char *input, size_t *input_length, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_length(tutf8e_encoder_iso_8859_1, input, input_length, invalid, output_length);
-}
-
-static inline int tutf8e_iso_8859_1_string_encode(const char *input, char *output, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_encode(tutf8e_encoder_iso_8859_1, input, invalid, output, output_length);
-}
-
-static inline int tutf8e_iso_8859_1_buffer_length(const char *i, size_t input_length, const char *invalid, size_t *length)
-{
-  return tutf8e_encoder_buffer_length(tutf8e_encoder_iso_8859_1, input, input_length, invalid, length);
-}
-
-static inline int tutf8e_iso_8859_1_buffer_encode(const char *i, size_t input_length, const char *invalid, char *output, size_t *output_length)
-{
-  return tutf8e_encoder_buffer_encode(tutf8e_encoder_iso_8859_1, input, input_length, invalid, output, output_length);
-}
-
-#endif

src/quickjs/iso_8859_10.h

@@ -1,27 +0,0 @@
-
-#ifndef TUTF8E_ISO_8859_10_H
-#define TUTF8E_ISO_8859_10_H
-
-#include <tutf8e.h>
-
-static inline int tutf8e_iso_8859_10_string_length(const char *input, size_t *input_length, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_length(tutf8e_encoder_iso_8859_10, input, input_length, invalid, output_length);
-}
-
-static inline int tutf8e_iso_8859_10_string_encode(const char *input, char *output, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_encode(tutf8e_encoder_iso_8859_10, input, invalid, output, output_length);
-}
-
-static inline int tutf8e_iso_8859_10_buffer_length(const char *i, size_t input_length, const char *invalid, size_t *length)
-{
-  return tutf8e_encoder_buffer_length(tutf8e_encoder_iso_8859_10, input, input_length, invalid, length);
-}
-
-static inline int tutf8e_iso_8859_10_buffer_encode(const char *i, size_t input_length, const char *invalid, char *output, size_t *output_length)
-{
-  return tutf8e_encoder_buffer_encode(tutf8e_encoder_iso_8859_10, input, input_length, invalid, output, output_length);
-}
-
-#endif

src/quickjs/iso_8859_11.h

@@ -1,27 +0,0 @@
-
-#ifndef TUTF8E_ISO_8859_11_H
-#define TUTF8E_ISO_8859_11_H
-
-#include <tutf8e.h>
-
-static inline int tutf8e_iso_8859_11_string_length(const char *input, size_t *input_length, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_length(tutf8e_encoder_iso_8859_11, input, input_length, invalid, output_length);
-}
-
-static inline int tutf8e_iso_8859_11_string_encode(const char *input, char *output, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_encode(tutf8e_encoder_iso_8859_11, input, invalid, output, output_length);
-}
-
-static inline int tutf8e_iso_8859_11_buffer_length(const char *i, size_t input_length, const char *invalid, size_t *length)
-{
-  return tutf8e_encoder_buffer_length(tutf8e_encoder_iso_8859_11, input, input_length, invalid, length);
-}
-
-static inline int tutf8e_iso_8859_11_buffer_encode(const char *i, size_t input_length, const char *invalid, char *output, size_t *output_length)
-{
-  return tutf8e_encoder_buffer_encode(tutf8e_encoder_iso_8859_11, input, input_length, invalid, output, output_length);
-}
-
-#endif

src/quickjs/iso_8859_13.h

@@ -1,27 +0,0 @@
-
-#ifndef TUTF8E_ISO_8859_13_H
-#define TUTF8E_ISO_8859_13_H
-
-#include <tutf8e.h>
-
-static inline int tutf8e_iso_8859_13_string_length(const char *input, size_t *input_length, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_length(tutf8e_encoder_iso_8859_13, input, input_length, invalid, output_length);
-}
-
-static inline int tutf8e_iso_8859_13_string_encode(const char *input, char *output, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_encode(tutf8e_encoder_iso_8859_13, input, invalid, output, output_length);
-}
-
-static inline int tutf8e_iso_8859_13_buffer_length(const char *i, size_t input_length, const char *invalid, size_t *length)
-{
-  return tutf8e_encoder_buffer_length(tutf8e_encoder_iso_8859_13, input, input_length, invalid, length);
-}
-
-static inline int tutf8e_iso_8859_13_buffer_encode(const char *i, size_t input_length, const char *invalid, char *output, size_t *output_length)
-{
-  return tutf8e_encoder_buffer_encode(tutf8e_encoder_iso_8859_13, input, input_length, invalid, output, output_length);
-}
-
-#endif

src/quickjs/iso_8859_14.h

@@ -1,27 +0,0 @@
-
-#ifndef TUTF8E_ISO_8859_14_H
-#define TUTF8E_ISO_8859_14_H
-
-#include <tutf8e.h>
-
-static inline int tutf8e_iso_8859_14_string_length(const char *input, size_t *input_length, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_length(tutf8e_encoder_iso_8859_14, input, input_length, invalid, output_length);
-}
-
-static inline int tutf8e_iso_8859_14_string_encode(const char *input, char *output, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_encode(tutf8e_encoder_iso_8859_14, input, invalid, output, output_length);
-}
-
-static inline int tutf8e_iso_8859_14_buffer_length(const char *i, size_t input_length, const char *invalid, size_t *length)
-{
-  return tutf8e_encoder_buffer_length(tutf8e_encoder_iso_8859_14, input, input_length, invalid, length);
-}
-
-static inline int tutf8e_iso_8859_14_buffer_encode(const char *i, size_t input_length, const char *invalid, char *output, size_t *output_length)
-{
-  return tutf8e_encoder_buffer_encode(tutf8e_encoder_iso_8859_14, input, input_length, invalid, output, output_length);
-}
-
-#endif

src/quickjs/iso_8859_15.h

@@ -1,27 +0,0 @@
-
-#ifndef TUTF8E_ISO_8859_15_H
-#define TUTF8E_ISO_8859_15_H
-
-#include <tutf8e.h>
-
-static inline int tutf8e_iso_8859_15_string_length(const char *input, size_t *input_length, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_length(tutf8e_encoder_iso_8859_15, input, input_length, invalid, output_length);
-}
-
-static inline int tutf8e_iso_8859_15_string_encode(const char *input, char *output, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_encode(tutf8e_encoder_iso_8859_15, input, invalid, output, output_length);
-}
-
-static inline int tutf8e_iso_8859_15_buffer_length(const char *i, size_t input_length, const char *invalid, size_t *length)
-{
-  return tutf8e_encoder_buffer_length(tutf8e_encoder_iso_8859_15, input, input_length, invalid, length);
-}
-
-static inline int tutf8e_iso_8859_15_buffer_encode(const char *i, size_t input_length, const char *invalid, char *output, size_t *output_length)
-{
-  return tutf8e_encoder_buffer_encode(tutf8e_encoder_iso_8859_15, input, input_length, invalid, output, output_length);
-}
-
-#endif

src/quickjs/iso_8859_16.h

@@ -1,27 +0,0 @@
-
-#ifndef TUTF8E_ISO_8859_16_H
-#define TUTF8E_ISO_8859_16_H
-
-#include <tutf8e.h>
-
-static inline int tutf8e_iso_8859_16_string_length(const char *input, size_t *input_length, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_length(tutf8e_encoder_iso_8859_16, input, input_length, invalid, output_length);
-}
-
-static inline int tutf8e_iso_8859_16_string_encode(const char *input, char *output, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_encode(tutf8e_encoder_iso_8859_16, input, invalid, output, output_length);
-}
-
-static inline int tutf8e_iso_8859_16_buffer_length(const char *i, size_t input_length, const char *invalid, size_t *length)
-{
-  return tutf8e_encoder_buffer_length(tutf8e_encoder_iso_8859_16, input, input_length, invalid, length);
-}
-
-static inline int tutf8e_iso_8859_16_buffer_encode(const char *i, size_t input_length, const char *invalid, char *output, size_t *output_length)
-{
-  return tutf8e_encoder_buffer_encode(tutf8e_encoder_iso_8859_16, input, input_length, invalid, output, output_length);
-}
-
-#endif

src/quickjs/iso_8859_2.h

@@ -1,27 +0,0 @@
-
-#ifndef TUTF8E_ISO_8859_2_H
-#define TUTF8E_ISO_8859_2_H
-
-#include <tutf8e.h>
-
-static inline int tutf8e_iso_8859_2_string_length(const char *input, size_t *input_length, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_length(tutf8e_encoder_iso_8859_2, input, input_length, invalid, output_length);
-}
-
-static inline int tutf8e_iso_8859_2_string_encode(const char *input, char *output, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_encode(tutf8e_encoder_iso_8859_2, input, invalid, output, output_length);
-}
-
-static inline int tutf8e_iso_8859_2_buffer_length(const char *i, size_t input_length, const char *invalid, size_t *length)
-{
-  return tutf8e_encoder_buffer_length(tutf8e_encoder_iso_8859_2, input, input_length, invalid, length);
-}
-
-static inline int tutf8e_iso_8859_2_buffer_encode(const char *i, size_t input_length, const char *invalid, char *output, size_t *output_length)
-{
-  return tutf8e_encoder_buffer_encode(tutf8e_encoder_iso_8859_2, input, input_length, invalid, output, output_length);
-}
-
-#endif

src/quickjs/iso_8859_3.h

@@ -1,27 +0,0 @@
-
-#ifndef TUTF8E_ISO_8859_3_H
-#define TUTF8E_ISO_8859_3_H
-
-#include <tutf8e.h>
-
-static inline int tutf8e_iso_8859_3_string_length(const char *input, size_t *input_length, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_length(tutf8e_encoder_iso_8859_3, input, input_length, invalid, output_length);
-}
-
-static inline int tutf8e_iso_8859_3_string_encode(const char *input, char *output, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_encode(tutf8e_encoder_iso_8859_3, input, invalid, output, output_length);
-}
-
-static inline int tutf8e_iso_8859_3_buffer_length(const char *i, size_t input_length, const char *invalid, size_t *length)
-{
-  return tutf8e_encoder_buffer_length(tutf8e_encoder_iso_8859_3, input, input_length, invalid, length);
-}
-
-static inline int tutf8e_iso_8859_3_buffer_encode(const char *i, size_t input_length, const char *invalid, char *output, size_t *output_length)
-{
-  return tutf8e_encoder_buffer_encode(tutf8e_encoder_iso_8859_3, input, input_length, invalid, output, output_length);
-}
-
-#endif

src/quickjs/iso_8859_4.h

@@ -1,27 +0,0 @@
-
-#ifndef TUTF8E_ISO_8859_4_H
-#define TUTF8E_ISO_8859_4_H
-
-#include <tutf8e.h>
-
-static inline int tutf8e_iso_8859_4_string_length(const char *input, size_t *input_length, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_length(tutf8e_encoder_iso_8859_4, input, input_length, invalid, output_length);
-}
-
-static inline int tutf8e_iso_8859_4_string_encode(const char *input, char *output, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_encode(tutf8e_encoder_iso_8859_4, input, invalid, output, output_length);
-}
-
-static inline int tutf8e_iso_8859_4_buffer_length(const char *i, size_t input_length, const char *invalid, size_t *length)
-{
-  return tutf8e_encoder_buffer_length(tutf8e_encoder_iso_8859_4, input, input_length, invalid, length);
-}
-
-static inline int tutf8e_iso_8859_4_buffer_encode(const char *i, size_t input_length, const char *invalid, char *output, size_t *output_length)
-{
-  return tutf8e_encoder_buffer_encode(tutf8e_encoder_iso_8859_4, input, input_length, invalid, output, output_length);
-}
-
-#endif

src/quickjs/iso_8859_5.h

@@ -1,27 +0,0 @@
-
-#ifndef TUTF8E_ISO_8859_5_H
-#define TUTF8E_ISO_8859_5_H
-
-#include <tutf8e.h>
-
-static inline int tutf8e_iso_8859_5_string_length(const char *input, size_t *input_length, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_length(tutf8e_encoder_iso_8859_5, input, input_length, invalid, output_length);
-}
-
-static inline int tutf8e_iso_8859_5_string_encode(const char *input, char *output, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_encode(tutf8e_encoder_iso_8859_5, input, invalid, output, output_length);
-}
-
-static inline int tutf8e_iso_8859_5_buffer_length(const char *i, size_t input_length, const char *invalid, size_t *length)
-{
-  return tutf8e_encoder_buffer_length(tutf8e_encoder_iso_8859_5, input, input_length, invalid, length);
-}
-
-static inline int tutf8e_iso_8859_5_buffer_encode(const char *i, size_t input_length, const char *invalid, char *output, size_t *output_length)
-{
-  return tutf8e_encoder_buffer_encode(tutf8e_encoder_iso_8859_5, input, input_length, invalid, output, output_length);
-}
-
-#endif

src/quickjs/iso_8859_6.h

@@ -1,27 +0,0 @@
-
-#ifndef TUTF8E_ISO_8859_6_H
-#define TUTF8E_ISO_8859_6_H
-
-#include <tutf8e.h>
-
-static inline int tutf8e_iso_8859_6_string_length(const char *input, size_t *input_length, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_length(tutf8e_encoder_iso_8859_6, input, input_length, invalid, output_length);
-}
-
-static inline int tutf8e_iso_8859_6_string_encode(const char *input, char *output, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_encode(tutf8e_encoder_iso_8859_6, input, invalid, output, output_length);
-}
-
-static inline int tutf8e_iso_8859_6_buffer_length(const char *i, size_t input_length, const char *invalid, size_t *length)
-{
-  return tutf8e_encoder_buffer_length(tutf8e_encoder_iso_8859_6, input, input_length, invalid, length);
-}
-
-static inline int tutf8e_iso_8859_6_buffer_encode(const char *i, size_t input_length, const char *invalid, char *output, size_t *output_length)
-{
-  return tutf8e_encoder_buffer_encode(tutf8e_encoder_iso_8859_6, input, input_length, invalid, output, output_length);
-}
-
-#endif

src/quickjs/iso_8859_7.h

@@ -1,27 +0,0 @@
-
-#ifndef TUTF8E_ISO_8859_7_H
-#define TUTF8E_ISO_8859_7_H
-
-#include <tutf8e.h>
-
-static inline int tutf8e_iso_8859_7_string_length(const char *input, size_t *input_length, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_length(tutf8e_encoder_iso_8859_7, input, input_length, invalid, output_length);
-}
-
-static inline int tutf8e_iso_8859_7_string_encode(const char *input, char *output, const char *invalid, size_t *output_length)
-{
-  return tutf8e_encoder_string_encode(tutf8e_encoder_iso_8859_7, input, invalid, output, output_length);
-}
-
-static inline int tutf8e_iso_8859_7_buffer_length(const char *i, size_t input_length, const char *invalid, size_t *length)
-{
-  return tutf8e_encoder_buffer_length(tutf8e_encoder_iso_8859_7, input, input_length, invalid, length);
-}
-
-static inline int tutf8e_iso_8859_7_buffer_encode(const char *i, size_t input_length, const char *invalid, char *output, size_t *output_length)
-{
-  return tutf8e_encoder_buffer_encode(tutf8e_encoder_iso_8859_7, input, input_length, invalid, output, output_length);
-}
-
-#endif