Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removal of 0123 0124 & implementation of MinedType GetGeneratedType - II #1390

Merged
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
78cb1cc
Introduce enum MinedType and GenerateType function
iFoggz Aug 19, 2018
54a93a9
Change the transaction table model to show type based on what it is a…
iFoggz Aug 19, 2018
ea839e0
Implement MinedType for selection of icons based on new implemnetation
iFoggz Aug 19, 2018
696837f
Remove bool IsPoR
iFoggz Aug 19, 2018
7899d5e
clean up tabs to 4 spacecs where i've done changes
iFoggz Aug 19, 2018
0ddf596
clean up implementation
iFoggz Aug 19, 2018
dcd78b3
Change to use icons used elsewhere till new ones can be created in su…
iFoggz Aug 19, 2018
7bed0c8
Add comment to enum about UNKNOWN
iFoggz Aug 19, 2018
d7a85c7
change Listtransactions2 to use new implementation
iFoggz Aug 19, 2018
6a93c75
Remove ISPOR2 function
iFoggz Aug 19, 2018
7f10b02
remove RemoteFlag section of Generated
iFoggz Aug 22, 2018
a579138
fix compile issue
iFoggz Aug 22, 2018
b5ca65b
update rule
iFoggz Sep 8, 2018
bfcf8fa
Another big step
iFoggz Sep 10, 2018
8efd474
More changes including conforming of description of transaction
iFoggz Sep 10, 2018
339dfb5
some clean up
iFoggz Sep 10, 2018
f5937e5
update icon section
iFoggz Sep 10, 2018
46e754e
remove last RemoteFlag
iFoggz Sep 10, 2018
c5ed849
add missing >
iFoggz Sep 10, 2018
acd6ce6
Add icons for sidestakes
jamescowens Jan 20, 2019
84ec4f1
Correction of UTXO credit for coinstake
jamescowens Jan 21, 2019
cb0e974
Change to new UI icons for staking.
jamescowens Jan 21, 2019
f3cef90
Further fixes for coinstake return outputs.
jamescowens Jan 21, 2019
0bbb342
Coalesce stake output (returns) to the same address
jamescowens Jan 21, 2019
1b38b7d
Fix qt include file to fix bitcoin resource build error
jamescowens Feb 2, 2019
3622421
Change GenerateType to GetGeneratedType for a better
jamescowens Feb 16, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,15 @@ RES_ICONS = \
qt/res/icons/tx2.png \
qt/res/icons/2tx_cpumined.png \
qt/res/icons/tx_minedoie_WOEI3ooIzGHI.png \
qt/res/icons/tx_mined.old.png \
qt/res/icons/www.png \
qt/res/icons/wwww.png \
qt/res/icons/tx_inout.svg \
qt/res/icons/tx_input.svg \
qt/res/icons/tx_mined.svg \
qt/res/icons/tx_output.svg \
qt/res/icons/tx_por.svg \
qt/res/icons/tx_mined_ss.svg \
qt/res/icons/tx_por_ss.svg \
qt/res/icons/icons_native/overview.svg \
qt/res/icons/icons_light/overview.svg \
qt/res/icons/icons_dark/overview.svg \
Expand Down
5 changes: 3 additions & 2 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2161,16 +2161,17 @@ int64_t GetProofOfStakeReward(uint64_t nCoinAge, int64_t nFees, std::string cpid
int64_t maxStakeReward = std::min(maxStakeReward1, maxStakeReward2);
if ((nSubsidy+nFees) > maxStakeReward) nSubsidy = maxStakeReward-nFees;
int64_t nTotalSubsidy = nSubsidy + nFees;
if (nBoinc > 1)
// This rule does not apply in v11
if (nBoinc > 1 && pindexLast->nVersion <= 10)
{
std::string sTotalSubsidy = RoundToString(CoinToDouble(nTotalSubsidy)+.00000123,8);

if (sTotalSubsidy.length() > 7)
{
sTotalSubsidy = sTotalSubsidy.substr(0,sTotalSubsidy.length()-4) + "0124";
nTotalSubsidy = RoundFromString(sTotalSubsidy,8)*COIN;
}
}

OUT_POR = CoinToDouble(nBoinc);
OUT_INTEREST = CoinToDouble(nInterest);
return nTotalSubsidy;
Expand Down
5 changes: 4 additions & 1 deletion src/qt/bitcoin.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
<file alias="tx_input">res/icons/tx_input.svg</file>
<file alias="tx_mined">res/icons/tx_mined.svg</file>
<file alias="tx_output">res/icons/tx_output.svg</file>
<file alias="tx_cpumined">res/icons/tx_por.svg</file>
<file alias="overview_native">res/icons/icons_native/overview.svg</file>
<file alias="overview_light">res/icons/icons_light/overview.svg</file>
<file alias="overview_dark">res/icons/icons_dark/overview.svg</file>
Expand All @@ -61,6 +60,9 @@
<file alias="history_dark">res/icons/icons_dark/transactions.svg</file>
<file alias="history_light">res/icons/icons_light/transactions.svg</file>
<file alias="history_native">res/icons/icons_native/transactions.svg</file>
<file alias="tx_mined_ss">res/icons/tx_mined_ss.svg</file>
<file alias="tx_cpumined">res/icons/tx_por.svg</file>
<file alias="tx_cpumined_ss">res/icons/tx_por_ss.svg</file>
</qresource>
<qresource prefix="/images">
<file alias="splash">res/images/splash3.png</file>
Expand All @@ -79,4 +81,5 @@
<file alias="native">res/stylesheets/native_stylesheet.qss</file>
<file alias="dark">res/stylesheets/dark_stylesheet.qss</file>
</qresource>
<qresource prefix="/"/>
</RCC>
Binary file removed src/qt/res/icons/tx_mined.old.png
Binary file not shown.
2 changes: 1 addition & 1 deletion src/qt/res/icons/tx_mined.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
68 changes: 68 additions & 0 deletions src/qt/res/icons/tx_mined_ss.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading