Multiple-URI support in `parse_uri` and `make_uri` #9756

U65535F · 2025-01-30T17:10:04Z

This pull request addresses the issues raised in #7737 and introduces a new feature to the Monero codebase: multi-URL support for parse_uri and make_uri functions.

Key Changes:

Fixed loop index misuse (replaced i with j for proper iteration).
Removed the usage of NA as a filler in certain cases.
General code cleanup for readability and maintainability.
Introduced new test cases in uri.cpp to validate multi-URL functionality.

Notes:
This PR was rewritten from the latest Monero repository rather than being forked from the original issue (#7737).
All builds are successfully passing, and existing tests have cleared without any regressions.

Please check for any overlooked issues or mistakes, especially in the multi-URL parsing logic.
Validate the new test cases and suggest improvements to ensure robustness.

…usages.

It doesn't properly call make_uri in wallet2.cpp

…ncy checks and improve error messages.

U65535F · 2025-01-31T12:38:45Z

@selsta

selsta · 2025-01-31T13:16:36Z

Thank you. The URI functional test case fails now. Can you take a look?

https://github.com/monero-project/monero/actions/runs/13057491252/job/36433416280?pr=9756#step:11:1471

U65535F · 2025-01-31T14:27:29Z

Alright, will ping you when it's done. It seems like I didn't update the python source files to comply with the new updated C++ code.

iamamyth · 2025-01-31T21:06:35Z

As illustrated by the test failures, this PR would introduce a backwards-incompatible change to the wallet RPC interface, which generally should not be done.

iamamyth · 2025-01-31T21:14:38Z

Two possible ways to address the compatibility issue:

Introduce a new version of the endpoint which works with only the new format, retaining the old one (you could still transform requests to the old endpoint into the new format upon receipt and share the address construction code).
Modify the endpoint to detect "old format" and "new format" requests, and pick the appropriate logic (e.g. payments field present implies new format, or address field present implies old format).

…allet.py for handling both new and old formats plus rewrite uri.py to handle tests properly. Rewrite was necessary to remove all broken tests written previously, restore the file and modify the way it accesses data (the structure is different).

…since it's in wallet2.h

U65535F · 2025-02-11T13:35:36Z

@selsta @iamamyth I think I have addressed your compatibility issue properly. Introduced v2 versions of parse_uri and make_uri into the RPC. While the C++ code does not explicitly have those functions, but there are overloads which will select the version based on the parameters (as mentioned by @iamamyth). The tests are restored to their original versions, except for there are new tests for multi-URI functionality. The tests are passing, but there seems be to the p2p test which is failing (due to the recent PR merges I guess) which is not linked to this PR. The tests are passing in my fork though. So that confirms it.

SNeedlewoods

Sorry, not sure what exactly I should look at.
I haven't done a review, just skimmed over the changes and noticed some unnecessary edits, mainly in tests/functional_tests/uri.py.
Other than that I left a comment regarding the API.

Maybe you can clarify how I can help?

SNeedlewoods · 2025-02-11T18:31:31Z

src/wallet/api/wallet.h

@@ -214,7 +214,9 @@ class WalletImpl : public Wallet
    virtual void startRefresh() override;
    virtual void pauseRefresh() override;
    virtual bool parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error) override;
+    virtual bool parse_uri(const std::string &uri, std::vector<tools::wallet2::uri_data> &data, std::string &payment_id, std::string &tx_description, std::vector<std::string> &unknown_parameters, std::string &error);


I see two issues here:

AFAICT we don't want to have "non-standard" types as arguments for methods in the Wallet API, so for simplicity I'd change std::vector<tools::wallet2::uri_data> &data to vectors of std::string/std::uint64_t here, see example below.

This belongs to the interface in src/wallet/api/wallet2_api.h and there it should look like this (with respect to the proposed change from point 1):

virtual bool parse_uri(const std::string &uri, std::vector<std::string> &addresses, std::vector<std::uint64_t> &amounts, std::vector<std::string> &recipient_names, std::string &payment_id, std::string &tx_description, std::vector<std::string> &unknown_parameters, std::string &error) = 0;

And here it should look like this (no virtual in the beginning but override at the end):

bool parse_uri(const std::string &uri, std::vector<std::string> &addresses, std::vector<std::uint64_t> &amounts, std::vector<std::string> &recipient_names, std::string &payment_id, std::string &tx_description, std::vector<std::string> &unknown_parameters, std::string &error) override;

Same goes for make_uri() below.

iamamyth · 2025-02-11T19:48:22Z

