diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e4a2752..eab7cd7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,13 +68,6 @@ jobs: cp build/libmonero* ../../build cd ../../ - - name: Build boost headers - run: | - cd external/boost - ./bootstrap.sh - ./b2 headers - cd ../../ - - name: Build monero-python run: | pip3 install . --target build/python3-monero_1.0.0-1noble1_amd64/usr/lib/python3/dist-packages diff --git a/.gitmodules b/.gitmodules index 1cd2ce4..5a1bf50 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "external/monero-cpp"] path = external/monero-cpp url = https://github.com/woodser/monero-cpp -[submodule "external/boost"] - path = external/boost - url = https://github.com/boostorg/boost.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ea04c9..3c5bf00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,6 @@ set(SOURCES include_directories( ${pybind11_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR}/external/boost ${CMAKE_CURRENT_SOURCE_DIR}/external/monero-cpp/src ${CMAKE_CURRENT_SOURCE_DIR}/external/monero-cpp/external/monero-project/src ${CMAKE_CURRENT_SOURCE_DIR}/external/monero-cpp/external/monero-project/contrib/epee/include diff --git a/external/boost b/external/boost deleted file mode 160000 index 564e2ac..0000000 --- a/external/boost +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 564e2ac16907019696cdaba8a93e3588ec596062 diff --git a/setup.py b/setup.py index 4a67ea5..aab8dd2 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,6 @@ ], include_dirs=[ pybind11.get_include(), - str(this_dir / 'external' / 'boost'), str(this_dir / 'external' / 'monero-cpp' / 'src'), str(this_dir / 'external' / 'monero-cpp' / 'external' / 'monero-project' / 'src'), str(this_dir / 'external' / 'monero-cpp' / 'external' / 'monero-project' / 'contrib' / 'epee' / 'include'), diff --git a/src/wallet/py_monero_wallet.h b/src/wallet/py_monero_wallet.h index d8b35a4..9715fa5 100644 --- a/src/wallet/py_monero_wallet.h +++ b/src/wallet/py_monero_wallet.h @@ -1817,22 +1817,6 @@ class PyMoneroWalletRelayTxParams : public PyMoneroJsonRequestParams { } }; -/** - // common request params - boolean relay = Boolean.TRUE.equals(config.getRelay()); - Map params = new HashMap(); - params.put("account_index", config.getAccountIndex()); - params.put("subaddr_indices", config.getSubaddressIndices()); - params.put("address", config.getDestinations().get(0).getAddress()); - params.put("priority", config.getPriority() == null ? null : config.getPriority().ordinal()); - params.put("payment_id", config.getPaymentId()); - params.put("do_not_relay", !relay); - params.put("below_amount", config.getBelowAmount()); - params.put("get_tx_keys", true); - params.put("get_tx_hex", true); - params.put("get_tx_metadata", true); -*/ - class PyMoneroSweepParams : public PyMoneroJsonRequestParams { public: boost::optional m_address; @@ -3117,14 +3101,14 @@ class PyMoneroWallet : public monero::monero_wallet { ); } - std::string get_tx_key(const std::string& tx_hash) const override { + std::string get_tx_key(const std::string& tx_hash) const override { PYBIND11_OVERRIDE( std::string, monero_wallet, get_tx_key, tx_hash ); - } + } std::shared_ptr check_tx_key(const std::string& tx_hash, const std::string& tx_key, const std::string& address) const override { PYBIND11_OVERRIDE( @@ -3400,7 +3384,6 @@ class PyMoneroWallet : public monero::monero_wallet { ); } - monero_multisig_sign_result sign_multisig_tx_hex(const std::string& multisig_tx_hex) override { PYBIND11_OVERRIDE( monero_multisig_sign_result, @@ -3454,7 +3437,6 @@ class PyMoneroWallet : public monero::monero_wallet { ); } - virtual void set_connection_manager(const std::shared_ptr &connection_manager) { if (m_connection_manager != nullptr) m_connection_manager->remove_listener(m_connection_manager_listener); m_connection_manager = connection_manager; @@ -5169,7 +5151,7 @@ class PyMoneroWalletRpc : public PyMoneroWallet { void clear_address_cache() { m_address_cache.clear(); - }; + } void refresh_listening() { if (m_rpc->m_zmq_uri == boost::none) { @@ -5186,7 +5168,7 @@ class PyMoneroWalletRpc : public PyMoneroWallet { void poll() { if (m_poller != nullptr && m_poller->is_polling()) m_poller->poll(); - }; + } void clear() { m_listeners.clear();