Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion external/boost
Submodule boost deleted from 564e2a
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
26 changes: 4 additions & 22 deletions src/wallet/py_monero_wallet.h
Original file line number Diff line number Diff line change
Expand Up @@ -1817,22 +1817,6 @@ class PyMoneroWalletRelayTxParams : public PyMoneroJsonRequestParams {
}
};

/**
// common request params
boolean relay = Boolean.TRUE.equals(config.getRelay());
Map<String, Object> params = new HashMap<String, Object>();
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<std::string> m_address;
Expand Down Expand Up @@ -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<monero_check_tx> check_tx_key(const std::string& tx_hash, const std::string& tx_key, const std::string& address) const override {
PYBIND11_OVERRIDE(
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -3454,7 +3437,6 @@ class PyMoneroWallet : public monero::monero_wallet {
);
}


virtual void set_connection_manager(const std::shared_ptr<PyMoneroConnectionManager> &connection_manager) {
if (m_connection_manager != nullptr) m_connection_manager->remove_listener(m_connection_manager_listener);
m_connection_manager = connection_manager;
Expand Down Expand Up @@ -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) {
Expand All @@ -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();
Expand Down