Skip to content

Commit

Permalink
update from move to monero-ecosystem/monero-cpp
Browse files Browse the repository at this point in the history
update submodule
update paths
  • Loading branch information
woodser committed Jun 3, 2020
1 parent 880767f commit 1e84b86
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "external/monero-cpp-library"]
path = external/monero-cpp-library
url = https://github.com/woodser/monero-cpp-library
[submodule "external/monero-cpp"]
path = external/monero-cpp
url = https://github.com/monero-ecosystem/monero-cpp
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ project(MoneroJavaJni)
# System
#############

set(MONERO_CPP "${CMAKE_SOURCE_DIR}/external/monero-cpp-library")
set(MONERO_CPP "${CMAKE_SOURCE_DIR}/external/monero-cpp")
message(STATUS MONERO_CPP : ${MONERO_CPP} : ${MONERO_CPP})

set(MONERO_CPP_SRC "${MONERO_CPP}/src")
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ A Java library for creating Monero applications using RPC or JNI bindings to [mo
* Supports multisig, view-only, and offline wallets.
* Wallet types are interchangeable by conforming to a [common interface](https://moneroecosystem.org/monero-java/index.html?monero/wallet/MoneroWallet.html).
* Uses a clearly defined [data model and API specification](https://moneroecosystem.org/monero-java/monero-spec.pdf) intended to be intuitive and robust.
* Query wallet transactions, transfers, and outputs by their many attributes.
* Query wallet transactions, transfers, and outputs by their properties.
* Fetch and process binary data from the daemon (e.g. raw blocks).
* Receive notifications when blocks are added to the chain or when wallets sync, send, or receive.
* Over 270 passing JUnit tests.
Expand Down Expand Up @@ -128,13 +128,13 @@ Please refer to [monero-javascript's developer guide](https://github.com/monero-

## Building JNI shared libraries from source

If you want to process binary data or use a client-side wallet instead of RPC, shared libraries must be built for your specific platform for this Java library to use. This project uses a C++ counterpart library, [monero-cpp-library](https://github.com/woodser/monero-cpp-library), to support JNI, which is included as a submodule in ./external/monero-cpp-library.
If you want to process binary data or use a client-side wallet instead of RPC, shared libraries must be built for your specific platform for this Java library to use. This project uses a C++ counterpart library, [monero-cpp](https://github.com/monero-ecosystem/monero-cpp), to support JNI, which is included as a submodule in ./external/monero-cpp.

1. Clone the project repository: `git clone https://github.com/monero-ecosystem/monero-java.git`
2. `cd monero-java`
3. Install dependencies using Maven: `mvn install`
4. Update submodules: `./bin/update_submodules.sh`
5. [Build ./external/monero-cpp-library as a shared library.](https://github.com/woodser/monero-cpp-library#how-to-run-this-library)
5. [Build ./external/monero-cpp as a shared library.](https://github.com/monero-ecosystem/monero-cpp#using-this-library-in-your-project)
6. `export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_66.jdk/Contents/Home/` (change as appropriate)
7. Build shared libraries to ./build/: `./bin/build_libmonero_java.sh`
8. Run TestMoneroCppUtils.java JUnit tests to verify the shared libraries are working with Java JNI.
Expand All @@ -156,7 +156,7 @@ If you want to process binary data or use a client-side wallet instead of RPC, s

* [API specification](http://moneroecosystem.org/monero-java/monero-spec.pdf)
* [monero-javascript](https://github.com/monero-ecosystem/monero-javascript)
* [monero-cpp-library](https://github.com/woodser/monero-cpp-library)
* [monero-cpp](https://github.com/monero-ecosystem/monero-cpp)

## License

Expand Down
4 changes: 2 additions & 2 deletions bin/build_libmonero_java.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
HOST_NCORES=$(nproc 2>/dev/null || shell nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 1)

# build libmonero-cpp shared library
cd ./external/monero-cpp-library/ &&
cd ./external/monero-cpp/ &&
./bin/build_libmonero_cpp.sh &&

# copy libmonero-cpp shared library to ./build
cd ../../ &&
mkdir -p ./build &&
cp ./external/monero-cpp-library/build/libmonero-cpp.* ./build &&
cp ./external/monero-cpp/build/libmonero-cpp.* ./build &&

# build libmonero-java shared library to ./build
cd build &&
Expand Down
1 change: 1 addition & 0 deletions external/monero-cpp
Submodule monero-cpp added at f2361b
1 change: 0 additions & 1 deletion external/monero-cpp-library
Submodule monero-cpp-library deleted from 0bf42e
2 changes: 1 addition & 1 deletion todo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ open monero core issues
testGetReserveProofAccount() still fails if 0 confirmations, could prevent with tx pool tracker
separate tests which demonstrate monero core issues
investigate monero core issues
swap gui's lib with monero-cpp-library
swap gui's lib with monero-cpp
(in no particular order...)
Monero REST API 2.0 based on refined model
refactor wallet2 to support wasm
Expand Down

0 comments on commit 1e84b86

Please sign in to comment.