logos-blockchain/logos-execution-zone-module
1
0
Fork 0
mirror of https://github.com/logos-blockchain/logos-execution-zone-module.git synced 2026-07-26 21:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: rewritted into QStringLists

Browse Source
This commit is contained in:
Pravdyvy 2026-06-10 13:38:23 +03:00
parent 4d1f4817a6
commit 8ded127c28
3 changed files with 84 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/i_logos_execution_zone_wallet_module.h
View File

@ -88,28 +88,28 @@ public:
virtual QString register_public_account(const QString& account_id_hex) = 0; virtual QString register_public_account(const QString& account_id_hex) = 0;
virtual QString register_private_account(const QString& account_id_hex) = 0; virtual QString register_private_account(const QString& account_id_hex) = 0;
virtual QJsonArray serialization_helper(const QJsonArray& input_data) = 0; virtual QList<QString> serialization_helper(const QList<QString>& input_data) = 0;
virtual QJsonArray authenticated_transfer_elf() = 0; virtual QList<QString> authenticated_transfer_elf() = 0;
virtual QJsonArray token_elf() = 0; virtual QList<QString> token_elf() = 0;
virtual QJsonArray amm_elf() = 0; virtual QList<QString> amm_elf() = 0;
virtual QJsonArray ata_elf() = 0; virtual QList<QString> ata_elf() = 0;
virtual QString send_generic_public_transaction( virtual QString send_generic_public_transaction(
const QList<QString>& account_ids, const QList<QString>& account_ids,
const QJsonArray& signing_requirements, const QList<QString>& signing_requirements,
const QJsonArray& instruction, const QList<QString>& instruction,
const QJsonArray& program_elf, const QList<QString>& program_elf,
const QJsonArray& program_dependencies const QList<QString>& program_dependencies
) = 0; ) = 0;
virtual QString send_generic_private_transaction( virtual QString send_generic_private_transaction(
const QList<QString>& account_ids, const QList<QString>& account_ids,
const QJsonArray& instruction, const QList<QString>& instruction,
const QJsonArray& program_elf, const QList<QString>& program_elf,
const QJsonArray& program_dependencies const QList<QString>& program_dependencies
) = 0; ) = 0;
virtual QString send_program_deployment_transaction( virtual QString send_program_deployment_transaction(
const QJsonArray& program_elf const QList<QString>& program_elf
) = 0; ) = 0;
// Wallet Lifecycle // Wallet Lifecycle

111
src/logos_execution_zone_wallet_module.cpp
View File

