oxen-io
/
oxen-core
mirror of https://github.com/oxen-io/oxen-core.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

Add is-stake to wallet api 

Mobile wallet needs this to determine when a transaction is a stake
rather than a transfer, otherwise it shows all stakes as outgoing
transfers of 0.
This commit is contained in:
Jason Rhinelander 2022-04-18 11:18:12 -03:00
parent ef51e5dd63
commit a73002747a
No known key found for this signature in database
GPG Key ID: C4992CE7A88D4262
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/api/transaction_history.cpp
View File

@ -152,6 +152,7 @@ void TransactionHistoryImpl::refresh()
ti->m_confirmations = (wallet_height > pd.m_block_height) ? wallet_height - pd.m_block_height : 0;
ti->m_unlock_time = pd.m_unlock_time;
ti->m_reward_type = from_pay_type(pd.m_type);
ti->m_is_stake = pd.m_type == wallet::pay_type::stake;
m_history.push_back(ti);
}
@ -194,6 +195,7 @@ void TransactionHistoryImpl::refresh()
ti->m_label = pd.m_subaddr_indices.size() == 1 ? w->get_subaddress_label({pd.m_subaddr_account, *pd.m_subaddr_indices.begin()}) : "";
ti->m_timestamp = pd.m_timestamp;
ti->m_confirmations = (wallet_height > pd.m_block_height) ? wallet_height - pd.m_block_height : 0;
ti->m_is_stake = pd.m_pay_type == wallet::pay_type::stake;
// single output transaction might contain multiple transfers
for (const auto &d: pd.m_dests) {
@ -228,6 +230,7 @@ void TransactionHistoryImpl::refresh()
ti->m_label = pd.m_subaddr_indices.size() == 1 ? w->get_subaddress_label({pd.m_subaddr_account, *pd.m_subaddr_indices.begin()}) : "";
ti->m_timestamp = pd.m_timestamp;
ti->m_confirmations = 0;
ti->m_is_stake = pd.m_pay_type == wallet::pay_type::stake;
m_history.push_back(ti);
}
@ -253,6 +256,7 @@ void TransactionHistoryImpl::refresh()
ti->m_timestamp = pd.m_timestamp;
ti->m_confirmations = 0;
ti->m_reward_type = from_pay_type(pd.m_type);
ti->m_is_stake = pd.m_type == wallet::pay_type::stake;
m_history.push_back(ti);
LOG_PRINT_L1(__FUNCTION__ << ": Unconfirmed payment found " << pd.m_amount);

7
src/wallet/api/transaction_info.cpp
View File

@ -48,6 +48,7 @@ TransactionInfoImpl::TransactionInfoImpl()
, m_pending(false)
, m_failed(false)
, m_reward_type(reward_type::unspecified)
, m_is_stake(false)
, m_amount(0)
, m_fee(0)
, m_blockheight(0)
@ -83,6 +84,12 @@ bool TransactionInfoImpl::isMinerReward() const
return m_reward_type == reward_type::miner;
}
EXPORT
bool TransactionInfoImpl::isStake() const
{
return m_is_stake;
}
EXPORT
bool TransactionInfoImpl::isPending() const
{

2
src/wallet/api/transaction_info.h
View File

@ -66,12 +66,14 @@ public:
virtual uint64_t unlockTime() const override;
bool isServiceNodeReward() const override;
bool isMinerReward() const override;
bool isStake() const override;
private:
int m_direction;
bool m_pending;
bool m_failed;
reward_type m_reward_type; // may have a value rather than `unspecified` after hf 10
bool m_is_stake;
uint64_t m_amount;
uint64_t m_fee;
uint64_t m_blockheight;

1
src/wallet/api/wallet2_api.h
View File

@ -177,6 +177,7 @@ struct TransactionInfo
virtual ~TransactionInfo() = 0;
virtual bool isServiceNodeReward() const = 0;
virtual bool isMinerReward() const = 0;
virtual bool isStake() const = 0;
virtual int direction() const = 0;
virtual bool isPending() const = 0;
virtual bool isFailed() const = 0;