such-gitea/wownero-lws
1
0
Fork 1
mirror of https://codeberg.org/wownero/wownero-lws synced 2026-01-09 15:15:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Add from_height to /import_wallet_request (#194)

Browse Source
This commit is contained in:
Lee *!* Clagett
2025-11-04 11:43:43 -05:00
committed by Lee *!* Clagett
parent 01374ec620
commit 151d3092a7
4 changed files with 74 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/rest_server.cpp
View File

@@ -1303,7 +1303,7 @@ namespace lws
struct import_request
{
using request = rpc::account_credentials;
using request = rpc::import_request;
using response = rpc::import_response;
static expect<response> handle(request req, connection_data& data, std::function<async_complete>&&)
@@ -1311,17 +1311,17 @@ namespace lws
bool new_request = false;
bool fulfilled = false;
{
auto user = open_account(req, data.global->disk.clone());
auto user = open_account(req.creds, data.global->disk.clone());
if (!user)
return user.error();
data.passed_login = true;
if (user->first.start_height == db::block_id(0))
if (user->first.start_height <= db::block_id(req.from_height))
fulfilled = true;
else
{
const expect<db::request_info> info =
user->second.get_request(db::request::import_scan, req.address);
user->second.get_request(db::request::import_scan, req.creds.address);
if (!info)
{
@@ -1334,7 +1334,7 @@ namespace lws
} // close reader
if (new_request)
MONERO_CHECK(data.global->disk.clone().import_request(req.address, db::block_id(0)));
MONERO_CHECK(data.global->disk.clone().import_request(req.creds.address, db::block_id(req.from_height)));
const char* status = new_request ?
"Accepted, waiting for approval" : (fulfilled ? "Approved" : "Waiting for Approval");

12
src/rpc/light_wallet.cpp
View File

@@ -48,6 +48,7 @@
#include "wire/traits.h"
#include "wire/vector.h"
#include "wire/wrapper/array.h"
#include "wire/wrapper/defaulted.h"
#include "wire/wrappers_impl.h"
namespace
@@ -361,6 +362,17 @@ namespace lws
);
}
void rpc::read_bytes(wire::json_reader& source, import_request& self)
{
std::string address;
wire::object(source,
wire::field("address", std::ref(address)),
wire::field("view_key", std::ref(unwrap(unwrap(self.creds.key)))),
WIRE_FIELD_DEFAULTED(from_height, unsigned(0))
);
convert_address(address, self.creds.address);
}
void rpc::write_bytes(wire::json_writer& dest, const import_response& self)
{
wire::object(dest,

8
src/rpc/light_wallet.h
View File

@@ -224,6 +224,14 @@ namespace rpc
void write_bytes(wire::json_writer&, const get_subaddrs_response&);
struct import_request
{
import_request() = delete;
account_credentials creds;
std::uint64_t from_height;
};
void read_bytes(wire::json_reader&, import_request&);
struct import_response
{
import_response() = delete;