@ -753,74 +753,78 @@ QString LogosExecutionZoneWalletModule::register_private_account(const QString&
return resultJson; return resultJson;
} }
QJsonArray LogosExecutionZoneWalletModule::token_elf() { QList<QString> LogosExecutionZoneWalletModule::token_elf() {
FfiProgram ffi_program {}; FfiProgram ffi_program {};
WalletFfiError error = wallet_ffi_token_elf(&ffi_program); WalletFfiError error = wallet_ffi_token_elf(&ffi_program);
if (error != SUCCESS) { if (error != SUCCESS) {
qWarning() << "token_elf: wallet FFI error " << error; qWarning() << "token_elf: wallet FFI error " << error;
return QJsonArray(); return QList<QString>();
} }
QJsonArray result; QList<QString> result;
result.reserve(ffi_program.elf_size);
for (size_t i = 0; i < ffi_program.elf_size; ++i) { for (size_t i = 0; i < ffi_program.elf_size; ++i) {
result.append(static_cast<int>(ffi_program.elf_data[i])); result.append(QString::number(static_cast<unsigned char>(ffi_program.elf_data[i])));
} }
wallet_ffi_free_ffi_program(&ffi_program); wallet_ffi_free_ffi_program(&ffi_program);
return result; return result;
} }
QJsonArray LogosExecutionZoneWalletModule::amm_elf() { QList<QString> LogosExecutionZoneWalletModule::amm_elf() {
FfiProgram ffi_program {}; FfiProgram ffi_program {};
WalletFfiError error = wallet_ffi_amm_elf(&ffi_program); WalletFfiError error = wallet_ffi_amm_elf(&ffi_program);
if (error != SUCCESS) { if (error != SUCCESS) {
qWarning() << "amm_elf: wallet FFI error " << error; qWarning() << "amm_elf: wallet FFI error " << error;
return QJsonArray(); return QList<QString>();
} }
QJsonArray result; QList<QString> result;
result.reserve(ffi_program.elf_size);
for (size_t i = 0; i < ffi_program.elf_size; ++i) { for (size_t i = 0; i < ffi_program.elf_size; ++i) {
result.append(static_cast<int>(ffi_program.elf_data[i])); result.append(QString::number(static_cast<unsigned char>(ffi_program.elf_data[i])));
} }
wallet_ffi_free_ffi_program(&ffi_program); wallet_ffi_free_ffi_program(&ffi_program);
return result; return result;
} }
QJsonArray LogosExecutionZoneWalletModule::ata_elf() { QList<QString> LogosExecutionZoneWalletModule::ata_elf() {
FfiProgram ffi_program {}; FfiProgram ffi_program {};
WalletFfiError error = wallet_ffi_ata_elf(&ffi_program); WalletFfiError error = wallet_ffi_ata_elf(&ffi_program);
if (error != SUCCESS) { if (error != SUCCESS) {
qWarning() << "ata_elf: wallet FFI error " << error; qWarning() << "ata_elf: wallet FFI error " << error;
return QJsonArray(); return QList<QString>();
} }
QJsonArray result; QList<QString> result;
result.reserve(ffi_program.elf_size);
for (size_t i = 0; i < ffi_program.elf_size; ++i) { for (size_t i = 0; i < ffi_program.elf_size; ++i) {
result.append(static_cast<int>(ffi_program.elf_data[i])); result.append(QString::number(static_cast<unsigned char>(ffi_program.elf_data[i])));
} }
wallet_ffi_free_ffi_program(&ffi_program); wallet_ffi_free_ffi_program(&ffi_program);
return result; return result;
} }
QJsonArray LogosExecutionZoneWalletModule::authenticated_transfer_elf() { QList<QString> LogosExecutionZoneWalletModule::authenticated_transfer_elf() {
FfiProgram ffi_program {}; FfiProgram ffi_program {};
WalletFfiError error = wallet_ffi_transfer_elf(&ffi_program); WalletFfiError error = wallet_ffi_transfer_elf(&ffi_program);
if (error != SUCCESS) { if (error != SUCCESS) {
qWarning() << "authenticated_transfer_elf: wallet FFI error " << error; qWarning() << "authenticated_transfer_elf: wallet FFI error " << error;
return QJsonArray(); return QList<QString>();
} }
QJsonArray result; QList<QString> result;
result.reserve(ffi_program.elf_size);
for (size_t i = 0; i < ffi_program.elf_size; ++i) { for (size_t i = 0; i < ffi_program.elf_size; ++i) {
result.append(static_cast<int>(ffi_program.elf_data[i])); result.append(QString::number(static_cast<unsigned char>(ffi_program.elf_data[i])));
} }
wallet_ffi_free_ffi_program(&ffi_program); wallet_ffi_free_ffi_program(&ffi_program);
return result; return result;
} }
QJsonArray LogosExecutionZoneWalletModule::serialization_helper(const QJsonArray& input_data) { QList<QString> LogosExecutionZoneWalletModule::serialization_helper(const QList<QString>& input_data) {
QList<uint8_t> input_list; QList<uint8_t> input_list;
input_list.reserve(input_data.size()); input_list.reserve(input_data.size());
for (const QJsonValue& val : input_data) { for (const QString& val : input_data) {
input_list.append(static_cast<uint8_t>(val.toInt())); input_list.append(static_cast<uint8_t>(val.toInt()));
} }
@ -829,12 +833,13 @@ QJsonArray LogosExecutionZoneWalletModule::serialization_helper(const QJsonArray
FfiInstructionWords raw_words = wallet_ffi_serialization_helper(input_instruction_data, input_instruction_data_size); FfiInstructionWords raw_words = wallet_ffi_serialization_helper(input_instruction_data, input_instruction_data_size);
if (raw_words.error != SUCCESS) { if (raw_words.error != SUCCESS) {
qWarning() << "serialization_helper: wallet FFI error" << raw_words.error; qWarning() << "serialization_helper: wallet FFI error" << raw_words.error;
return QJsonArray{}; return QList<QString>();
} }
QJsonArray result; QList<QString> result;
result.reserve(raw_words.instruction_words_size);
for (size_t i = 0; i < raw_words.instruction_words_size; ++i) { for (size_t i = 0; i < raw_words.instruction_words_size; ++i) {
result.append(static_cast<qint64>(raw_words.instruction_words[i])); result.append(QString::number(raw_words.instruction_words[i]));
} }
wallet_ffi_free_instruction_words(&raw_words); wallet_ffi_free_instruction_words(&raw_words);
return result; return result;
@ -842,15 +847,15 @@ QJsonArray LogosExecutionZoneWalletModule::serialization_helper(const QJsonArray
QString LogosExecutionZoneWalletModule::send_generic_public_transaction( QString LogosExecutionZoneWalletModule::send_generic_public_transaction(
const QList<QString>& account_ids, const QList<QString>& account_ids,
const QJsonArray& signing_requirements, const QList<QString>& signing_requirements,
const QJsonArray& instruction, const QList<QString>& instruction,
const QJsonArray& program_elf, const QList<QString>& program_elf,
const QJsonArray& program_dependencies const QList<QString>& program_dependencies
) { ) {
QList<bool> signing_requirements_list; QList<bool> signing_requirements_list;
signing_requirements_list.reserve(signing_requirements.size()); signing_requirements_list.reserve(signing_requirements.size());
for (const QJsonValue& val : signing_requirements) { for (const QString& val : signing_requirements) {
signing_requirements_list.append(val.toBool()); signing_requirements_list.append(val == "true");
} }
QList<FfiAccountIdentity> identities_resolved; QList<FfiAccountIdentity> identities_resolved;
@ -877,9 +882,9 @@ QString LogosExecutionZoneWalletModule::send_generic_public_transaction(
uintptr_t account_identities_size = static_cast<uintptr_t>(identities_resolved.size()); uintptr_t account_identities_size = static_cast<uintptr_t>(identities_resolved.size());
QList<uint32_t> instruction_list; QList<uint32_t> instruction_list;
instruction_list.reserve(instruction.size()); instruction_list.reserve(instruction.size());
for (const QJsonValue& val : instruction) { for (const QString& val : instruction) {
instruction_list.append(static_cast<uint32_t>(val.toInt())); instruction_list.append(val.toULong());
} }
const uint32_t* input_instruction_data = instruction_list.constData(); const uint32_t* input_instruction_data = instruction_list.constData();
@ -889,8 +894,8 @@ QString LogosExecutionZoneWalletModule::send_generic_public_transaction(
QList<uint8_t> program_elf_list; QList<uint8_t> program_elf_list;
program_elf_list.reserve(program_elf.size()); program_elf_list.reserve(program_elf.size());
for (const QJsonValue& val : program_elf) { for (const QString& val : program_elf) {
program_elf_list.append(static_cast<uint8_t>(val.toInt())); program_elf_list.append(static_cast<uint8_t>(val.toUInt()));
} }
const uint8_t *program_elf_data = program_elf_list.constData(); const uint8_t *program_elf_data = program_elf_list.constData();
@ -901,12 +906,12 @@ QString LogosExecutionZoneWalletModule::send_generic_public_transaction(
QList<QList<uint8_t>> program_dependencies_list; QList<QList<uint8_t>> program_dependencies_list;
program_dependencies_list.reserve(program_dependencies.size()); program_dependencies_list.reserve(program_dependencies.size());
for (const QJsonValue& outer : program_dependencies) { for (const QString& outer : program_dependencies) {
QList<uint8_t> inner; QList<uint8_t> inner;
const QJsonArray inner_arr = outer.toArray(); const QStringList parts = outer.split(' ', Qt::SkipEmptyParts);
inner.reserve(inner_arr.size()); inner.reserve(parts.size());
for (const QJsonValue& val : inner_arr) { for (const QString& val : parts) {
inner.append(static_cast<uint8_t>(val.toInt())); inner.append(static_cast<uint8_t>(val.toUInt()));
} }
program_dependencies_list.append(inner); program_dependencies_list.append(inner);
} }
@ -961,9 +966,9 @@ QString LogosExecutionZoneWalletModule::send_generic_public_transaction(
QString LogosExecutionZoneWalletModule::send_generic_private_transaction( QString LogosExecutionZoneWalletModule::send_generic_private_transaction(
const QList<QString>& account_ids, const QList<QString>& account_ids,
const QJsonArray& instruction, const QList<QString>& instruction,
const QJsonArray& program_elf, const QList<QString>& program_elf,
const QJsonArray& program_dependencies const QList<QString>& program_dependencies
) { ) {
QList<FfiAccountIdentity> identities_resolved; QList<FfiAccountIdentity> identities_resolved;
identities_resolved.reserve(account_ids.size()); identities_resolved.reserve(account_ids.size());
@ -989,9 +994,9 @@ QString LogosExecutionZoneWalletModule::send_generic_private_transaction(
uintptr_t account_identities_size = static_cast<uintptr_t>(identities_resolved.size()); uintptr_t account_identities_size = static_cast<uintptr_t>(identities_resolved.size());
QList<uint32_t> instruction_list; QList<uint32_t> instruction_list;
instruction_list.reserve(instruction.size()); instruction_list.reserve(instruction.size());
for (const QJsonValue& val : instruction) { for (const QString& val : instruction) {
instruction_list.append(static_cast<uint32_t>(val.toInt())); instruction_list.append(val.toULong());
} }
const uint32_t* input_instruction_data = instruction_list.constData(); const uint32_t* input_instruction_data = instruction_list.constData();
@ -1001,8 +1006,8 @@ QString LogosExecutionZoneWalletModule::send_generic_private_transaction(
QList<uint8_t> program_elf_list; QList<uint8_t> program_elf_list;
program_elf_list.reserve(program_elf.size()); program_elf_list.reserve(program_elf.size());
for (const QJsonValue& val : program_elf) { for (const QString& val : program_elf) {
program_elf_list.append(static_cast<uint8_t>(val.toInt())); program_elf_list.append(static_cast<uint8_t>(val.toUInt()));
} }
const uint8_t *program_elf_data = program_elf_list.constData(); const uint8_t *program_elf_data = program_elf_list.constData();
@ -1013,12 +1018,12 @@ QString LogosExecutionZoneWalletModule::send_generic_private_transaction(
QList<QList<uint8_t>> program_dependencies_list; QList<QList<uint8_t>> program_dependencies_list;
program_dependencies_list.reserve(program_dependencies.size()); program_dependencies_list.reserve(program_dependencies.size());
for (const QJsonValue& outer : program_dependencies) { for (const QString& outer : program_dependencies) {
QList<uint8_t> inner; QList<uint8_t> inner;
const QJsonArray inner_arr = outer.toArray(); const QStringList parts = outer.split(' ', Qt::SkipEmptyParts);
inner.reserve(inner_arr.size()); inner.reserve(parts.size());
for (const QJsonValue& val : inner_arr) { for (const QString& val : parts) {
inner.append(static_cast<uint8_t>(val.toInt())); inner.append(static_cast<uint8_t>(val.toUInt()));
} }
program_dependencies_list.append(inner); program_dependencies_list.append(inner);
} }
@ -1072,14 +1077,14 @@ QString LogosExecutionZoneWalletModule::send_generic_private_transaction(
} }
QString LogosExecutionZoneWalletModule::send_program_deployment_transaction( QString LogosExecutionZoneWalletModule::send_program_deployment_transaction(
const QJsonArray& program_elf const QList<QString>& program_elf
) { ) {
FfiTransactionResult result {}; FfiTransactionResult result {};
QList<uint8_t> program_elf_list; QList<uint8_t> program_elf_list;
program_elf_list.reserve(program_elf.size()); program_elf_list.reserve(program_elf.size());
for (const QJsonValue& val : program_elf) { for (const QString& val : program_elf) {
program_elf_list.append(static_cast<uint8_t>(val.toInt())); program_elf_list.append(static_cast<uint8_t>(val.toUInt()));
} }
const uint8_t *program_elf_data = program_elf_list.constData(); const uint8_t *program_elf_data = program_elf_list.constData();

26
src/logos_execution_zone_wallet_module.h
View File

@ -116,28 +116,28 @@ public:
Q_INVOKABLE QString register_public_account(const QString& account_id_hex) override; Q_INVOKABLE QString register_public_account(const QString& account_id_hex) override;
Q_INVOKABLE QString register_private_account(const QString& account_id_hex) override; Q_INVOKABLE QString register_private_account(const QString& account_id_hex) override;
Q_INVOKABLE QJsonArray serialization_helper(const QJsonArray& input_data) override; Q_INVOKABLE QList<QString> serialization_helper(const QList<QString>& input_data) override;
Q_INVOKABLE QJsonArray authenticated_transfer_elf() override; Q_INVOKABLE QList<QString> authenticated_transfer_elf() override;
Q_INVOKABLE QJsonArray token_elf() override; Q_INVOKABLE QList<QString> token_elf() override;
Q_INVOKABLE QJsonArray amm_elf() override; Q_INVOKABLE QList<QString> amm_elf() override;
Q_INVOKABLE QJsonArray ata_elf() override; Q_INVOKABLE QList<QString> ata_elf() override;
Q_INVOKABLE QString send_generic_public_transaction( Q_INVOKABLE QString send_generic_public_transaction(
const QList<QString>& account_ids, const QList<QString>& account_ids,
const QJsonArray& signing_requirements, const QList<QString>& signing_requirements,
const QJsonArray& instruction, const QList<QString>& instruction,
const QJsonArray& program_elf, const QList<QString>& program_elf,
const QJsonArray& program_dependencies const QList<QString>& program_dependencies
) override; ) override;
Q_INVOKABLE QString send_generic_private_transaction( Q_INVOKABLE QString send_generic_private_transaction(
const QList<QString>& account_ids, const QList<QString>& account_ids,
const QJsonArray& instruction, const QList<QString>& instruction,
const QJsonArray& program_elf, const QList<QString>& program_elf,
const QJsonArray& program_dependencies const QList<QString>& program_dependencies
) override; ) override;
Q_INVOKABLE QString send_program_deployment_transaction( Q_INVOKABLE QString send_program_deployment_transaction(
const QJsonArray& program_elf const QList<QString>& program_elf
) override; ) override;
// Wallet Lifecycle // Wallet Lifecycle