diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -63,6 +63,8 @@ bool parseBitcoinURI(const QString &scheme, QString uri, SendCoinsRecipient *out); QString formatBitcoinURI(const SendCoinsRecipient &info); +QString formatBitcoinURI(const CChainParams ¶ms, + const SendCoinsRecipient &info); // Returns true if given address+amount meets "dust" definition bool isDust(interfaces::Node &node, const QString &address, const Amount amount, diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -210,7 +210,12 @@ } QString formatBitcoinURI(const SendCoinsRecipient &info) { - QString ret = convertToCashAddr(Params(), info.address); + return formatBitcoinURI(Params(), info); +} + +QString formatBitcoinURI(const CChainParams ¶ms, + const SendCoinsRecipient &info) { + QString ret = convertToCashAddr(params, info.address); int paramCount = 0; if (info.amount != Amount::zero()) { diff --git a/src/qt/test/uritests.cpp b/src/qt/test/uritests.cpp --- a/src/qt/test/uritests.cpp +++ b/src/qt/test/uritests.cpp @@ -99,11 +99,13 @@ } void URITests::uriTestFormatURI() { + const auto params = CreateChainParams(CBaseChainParams::MAIN); + { SendCoinsRecipient r; r.address = "bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a"; r.message = "test"; - QString uri = GUIUtil::formatBitcoinURI(r); + QString uri = GUIUtil::formatBitcoinURI(*params, r); QVERIFY(uri == "bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a?" "message=test"); } @@ -113,7 +115,7 @@ SendCoinsRecipient r; r.address = "175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"; r.message = "test"; - QString uri = GUIUtil::formatBitcoinURI(r); + QString uri = GUIUtil::formatBitcoinURI(*params, r); QVERIFY(uri == "175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?message=test"); } @@ -122,7 +124,7 @@ SendCoinsRecipient r; r.address = "12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX"; r.message = "test"; - QString uri = GUIUtil::formatBitcoinURI(r); + QString uri = GUIUtil::formatBitcoinURI(*params, r); QVERIFY(uri == "bitcoincash:qqgekzvw96vq5g57zwdfa5q6g609rrn0ycp33uc325?" "message=test"); }