Qortal/qortal
1
0
Fork 1
mirror of https://github.com/Qortal/qortal.git synced 2025-07-22 20:26:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ProxyForging->RewardShare massive refactor & more...

Browse Source 
Unified terminology from block "generator", "forger", etc. to "minter"

Unified terminology "proxy forger" to "reward share" as it was
incorrect, or at least highly ambiguous, which account had which role.

AccountRepository.findRewardShares() has different arg order!

Account.canMint() now returns true if account has 'founder' flag set.
Added Account.canRewardShare() which returns whether acocunt can create
a reward-share (e.g. level 5+ or founder).

Fixed HSQLDBAssetRepository.getAllAssets() which had incorrect
resultSet column indexes.

Removed old traces of EnableForging transaction.

ACCOUNT_LEVEL and ACCOUNT_FLAGS (genesis-block-only transaction types)
now set target account's last-reference. This is allow later REWARD_SHARE
transactions in genesis block and post-genesis transactions by that account.

REWARD_SHARE transactions are now FREE, but only if minter is also recipient.
If a self-reward-share already exists, then unless share-percent is zero (to
terminate reward-share), any subsequent self-reward-share is invalid.

Updated SysTray i18n properties file.

BlockChain config file requires 'minAccountLevelToRewardShare' and optional
'minAccountLevelToMint'.

Added potential, but currently unused, memory-hard PoW algorithm.

Fixed/removed/disabled some unit tests.
BlockMinter.generateTestingBlock asks Controller to pretend mintingAccount is 'online'.
More testing needed!
This commit is contained in:
catbref
2019-10-29 17:46:55 +00:00
parent 843aad4930
commit 491e79b8e6
80 changed files with 1853 additions and 2044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
src/main/resources/blockchain.json
View File