@SNeedlewoods The reason I suggested pinging you was for your feedback on the wallet API changes, as you've put in some effort to establish a coherent interface. And, it seems your comments address those changes, as hoped. Thanks.

iamamyth · 2025-02-11T19:49:41Z

Please note that I have no interest in formally reviewing/approving this PR, so, if/when it gains the necessary approvals, there's no sense in pinging me.

U65535F · 2025-02-12T02:52:05Z

Sorry, not sure what exactly I should look at. I haven't done a review, just skimmed over the changes and noticed some unnecessary edits, mainly in tests/functional_tests/uri.py. Other than that I left a comment regarding the API.

Maybe you can clarify how I can help?

@SNeedlewoods What exactly are those unnecessary edits? Could you please list them so I can remove.

SNeedlewoods · 2025-02-12T13:49:14Z

src/wallet/api/wallet.h

@@ -214,7 +214,9 @@ class WalletImpl : public Wallet
    virtual void startRefresh() override;
    virtual void pauseRefresh() override;
    virtual bool parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error) override;
+    virtual bool parse_uri(const std::string &uri, std::vector<std::string> &addresses, std::vector<std::uint64_t> &amounts, std::vector<std::string> &recipient_names, std::string &payment_id, std::string &tx_description, std::vector<std::string> &unknown_parameters, std::string &error) override;


There should be no virtual keyword in the front here (it should only be used in the interface class src/wallet/api/wallet2_api.h (here you can find some general information about "pure virtual function" and "interface class")), IMO it's unfortunate that many methods in src/wallet/api/wallet.h already have this wrong, but for example these methods are considered to do it the "right way":

monero/src/wallet/api/wallet.h

Lines 83 to 138 in 84df774

Device getDeviceType() const override;

bool close(bool store = true);

std::string seed(const std::string& seed_offset = "") const override;

std::string getSeedLanguage() const override;

void setSeedLanguage(const std::string &arg) override;

// void setListener(Listener *) {}

int status() const override;

std::string errorString() const override;

void statusWithErrorString(int& status, std::string& errorString) const override;

bool setPassword(const std::string &password) override;

const std::string& getPassword() const override;

bool setDevicePin(const std::string &password) override;

bool setDevicePassphrase(const std::string &password) override;

std::string address(uint32_t accountIndex = 0, uint32_t addressIndex = 0) const override;

std::string integratedAddress(const std::string &payment_id) const override;

std::string secretViewKey() const override;

std::string publicViewKey() const override;

std::string secretSpendKey() const override;

std::string publicSpendKey() const override;

std::string publicMultisigSignerKey() const override;

std::string path() const override;

void stop() override;

bool store(const std::string &path) override;

std::string filename() const override;

std::string keysFilename() const override;

bool init(const std::string &daemon_address, uint64_t upper_transaction_size_limit = 0, const std::string &daemon_username = "", const std::string &daemon_password = "", bool use_ssl = false, bool lightWallet = false, const std::string &proxy_address = "") override;

bool connectToDaemon() override;

ConnectionStatus connected() const override;

void setTrustedDaemon(bool arg) override;

bool trustedDaemon() const override;

bool setProxy(const std::string &address) override;

uint64_t balance(uint32_t accountIndex = 0) const override;

uint64_t unlockedBalance(uint32_t accountIndex = 0) const override;

uint64_t blockChainHeight() const override;

uint64_t approximateBlockChainHeight() const override;

uint64_t estimateBlockChainHeight() const override;

uint64_t daemonBlockChainHeight() const override;

uint64_t daemonBlockChainTargetHeight() const override;

bool synchronized() const override;

bool refresh() override;

void refreshAsync() override;

bool rescanBlockchain() override;

void rescanBlockchainAsync() override;

void setAutoRefreshInterval(int millis) override;

int autoRefreshInterval() const override;

void setRefreshFromBlockHeight(uint64_t refresh_from_block_height) override;

uint64_t getRefreshFromBlockHeight() const override { return m_wallet->get_refresh_from_block_height(); };

void setRecoveringFromSeed(bool recoveringFromSeed) override;

void setRecoveringFromDevice(bool recoveringFromDevice) override;

void setSubaddressLookahead(uint32_t major, uint32_t minor) override;

bool watchOnly() const override;

bool isDeterministic() const override;

bool rescanSpent() override;

NetworkType nettype() const override {return static_cast<NetworkType>(m_wallet->nettype());}

void hardForkInfo(uint8_t &version, uint64_t &earliest_height) const override;

bool useForkRules(uint8_t version, int64_t early_blocks) const override;

Again same for make_uri() below.

