Merge branch 'main' of https://github.com/salvium/salvium

src/wallet/api/wallet.cpp

@@ -1444,6 +1444,34 @@ PendingTransaction *WalletImpl::createStakeTransaction(uint64_t amount, uint32_t
   return createTransactionMultDest(Monero::transaction_type::STAKE, std::vector<string> {dst_addr}, payment_id, amount ? (std::vector<uint64_t> {amount}) : (optional<std::vector<uint64_t>>()), mixin_count, asset_type, is_return, priority, subaddr_account, subaddr_indices);
 }
 
+PendingTransaction *WalletImpl::createAuditTransaction(
+    uint32_t mixin_count,
+    PendingTransaction::Priority priority,
+    uint32_t subaddr_account,
+    std::set<uint32_t> subaddr_indices
+) {
+    // Need to populate {dst_entr, payment_id, asset_type, is_return}
+    const string dst_addr = m_wallet->get_subaddress_as_str({subaddr_account, 0});//MY LOCAL (SUB)ADDRESS
+    const string payment_id = "";
+    const string asset_type = "SAL";
+    const bool is_return = false;
+
+    LOG_ERROR("createAuditTransaction: called");
+  
+    return createTransactionMultDest(
+        Monero::transaction_type::AUDIT,
+        std::vector<string> {dst_addr},
+        payment_id,
+        (optional<std::vector<uint64_t>>()), 
+        mixin_count,
+        asset_type,
+        is_return,
+        priority,
+        subaddr_account,
+        subaddr_indices
+    );
+}
+
 // TODO:
 // 1 - properly handle payment id (add another menthod with explicit 'payment_id' param)
 // 2 - check / design how "Transaction" can be single interface

src/wallet/api/wallet.h

@@ -158,6 +158,10 @@ public:
                                                 PendingTransaction::Priority priority = PendingTransaction::Priority_Low,
                                                 uint32_t subaddr_account = 0,
                                                 std::set<uint32_t> subaddr_indices = {}) override;
+    PendingTransaction * createAuditTransaction(uint32_t mixin_count,
+                                                PendingTransaction::Priority priority = PendingTransaction::Priority_Low,
+                                                uint32_t subaddr_account = 0,
+                                                std::set<uint32_t> subaddr_indices = {}) override;
     PendingTransaction * createTransactionMultDest(const transaction_type &tx_type,
                                                    const std::vector<std::string> &dst_addr, const std::string &payment_id,
                                                    optional<std::vector<uint64_t>> amount, uint32_t mixin_count,

src/wallet/api/wallet2_api.h

@@ -58,7 +58,8 @@ enum transaction_type : uint8_t {
     BURN = 5,
     STAKE = 6,
     RETURN = 7,
-    MAX = 7
+    AUDIT = 8,
+    MAX = 8
 };
   
     namespace Utils {
@@ -97,7 +98,7 @@ struct YieldInfo
   virtual uint64_t yield() const = 0;
   virtual uint64_t yield_per_stake() const = 0;
   virtual std::string period() const = 0;
-  virtual std::vector<std::tuple<size_t, std::string, uint64_t, uint64_t>> payouts() const = 0;
+  virtual std::vector<std::tuple<size_t, std::string, std::string, uint64_t, uint64_t>> payouts() const = 0;
 };
 
   
@@ -878,6 +879,20 @@ struct Wallet
                                                         uint32_t subaddr_account = 0,
                                                         std::set<uint32_t> subaddr_indices = {}) = 0;
 
+    /*!
+     * \brief createAuditTransaction  creates audit transaction.
+     * \param mixin_count             mixin count. if 0 passed, wallet will use default value
+     * \param subaddr_indices         set of subaddress indices to use for transfer or sweeping. if set empty, all are chosen when sweeping, and one or more are automatically chosen when transferring. after execution, returns the set of actually used indices
+     * \param priority
+     * \return                        PendingTransaction object. caller is responsible to check PendingTransaction::status()
+     *                                after object returned
+     */
+
+    virtual PendingTransaction * createAuditTransaction(uint32_t mixin_count,
+                                                        PendingTransaction::Priority = PendingTransaction::Priority_Low,
+                                                        uint32_t subaddr_account = 0,
+                                                        std::set<uint32_t> subaddr_indices = {}) = 0;
+
     /*!
      * \brief createTransactionMultDest creates transaction with multiple destinations. if dst_addr is an integrated address, payment_id is ignored
      * \param tx_type                   the type of transaction being created

src/wallet/api/yield_info.cpp

@@ -123,7 +123,7 @@ namespace Monero {
     return m_yield_per_stake;
   }
 
-  std::vector<std::tuple<size_t, std::string, uint64_t, uint64_t>> YieldInfoImpl::payouts() const
+  std::vector<std::tuple<size_t, std::string, std::string, uint64_t, uint64_t>> YieldInfoImpl::payouts() const
   {
     return m_payouts;
   }

src/wallet/api/yield_info.h

@@ -53,7 +53,7 @@ public:
   uint64_t yield() const override;
   uint64_t yield_per_stake() const override;
   std::string period() const override;
-  std::vector<std::tuple<size_t, std::string, uint64_t, uint64_t>> payouts() const override;
+  std::vector<std::tuple<size_t, std::string, std::string, uint64_t, uint64_t>> payouts() const override;
 
 private:
   friend class WalletImpl;
@@ -68,7 +68,7 @@ private:
   uint64_t m_yield_per_stake;
   uint64_t m_num_entries;
   std::string m_period;
-  std::vector<std::tuple<size_t, std::string, uint64_t, uint64_t>> m_payouts;
+  std::vector<std::tuple<size_t, std::string, std::string, uint64_t, uint64_t>> m_payouts;
 };
 
 }