@@ -8,32 +8,10 @@
"requireGroupForApproval": false,
"defaultGroupId": 0,
"oneNamePerAccount": true,
"maxProxyRelationships": 20,
"minAccountLevelToRewardShare": 5,
"maxRewardSharesPerMintingAccount": 20,
"onlineAccountSignaturesMinLifetime": 2592000000,
"onlineAccountSignaturesMaxLifetime": 3196800000,
"genesisInfo": {
"version": 4,
"timestamp": "1569510000000",
"transactions": [
{ "type": "ISSUE_ASSET", "owner": "QUwGVHPPxJNJ2dq95abQNe79EyBN2K26zM", "assetName": "QORT", "description": "QORTAL coin", "quantity": 10000000, "isDivisible": true, "reference": "28u54WRcMfGujtQMZ9dNKFXVqucY7XfPihXAqPFsnx853NPUwfDJy1sMH5boCkahFgjUNYqc5fkduxdBhQTKgUsC", "data": "{}" },
{ "type": "ISSUE_ASSET", "owner": "QUwGVHPPxJNJ2dq95abQNe79EyBN2K26zM", "assetName": "QORA", "description": "Representative legacy QORA", "quantity": 10000000000, "isDivisible": true, "data": "{}", "isUnspendable": true },
{ "type": "GENESIS", "recipient": "QcatTpaU1UneBs3fVHo8QN6mUmuceRVzFY", "amount": "1000000" },
{ "type": "GENESIS", "recipient": "QcatoCyyp7dVfMtJ92sgUUPDoBJevaemRX", "amount": "1000000" },
{ "type": "GENESIS", "recipient": "QTiga19sttbf6CLQLT83mhCSWEaCvjk8th", "amount": "1000000" },
{ "type": "GENESIS", "recipient": "QcrowX39FuycKvMFFBsakyd5HSxe7bxFsn", "amount": "1000000" },
{ "type": "ACCOUNT_FLAGS", "target": "QcatTpaU1UneBs3fVHo8QN6mUmuceRVzFY", "andMask": -1, "orMask": 1, "xorMask": 0 },
{ "type": "ACCOUNT_FLAGS", "target": "QcatoCyyp7dVfMtJ92sgUUPDoBJevaemRX", "andMask": -1, "orMask": 1, "xorMask": 0 },
{ "type": "ACCOUNT_FLAGS", "target": "QTiga19sttbf6CLQLT83mhCSWEaCvjk8th", "andMask": -1, "orMask": 1, "xorMask": 0 },
{ "type": "ACCOUNT_FLAGS", "target": "QcrowX39FuycKvMFFBsakyd5HSxe7bxFsn", "andMask": -1, "orMask": 1, "xorMask": 0 },
{ "type": "ACCOUNT_LEVEL", "target": "QcatTpaU1UneBs3fVHo8QN6mUmuceRVzFY", "level": 8 },
{ "type": "ACCOUNT_LEVEL", "target": "QcatoCyyp7dVfMtJ92sgUUPDoBJevaemRX", "level": 3 },
{ "type": "ACCOUNT_LEVEL", "target": "QTiga19sttbf6CLQLT83mhCSWEaCvjk8th", "level": 10 },
{ "type": "ACCOUNT_LEVEL", "target": "QcrowX39FuycKvMFFBsakyd5HSxe7bxFsn", "level": 10 },
{ "type": "CREATE_GROUP", "creatorPublicKey": "6rNn9b3pYRrG9UKqzMWYZ9qa8F3Zgv2mVWrULGHUusb", "owner": "QcatTpaU1UneBs3fVHo8QN6mUmuceRVzFY", "groupName": "dev-group", "description": "developer group", "isOpen": false, "approvalThreshold": "PCT60", "minimumBlockDelay": 0, "maximumBlockDelay": 1440 },
{ "type": "CREATE_GROUP", "creatorPublicKey": "JBNBQQDzZsm5do1BrwWAp53Ps4KYJVt749EGpCf7ofte", "owner": "QTiga19sttbf6CLQLT83mhCSWEaCvjk8th", "groupName": "Tiga", "description": "Tiga's group", "isOpen": true, "approvalThreshold": "PCT20", "minimumBlockDelay": 120, "maximumBlockDelay": 2880 },
{ "type": "PROXY_FORGING", "forgerPublicKey": "6rNn9b3pYRrG9UKqzMWYZ9qa8F3Zgv2mVWrULGHUusb", "recipient": "QcatTpaU1UneBs3fVHo8QN6mUmuceRVzFY", "proxyPublicKey": "8X3w1521UNnnonieugAxhfbfvqoRpwPXJrwGQZb5JjQ3", "share": 100 }
]
},
"rewardsByHeight": [
{ "height": 2, "reward": 5.0000 },
{ "height": 259204, "reward": 4.7500 },
@@ -71,5 +49,117 @@
"v2Timestamp": 0,
"newAssetPricingTimestamp": 0,
"groupApprovalTimestamp": 0
},
"genesisInfo": {
"version": 4,
"timestamp": "1572000000000",
"transactions": [
{ "type": "ISSUE_ASSET", "owner": "QUwGVHPPxJNJ2dq95abQNe79EyBN2K26zM", "assetName": "QORT", "description": "QORTAL coin", "quantity": 0, "isDivisible": true, "reference": "28u54WRcMfGujtQMZ9dNKFXVqucY7XfPihXAqPFsnx853NPUwfDJy1sMH5boCkahFgjUNYqc5fkduxdBhQTKgUsC", "data": "{}" },
{ "type": "ISSUE_ASSET", "owner": "QUwGVHPPxJNJ2dq95abQNe79EyBN2K26zM", "assetName": "QORA", "description": "Representative legacy QORA", "quantity": 0, "isDivisible": true, "data": "{}", "isUnspendable": true },
{ "type": "GENESIS", "recipient": "QcatTpaU1UneBs3fVHo8QN6mUmuceRVzFY", "amount": "1000" },
{ "type": "ACCOUNT_FLAGS", "target": "QcatTpaU1UneBs3fVHo8QN6mUmuceRVzFY", "andMask": -1, "orMask": 1, "xorMask": 0 },
{ "type": "ACCOUNT_LEVEL", "target": "QcatTpaU1UneBs3fVHo8QN6mUmuceRVzFY", "level": 8 },
{ "type": "REWARD_SHARE", "minterPublicKey": "6rNn9b3pYRrG9UKqzMWYZ9qa8F3Zgv2mVWrULGHUusb", "recipient": "QcatTpaU1UneBs3fVHo8QN6mUmuceRVzFY", "rewardSharePublicKey": "8X3w1521UNnnonieugAxhfbfvqoRpwPXJrwGQZb5JjQ3", "sharePercent": 100 },
{ "type": "GENESIS", "recipient": "QcatoCyyp7dVfMtJ92sgUUPDoBJevaemRX", "amount": "1000" },
{ "type": "ACCOUNT_FLAGS", "target": "QcatoCyyp7dVfMtJ92sgUUPDoBJevaemRX", "andMask": -1, "orMask": 1, "xorMask": 0 },
{ "type": "ACCOUNT_LEVEL", "target": "QcatoCyyp7dVfMtJ92sgUUPDoBJevaemRX", "level": 3 },
{ "type": "GENESIS", "recipient": "QTiga19sttbf6CLQLT83mhCSWEaCvjk8th", "amount": "1000" },
{ "type": "ACCOUNT_FLAGS", "target": "QTiga19sttbf6CLQLT83mhCSWEaCvjk8th", "andMask": -1, "orMask": 1, "xorMask": 0 },
{ "type": "ACCOUNT_LEVEL", "target": "QTiga19sttbf6CLQLT83mhCSWEaCvjk8th", "level": 10 },
{ "type": "GENESIS", "recipient": "QcrowX39FuycKvMFFBsakyd5HSxe7bxFsn", "amount": "1000" },
{ "type": "ACCOUNT_FLAGS", "target": "QcrowX39FuycKvMFFBsakyd5HSxe7bxFsn", "andMask": -1, "orMask": 1, "xorMask": 0 },
{ "type": "ACCOUNT_LEVEL", "target": "QcrowX39FuycKvMFFBsakyd5HSxe7bxFsn", "level": 10 },
{ "type": "CREATE_GROUP", "creatorPublicKey": "6rNn9b3pYRrG9UKqzMWYZ9qa8F3Zgv2mVWrULGHUusb", "owner": "QcatTpaU1UneBs3fVHo8QN6mUmuceRVzFY", "groupName": "dev-group", "description": "developer group", "isOpen": false, "approvalThreshold": "PCT60", "minimumBlockDelay": 0, "maximumBlockDelay": 1440 },
{ "type": "ACCOUNT_LEVEL", "target": "QQKeokRiFCgAhBSdu1DUf5e1LCkgApvrxZ", "level": 5 },
{ "type": "ACCOUNT_LEVEL", "target": "QiaaoNZ54wKoaUMXxW72UsPt1MiPpeUTWm", "level": 5 },
{ "type": "ACCOUNT_LEVEL", "target": "QN5XF1YQUyVt3S1LNZtStXQCbtxyhkj2FR", "level": 5 },
{ "type": "ACCOUNT_LEVEL", "target": "QYoRWAxw6CVMeYeWHKJh3csmTVkVzjpdBo", "level": 5 },
{ "type": "ACCOUNT_LEVEL", "target": "QMtx2UmUuRZckCmRJRyxdzSAazHP8hU5rA", "level": 4 },
{ "type": "ACCOUNT_LEVEL", "target": "QM4LF9EzQnXJ9VyFwnJbJzskJLrybuSzsw", "level": 3 },
{ "type": "ACCOUNT_LEVEL", "target": "QMkgf9Y6Ac2TUrynDvyhX69ekpC3P3GQmN", "level": 3 },
{ "type": "ACCOUNT_LEVEL", "target": "QiRey96Ka6uWrHTvSn3zY7cveqj3Et3YQd", "level": 2 },
{ "type": "ACCOUNT_LEVEL", "target": "QjchrhQ6HPhWn1sAr68PfYdeMS3C6PjH2J", "level": 2 },
{ "type": "ACCOUNT_LEVEL", "target": "QMWSbqWDC1eHU7fCGJ3UwABHiTxBgBJGRC", "level": 2 },
{ "type": "ACCOUNT_LEVEL", "target": "QWbLcR7ijdJV3eU23wVKk3gKh7G6wKEj3d", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QWviNvp1KPMdyG83ZB2HH29Xxca8fCAv9D", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QRbxbqavJNQYAhqygxYnbrbFx3LmfuTehe", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QLpqg45nszcs1ewfGrqcXzQX8VuZCaxbN6", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QSqeotdyTHxrpx4uquPfq4LLBmezBDuCBo", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "Qa1DSUZPXQSnC1DaTdpZ1fBaCuS62F8GLM", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QS2k8PMpmvUHzFDp2JfbVxRo8SiGiV72xx", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QaYAUoT2SzYA6kqBEW6W11brkYpSf7g4Wy", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QLrErVJvpRdYAt4dGwk8i8rG3PMUSgpp3i", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QQLnurs5NkGB59Ww1jrnRM6deJbAahVLt4", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QczBn7uYPb3Evsei2AVjMqSpmV5f2e94Hf", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QfnYhVqbi8Co87dpzqB8NUXxoRhrcQ55am", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QPR9YBXhyAaCZKhvYK6Z9K9ddBM8F7kT21", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QPa2Jy6KK1Yf9XnETHSW5Rp9Pwjum2VWBP", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QQaEZ52y8govJUUTDdQtERU9saG9kg491N", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QQShonrAdJXg4CzhegtynzaBP7S631vKGq", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QdxuYD638XE84UGdKnb8QPoss1shkMRKYw", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QWGwGBzZG8UeNXJYZq9tjzN6ceriqTgMRd", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QaWReiLe5tAsTNoq7hMiSGNasJEXTX5bmn", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QjJjjBUJSZAMuYiwTyfJTFthH6SrofjG6d", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QQSiZAgdMjadXZRVTHa252AAY2yjZfQKR1", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QbdHzyw6q2hMAhg12JFbXSEcbrj43xNnYG", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QRD3WHcsek8TB9ReSQqGAAYopBwZm1Ue8C", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QQMswzmv65MZSdafqzCACm3tbLj23ixkVR", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QM5Fg3kBzj9BqsGAJKHhsEtgRgf4x2Yn5G", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QNwedkYs6hToBRPZvBb6naKvDEgB7BeaKi", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QPV6E7UXYjcxxFECoiRfwK8bU9AxaMH36U", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QPK8TJ5t32YWef7UCJErELtqKXy2aKPmqy", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QQ2ijixLLGg6Bic5ho1Q1uM5nDdN7PEujQ", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QLgBTDkt7t7WwbTd1RM8iGxu9FexPZcn7C", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "Qa15fMdEiY7WqK2xwvdHrdhU2TE6yk3V3L", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QVxvbaNRk2LUheWJaAzS3dpZ3iSFwrd8Jo", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QVz1rKM9QQrGX7gkxR9EV8a2T4AuD1QT87", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QiECCjPphHZNBbpbqgzRuDnBqbYTH6sBCN", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QU8SzA12SVKPgqpTzRna5itKktGhvEdmgP", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QMz7UGfYpjBVfgAhqdKEMAkFyyGi4CrDc2", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QRh9zNPmz5McxeWx3iCy2xnBRrBoYDZfMJ", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QNyEBd1MNtY8itADG6WQHXSEJWV5dvTLf5", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QLcvvSBPkLkfz9rSKATf7DmS6M2ryw7okL", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QhUWSWWFt6vDy2qNFn68JPTPLjyDrzrh4D", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QUNZQwRXhu1h5fXh39EgbQqCCN1gNo8MV6", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QPow3AFucRRHyNP8csLspMJL9N3hKYiKGK", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QVddqTw2VyqtP91F3U21EiMwov7tfuNsQd", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QPUyMFyXB6g3uUkUruy2AVhrmBniZvHkQ1", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QP86QhNUhLKUignCEo2MFmj7XPFEq1KMZ5", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QNsdyTKN7MVsTYqSyZNPatzRTgNyWDqPZW", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "Qa95hURaNK4kPhDhbdmDFm2wMkkoWFZ4Zz", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QZNYeoAtuSGajD3kihKUBFNv9TvJ6cFqru", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QUnfm6t9SrhgFB8YqCV1vQhmqFzhncxioK", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QRy5dV1xgfxMFXuKHHke1SiFQcdAGkYpnT", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QeaPN9sxEXR5EJ71wuXmWj63XN9MDToD4w", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QTekAqCoXPy5R7NE78GXxjSaXBuekZge88", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QMFJGxGLCbegHL3NZ7HRo3UYaCXhweJVKS", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QSZtc5EQBuVcovMBxcdSQNnEqwdUZvzjSe", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QNFWWhmsun3HVUChjck8XqhsQW2tckNxxM", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QYsLsfwMRBPnunmuWmFkM4hvGsfooY8ssU", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QW9Gf4VofYEyqgxBGzbPZuqcozY2uaMNBc", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QNzsigxC8EikCFWCun9cieggFtbJDz6f3Q", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QR3fQyu3g3ox6mGoyC9ytaVKZwugmbmSFh", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QMvymCURS2abuV1Gn8tFiMkePpvXTKacco", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QVD1zDHyNy3PWgcsuYMz1NqzKGMiVrXD2T", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "Qiw4VrpLh5yx9RH1VbL9jrKhz7S7sHztDw", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QUkq2151QPXfvt8VPc7u5LjFhiHgAtEvC9", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QRHDHASWAXarqTvB2X4SNtJCWbxGf68M2o", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QR9e8PfrLWU96QCL4UQNqioEUcAGoHfHBH", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QPZTxWtCmH6Y6zwwntjnPDfKG6zNKRivqJ", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QMZwrMVDW8L5CTb896ubMeRWUBjiG4cQAi", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QMYzatepF38RJwe3UygUXEh4sA3K7HoQfG", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QMNdPz11XubtvxXLGeiG3PHKaQW67LkZMp", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QM7KP9J7ty7gVAg13DXJyEkASiWmdT5GQC", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QjhFQysNr2R4fuybiS6Nm6tPvPhT8xcmqF", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QixvmAGdJWNkSmentXe8CAnisU9DmifB1C", "level": 1 },
{ "type": "ACCOUNT_LEVEL", "target": "QgrEf4nHhijFQCVgJKro8cRgYWAy1G5rDg", "level": 1 }
]
}
}

4
src/main/resources/i18n/SysTray_en.properties
View File

@@ -11,9 +11,9 @@ CONNECTIONS = connections
EXIT = Exit
GENERATING_DISABLED = NOT minting
MINTING_DISABLED = NOT minting
GENERATING_ENABLED = \u2714 Minting
MINTING_ENABLED = \u2714 Minting
# Nagging about lack of NTP time sync
NTP_NAG_CAPTION = Computer's clock is inaccurate!

4
src/main/resources/i18n/SysTray_zh.properties
View File

@@ -11,9 +11,9 @@ CONNECTIONS = \u4E2A\u8FDE\u63A5
EXIT = \u9000\u51FA\u8F6F\u4EF6
GENERATING_DISABLED = \u6CA1\u6709\u94F8\u5E01
MINTING_DISABLED = \u6CA1\u6709\u94F8\u5E01
GENERATING_ENABLED = \u2714 \u94F8\u5E01
MINTING_ENABLED = \u2714 \u94F8\u5E01
# Nagging about lack of NTP time sync
NTP_NAG_CAPTION = \u7535\u8111\u7684\u65F6\u949F\u4E0D\u51C6\u786E\uFF01