tiamak/monero_c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

ci update, cpp update

Browse Source
This commit is contained in:
Czarek Nakamoto
2023-12-27 22:04:19 +01:00
parent 2a6489678a
commit fb76ef5ddd
8 changed files with 88 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libbridge/src/main/cpp/wallet2_api_c.cpp
+20 -26
View File
@@ -1,22 +1,7 @@
/**
* Copyright (c) 2017 m2049r
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <inttypes.h>
#include "wallet2_api_c.h"
#include "wallet2_api.h"
#include <unistd.h>
#ifdef __cplusplus
extern "C"
@@ -40,12 +25,10 @@ extern "C"
{
#endif
// void* MONERO_createWalletJ(const char* path, const char* password, const char* language, int networkType);
void* MONERO_createWalletJ(const char* path, const char* password, const char* language, int networkType) {
// void* MONERO_WalletManager_createWallet(const char* path, const char* password, const char* language, int networkType)
void* MONERO_WalletManager_createWallet(const char* path, const char* password, const char* language, int networkType) {
Monero::NetworkType _networkType = static_cast<Monero::NetworkType>(networkType);
std::cout << "WE GOT OUT\n";
std::string _path(path);
std::string _password(password);
std::string _language(language);
@@ -60,15 +43,26 @@ void* MONERO_createWalletJ(const char* path, const char* password, const char* l
_language,
_networkType);
int status;
std::string errorString;
wallet->statusWithErrorString(status, errorString);
std::cout << status << " - " << errorString << "\n";
return reinterpret_cast<void*>(wallet);
}
// virtual Wallet * recoveryWallet(const std::string &path, const std::string &mnemonic, NetworkType nettype, uint64_t restoreHeight = 0) = 0;
const char* MONERO_Wallet_errorString(void* wallet_ptr) {
Monero::Wallet *wallet = reinterpret_cast<Monero::Wallet*>(wallet_ptr);
return wallet->errorString().c_str();
}
int MONERO_Wallet_status(void* wallet_ptr) {
Monero::Wallet *wallet = reinterpret_cast<Monero::Wallet*>(wallet_ptr);
return wallet->status();
}
int MONERO_DEBUG_sleep(int time) {
sleep(time);
return time-1;
}
#ifdef __cplusplus
}
#endif
libbridge/src/main/cpp/wallet2_api_c.h
+5 -64
View File
@@ -1,24 +1,3 @@
/**
* Copyright (c) 2017 m2049r
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef XMRWALLET_WALLET_LIB_H
#define XMRWALLET_WALLET_LIB_H
#include <jni.h>
/*
#include <android/log.h>
@@ -28,54 +7,16 @@
#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
*/
jfieldID getHandleField(JNIEnv *env, jobject obj, const char *fieldName = "handle") {
jclass c = env->GetObjectClass(obj);
return env->GetFieldID(c, fieldName, "J"); // of type long
}
template<typename T>
T *getHandle(JNIEnv *env, jobject obj, const char *fieldName = "handle") {
jlong handle = env->GetLongField(obj, getHandleField(env, obj, fieldName));
return reinterpret_cast<T *>(handle);
}
void setHandleFromLong(JNIEnv *env, jobject obj, jlong handle) {
env->SetLongField(obj, getHandleField(env, obj), handle);
}
template<typename T>
void setHandle(JNIEnv *env, jobject obj, T *t) {
jlong handle = reinterpret_cast<jlong>(t);
setHandleFromLong(env, obj, handle);
}
#ifdef __cplusplus
extern "C"
{
#endif
void* MONERO_createWalletJ(const char* path, const char* password, const char* language, int networkType);
extern const char* const MONERO_VERSION; // the actual monero core version
// from monero-core crypto/hash-ops.h - avoid #including monero code here
enum {
HASH_SIZE = 32,
HASH_DATA_AREA = 136
};
void cn_slow_hash(const void *data, size_t length, char *hash, int variant, int prehashed, uint64_t height);
inline void slow_hash(const void *data, const size_t length, char *hash) {
cn_slow_hash(data, length, hash, 0 /*variant*/, 0 /*prehashed*/, 0 /*height*/);
}
inline void slow_hash_broken(const void *data, char *hash, int variant) {
cn_slow_hash(data, 200 /*sizeof(union hash_state)*/, hash, variant, 1 /*prehashed*/, 0 /*height*/);
}
void* MONERO_WalletManager_createWallet(const char* path, const char* password, const char* language, int networkType);
const char* MONERO_Wallet_errorString(void* wallet_ptr);
int MONERO_Wallet_status(void* wallet_ptr);
int MONERO_DEBUG_sleep(int time);
#ifdef __cplusplus
}
#endif
#endif //XMRWALLET_WALLET_LIB_H
#endif