mirror of
https://github.com/logos-blockchain/lez-programs.git
synced 2026-08-25 22:21:16 +00:00
r4bbit
f5ff9b829f
After the amm_module refactor, this crate is linked only by the module (the
UI delegates to modules().amm_module and links nothing), so its home under
apps/amm/ and the name "client" were both misnomers: it's the AMM business
logic the module wraps, reached across an FFI boundary — the same relationship
logos_execution_zone has with wallet_ffi. Co-locate it with the module that
owns it and name it for that role.
The FFI surface is unchanged — the exported functions are already amm_* (not
amm_client_*) — so only the crate, directory, generated header, dylib, and
package names move. The module's call sites are untouched; it just includes the
renamed header.
- apps/amm/client → modules/amm/ffi (git-tracked rename; history preserved)
- crate amm_client → amm_ffi: package name, include/amm_ffi.h, libamm_ffi.dylib,
AMM_FFI_H guard, build.rs output path, tests/public_api.rs import
- workspace member path + Cargo.lock
- flake.nix: pname, -p, header-copy path, dylib install_name, packages.amm_ffi,
ammModuleOutputs externalLibInputs, DYLD wrapper
- modules/amm: metadata external_libraries, CMakeLists EXTERNAL_LIBS, impl
#include + comments, README, flake note
- apps/amm/flake.nix: drop the now-dead amm_client external-lib input (the UI
links no external lib of its own)
Resulting layout:
modules/amm/
src/ # C++ module (amm_module_impl.{h,cpp})
ffi/ # Rust crate amm_ffi (Cargo.toml, src/, include/amm_ffi.h)
64 lines
2.8 KiB
Nix
64 lines
2.8 KiB
Nix
{
|
|
description = "Logos AMM QML UI — trade and provide liquidity on the LEZ AMM";
|
|
|
|
inputs = {
|
|
logos-module-builder.url = "github:logos-co/logos-module-builder";
|
|
|
|
# Shared C++ wallet access and Logos.Wallet QML sources.
|
|
shared_wallet = {
|
|
url = "path:../shared/wallet";
|
|
flake = false;
|
|
};
|
|
|
|
# Core wallet module (the LEZ wallet FFI Qt plugin). The input name must
|
|
# match the metadata.json `dependencies` entry so the builder can resolve
|
|
# it as a module dependency. This revision exposes generic transaction
|
|
# submission by deployed program ID.
|
|
logos_execution_zone = {
|
|
url = "github:logos-blockchain/logos-execution-zone-module?rev=d70225ced646934d2294fd9e8f8b03615c104b80";
|
|
|
|
# The module pins the monorepo at v0.2.0-rc6 (e37876a), which owns the
|
|
# xcrun wrapper in its flake.nix. Override that transitive input to the
|
|
# head of PR #629 (fix(macos): nuke xcrun cache) so the Metal/xcrun build
|
|
# works on macOS. Note: #629 branches off `dev`, so this also pulls dev's
|
|
# drift from rc6 — if the wallet_ffi ABI mismatches the module build, fall
|
|
# back to cherry-picking #629's one line onto e37876a and pin that commit.
|
|
inputs.logos-execution-zone.url =
|
|
"github:logos-blockchain/logos-execution-zone?rev=a7e06a660940a00093b1760560d37ff84aff5a05";
|
|
};
|
|
};
|
|
|
|
# NOTE: this flake is no longer built standalone; the repo-root flake.nix
|
|
# builds the UI directly (src = ./apps/amm). The UI links no external lib of
|
|
# its own — the AMM logic lives in the amm_ffi crate, which the amm_module
|
|
# core module links; the UI reaches it via modules().amm_module (declared in
|
|
# metadata.json `dependencies`). The repo-root flake exposes the UI as a named
|
|
# attribute (there is no bare `default`): run it with `nix run .#amm-ui`, and
|
|
# build the AMM logic crate with `nix build .#amm_ffi`.
|
|
outputs = inputs@{ logos-module-builder, shared_wallet, ... }:
|
|
logos-module-builder.lib.mkLogosQmlModule {
|
|
src = ./.;
|
|
configFile = ./metadata.json;
|
|
flakeInputs = inputs;
|
|
preConfigure = ''
|
|
cmakeFlagsArray+=("-DLOGOS_WALLET_SOURCE_DIR=${shared_wallet}")
|
|
'';
|
|
externalLibInputs = { };
|
|
postInstall = ''
|
|
# The builder installs the view under lib/qml after this hook. Its
|
|
# import descriptor points back to this compiled shared QML module.
|
|
test -f ${./qml}/Logos/Wallet/qmldir
|
|
|
|
walletQmlDir="shared-wallet/qml/Logos/Wallet"
|
|
if [ ! -d "$walletQmlDir" ]; then
|
|
echo "Built Logos.Wallet QML module not found"
|
|
exit 1
|
|
fi
|
|
walletQmlInstallDir="$out/lib/Logos/Wallet"
|
|
mkdir -p "$walletQmlInstallDir"
|
|
cp -r "$walletQmlDir/." "$walletQmlInstallDir/"
|
|
test -f "$walletQmlInstallDir/qmldir"
|
|
'';
|
|
};
|
|
}
|