MoneroWalletLight implementation

woodser · Apr 5, 2024 · 7a4d5f7 · 7a4d5f7
1 parent 9b5da05
commit 7a4d5f7
Show file tree

Hide file tree

Showing 281 changed files with 6,156 additions and 999 deletions.
diff --git a/.classpath b/.classpath
@@ -1,35 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" output="target/test-classes" path="src/test/java">
-        <attributes>
-            <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="monero-java/build"/>
-            <attribute name="test" value="true"/>
-            <attribute name="optional" value="true"/>
-            <attribute name="maven.pomderived" value="true"/>
-        </attributes>
-    </classpathentry>
-    <classpathentry kind="src" output="target/classes" path="src/main/java">
-        <attributes>
-            <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="monero-java/build"/>
-            <attribute name="optional" value="true"/>
-            <attribute name="maven.pomderived" value="true"/>
-        </attributes>
-    </classpathentry>
-    <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-        <attributes>
-            <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="monero-java/build"/>
-            <attribute name="maven.pomderived" value="true"/>
-        </attributes>
-    </classpathentry>
-    <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-        <attributes>
-            <attribute name="maven.pomderived" value="true"/>
-        </attributes>
-    </classpathentry>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-        <attributes>
-            <attribute name="maven.pomderived" value="true"/>
-        </attributes>
-    </classpathentry>
-    <classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="monero-java/build"/>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="monero-java/build"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="lib">
+		<attributes>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="monero-java/build"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
@@ -0,0 +1,25 @@
+name: Comment to label
+
+on:
+  issues:
+    types: [labeled]
+  workflow_call:
+
+jobs:
+  issueLabeled:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Bounty explanation
+        uses: peter-evans/create-or-update-comment@v2
+        if: github.event.label.name == '💰bounty'
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: >
+            There is a bounty on this issue. The amount is in the title. The reward will be awarded to the first person or group of people who resolve this issue.
+
+
+            If you are starting to work on this bounty, please write a comment so that we can assign the issue to you. We expect contributors to provide a PR in a reasonable timeframe or, in case of an extensive work, updates on their progress. We will unassign the issue if we feel the assignee is not responsive or has abandoned the task.
+
+
+            Read the [full conditions and details](https://github.com/woodser/monero-java/blob/master/docs/bounties.md) of the bounty system.
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,3 @@
 **/pom.xml.versionsBackup
 **/logs
 /test_wallets
-/external-libs/
-/log_java_tests.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,9 +3,9 @@ cmake_minimum_required(VERSION 3.4.1)
 if (WIN32)
   add_definitions( "-D_GLIBCXX_USE_NANOSLEEP=1" )
   add_definitions( "-DWIN32_LEAN_AND_MEAN" )
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj -O2 -fPIC -std=c++11 -F/Library/Frameworks -pthread -lcrypto -lcrypt32") 
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj -O2 -fPIC -std=c++14 -F/Library/Frameworks -pthread -lcrypto -lcrypt32") 
 else()
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -std=c++11 -F/Library/Frameworks -pthread")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -std=c++14 -F/Library/Frameworks -pthread")
 endif()
 
 #SET(CMAKE_C_COMPILER /path/to/c/compiler)
@@ -24,35 +24,11 @@ set(MONERO_CPP_SRC "${MONERO_CPP}/src")
 set(MONERO_PROJECT ${MONERO_CPP}/external/monero-project)
 set(MONERO_PROJECT_SRC "${MONERO_PROJECT}/src")
 
-# java header includes
+# check JAVA_HOME
 if(NOT DEFINED ENV{JAVA_HOME} OR "$ENV{JAVA_HOME}" STREQUAL "")
   message(FATAL_ERROR "JAVA_HOME variable not set, for example: export JAVA_HOME=/path/to/jdk")
-else()
-  include_directories("$ENV{JAVA_HOME}")
-  include_directories("$ENV{JAVA_HOME}/include")
-  if (APPLE)
-    include_directories("$ENV{JAVA_HOME}/include/darwin")
-  elseif (WIN32)
-    include_directories("$ENV{JAVA_HOME}/include/win32")
-  else()
-    include_directories("$ENV{JAVA_HOME}/include/linux")
-  endif()
 endif()
 
