From aa394d85091d7fd3ca97d50de142d2e05517d686 Mon Sep 17 00:00:00 2001 From: Some Random Crypto Guy Date: Tue, 7 Oct 2025 16:02:40 +0100 Subject: [PATCH] added Carrot secrets to API calls; bumped salvium --- .../monero.dart/lib/src/checksum_salvium.dart | 6 +-- impls/monero.ts/checksum_salvium.ts | 6 +-- .../salvium_libwallet2_api_c.exp | 4 ++ .../src/main/cpp/salvium_checksum.h | 6 +-- .../src/main/cpp/wallet2_api_c.cpp | 45 +++++++++++++++++++ .../src/main/cpp/wallet2_api_c.h | 8 ++++ 6 files changed, 66 insertions(+), 9 deletions(-) diff --git a/impls/monero.dart/lib/src/checksum_salvium.dart b/impls/monero.dart/lib/src/checksum_salvium.dart index d8a0361..91175ba 100644 --- a/impls/monero.dart/lib/src/checksum_salvium.dart +++ b/impls/monero.dart/lib/src/checksum_salvium.dart @@ -1,4 +1,4 @@ // ignore_for_file: constant_identifier_names -const String wallet2_api_c_h_sha256 = "bf14955d181bc1ed7d033eadc02c78d9943845e940cbc687d7cfa8b62d7348db"; -const String wallet2_api_c_cpp_sha256 = "0cf05a712e9206d29045ec948378534b7f01ba2169078f3f6cd066f0fcdd4b6e-845d46d7b3c0a856299ff9f169ce7d49093d06b8"; -const String wallet2_api_c_exp_sha256 = "0ef2b0e950f90ae3a2aaf41548364483dfa692d189e587a3964453639b05a374"; +const String wallet2_api_c_h_sha256 = "93ad4f6247f0b89c17218766c960e956047b0e8032c3db2b791842d576279330"; +const String wallet2_api_c_cpp_sha256 = "2d52bbe50a6db8c1bd68ce4be288c28319f35f48c6d093a3d67d888c8e4b3230-45404ecc719b916c217938f9e82ad352a4068d12"; +const String wallet2_api_c_exp_sha256 = "f7ab584f1271f4d533980f403597a1d9e50bced85c233ca2b17c77f4a94ed3bc"; diff --git a/impls/monero.ts/checksum_salvium.ts b/impls/monero.ts/checksum_salvium.ts index 1fe103f..d950519 100644 --- a/impls/monero.ts/checksum_salvium.ts +++ b/impls/monero.ts/checksum_salvium.ts @@ -1,5 +1,5 @@ export const salviumChecksum = { - wallet2_api_c_h_sha256: "bf14955d181bc1ed7d033eadc02c78d9943845e940cbc687d7cfa8b62d7348db", - wallet2_api_c_cpp_sha256: "0cf05a712e9206d29045ec948378534b7f01ba2169078f3f6cd066f0fcdd4b6e-845d46d7b3c0a856299ff9f169ce7d49093d06b8", - wallet2_api_c_exp_sha256: "0ef2b0e950f90ae3a2aaf41548364483dfa692d189e587a3964453639b05a374", + wallet2_api_c_h_sha256: "93ad4f6247f0b89c17218766c960e956047b0e8032c3db2b791842d576279330", + wallet2_api_c_cpp_sha256: "2d52bbe50a6db8c1bd68ce4be288c28319f35f48c6d093a3d67d888c8e4b3230-45404ecc719b916c217938f9e82ad352a4068d12", + wallet2_api_c_exp_sha256: "f7ab584f1271f4d533980f403597a1d9e50bced85c233ca2b17c77f4a94ed3bc", } diff --git a/salvium_libwallet2_api_c/salvium_libwallet2_api_c.exp b/salvium_libwallet2_api_c/salvium_libwallet2_api_c.exp index f2d57e0..0d5de30 100644 --- a/salvium_libwallet2_api_c/salvium_libwallet2_api_c.exp +++ b/salvium_libwallet2_api_c/salvium_libwallet2_api_c.exp @@ -146,6 +146,10 @@ _SALVIUM_Wallet_publicViewKey _SALVIUM_Wallet_secretSpendKey _SALVIUM_Wallet_publicSpendKey _SALVIUM_Wallet_publicMultisigSignerKey +_SALVIUM_Wallet_secretViewBalance +_SALVIUM_Wallet_secretProveSpend +_SALVIUM_Wallet_secretGenerateAddress +_SALVIUM_Wallet_secretGenerateImage _SALVIUM_Wallet_stop _SALVIUM_Wallet_store _SALVIUM_Wallet_filename diff --git a/salvium_libwallet2_api_c/src/main/cpp/salvium_checksum.h b/salvium_libwallet2_api_c/src/main/cpp/salvium_checksum.h index 0113eab..504f10b 100644 --- a/salvium_libwallet2_api_c/src/main/cpp/salvium_checksum.h +++ b/salvium_libwallet2_api_c/src/main/cpp/salvium_checksum.h @@ -1,6 +1,6 @@ #ifndef MONEROC_CHECKSUMS #define MONEROC_CHECKSUMS -const char * SALVIUM_wallet2_api_c_h_sha256 = "bf14955d181bc1ed7d033eadc02c78d9943845e940cbc687d7cfa8b62d7348db"; -const char * SALVIUM_wallet2_api_c_cpp_sha256 = "0cf05a712e9206d29045ec948378534b7f01ba2169078f3f6cd066f0fcdd4b6e-845d46d7b3c0a856299ff9f169ce7d49093d06b8"; -const char * SALVIUM_wallet2_api_c_exp_sha256 = "0ef2b0e950f90ae3a2aaf41548364483dfa692d189e587a3964453639b05a374"; +const char * SALVIUM_wallet2_api_c_h_sha256 = "93ad4f6247f0b89c17218766c960e956047b0e8032c3db2b791842d576279330"; +const char * SALVIUM_wallet2_api_c_cpp_sha256 = "2d52bbe50a6db8c1bd68ce4be288c28319f35f48c6d093a3d67d888c8e4b3230-45404ecc719b916c217938f9e82ad352a4068d12"; +const char * SALVIUM_wallet2_api_c_exp_sha256 = "f7ab584f1271f4d533980f403597a1d9e50bced85c233ca2b17c77f4a94ed3bc"; #endif diff --git a/salvium_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp b/salvium_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp index 3d9c644..3b8a52c 100644 --- a/salvium_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp +++ b/salvium_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp @@ -1263,6 +1263,51 @@ const char* SALVIUM_Wallet_publicMultisigSignerKey(void* wallet_ptr) { DEBUG_END() } +const char* SALVIUM_Wallet_secretViewBalance(void* wallet_ptr) { + DEBUG_START() + Monero::Wallet *wallet = reinterpret_cast(wallet_ptr); + std::string str = wallet->secretViewBalance(); + const std::string::size_type size = str.size(); + char *buffer = new char[size + 1]; //we need extra char for NUL + memcpy(buffer, str.c_str(), size + 1); + return buffer; + DEBUG_END() +} + +const char* SALVIUM_Wallet_secretProveSpend(void* wallet_ptr) { + DEBUG_START() + Monero::Wallet *wallet = reinterpret_cast(wallet_ptr); + std::string str = wallet->secretProveSpend(); + const std::string::size_type size = str.size(); + char *buffer = new char[size + 1]; //we need extra char for NUL + memcpy(buffer, str.c_str(), size + 1); + return buffer; + DEBUG_END() +} + +const char* SALVIUM_Wallet_secretGenerateAddress(void* wallet_ptr) { + DEBUG_START() + Monero::Wallet *wallet = reinterpret_cast(wallet_ptr); + std::string str = wallet->secretGenerateAddress(); + const std::string::size_type size = str.size(); + char *buffer = new char[size + 1]; //we need extra char for NUL + memcpy(buffer, str.c_str(), size + 1); + return buffer; + DEBUG_END() +} + +const char* SALVIUM_Wallet_secretGenerateImage(void* wallet_ptr) { + DEBUG_START() + Monero::Wallet *wallet = reinterpret_cast(wallet_ptr); + std::string str = wallet->secretGenerateImage(); + const std::string::size_type size = str.size(); + char *buffer = new char[size + 1]; //we need extra char for NUL + memcpy(buffer, str.c_str(), size + 1); + return buffer; + DEBUG_END() +} + + void SALVIUM_Wallet_stop(void* wallet_ptr) { DEBUG_START() Monero::Wallet *wallet = reinterpret_cast(wallet_ptr); diff --git a/salvium_libwallet2_api_c/src/main/cpp/wallet2_api_c.h b/salvium_libwallet2_api_c/src/main/cpp/wallet2_api_c.h index 127dd3f..baaca56 100644 --- a/salvium_libwallet2_api_c/src/main/cpp/wallet2_api_c.h +++ b/salvium_libwallet2_api_c/src/main/cpp/wallet2_api_c.h @@ -555,6 +555,14 @@ extern ADDAPI const char* SALVIUM_Wallet_secretSpendKey(void* wallet_ptr); extern ADDAPI const char* SALVIUM_Wallet_publicSpendKey(void* wallet_ptr); // virtual std::string publicMultisigSignerKey() const = 0; extern ADDAPI const char* SALVIUM_Wallet_publicMultisigSignerKey(void* wallet_ptr); +// virtual std::string secretViewBalance() const = 0; +extern ADDAPI const char* SALVIUM_Wallet_secretViewBalance(void* wallet_ptr); +// virtual std::string secretProveSpend() const = 0; +extern ADDAPI const char* SALVIUM_Wallet_secretProveSpend(void* wallet_ptr); +// virtual std::string secretGenerateAddress() const = 0; +extern ADDAPI const char* SALVIUM_Wallet_secretGenerateAddress(void* wallet_ptr); +// virtual std::string secretGenerateImage() const = 0; +extern ADDAPI const char* SALVIUM_Wallet_secretGenerateImage(void* wallet_ptr); // virtual void stop() = 0; extern ADDAPI void SALVIUM_Wallet_stop(void* wallet_ptr); // virtual bool store(const std::string &path) = 0;