Multiple-URI support in parse_uri and make_uri

src/simplewallet/simplewallet.cpp

@@ -6532,25 +6532,70 @@ bool simple_wallet::transfer_main(const std::vector<std::string> &args_, bool ca
     bool r = true;
 
     // check for a URI
-    std::string address_uri, payment_id_uri, tx_description, recipient_name, error;
+    std::string payment_id_uri, tx_description, error;
     std::vector<std::string> unknown_parameters;
-    uint64_t amount = 0;
-    bool has_uri = m_wallet->parse_uri(local_args[i], address_uri, payment_id_uri, amount, tx_description, recipient_name, unknown_parameters, error);
+    std::vector<tools::wallet2::uri_data> uri_data;
+    bool has_uri = m_wallet->parse_uri(local_args[i], uri_data, payment_id_uri, tx_description, unknown_parameters, error);
     if (has_uri)
     {
-      r = cryptonote::get_account_address_from_str_or_url(info, m_wallet->nettype(), address_uri, oa_prompter);
-      if (payment_id_uri.size() == 16)
+
+      for (size_t j = 0; j < uri_data.size(); j++)
       {
-        if (!tools::wallet2::parse_short_payment_id(payment_id_uri, info.payment_id))
+        r = cryptonote::get_account_address_from_str_or_url(info, m_wallet->nettype(), uri_data[j].address, oa_prompter);
+        if (payment_id_uri.size() == 16)
         {
-          fail_msg_writer() << tr("failed to parse short payment ID from URI");
+          if (!tools::wallet2::parse_short_payment_id(payment_id_uri, info.payment_id))
+          {
+            fail_msg_writer() << tr("failed to parse short payment ID from URI");
+            return false;
+          }
+          info.has_payment_id = true;
+        }
+        de.amount = uri_data[j].amount;
+        de.original = uri_data[j].address;
+        if (!r)
+        {
+          fail_msg_writer() << tr("failed to parse address");
           return false;
         }
-        info.has_payment_id = true;
+        de.addr = info.address;
+        de.is_subaddress = info.is_subaddress;
+        de.is_integrated = info.has_payment_id;
+
+        if (info.has_payment_id || !payment_id_uri.empty())
+        {
+          if (payment_id_seen)
+          {
+            fail_msg_writer() << tr("a single transaction cannot use more than one payment id");
+            return false;
+          }
+          crypto::hash payment_id;
+          std::string extra_nonce;
+          if (info.has_payment_id)
+          {
+            set_encrypted_payment_id_to_tx_extra_nonce(extra_nonce, info.payment_id);
+          }
+          else if (tools::wallet2::parse_payment_id(payment_id_uri, payment_id))
+          {
+            LONG_PAYMENT_ID_SUPPORT_CHECK();
+          }
+          else
+          {
+            fail_msg_writer() << tr("failed to parse payment id, though it was detected");
+            return false;
+          }
+          bool r = add_extra_nonce_to_tx_extra(extra, extra_nonce);
+          if(!r)
+          {
+            fail_msg_writer() << tr("failed to set up payment id, though it was decoded correctly");
+            return false;
+          }
+          payment_id_seen = true;
+        }
+        dsts.push_back(de);
       }
-      de.amount = amount;
-      de.original = local_args[i];
-      ++i;
+      i++;
+      break;
     }
     else if (i + 1 < local_args.size())
     {

src/wallet/api/wallet.cpp

@@ -2548,7 +2548,12 @@ bool WalletImpl::checkBackgroundSync(const std::string &message) const
     return false;
 }
 
-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::vector<tools::wallet2::uri_data> &data, std::string &payment_id, std::string &tx_description, std::vector<std::string> &unknown_parameters, std::string &error)
+{
+    return m_wallet->parse_uri(uri, data, payment_id, tx_description, unknown_parameters, 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)
 {
     return m_wallet->parse_uri(uri, address, payment_id, amount, tx_description, recipient_name, unknown_parameters, error);
 }
@@ -2558,6 +2563,11 @@ std::string WalletImpl::make_uri(const std::string &address, const std::string &
     return m_wallet->make_uri(address, payment_id, amount, tx_description, recipient_name, error);
 }
 
+std::string WalletImpl::make_uri(std::vector<tools::wallet2::uri_data> data, const std::string &payment_id, const std::string &tx_description, std::string &error) const
+{
+    return m_wallet->make_uri(data, payment_id, tx_description, error);
+}
+
 std::string WalletImpl::getDefaultDataDir() const
 {
  return tools::get_default_data_dir();

src/wallet/api/wallet.h

@@ -214,7 +214,10 @@ 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);
     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 override;
+    virtual std::string make_uri(std::vector<tools::wallet2::uri_data> data, const std::string &payment_id, const std::string &tx_description, std::string &error) const;
+
     virtual std::string getDefaultDataDir() const override;
     virtual bool blackballOutputs(const std::vector<std::string> &outputs, bool add) override;
     virtual bool blackballOutput(const std::string &amount, const std::string &offset) override;

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 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 getDefaultDataDir() const = 0;
 
    /*