-# monero-project header includes
-include_directories("${MONERO_CPP}/external/libsodium/include/sodium")
-include_directories("${MONERO_CPP}/external/openssl-sdk/include")
-include_directories("${MONERO_CPP_SRC}/")
-include_directories("${MONERO_PROJECT}/contrib/epee/include")
-include_directories("${MONERO_PROJECT}/external/")
-include_directories("${MONERO_PROJECT}/external/easylogging++")
-include_directories("${MONERO_PROJECT}/external/rapidjson/include")
-include_directories("${MONERO_PROJECT_SRC}/")
-include_directories("${MONERO_PROJECT_SRC}/crypto")
-include_directories("${MONERO_PROJECT_SRC}/crypto/crypto_ops_builder/include/")
-include_directories("${MONERO_PROJECT_SRC}/wallet")
-include_directories("${MONERO_PROJECT_SRC}/wallet/api")
-
 # TODO: remove TRUEs, how are APPLE, DEPENDS, etc initialized?
 if (TRUE OR HIDAPI_FOUND OR LibUSB_COMPILE_TEST_PASSED)
   if (APPLE)
@@ -82,14 +58,13 @@ set(Boost_NO_BOOST_CMAKE 1)
 set(Boost_USE_MULTITHREADED ON)
 find_package(Boost 1.58 QUIET REQUIRED COMPONENTS chrono date_time filesystem program_options regex serialization wserialization system thread)
 message(STATUS "Using Boost include dir at ${Boost_INCLUDE_DIR}")
-include_directories(${Boost_INCLUDE_DIR})
 
 ############
 # OpenSSL
 ############
 
 if (APPLE AND NOT IOS)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default -std=c++11")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default -std=c++14")
   if (NOT OPENSSL_ROOT_DIR)
       EXECUTE_PROCESS(COMMAND brew --prefix openssl
         OUTPUT_VARIABLE OPENSSL_ROOT_DIR
@@ -100,7 +75,6 @@ endif()
 
 find_package(OpenSSL REQUIRED)
 message(STATUS "Using OpenSSL include dir at ${OPENSSL_INCLUDE_DIR}")
-include_directories(${OPENSSL_INCLUDE_DIR})
 
 if(STATIC AND NOT IOS)
   if(UNIX)
@@ -138,6 +112,33 @@ set(
 )
 add_library(monero-java SHARED ${MONERO_JNI_SRC_FILES})
 
+target_include_directories(monero-java PUBLIC
+  "$ENV{JAVA_HOME}"
+  "$ENV{JAVA_HOME}/include"
+  "${MONERO_CPP}/external/libsodium/include/sodium"
+  "${MONERO_CPP}/external/openssl-sdk/include"
+  "${MONERO_CPP_SRC}/"
+  "${MONERO_PROJECT}/contrib/epee/include"
+  "${MONERO_PROJECT}/external/"
+  "${MONERO_PROJECT}/external/easylogging++"
+  "${MONERO_PROJECT}/external/rapidjson/include"
+  "${MONERO_PROJECT_SRC}/"
+  "${MONERO_PROJECT_SRC}/crypto"
+  "${MONERO_PROJECT_SRC}/crypto/crypto_ops_builder/include/"
+  "${MONERO_PROJECT_SRC}/wallet"
+  "${MONERO_PROJECT_SRC}/wallet/api"
+  ${Boost_INCLUDE_DIR}
+  ${OPENSSL_INCLUDE_DIR}
+)
+
+if (APPLE)
+  target_include_directories(monero-java PUBLIC "$ENV{JAVA_HOME}/include/darwin")
+elseif (WIN32)
+  target_include_directories(monero-java PUBLIC "$ENV{JAVA_HOME}/include/win32")
+else()
+  target_include_directories(monero-java PUBLIC "$ENV{JAVA_HOME}/include/linux")
+endif()
+
 target_link_libraries(monero-java
     monero-cpp
     ${Boost_LIBRARIES}