mirror of
https://github.com/logos-blockchain/lez-programs.git
synced 2026-07-25 00:03:11 +00:00
feat(amm): swap via d70225ced program_id_hex API; pin wallet-module core to sequencer rev 415964d7
This commit is contained in:
Andrea Franz
r4bbit
parent
69cd58d377
commit
9b7a3dcaac
47
Cargo.lock
generated
47
Cargo.lock
generated
@ -83,7 +83,7 @@ dependencies = [
|
||||
"amm_core",
|
||||
"borsh",
|
||||
"cbindgen",
|
||||
"lee_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc6)",
|
||||
"lee_core",
|
||||
"risc0-binfmt",
|
||||
"risc0-zkvm",
|
||||
"ruint",
|
||||
@ -96,7 +96,7 @@ version = "0.1.0"
|
||||
dependencies = [
|
||||
"alloy-primitives",
|
||||
"borsh",
|
||||
"lee_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0)",
|
||||
"lee_core",
|
||||
"risc0-zkvm",
|
||||
"ruint",
|
||||
"serde",
|
||||
@ -110,7 +110,7 @@ version = "0.1.0"
|
||||
dependencies = [
|
||||
"amm_core",
|
||||
"clock_core",
|
||||
"lee_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0)",
|
||||
"lee_core",
|
||||
"token_core",
|
||||
"twap_oracle_core",
|
||||
]
|
||||
@ -544,7 +544,7 @@ name = "ata_core"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"borsh",
|
||||
"lee_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0)",
|
||||
"lee_core",
|
||||
"risc0-zkvm",
|
||||
"serde",
|
||||
]
|
||||
@ -554,7 +554,7 @@ name = "ata_program"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"ata_core",
|
||||
"lee_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0)",
|
||||
"lee_core",
|
||||
"token_core",
|
||||
]
|
||||
|
||||
@ -974,7 +974,7 @@ version = "0.1.0"
|
||||
source = "git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0#a58fbce2ff48c58b7bb5001b1a27e64b9596ee3a"
|
||||
dependencies = [
|
||||
"borsh",
|
||||
"lee_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0)",
|
||||
"lee_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2175,7 +2175,7 @@ dependencies = [
|
||||
"ata_core",
|
||||
"clock_core",
|
||||
"lee",
|
||||
"lee_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0)",
|
||||
"lee_core",
|
||||
"stablecoin-methods",
|
||||
"stablecoin_core",
|
||||
"token-methods",
|
||||
@ -2351,7 +2351,7 @@ dependencies = [
|
||||
"build_utils",
|
||||
"hex",
|
||||
"k256",
|
||||
"lee_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0)",
|
||||
"lee_core",
|
||||
"log",
|
||||
"rand 0.8.6",
|
||||
"risc0-binfmt",
|
||||
@ -2379,23 +2379,6 @@ dependencies = [
|
||||
"thiserror 2.0.18",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lee_core"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc6#e37876a64028a335eb693198a1ed6a0e875ec5b4"
|
||||
dependencies = [
|
||||
"base58",
|
||||
"borsh",
|
||||
"bytemuck",
|
||||
"bytesize",
|
||||
"chacha20",
|
||||
"ml-kem",
|
||||
"risc0-zkvm",
|
||||
"serde",
|
||||
"serde_with",
|
||||
"thiserror 2.0.18",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.186"
|
||||
@ -3847,7 +3830,7 @@ source = "git+https://github.com/logos-co/spel.git?tag=v0.6.0#0cb7e0980535af6194
|
||||
dependencies = [
|
||||
"base58",
|
||||
"borsh",
|
||||
"lee_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0)",
|
||||
"lee_core",
|
||||
"proc-macro2",
|
||||
"serde",
|
||||
"serde_json",
|
||||
@ -3927,7 +3910,7 @@ version = "0.1.0"
|
||||
dependencies = [
|
||||
"alloy-primitives",
|
||||
"borsh",
|
||||
"lee_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0)",
|
||||
"lee_core",
|
||||
"risc0-zkvm",
|
||||
"ruint",
|
||||
"serde",
|
||||
@ -3939,7 +3922,7 @@ dependencies = [
|
||||
name = "stablecoin_program"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"lee_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0)",
|
||||
"lee_core",
|
||||
"stablecoin_core",
|
||||
"token_core",
|
||||
]
|
||||
@ -4153,7 +4136,7 @@ name = "token_core"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"borsh",
|
||||
"lee_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0)",
|
||||
"lee_core",
|
||||
"serde",
|
||||
"spel-framework-macros",
|
||||
]
|
||||
@ -4162,7 +4145,7 @@ dependencies = [
|
||||
name = "token_program"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"lee_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0)",
|
||||
"lee_core",
|
||||
"token_core",
|
||||
]
|
||||
|
||||
@ -4382,7 +4365,7 @@ version = "0.1.0"
|
||||
dependencies = [
|
||||
"alloy-primitives",
|
||||
"borsh",
|
||||
"lee_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0)",
|
||||
"lee_core",
|
||||
"risc0-zkvm",
|
||||
"ruint",
|
||||
"serde",
|
||||
@ -4395,7 +4378,7 @@ name = "twap_oracle_program"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"clock_core",
|
||||
"lee_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0)",
|
||||
"lee_core",
|
||||
"twap_oracle_core",
|
||||
]
|
||||
|
||||
|
||||
@ -32,13 +32,14 @@ extern "C" {
|
||||
// arguments — including the account_id_to_base58 round-trips used to render
|
||||
// accounts — are NOT evaluated, so there's no per-call overhead.
|
||||
//
|
||||
// NOTE: `send_generic_public_transaction` takes `instruction` and
|
||||
// `program_dependencies` as byte strings (`bstr`). Declaring them as Vec<u32> /
|
||||
// Vec<Vec<u8>> makes the module's Qt/QtRO glue downgrade them to an opaque `any`
|
||||
// the separate module process can't deserialize, silently dropping every
|
||||
// argument. We therefore send `instruction` as the little-endian bytes of the
|
||||
// u32 words and `program_dependencies` empty. Requires the wallet module built
|
||||
// with byte-string params; see docs/amm-swap-qtro-serialization-bug.md.
|
||||
// NOTE: `send_generic_public_transaction(account_ids, signing_requirements,
|
||||
// instruction, program_id_hex)`. `instruction` is a byte string (`bstr`):
|
||||
// declaring it as Vec<u32> makes the module's Qt/QtRO glue downgrade it to an
|
||||
// opaque `any` the separate module process can't deserialize, silently dropping
|
||||
// every argument. We send `instruction` as the little-endian bytes of the u32
|
||||
// words, and the deployed program by its id hex (not the raw ELF). Requires the
|
||||
// wallet module built with the byte-string param; see
|
||||
// docs/amm-swap-qtro-serialization-bug.md.
|
||||
static bool ammDebugEnabled()
|
||||
{
|
||||
static const bool on = qEnvironmentVariableIsSet("AMM_DEBUG");
|
||||
@ -775,15 +776,38 @@ QString AmmUiBackend::swapExactInput(QString defAHex, QString defBHex, QString u
|
||||
}
|
||||
|
||||
// 6. Submit through the wallet module's generic public-transaction entry
|
||||
// point. `instruction` is sent as the little-endian bytes of the u32 words
|
||||
// (see the note atop this file); program_dependencies is empty because the
|
||||
// sequencer resolves the AMM's chained token/twap calls on-chain for a
|
||||
// public tx.
|
||||
// point. The module API takes `instruction` (as bytes — see the note atop
|
||||
// this file) plus the program's id as hex, not the raw ELF: the program is
|
||||
// already deployed and referenced by id. There is no program_dependencies
|
||||
// arg — the sequencer resolves the AMM's chained token/twap calls on-chain.
|
||||
const QByteArray instructionBytes(reinterpret_cast<const char*>(instruction.data()),
|
||||
static_cast<int>(instruction.size() * sizeof(uint32_t)));
|
||||
|
||||
// Derive the deployed AMM program id from the ELF and hex-encode it as the
|
||||
// canonical 32-byte hex (little-endian per u32 word — matches `spel
|
||||
// program-id` and the on-chain config's *_program_id fields).
|
||||
ProgramId ammId;
|
||||
if (!amm_client_program_id_from_elf(reinterpret_cast<const uint8_t*>(elf.constData()),
|
||||
static_cast<uintptr_t>(elf.size()), &ammId)) {
|
||||
qWarning() << "AmmUiBackend::swapExactInput: amm_client_program_id_from_elf failed";
|
||||
return QString();
|
||||
}
|
||||
QByteArray programIdBytes;
|
||||
programIdBytes.reserve(32);
|
||||
for (int i = 0; i < 8; ++i) {
|
||||
const uint32_t w = ammId[i];
|
||||
programIdBytes.append(static_cast<char>(w & 0xff));
|
||||
programIdBytes.append(static_cast<char>((w >> 8) & 0xff));
|
||||
programIdBytes.append(static_cast<char>((w >> 16) & 0xff));
|
||||
programIdBytes.append(static_cast<char>((w >> 24) & 0xff));
|
||||
}
|
||||
const QString programIdHex = QString::fromLatin1(programIdBytes.toHex());
|
||||
AMM_DBG() << "[amm-debug] swapExactInput: program_id_hex=" << programIdHex;
|
||||
|
||||
// `instruction` is a QVariant (bstr); `program_id_hex` is a plain QString
|
||||
// (tstr) in the generated proxy — pass it directly, not QVariant-wrapped.
|
||||
const QString resultJson = m_logos->logos_execution_zone.send_generic_public_transaction(
|
||||
accounts, signers, QVariant::fromValue(instructionBytes), QVariant::fromValue(elf),
|
||||
QVariant::fromValue(QByteArray()));
|
||||
accounts, signers, QVariant::fromValue(instructionBytes), programIdHex);
|
||||
AMM_DBG() << "[amm-debug] swapExactInput: send_generic_public_transaction ->"
|
||||
<< resultJson.size() << "chars; raw:" << resultJson.left(600);
|
||||
|
||||
|
||||
20
flake.lock
generated
20
flake.lock
generated
@ -3413,17 +3413,17 @@
|
||||
"rust-rapidsnark": "rust-rapidsnark"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1782310268,
|
||||
"narHash": "sha256-tIIIO+V+w/C/KLtKnLIv8O8/GoJ4PzgJSWrlQCXJ2P4=",
|
||||
"lastModified": 1783788663,
|
||||
"narHash": "sha256-Tl3CDPFWdTgRliX03oUI92E4+8XbpsFpnwooNxM3q+s=",
|
||||
"owner": "logos-blockchain",
|
||||
"repo": "lssa",
|
||||
"rev": "fb8cbac40e0bda4f152415ff4f181cdc6bca6d4a",
|
||||
"repo": "logos-execution-zone",
|
||||
"rev": "415964d7f9043a1bfe28da8d0e8b3a6f64abb258",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "logos-blockchain",
|
||||
"repo": "lssa",
|
||||
"rev": "fb8cbac40e0bda4f152415ff4f181cdc6bca6d4a",
|
||||
"repo": "logos-execution-zone",
|
||||
"rev": "415964d7f9043a1bfe28da8d0e8b3a6f64abb258",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
@ -24345,16 +24345,16 @@
|
||||
"nix-bundle-lgx": "nix-bundle-lgx_40"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1784205966,
|
||||
"narHash": "sha256-9qDpsio9ms7sz2yf8umH2bZLL4esjNuNDWUvsPzdNYc=",
|
||||
"lastModified": 1784294670,
|
||||
"narHash": "sha256-4II7lLMMcvwKBprA8QMAvtYklQMwstlL3C9UuvT+2Ow=",
|
||||
"owner": "gravityblast",
|
||||
"repo": "logos-execution-zone-module",
|
||||
"rev": "a48fd1c7447885895c15a929b945b713cebf2032",
|
||||
"rev": "4513e21f08dbd69c8e75edd76da99a78d23b79f2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "gravityblast",
|
||||
"ref": "fix/generic-tx-bstr-serialization",
|
||||
"ref": "fix/generic-tx-instruction-bstr",
|
||||
"repo": "logos-execution-zone-module",
|
||||
"type": "github"
|
||||
}
|
||||
|
||||
27
flake.nix
27
flake.nix
@ -18,14 +18,25 @@
|
||||
logos-module-builder.url = "github:logos-co/logos-module-builder";
|
||||
|
||||
# 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 rev pins LEZ (lssa) at fb8cbac4, which
|
||||
# includes the macOS Metal-build fix, so no `--override-input` is needed.
|
||||
# Fork of logos-blockchain/logos-execution-zone-module @ d2e9400a with the
|
||||
# QtRO serialization fix: send_generic_public_transaction's `instruction` and
|
||||
# `program_dependencies` use byte-string IPC types so the args survive the
|
||||
# cross-process boundary. See docs/amm-swap-qtro-serialization-bug.md.
|
||||
logos_execution_zone.url = "github:gravityblast/logos-execution-zone-module?ref=fix/generic-tx-bstr-serialization";
|
||||
# match the metadata.json `dependencies` entry so the builder can resolve it
|
||||
# as a module dependency.
|
||||
#
|
||||
# Fork of logos-blockchain/logos-execution-zone-module @ d70225ced with the
|
||||
# QtRO serialization fix: send_generic_public_transaction's `instruction` uses
|
||||
# a byte-string IPC type so the args survive the cross-process boundary (at
|
||||
# d70225ced the API already takes program_id_hex instead of program_elf/deps).
|
||||
# See docs/amm-swap-qtro-serialization-bug.md.
|
||||
logos_execution_zone = {
|
||||
url = "github:gravityblast/logos-execution-zone-module?ref=fix/generic-tx-instruction-bstr";
|
||||
|
||||
# Override the module's pinned LEZ monorepo (logos-execution-zone) to the
|
||||
# SAME rev the target sequencer runs (415964d7): the wallet client and the
|
||||
# sequencer must agree on the JSON-RPC API, or tx submission fails at
|
||||
# runtime with `MethodNotFound`. 415964d7's wallet_ffi takes a program id
|
||||
# for send_generic_public_transaction, matching the d70225ced module.
|
||||
inputs.logos-execution-zone.url =
|
||||
"github:logos-blockchain/logos-execution-zone?rev=415964d7f9043a1bfe28da8d0e8b3a6f64abb258";
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user