SNeedlewoods · 2025-02-12T13:49:25Z

src/wallet/api/wallet2_api.h

@@ -1066,8 +1066,10 @@ struct Wallet
    virtual bool verifyMessageWithPublicKey(const std::string &message, const std::string &publicKey, const std::string &signature) const = 0;

    virtual bool parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error) = 0;
+    virtual bool parse_uri(const std::string &uri, std::vector<std::string> &addresses, std::vector<std::uint64_t> &amounts, std::vector<std::string> &recipient_names, std::string &payment_id, std::string &tx_description, std::vector<std::string> &unknown_parameters, std::string &error);


Suggested change

virtual bool parse_uri(const std::string &uri, std::vector<std::string> &addresses, std::vector<std::uint64_t> &amounts, std::vector<std::string> &recipient_names, std::string &payment_id, std::string &tx_description, std::vector<std::string> &unknown_parameters, std::string &error);

virtual bool parse_uri(const std::string &uri, std::vector<std::string> &addresses, std::vector<std::uint64_t> &amounts, std::vector<std::string> &recipient_names, std::string &payment_id, std::string &tx_description, std::vector<std::string> &unknown_parameters, std::string &error) = 0;

= 0 at the end for "pure virtual" functions

SNeedlewoods · 2025-02-12T13:49:27Z

src/wallet/api/wallet2_api.h

    virtual std::string make_uri(const std::string &address, const std::string &payment_id, uint64_t amount, const std::string &tx_description, const std::string &recipient_name, std::string &error) const = 0;
-
+    virtual std::string make_uri(std::vector<std::string> &addresses, std::vector<std::uint64_t> &amounts, std::vector<std::string> &recipient_names, const std::string &payment_id, const std::string &tx_description, std::string &error) const;


Suggested change

virtual std::string make_uri(std::vector<std::string> &addresses, std::vector<std::uint64_t> &amounts, std::vector<std::string> &recipient_names, const std::string &payment_id, const std::string &tx_description, std::string &error) const;

virtual std::string make_uri(std::vector<std::string> &addresses, std::vector<std::uint64_t> &amounts, std::vector<std::string> &recipient_names, const std::string &payment_id, const std::string &tx_description, std::string &error) const = 0;

SNeedlewoods · 2025-02-12T13:51:57Z

tests/functional_tests/uri.py

            assert res.uri.address == address
-            assert res.uri.payment_id == ''
            assert res.uri.amount == 0
-            assert res.uri.tx_description == ''
            assert res.uri.recipient_name == ''
+            assert res.uri.payment_id == ''
+            assert res.uri.tx_description == ''
+


There are several places where the order of asserts is changed, without changing the logic, these I'd consider unnecessary changes.

SNeedlewoods · 2025-02-12T13:52:31Z

src/wallet/api/wallet.cpp

-bool WalletImpl::parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error)
+bool WalletImpl::parse_uri(const std::string& uri, std::string& address, std::string& payment_id, uint64_t& amount, std::string& tx_description, std::string& recipient_name, std::vector<std::string>& unknown_parameters, std::string& error)


I'd say this is also unnecessary

U65535F · 2025-02-12T14:37:57Z

@SNeedlewoods I think I've addressed your issues and fixed them. Please check again if you are willing to, and tell me if I missed anything. As it seems, I've missed 2 unnecessary edits in uri.py which I will tackle in newer commits.

SNeedlewoods · 2025-02-12T15:08:50Z

The things I addressed look good to me now. Thanks for your contribution.

I want to make clear though, I haven't looked into changes in wallet2, simplewallet, wallet_rpc_server or the tests, because I'm not as familiar with those areas and would need way more time for a proper review.

… in uri.py

U65535F · 2025-02-13T02:27:55Z

@selsta How do I get more people to review it?

U65535F · 2025-02-13T17:04:17Z

@selsta ping

selsta · 2025-02-13T17:07:44Z

I'm busy with the current release, will be able to take a look afterwards.

U65535F added 15 commits January 28, 2025 21:53

Multiple url functionality.

7469d69

Remove commented line.

d1f69b9

Fix error by removing repeated code block.

1b1e930

fix no member named errors

168668a

Add function overloads for make_uri to make it compatible with older …

ab0c39e

…usages.

Fix tests

25b3ef2

Fix function overloads

a55f1f1

Fix errors of parse_uri saying that m_wallet was not found.

246926a

Add semi-colon

bfa2c35

Update parse_uri to support single tx

cd922c6

fix parse_uri

0fe95f9

fix errors

a5750c5

fix make_uri

