Skip to content

Rpc wallet consolidation #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
everoddandeven merged 1 commit into from
Feb 26, 2026
Merged

Rpc wallet consolidation #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions .github/workflows/build-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,23 +48,23 @@ jobs:
base-devel
wget

- name: Install ICU v75.1.1
- name: Install ICU v75.1
shell: msys2 {0}
run: |
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-icu-75.1-1-any.pkg.tar.zst
pacman -U --noconfirm mingw-w64-x86_64-icu-75.1-1-any.pkg.tar.zst
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-icu-75.1-2-any.pkg.tar.zst
pacman -U --noconfirm mingw-w64-x86_64-icu-75.1-2-any.pkg.tar.zst

- name: Install boost v1.85.0
shell: msys2 {0}
run: |
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-boost-1.85.0-4-any.pkg.tar.zst
pacman -U --noconfirm mingw-w64-x86_64-boost-1.85.0-4-any.pkg.tar.zst

- name: Install pybind11 v2.11.1
- name: Install pybind11 v2.12.0
shell: msys2 {0}
run: |
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-pybind11-2.11.1-1-any.pkg.tar.zst
pacman -U --noconfirm mingw-w64-x86_64-pybind11-2.11.1-1-any.pkg.tar.zst
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-pybind11-2.12.0-1-any.pkg.tar.zst
pacman -U --noconfirm mingw-w64-x86_64-pybind11-2.12.0-1-any.pkg.tar.zst

- name: Build monero
shell: msys2 {0}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,23 +164,23 @@ jobs:
base-devel
wget

- name: Install ICU v75.1.1
- name: Install ICU v75.1
shell: msys2 {0}
run: |
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-icu-75.1-1-any.pkg.tar.zst
pacman -U --noconfirm mingw-w64-x86_64-icu-75.1-1-any.pkg.tar.zst
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-icu-75.1-2-any.pkg.tar.zst
pacman -U --noconfirm mingw-w64-x86_64-icu-75.1-2-any.pkg.tar.zst

- name: Install boost v1.85.0
shell: msys2 {0}
run: |
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-boost-1.85.0-4-any.pkg.tar.zst
pacman -U --noconfirm mingw-w64-x86_64-boost-1.85.0-4-any.pkg.tar.zst

- name: Install pybind11 v2.11.1
- name: Install pybind11 v2.12.0
shell: msys2 {0}
run: |
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-pybind11-2.11.1-1-any.pkg.tar.zst
pacman -U --noconfirm mingw-w64-x86_64-pybind11-2.11.1-1-any.pkg.tar.zst
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-pybind11-2.12.0-1-any.pkg.tar.zst
pacman -U --noconfirm mingw-w64-x86_64-pybind11-2.12.0-1-any.pkg.tar.zst

- name: Clone monero-cpp (regtest)
shell: msys2 {0}
Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,12 @@ wallet_full.close(True)

```
pacman -S mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-unbound mingw-w64-x86_64-protobuf git mingw-w64-x86_64-libusb gettext base-devel
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-icu-75.1-1-any.pkg.tar.zst
pacman -U mingw-w64-x86_64-icu-75.1-1-any.pkg.tar.zst
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-icu-75.1-2-any.pkg.tar.zst
pacman -U mingw-w64-x86_64-icu-75.1-2-any.pkg.tar.zst
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-boost-1.85.0-4-any.pkg.tar.zst
pacman -U mingw-w64-x86_64-boost-1.85.0-4-any.pkg.tar.zst
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-pybind11-2.11.1-1-any.pkg.tar.zst
pacman -U mingw-w64-x86_64-pybind11-2.11.1-1-any.pkg.tar.zst
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-pybind11-2.12.0-1-any.pkg.tar.zst
pacman -U mingw-w64-x86_64-pybind11-2.12.0-1-any.pkg.tar.zst
```

5. Clone repo: `git clone --recurse-submodules https://github.com/everoddandeven/monero-python.git`
Expand Down
9 changes: 7 additions & 2 deletions src/cpp/daemon/py_monero_daemon_model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,18 +659,23 @@ void PyMoneroOutputHistogramEntry::from_property_tree(const boost::property_tree
void PyMoneroTxPoolStats::from_property_tree(const boost::property_tree::ptree& node, const std::shared_ptr<PyMoneroTxPoolStats>& stats) {
for (boost::property_tree::ptree::const_iterator it = node.begin(); it != node.end(); ++it) {
std::string key = it->first;
if (key == std::string("txs_total")) stats->m_num_txs = it->second.get_value<int>();
if (key == std::string("pool_stats")) {
PyMoneroTxPoolStats::from_property_tree(it->second, stats);
break;
}
else if (key == std::string("txs_total")) stats->m_num_txs = it->second.get_value<int>();
else if (key == std::string("num_not_relayed")) stats->m_num_not_relayed = it->second.get_value<int>();
else if (key == std::string("num_failing")) stats->m_num_failing = it->second.get_value<int>();
else if (key == std::string("num_double_spends")) stats->m_num_double_spends = it->second.get_value<int>();
else if (key == std::string("num10m")) stats->m_num10m = it->second.get_value<int>();
else if (key == std::string("num_10m")) stats->m_num10m = it->second.get_value<int>();
else if (key == std::string("fee_total")) stats->m_fee_total = it->second.get_value<uint64_t>();
else if (key == std::string("bytes_max")) stats->m_bytes_max = it->second.get_value<uint64_t>();
else if (key == std::string("bytes_med")) stats->m_bytes_med = it->second.get_value<uint64_t>();
else if (key == std::string("bytes_min")) stats->m_bytes_min = it->second.get_value<uint64_t>();
else if (key == std::string("bytes_total")) stats->m_bytes_total = it->second.get_value<uint64_t>();
else if (key == std::string("histo_98pc")) stats->m_histo98pc = it->second.get_value<uint64_t>();
else if (key == std::string("oldest")) stats->m_oldest_timestamp = it->second.get_value<uint64_t>();
// TODO histo
}
}

Expand Down
8 changes: 8 additions & 0 deletions src/cpp/daemon/py_monero_daemon_rpc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,14 @@ std::shared_ptr<PyMoneroSubmitTxResult> PyMoneroDaemonRpc::submit_tx_hex(std::st
auto res = response->m_response.get();
auto sum = std::make_shared<PyMoneroSubmitTxResult>();
PyMoneroSubmitTxResult::from_property_tree(res, sum);

// set m_is_good based on status
try {
check_response_status(response);
sum->m_is_good = true;
} catch (...) {
sum->m_is_good = false;
}
return sum;
}

Expand Down
Loading