4a83b22

It doesn't properly call make_uri in wallet2.cpp

Slight imporvements and fix always failing test code.

6ca8ace

Fix tests that were using atomic units in URL. Add parameter consiste…

dab6fe2

…ncy checks and improve error messages.

U65535F changed the title ~~Multiple-URL~~ Multiple-URI support in parse_uri and make_uri Jan 30, 2025

U65535F added 2 commits January 31, 2025 21:30

Fix failing python functional tests

20e6095

fix improper size calc

546fb29

selsta added pending review wallet labels Jan 31, 2025

U65535F marked this pull request as draft February 1, 2025 02:29

U65535F added 4 commits February 1, 2025 23:24

Fix function declarations

577b7ee

fix uri_data not found by replacing it with tools::wallet2::uri_data …

faf7306

…since it's in wallet2.h

remove override keyword from wallet.h: make_uri and parse_uri

48fe7eb

fix uri.py not providing payment_id to one of the tests

3562a50

remove extra new lines in wallet2_api.h

33ad3f0

SNeedlewoods reviewed Feb 11, 2025

View reviewed changes

U65535F added 3 commits February 12, 2025 17:38

Merge branch 'monero-project:master' into master

1ebba43

only accept standard types as parameters

71aa95e

Merge branch 'master' of https://github.com/U65535F/monero

de28957

U65535F requested review from SNeedlewoods and selsta February 12, 2025 12:21

U65535F added 8 commits February 12, 2025 17:55

update wallet2

44b70c1

fix typos and overlooked references to old variables

eeb3051

fix typos

bbcc043

add const keyword

a647610

fix const keyword dropping error

c1964b1

remove override keyword

707700d

add const keyword to wallet2 interface

952486e

add const keyword

cc6deca

SNeedlewoods reviewed Feb 12, 2025

View reviewed changes

restore unnecessary edits and address sneedlewoods' comments

0d8698f

U65535F added 2 commits February 12, 2025 21:40

remove some unnecessary edits and old references to removed variables…

c6f16a6

… in uri.py

fix silly typos

1f14a22

Merge branch 'monero-project:master' into master

9158feb

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Multiple-URI support in `parse_uri` and `make_uri` #9756

Multiple-URI support in `parse_uri` and `make_uri` #9756

U65535F commented Jan 30, 2025 •

edited

Loading

U65535F commented Jan 31, 2025

selsta commented Jan 31, 2025

U65535F commented Jan 31, 2025

iamamyth commented Jan 31, 2025

iamamyth commented Jan 31, 2025

U65535F commented Feb 11, 2025 •

edited

Loading

SNeedlewoods left a comment

SNeedlewoods Feb 11, 2025

iamamyth commented Feb 11, 2025

iamamyth commented Feb 11, 2025

U65535F commented Feb 12, 2025

SNeedlewoods Feb 12, 2025

SNeedlewoods Feb 12, 2025

SNeedlewoods Feb 12, 2025

SNeedlewoods Feb 12, 2025

SNeedlewoods Feb 12, 2025

U65535F commented Feb 12, 2025

SNeedlewoods commented Feb 12, 2025

U65535F commented Feb 13, 2025

U65535F commented Feb 13, 2025

selsta commented Feb 13, 2025

	Device getDeviceType() const override;
	bool close(bool store = true);
	std::string seed(const std::string& seed_offset = "") const override;
	std::string getSeedLanguage() const override;
	void setSeedLanguage(const std::string &arg) override;
	// void setListener(Listener *) {}
	int status() const override;
	std::string errorString() const override;
	void statusWithErrorString(int& status, std::string& errorString) const override;
	bool setPassword(const std::string &password) override;
	const std::string& getPassword() const override;
	bool setDevicePin(const std::string &password) override;
	bool setDevicePassphrase(const std::string &password) override;
	std::string address(uint32_t accountIndex = 0, uint32_t addressIndex = 0) const override;
	std::string integratedAddress(const std::string &payment_id) const override;
	std::string secretViewKey() const override;
	std::string publicViewKey() const override;
	std::string secretSpendKey() const override;
	std::string publicSpendKey() const override;
	std::string publicMultisigSignerKey() const override;
	std::string path() const override;
	void stop() override;
	bool store(const std::string &path) override;
	std::string filename() const override;
	std::string keysFilename() const override;
	bool init(const std::string &daemon_address, uint64_t upper_transaction_size_limit = 0, const std::string &daemon_username = "", const std::string &daemon_password = "", bool use_ssl = false, bool lightWallet = false, const std::string &proxy_address = "") override;
	bool connectToDaemon() override;
	ConnectionStatus connected() const override;
	void setTrustedDaemon(bool arg) override;
	bool trustedDaemon() const override;
	bool setProxy(const std::string &address) override;
	uint64_t balance(uint32_t accountIndex = 0) const override;
	uint64_t unlockedBalance(uint32_t accountIndex = 0) const override;
	uint64_t blockChainHeight() const override;
	uint64_t approximateBlockChainHeight() const override;
	uint64_t estimateBlockChainHeight() const override;
	uint64_t daemonBlockChainHeight() const override;
	uint64_t daemonBlockChainTargetHeight() const override;
	bool synchronized() const override;
	bool refresh() override;
	void refreshAsync() override;
	bool rescanBlockchain() override;
	void rescanBlockchainAsync() override;
	void setAutoRefreshInterval(int millis) override;
	int autoRefreshInterval() const override;
	void setRefreshFromBlockHeight(uint64_t refresh_from_block_height) override;
	uint64_t getRefreshFromBlockHeight() const override { return m_wallet->get_refresh_from_block_height(); };
	void setRecoveringFromSeed(bool recoveringFromSeed) override;
	void setRecoveringFromDevice(bool recoveringFromDevice) override;
	void setSubaddressLookahead(uint32_t major, uint32_t minor) override;
	bool watchOnly() const override;
	bool isDeterministic() const override;
	bool rescanSpent() override;
	NetworkType nettype() const override {return static_cast<NetworkType>(m_wallet->nettype());}
	void hardForkInfo(uint8_t &version, uint64_t &earliest_height) const override;
	bool useForkRules(uint8_t version, int64_t early_blocks) const override;

	virtual bool parse_uri(const std::string &uri, std::vector<std::string> &addresses, std::vector<std::uint64_t> &amounts, std::vector<std::string> &recipient_names, std::string &payment_id, std::string &tx_description, std::vector<std::string> &unknown_parameters, std::string &error);
	virtual bool parse_uri(const std::string &uri, std::vector<std::string> &addresses, std::vector<std::uint64_t> &amounts, std::vector<std::string> &recipient_names, std::string &payment_id, std::string &tx_description, std::vector<std::string> &unknown_parameters, std::string &error) = 0;

		virtual std::string make_uri(const std::string &address, const std::string &payment_id, uint64_t amount, const std::string &tx_description, const std::string &recipient_name, std::string &error) const = 0;

		virtual std::string make_uri(std::vector<std::string> &addresses, std::vector<std::uint64_t> &amounts, std::vector<std::string> &recipient_names, const std::string &payment_id, const std::string &tx_description, std::string &error) const;

		bool WalletImpl::parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error)
		bool WalletImpl::parse_uri(const std::string& uri, std::string& address, std::string& payment_id, uint64_t& amount, std::string& tx_description, std::string& recipient_name, std::vector<std::string>& unknown_parameters, std::string& error)

Multiple-URI support in parse_uri and make_uri #9756

Are you sure you want to change the base?

Multiple-URI support in parse_uri and make_uri #9756

Conversation

U65535F commented Jan 30, 2025 • edited Loading

Key Changes:

U65535F commented Jan 31, 2025

selsta commented Jan 31, 2025

U65535F commented Jan 31, 2025

iamamyth commented Jan 31, 2025

iamamyth commented Jan 31, 2025

U65535F commented Feb 11, 2025 • edited Loading

SNeedlewoods left a comment

Choose a reason for hiding this comment

SNeedlewoods Feb 11, 2025

Choose a reason for hiding this comment

iamamyth commented Feb 11, 2025

iamamyth commented Feb 11, 2025

U65535F commented Feb 12, 2025

SNeedlewoods Feb 12, 2025

Choose a reason for hiding this comment

SNeedlewoods Feb 12, 2025

Choose a reason for hiding this comment

SNeedlewoods Feb 12, 2025

Choose a reason for hiding this comment

SNeedlewoods Feb 12, 2025

Choose a reason for hiding this comment

SNeedlewoods Feb 12, 2025

Choose a reason for hiding this comment

U65535F commented Feb 12, 2025

SNeedlewoods commented Feb 12, 2025

U65535F commented Feb 13, 2025

U65535F commented Feb 13, 2025

selsta commented Feb 13, 2025

Multiple-URI support in `parse_uri` and `make_uri` #9756

Multiple-URI support in `parse_uri` and `make_uri` #9756

U65535F commented Jan 30, 2025 •

edited

Loading

U65535F commented Feb 11, 2025 •

edited

Loading