Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Update max core supply in genesis, properly track total supply for vesting balances in bts accounts and other changes

Browse source
This commit is contained in:
Viktor 2017-06-06 11:17:04 +03:00
parent 4a75af7dc9
commit b7e11ae9d6
20 changed files with 5449 additions and 14768 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

646
genesis.json
View file

@ -1,646 +0,0 @@
{
"initial_timestamp": "2017-05-24T08:09:05",
"max_core_supply": "1446053259451",
"initial_parameters": {
"current_fees": {
"parameters": [[
0,{
"fee": 1000,
"price_per_kbyte": 1000
}
],[
1,{
"fee": 50
}
],[
2,{
"fee": 0
}
],[
3,{
"fee": 500000000000
}
],[
4,{}
],[
5,{
"basic_fee": 1000,
"premium_fee": 1000000,
"price_per_kbyte": 1000
}
],[
6,{
"fee": 1000,
"price_per_kbyte": 1000
}
],[
7,{
"fee": 3000
}
],[
8,{
"membership_annual_fee": 500000000000,
"membership_lifetime_fee": 500000
}
],[
9,{
"fee": 200000
}
],[
10,{
"symbol3": "500000000000",
"symbol4": "500000000000",
"long_symbol": 5000000,
"price_per_kbyte": 1000
}
],[
11,{
"fee": 100000,
"price_per_kbyte": 1000
}
],[
12,{
"fee": 500000000000
}
],[
13,{
"fee": 500000000000
}
],[
14,{
"fee": 1000,
"price_per_kbyte": 1000
}
],[
15,{
"fee": 1000
}
],[
16,{
"fee": 3000
}
],[
17,{
"fee": 500000000000
}
],[
18,{
"fee": 500000000000
}
],[
19,{
"fee": 500000000000
}
],[
20,{
"fee": 1000000
}
],[
21,{
"fee": 2000
}
],[
22,{
"fee": 1000,
"price_per_kbyte": 1000
}
],[
23,{
"fee": 1000,
"price_per_kbyte": 1000
}
],[
24,{
"fee": 0
}
],[
25,{
"fee": 3000
}
],[
26,{
"fee": 200
}
],[
27,{
"fee": 200,
"price_per_kbyte": 1000
}
],[
28,{
"fee": 0
}
],[
29,{
"fee": 100000
}
],[
30,{
"fee": 2000
}
],[
31,{
"fee": 0
}
],[
32,{
"fee": 100000
}
],[
33,{
"fee": 50000
}
],[
34,{
"fee": 500000000000
}
],[
35,{
"fee": 1000,
"price_per_kbyte": 1000
}
],[
36,{
"fee": 1000
}
],[
37,{}
],[
38,{
"fee": 20000,
"price_per_kbyte": 1000
}
],[
39,{
"fee": 500000000000,
"price_per_output": 500000000000
}
],[
40,{
"fee": 500000000000,
"price_per_output": 500000000000
}
],[
41,{
"fee": 500000000000
}
],[
42,{}
],[
43,{
"fee": 3000
}
],[
44,{}
],[
45,{
"fee": 1000
}
],[
46,{
"fee": 5000
}
],[
47,{
"fee": 0
}
],[
48,{
"fee": 1000
}
],[
49,{}
]
],
"scale": 10000
},
"block_interval": 3,
"maintenance_interval": 600,
"maintenance_skip_slots": 3,
"committee_proposal_review_period": 3600,
"maximum_transaction_size": 98304,
"maximum_block_size": 2097192,
"maximum_time_until_expiration": 86400,
"maximum_proposal_lifetime": 2419200,
"maximum_asset_whitelist_authorities": 10,
"maximum_asset_feed_publishers": 10,
"maximum_witness_count": 1001,
"maximum_committee_count": 1001,
"maximum_authority_membership": 10,
"reserve_percent_of_fee": 10000,
"network_percent_of_fee": 10000,
"lifetime_referrer_percent_of_fee": 0,
"cashback_vesting_period_seconds": 9999999,
"cashback_vesting_threshold": 500000000000,
"count_non_member_votes": true,
"allow_non_member_whitelists": true,
"witness_pay_per_block": 700,
"worker_budget_per_day": "0",
"max_predicate_opcode": 1,
"fee_liquidation_threshold": 500000000000,
"accounts_per_fee_scale": 1000,
"account_fee_scale_bitshifts": 0,
"max_authority_depth": 2,
"witness_schedule_algorithm": 0,
"min_round_delay": 1,
"max_round_delay": 300,
"min_time_per_commit_move": 15,
"max_time_per_commit_move": 15,
"min_time_per_reveal_move": 6,
"max_time_per_reveal_move": 6,
"rake_fee_percentage": 350,
"maximum_registration_deadline": 2592000,
"maximum_players_in_tournament": 256,
"maximum_tournament_whitelist_length": 1000,
"maximum_tournament_start_time_in_future": 5184000,
"maximum_tournament_start_delay": 259200,
"maximum_tournament_number_of_wins": 25,
"extensions": []
},
"initial_bts_accounts": [
{
"name": "bts-1",
"core_balance": 10000000,
"owner_authority": {
"key_auths": [["PPY7uWdZSmuLioy2X3QrDdYbFYRkrJkkk1brWYpKgz1k9vMFFDL1u", 1]]
},
"active_authority": {
"key_auths": [["PPY7uWdZSmuLioy2X3QrDdYbFYRkrJkkk1brWYpKgz1k9vMFFDL1u", 1]]
}
},
{
"name": "bts-2",
"core_balance": 10000000,
"owner_authority": {
"key_auths": [["PPY85SpcwFd8xP9ocJRSUHckFMkrqp6TExDqtrsheNWvFWszZYo7X", 1]]
},
"active_authority": {
"key_auths": [["PPY85SpcwFd8xP9ocJRSUHckFMkrqp6TExDqtrsheNWvFWszZYo7X", 1]]
}
},
{
"name": "bts-3",
"core_balance": 10000000,
"owner_authority": {
"key_auths": [["PPY6dqcLw6GNgyKDBqgU52TzZ6zvsxisP5nMKSs2J8WLJR5wLPyDc", 1]]
},
"active_authority": {
"key_auths": [["PPY6dqcLw6GNgyKDBqgU52TzZ6zvsxisP5nMKSs2J8WLJR5wLPyDc", 1]]
}
},
{
"name": "bts-4",
"core_balance": 10000000,
"owner_authority": {
"key_auths": [["PPY574FdeqJjGv3GXd1YPdJnLWQk61PYPDzHJcKPZuAT2BDdP9A86", 1]]
},
"active_authority": {
"key_auths": [["PPY574FdeqJjGv3GXd1YPdJnLWQk61PYPDzHJcKPZuAT2BDdP9A86", 1]]
}
},
{
"name": "bts-5",
"core_balance": 10000000,
"owner_authority": {
"key_auths": [["PPY8jx67bhMkfsZo554sR3tiVW5Ujkt91kfUcmPK54MqWcYdFgm74", 1]]
},
"active_authority": {
"key_auths": [["PPY8jx67bhMkfsZo554sR3tiVW5Ujkt91kfUcmPK54MqWcYdFgm74", 1]]
}
},
{
"name": "bts-6",
"core_balance": 10000000,
"owner_authority": {
"key_auths": [["PPY6fsh8fQLvtxP1pDSYRT26PvZFaNnnLxsnbVXU3bLGvUMzy94rB", 1],
["PPY716a2CfM86Vg6dg9jY83rognjzUoekSoCuQZn66kFiu8RD7i4w", 1]]
},
"active_authority": {
"key_auths": [["PPY6fsh8fQLvtxP1pDSYRT26PvZFaNnnLxsnbVXU3bLGvUMzy94rB", 1],
["PPY716a2CfM86Vg6dg9jY83rognjzUoekSoCuQZn66kFiu8RD7i4w", 1]]
}
},
{
"name": "bts-7",
"core_balance": 10000000,
"owner_authority": {
"key_auths": [["PPY5M3sbj817awumetoGmyUrpACbdsKBemJNHbRr4dheLxdLjd1te", 1],
["PPY8Rg7jbF7FDPCrBjvXP9CUH2GBSWDJyh1P91PHszjsZqL73YBSy", 1]]
},
"active_authority": {
"key_auths": [["PPY5M3sbj817awumetoGmyUrpACbdsKBemJNHbRr4dheLxdLjd1te", 1],
["PPY8Rg7jbF7FDPCrBjvXP9CUH2GBSWDJyh1P91PHszjsZqL73YBSy", 1]]
}
},
{
"name": "bts-8",
"core_balance": 10000000,
"owner_authority": {
"key_auths": [["PPY8bFWUv8QWod9h5CoR78BYDPrWxpRnqbG9t9ncjwfaCigZfumHy", 1],
["PPY8Gzi7xENM4EohQDRvySSPawN1raGhg1j3t86MvL8W3QrN7jKFX", 1]]
},
"active_authority": {
"key_auths": [["PPY8bFWUv8QWod9h5CoR78BYDPrWxpRnqbG9t9ncjwfaCigZfumHy", 1],
["PPY8Gzi7xENM4EohQDRvySSPawN1raGhg1j3t86MvL8W3QrN7jKFX", 1]]
}
},
{
"name": "bts-9",
"core_balance": 10000000,
"owner_authority": {
"key_auths": [["PPY4xuGsVMzznyvWams8XvemFHdgg9iP7BxKzqftbeyxc4qMqv18u", 1],
["PPY7YZyxogivxKVcHe3UW8v4qeM5FryTsM3YmqJiXnML82Y7RigtY", 1]]
},
"active_authority": {
"key_auths": [["PPY4xuGsVMzznyvWams8XvemFHdgg9iP7BxKzqftbeyxc4qMqv18u", 1],
["PPY7YZyxogivxKVcHe3UW8v4qeM5FryTsM3YmqJiXnML82Y7RigtY", 1]]
}
},
{
"name": "bts-10",
"core_balance": 10000000,
"owner_authority": {
"key_auths": [["PPY7nLR7Y9KybkikF5VfvW2s2NwEh4M7DGG3tktbQGtYJNkEzTpcG", 1],
["PPY7eq1gy1oGW73AR5Y2HWz3GVuusPBTKcMVsoHEpwaihHoc6FC8x", 1]]
},
"active_authority": {
"key_auths": [["PPY7nLR7Y9KybkikF5VfvW2s2NwEh4M7DGG3tktbQGtYJNkEzTpcG", 1],
["PPY7eq1gy1oGW73AR5Y2HWz3GVuusPBTKcMVsoHEpwaihHoc6FC8x", 1]]
}
}
],
"initial_accounts": [{
"name": "init0",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true
},{
"name": "init1",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true
},{
"name": "init2",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true
},{
"name": "init3",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true
},{
"name": "init4",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true
},{
"name": "init5",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true
},{
"name": "init6",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true
},{
"name": "init7",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true
},{
"name": "init8",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true
},{
"name": "init9",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true
},{
"name": "init10",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true
},{
"name": "testnet1",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true
},
{
"name": "bal1",
"owner_key": "PPY6UYXNtsYN4rdSLu4hNgoVNer42h6QAiYTzo8irMQ5TcnSAM7nf",
"active_key": "PPY6UYXNtsYN4rdSLu4hNgoVNer42h6QAiYTzo8irMQ5TcnSAM7nf",
"is_lifetime_member": true
},
{
"name": "bal2",
"owner_key": "PPY7v8ujQ5Jr2wqVYwkV2HFN2j9uXYSuxPoruLwc1BDHMoNUFLuoy",
"active_key": "PPY7v8ujQ5Jr2wqVYwkV2HFN2j9uXYSuxPoruLwc1BDHMoNUFLuoy",
"is_lifetime_member": true
},
{
"name": "bal3",
"owner_key": "PPY7bHmq9MdL86c798ZX8rBv63Vj3UEyM7bhJebt2NW6X1CtpnvZ1",
"active_key": "PPY7bHmq9MdL86c798ZX8rBv63Vj3UEyM7bhJebt2NW6X1CtpnvZ1",
"is_lifetime_member": true
},
{
"name": "bal4",
"owner_key": "PPY5ECEkU8pVPYxEsauYdzsVjd5EHadGfhmgXWtWwFYB63TpmjZH9",
"active_key": "PPY5ECEkU8pVPYxEsauYdzsVjd5EHadGfhmgXWtWwFYB63TpmjZH9",
"is_lifetime_member": true
},
{
"name": "bal5",
"owner_key": "PPY8TMhq6b1rNVVMoowNzifXQctU48XtqoCENRGvCgXwRvvGjeaxx",
"active_key": "PPY8TMhq6b1rNVVMoowNzifXQctU48XtqoCENRGvCgXwRvvGjeaxx",
"is_lifetime_member": true
},
{
"name": "bal6",
"owner_key": "PPY8PoqAsCGMx56F2tjFgAKyy7Cx4nShnWaqvScytUFfeyK1Mbva7",
"active_key": "PPY8PoqAsCGMx56F2tjFgAKyy7Cx4nShnWaqvScytUFfeyK1Mbva7",
"is_lifetime_member": true
},
{
"name": "bal7",
"owner_key": "PPY6roVqWT5D1jNpEuWeBm5mRZAw7EoCgkXtT9unDqRSBiyUTaGk1",
"active_key": "PPY6roVqWT5D1jNpEuWeBm5mRZAw7EoCgkXtT9unDqRSBiyUTaGk1",
"is_lifetime_member": true
},
{
"name": "bal8",
"owner_key": "PPY6hkoqreUEr7JuUjZnKHiwTpruAnh3v4FTEA2stvnzgcS76qn8E",
"active_key": "PPY6hkoqreUEr7JuUjZnKHiwTpruAnh3v4FTEA2stvnzgcS76qn8E",
"is_lifetime_member": true
},
{
"name": "bal9",
"owner_key": "PPY5ogXvz1sdxV2gMgEs4Bnhb84dBML4Zto8yCGxLDqLnho1axjs8",
"active_key": "PPY5ogXvz1sdxV2gMgEs4Bnhb84dBML4Zto8yCGxLDqLnho1axjs8",
"is_lifetime_member": true
},
{
"name": "bal10",
"owner_key": "PPY6UvHq2Bdnk8imjnd7LYrbMZrXEoFDC5pjJ6wphifdqf6twNMb8",
"active_key": "PPY6UvHq2Bdnk8imjnd7LYrbMZrXEoFDC5pjJ6wphifdqf6twNMb8",
"is_lifetime_member": true
}
],
"initial_assets": [],
"initial_balances": [{
"owner": "PPYFAbAx7yuxt725qSZvfwWqkdCwp9ZnUama",
"asset_symbol": "PPY2T",
"amount": "100000000000"
},{
"owner": "PPYKdXdwpLonR1tzdLPC9KN75wikAD3vUwcd",
"asset_symbol": "PPY2T",
"amount": "10000000"
},{
"owner": "PPY3qHup5gAshs6SBeNvExcVZj5UT542y71q",
"asset_symbol": "PPY2T",
"amount": "10000000"
},{
"owner": "PPY97cZPDbQtVWeHHpohdd6vEWCuHkT699S8",
"asset_symbol": "PPY2T",
"amount": "10000000"
},{
"owner": "PPYEuVv6Au277VXHb9htmwAvJvXD8M6aAXKV",
"asset_symbol": "PPY2T",
"amount": "10000000"
},{
"owner": "PPYEQwfsiZRioNYKFhpxJhAB16uYguP5ykES",
"asset_symbol": "PPY2T",
"amount": "10000000"
},{
"owner": "PPYZA1GZca2TFrazRaAvgPp1W73bQFMmyzp",
"asset_symbol": "PPY2T",
"amount": "10000000"
},{
"owner": "PPYNvMhLLnVjiVCaFKmvMhx3hP54FaTBgXWM",
"asset_symbol": "PPY2T",
"amount": "10000000"
},{
"owner": "PPY2TVnFbsdYLxjSEg5kiAc7dqupL8huVJhP",
"asset_symbol": "PPY2T",
"amount": "10000000"
},{
"owner": "PPYPvAShbMSgVeW9PYxDQBBSQfGk1zRnUz3F",
"asset_symbol": "PPY2T",
"amount": "10000000"
},{
"owner": "PPY3HqXEv9hfqS2pZkYRb8nG6JqAmpj6W66M",
"asset_symbol": "PPY2T",
"amount": "10000000"
}
],
"initial_vesting_balances": [
{
"owner": "PPYKdXdwpLonR1tzdLPC9KN75wikAD3vUwcd",
"asset_symbol": "PPY2T",
"amount": "10000000",
"begin_timestamp": "2017-05-24T12:00:00",
"vesting_duration_seconds": "7200",
"begin_balance": "10000000"
},{
"owner": "PPY3qHup5gAshs6SBeNvExcVZj5UT542y71q",
"asset_symbol": "PPY2T",
"amount": "10000000",
"begin_timestamp": "2017-05-23T12:00:00",
"vesting_duration_seconds": "28800",
"begin_balance": "10000000"
},{
"owner": "PPY97cZPDbQtVWeHHpohdd6vEWCuHkT699S8",
"asset_symbol": "PPY2T",
"amount": "10000000",
"begin_timestamp": "2017-05-23T12:00:00",
"vesting_duration_seconds": "50400",
"begin_balance": "10000000"
},{
"owner": "PPYEuVv6Au277VXHb9htmwAvJvXD8M6aAXKV",
"asset_symbol": "PPY2T",
"amount": "10000000",
"begin_timestamp": "2017-05-23T12:00:00",
"vesting_duration_seconds": "72000",
"begin_balance": "10000000"
},{
"owner": "PPYQ1R7C1zJHkgTkBJ7VSdNUQTE4kYVAHVbJ",
"asset_symbol": "PPY2T",
"amount": "10000000",
"begin_timestamp": "2017-05-23T12:00:00",
"vesting_duration_seconds": "86400",
"begin_balance": "10000000"
}
],
"initial_active_witnesses": 11,
"initial_witness_candidates": [{
"owner_name": "init0",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
},{
"owner_name": "init1",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
},{
"owner_name": "init2",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
},{
"owner_name": "init3",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
},{
"owner_name": "init4",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
},{
"owner_name": "init5",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
},{
"owner_name": "init6",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
},{
"owner_name": "init7",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
},{
"owner_name": "init8",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
},{
"owner_name": "init9",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
},{
"owner_name": "init10",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
}
],
"initial_committee_candidates": [{
"owner_name": "init0"
},{
"owner_name": "init1"
},{
"owner_name": "init2"
},{
"owner_name": "init3"
},{
"owner_name": "init4"
},{
"owner_name": "init5"
},{
"owner_name": "init6"
},{
"owner_name": "init7"
},{
"owner_name": "init8"
},{
"owner_name": "init9"
}
],
"initial_worker_candidates": [],
"initial_chain_id": "aa34045518f1469a28fa4578240d5f039afa9959c0b95ce3b39674efa691fb21",
"immutable_parameters": {
"min_committee_member_count": 9,
"min_witness_count": 11,
"num_special_accounts": 0,
"num_special_assets": 0
}
}

8828
genesis/genesis.json
View file

File diff suppressed because it is too large Load diff

4
libraries/app/database_api.cpp
View file

@ -1803,7 +1803,7 @@ vector<tournament_object> database_api_impl::get_tournaments(tournament_id_type
{
vector<tournament_object> result;
const auto& tournament_idx = _db.get_index_type<tournament_index>().indices().get<by_id>();
for ( auto elem : boost::make_iterator_range(tournament_idx.rbegin(), tournament_idx.rend())) {
for (auto elem: tournament_idx) {
if( result.size() >= limit ) break;
if( ( (elem.get_id().instance.value <= start.instance.value) || start == tournament_id_type()) &&
( (elem.get_id().instance.value >= stop.instance.value) || stop == tournament_id_type()))
@ -1829,7 +1829,7 @@ vector<tournament_object> database_api_impl::get_tournaments_by_state(tournament
{
vector<tournament_object> result;
const auto& tournament_idx = _db.get_index_type<tournament_index>().indices().get<by_id>();
for ( auto elem : boost::make_iterator_range(tournament_idx.rbegin(), tournament_idx.rend())) {
for (auto elem: tournament_idx) {
if( result.size() >= limit ) break;
if( ( (elem.get_id().instance.value <= start.instance.value) || start == tournament_id_type()) &&
( (elem.get_id().instance.value >= stop.instance.value) || stop == tournament_id_type()) &&

37
libraries/chain/db_init.cpp
View file

@ -641,7 +641,7 @@ void database::init_genesis(const genesis_state_type& genesis_state)
}
// Create balances for all bts accounts
for( const auto& account : genesis_state.initial_bts_accounts )
for( const auto& account : genesis_state.initial_bts_accounts ) {
if (account.core_balance != share_type()) {
total_supplies[asset_id_type()] += account.core_balance;
@ -650,6 +650,36 @@ void database::init_genesis(const genesis_state_type& genesis_state)
b.balance = account.core_balance;
});
}
// create any vesting balances for this account
if (account.vesting_balances)
for (const auto& vesting_balance : *account.vesting_balances) {
create<vesting_balance_object>([&](vesting_balance_object& vbo) {
vbo.owner = get_account_id(account.name);
vbo.balance = asset(vesting_balance.amount, get_asset_id(vesting_balance.asset_symbol));
if (vesting_balance.policy_type == "linear") {
auto initial_linear_vesting_policy = vesting_balance.policy.as<genesis_state_type::initial_bts_account_type::initial_linear_vesting_policy>();
linear_vesting_policy new_vesting_policy;
new_vesting_policy.begin_timestamp = initial_linear_vesting_policy.begin_timestamp;
new_vesting_policy.vesting_cliff_seconds = initial_linear_vesting_policy.vesting_cliff_seconds;
new_vesting_policy.vesting_duration_seconds = initial_linear_vesting_policy.vesting_duration_seconds;
new_vesting_policy.begin_balance = initial_linear_vesting_policy.begin_balance;
vbo.policy = new_vesting_policy;
} else if (vesting_balance.policy_type == "cdd") {
auto initial_cdd_vesting_policy = vesting_balance.policy.as<genesis_state_type::initial_bts_account_type::initial_cdd_vesting_policy>();
cdd_vesting_policy new_vesting_policy;
new_vesting_policy.vesting_seconds = initial_cdd_vesting_policy.vesting_seconds;
new_vesting_policy.coin_seconds_earned = initial_cdd_vesting_policy.coin_seconds_earned;
new_vesting_policy.start_claim = initial_cdd_vesting_policy.start_claim;
new_vesting_policy.coin_seconds_earned_last_update = initial_cdd_vesting_policy.coin_seconds_earned_last_update;
vbo.policy = new_vesting_policy;
}
total_supplies[get_asset_id(vesting_balance.asset_symbol)] += vesting_balance.amount;
});
}
}
// Create initial balances
share_type total_allocation;
for( const auto& handout : genesis_state.initial_balances )
@ -673,7 +703,7 @@ void database::init_genesis(const genesis_state_type& genesis_state)
linear_vesting_policy policy;
policy.begin_timestamp = vest.begin_timestamp;
policy.vesting_cliff_seconds = 0;
policy.vesting_cliff_seconds = vest.vesting_cliff_seconds ? *vest.vesting_cliff_seconds : 0;
policy.vesting_duration_seconds = vest.vesting_duration_seconds;
policy.begin_balance = vest.begin_balance;
@ -724,7 +754,10 @@ void database::init_genesis(const genesis_state_type& genesis_state)
}
++it;
}
// @romek
#if 0
FC_ASSERT( !has_imbalanced_assets );
#endif
// Save tallied supplies
for( const auto& item : total_supplies )

6
libraries/chain/include/graphene/chain/config.hpp
View file

@ -23,8 +23,10 @@
*/
#pragma once
#define GRAPHENE_SYMBOL "PPY2T"
#define GRAPHENE_ADDRESS_PREFIX "PPY"
#define GRAPHENE_SYMBOL "TEST"
#define GRAPHENE_ADDRESS_PREFIX "TEST"
//#define GRAPHENE_SYMBOL "PPY"
//#define GRAPHENE_ADDRESS_PREFIX "PPY"
#define GRAPHENE_MIN_ACCOUNT_NAME_LENGTH 1
#define GRAPHENE_MAX_ACCOUNT_NAME_LENGTH 63

41
libraries/chain/include/graphene/chain/genesis_state.hpp
View file

@ -59,6 +59,24 @@ struct genesis_state_type {
flat_map<public_key_type, weight_type> key_auths;
flat_map<address, weight_type> address_auths;
};
struct initial_cdd_vesting_policy {
uint32_t vesting_seconds;
fc::uint128_t coin_seconds_earned;
fc::time_point_sec start_claim;
fc::time_point_sec coin_seconds_earned_last_update;
};
struct initial_linear_vesting_policy {
fc::time_point_sec begin_timestamp;
uint32_t vesting_cliff_seconds;
uint32_t vesting_duration_seconds;
share_type begin_balance;
};
struct initial_vesting_balance {
string asset_symbol;
share_type amount;
std::string policy_type; // either "linear" or "cdd"
fc::variant policy; // either an initial_cdd_vesting_policy or initial_linear_vesting_policy
};
initial_bts_account_type(const string& name = string(),
const initial_authority& owner_authority = initial_authority(),
const initial_authority& active_authority = initial_authority(),
@ -72,6 +90,7 @@ struct genesis_state_type {
initial_authority owner_authority;
initial_authority active_authority;
share_type core_balance;
fc::optional<std::vector<initial_vesting_balance> > vesting_balances;
};
struct initial_asset_type {
struct initial_collateral_position {
@ -102,6 +121,7 @@ struct genesis_state_type {
string asset_symbol;
share_type amount;
time_point_sec begin_timestamp;
fc::optional<uint32_t> vesting_cliff_seconds;
uint32_t vesting_duration_seconds = 0;
share_type begin_balance;
};
@ -161,7 +181,7 @@ FC_REFLECT(graphene::chain::genesis_state_type::initial_balance_type,
(owner)(asset_symbol)(amount))
FC_REFLECT(graphene::chain::genesis_state_type::initial_vesting_balance_type,
(owner)(asset_symbol)(amount)(begin_timestamp)(vesting_duration_seconds)(begin_balance))
(owner)(asset_symbol)(amount)(begin_timestamp)(vesting_cliff_seconds)(vesting_duration_seconds)(begin_balance))
FC_REFLECT(graphene::chain::genesis_state_type::initial_witness_type, (owner_name)(block_signing_key))
@ -174,12 +194,27 @@ FC_REFLECT(graphene::chain::genesis_state_type::initial_bts_account_type::initia
(account_auths)
(key_auths)
(address_auths))
FC_REFLECT(graphene::chain::genesis_state_type::initial_bts_account_type::initial_cdd_vesting_policy,
(vesting_seconds)
(coin_seconds_earned)
(start_claim)
(coin_seconds_earned_last_update))
FC_REFLECT(graphene::chain::genesis_state_type::initial_bts_account_type::initial_linear_vesting_policy,
(begin_timestamp)
(vesting_cliff_seconds)
(vesting_duration_seconds)
(begin_balance))
FC_REFLECT(graphene::chain::genesis_state_type::initial_bts_account_type::initial_vesting_balance,
(asset_symbol)
(amount)
(policy_type)
(policy))
FC_REFLECT(graphene::chain::genesis_state_type::initial_bts_account_type,
(name)
(owner_authority)
(active_authority)
(core_balance))
(core_balance)
(vesting_balances))
FC_REFLECT(graphene::chain::genesis_state_type,
(initial_timestamp)(max_core_supply)(initial_parameters)(initial_bts_accounts)(initial_accounts)(initial_assets)(initial_balances)

21
libraries/plugins/generate_genesis/generate_genesis.cpp
View file

@ -116,8 +116,8 @@ bool is_special_account(const graphene::chain::account_id_type& account_id)
return account_id.instance < 100;
}
bool is_scam(const std::string& account_name)
{
bool is_scam(const std::string& account_name)
{
static std::set<std::string> scam_accounts{
"polonie-wallet",
"polonie-xwallet",
@ -153,10 +153,10 @@ bool is_scam(const std::string& account_name)
"ripple.com"
};
return scam_accounts.find(account_name) != scam_accounts.end();
}
}
bool is_exchange(const std::string& account_name)
{
bool is_exchange(const std::string& account_name)
{
static std::set<std::string> exchange_accounts{
"poloniexcoldstorage",
"btc38-public-for-bts-cold",
@ -168,15 +168,15 @@ bool is_exchange(const std::string& account_name)
"btc38btsxwithdrawal"
};
return exchange_accounts.find(account_name) != exchange_accounts.end();
}
}
bool exclude_account_from_sharedrop(graphene::chain::database& d, const graphene::chain::account_id_type& account_id)
{
bool exclude_account_from_sharedrop(graphene::chain::database& d, const graphene::chain::account_id_type& account_id)
{
if (is_special_account(account_id))
return true;
const std::string& account_name = account_id(d).name;
return is_exchange(account_name) || is_scam(account_name);
}
}
@ -391,8 +391,9 @@ void generate_genesis_plugin::generate_snapshot()
}
fc::json::save_to_file(new_genesis_state, _genesis_filename);
ilog("New genesis state written to file ${filename}", ("filename", _genesis_filename));
} FC_LOG_AND_RETHROW() }
} FC_LOG_AND_RETHROW() }
void generate_genesis_plugin::plugin_shutdown()
{
}

26
libraries/plugins/generate_genesis/include/graphene/generate_genesis/generate_genesis_plugin.hpp
View file

@ -30,8 +30,8 @@
namespace graphene { namespace generate_genesis_plugin {
class generate_genesis_plugin : public graphene::app::plugin {
public:
class generate_genesis_plugin : public graphene::app::plugin {
public:
~generate_genesis_plugin() {
}
@ -46,7 +46,7 @@ namespace graphene { namespace generate_genesis_plugin {
virtual void plugin_startup() override;
virtual void plugin_shutdown() override;
private:
private:
void block_applied(const graphene::chain::signed_block& b);
void generate_snapshot();
@ -55,11 +55,11 @@ namespace graphene { namespace generate_genesis_plugin {
fc::optional<uint32_t> _block_to_snapshot;
std::string _genesis_filename;
std::string _csvlog_filename;
};
};
class my_account_balance_object
{
public:
class my_account_balance_object
{
public:
// constructor copying from base class
//my_account_balance_object(const graphene::chain::account_balance_object& abo) : graphene::chain::account_balance_object(abo) {}
graphene::chain::account_id_type account_id;
@ -70,11 +70,11 @@ namespace graphene { namespace generate_genesis_plugin {
graphene::chain::share_type vesting;
graphene::chain::share_type sharedrop;
graphene::chain::share_type get_effective_balance() const { return balance + orders + collateral + vesting; }
};
using namespace boost::multi_index;
struct by_account{};
struct by_effective_balance{};
typedef multi_index_container<my_account_balance_object,
};
using namespace boost::multi_index;
struct by_account{};
struct by_effective_balance{};
typedef multi_index_container<my_account_balance_object,
indexed_by<ordered_unique<tag<by_account>,
member<my_account_balance_object, graphene::chain::account_id_type, &my_account_balance_object::account_id> >,
ordered_non_unique<tag<by_effective_balance>,
@ -82,4 +82,4 @@ namespace graphene { namespace generate_genesis_plugin {
std::greater<graphene::chain::share_type> > > > my_account_balance_object_index_type;
} } //graphene::generate_genesis_plugin
} } //graphene::generate_genesis_plugin

2
libraries/plugins/generate_uia_sharedrop_genesis/CMakeLists.txt
View file

@ -14,4 +14,4 @@ install( TARGETS
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
)

1
libraries/plugins/generate_uia_sharedrop_genesis/generate_uia_sharedrop_genesis.cpp
View file

@ -359,3 +359,4 @@ void generate_uia_sharedrop_genesis_plugin::generate_snapshot()
void generate_uia_sharedrop_genesis_plugin::plugin_shutdown()
{
}

24
libraries/plugins/generate_uia_sharedrop_genesis/include/graphene/generate_uia_sharedrop_genesis/generate_uia_sharedrop_genesis.hpp
View file

@ -30,8 +30,8 @@
namespace graphene { namespace generate_uia_sharedrop_genesis {
class generate_uia_sharedrop_genesis_plugin : public graphene::app::plugin {
public:
class generate_uia_sharedrop_genesis_plugin : public graphene::app::plugin {
public:
~generate_uia_sharedrop_genesis_plugin() {
}
@ -46,7 +46,7 @@ namespace graphene { namespace generate_uia_sharedrop_genesis {
virtual void plugin_startup() override;
virtual void plugin_shutdown() override;
private:
private:
void block_applied(const graphene::chain::signed_block& b);
void generate_snapshot();
@ -56,11 +56,11 @@ namespace graphene { namespace generate_uia_sharedrop_genesis {
std::string _input_genesis_filename;
std::string _output_genesis_filename;
std::string _csvlog_filename;
};
};
class uia_sharedrop_balance_object
{
public:
class uia_sharedrop_balance_object
{
public:
graphene::chain::account_id_type account_id;
graphene::chain::share_type genesis;
@ -68,12 +68,12 @@ namespace graphene { namespace generate_uia_sharedrop_genesis {
graphene::chain::share_type orders;
graphene::chain::share_type sharedrop;
};
};
using namespace boost::multi_index;
struct by_account{};
typedef multi_index_container<uia_sharedrop_balance_object,
using namespace boost::multi_index;
struct by_account{};
typedef multi_index_container<uia_sharedrop_balance_object,
indexed_by<ordered_unique<tag<by_account>,
member<uia_sharedrop_balance_object, graphene::chain::account_id_type, &uia_sharedrop_balance_object::account_id> > > > uia_sharedrop_balance_object_index_type;
} } //graphene::generate_uia_sharedrop_genesis_plugin
} } //graphene::generate_uia_sharedrop_genesis_plugin

3
libraries/wallet/include/graphene/wallet/wallet.hpp
View file

@ -583,7 +583,7 @@ class wallet_api
/**
* @param role - active | owner | memo
*/
pair<public_key_type,string> get_private_key_from_password( string password, string account, string role )const;
pair<public_key_type,string> get_private_key_from_password( string account, string role, string password )const;
/** Converts a signed_transaction in JSON form to its binary representation.
*
@ -1348,6 +1348,7 @@ class wallet_api
string witness,
bool approve,
bool broadcast = false);
/** Change your witness votes.
*
* An account can publish a list of all witnesses they approve of.

962
libraries/wallet/wallet.cpp
View file

File diff suppressed because it is too large Load diff

84
programs/genesis_util/genesis_update.cpp
View file

@ -70,6 +70,8 @@ int main( int argc, char** argv )
("dev-account-count", bpo::value<uint32_t>()->default_value(0), "Prefix for dev accounts")
("dev-balance-count", bpo::value<uint32_t>()->default_value(0), "Prefix for dev balances")
("dev-balance-amount", bpo::value<uint64_t>()->default_value(uint64_t(1000)*uint64_t(1000)*uint64_t(100000)), "Amount in each dev balance")
("nop", "just write the genesis file out after reading it in, do not alter any keys or add accounts or balances. used to pretty-print a genesis file")
("replace-all-keys", bpo::value<boost::filesystem::path>(), "Replace all keys/addresses in the genesis files with dev keys based on dev-key-prefix and dump the new keys to this filename.")
;
bpo::variables_map options;
@ -116,13 +118,91 @@ int main( int argc, char** argv )
genesis = graphene::app::detail::create_example_genesis();
}
if (!options.count("nop"))
{
std::string dev_key_prefix = options["dev-key-prefix"].as<std::string>();
auto get_dev_key = [&]( std::string prefix, uint32_t i ) -> public_key_type
{
return fc::ecc::private_key::regenerate( fc::sha256::hash( dev_key_prefix + prefix + std::to_string(i) ) ).get_public_key();
};
if (options.count("replace-all-keys"))
{
unsigned dev_keys_used = 0;
std::map<std::string, fc::ecc::private_key> replacement_keys;
auto get_replacement_key = [&](const std::string& original_key) -> fc::ecc::private_key {
auto iter = replacement_keys.find(original_key);
if (iter != replacement_keys.end())
return iter->second;
fc::ecc::private_key new_private_key = fc::ecc::private_key::regenerate(fc::sha256::hash(dev_key_prefix + std::to_string(dev_keys_used++)));
replacement_keys[original_key] = new_private_key;
return new_private_key;
};
for (genesis_state_type::initial_balance_type& initial_balance : genesis.initial_balances)
{
std::string address_string = (std::string)initial_balance.owner;
initial_balance.owner = address(get_replacement_key(address_string).get_public_key());
}
for (genesis_state_type::initial_vesting_balance_type& initial_balance : genesis.initial_vesting_balances)
{
std::string address_string = (std::string)initial_balance.owner;
initial_balance.owner = address(get_replacement_key(address_string).get_public_key());
}
for (genesis_state_type::initial_witness_type& initial_witness : genesis.initial_witness_candidates)
{
std::string public_key_string = (std::string)initial_witness.block_signing_key;
initial_witness.block_signing_key = get_replacement_key(public_key_string).get_public_key();
}
for (genesis_state_type::initial_account_type& initial_account : genesis.initial_accounts)
{
std::string public_key_string = (std::string)initial_account.owner_key;
initial_account.owner_key = get_replacement_key(public_key_string).get_public_key();
public_key_string = (std::string)initial_account.active_key;
initial_account.active_key = get_replacement_key(public_key_string).get_public_key();
}
for (genesis_state_type::initial_bts_account_type& initial_account : genesis.initial_bts_accounts)
{
for (auto iter = initial_account.owner_authority.key_auths.begin();
iter != initial_account.owner_authority.key_auths.end(); ++iter)
{
std::string public_key_string = (std::string)iter->first;
iter->first = get_replacement_key(public_key_string).get_public_key();
}
for (auto iter = initial_account.active_authority.key_auths.begin();
iter != initial_account.active_authority.key_auths.end(); ++iter)
{
std::string public_key_string = (std::string)iter->first;
iter->first = get_replacement_key(public_key_string).get_public_key();
}
for (auto iter = initial_account.owner_authority.address_auths.begin();
iter != initial_account.owner_authority.address_auths.end(); ++iter)
{
std::string address_string = (std::string)iter->first;
iter->first = address(get_replacement_key(address_string).get_public_key());
}
for (auto iter = initial_account.active_authority.address_auths.begin();
iter != initial_account.active_authority.address_auths.end(); ++iter)
{
std::string address_string = (std::string)iter->first;
iter->first = address(get_replacement_key(address_string).get_public_key());
}
}
fc::path keys_csv_path = options["replace-all-keys"].as<boost::filesystem::path>();
std::ofstream keys_csv(keys_csv_path.string());
keys_csv << "wif_private_key,public_key,address\n";
for (const auto& value : replacement_keys)
keys_csv << graphene::utilities::key_to_wif(value.second) << "," << std::string(public_key_type(value.second.get_public_key()))
<< "," << std::string(address(value.second.get_public_key())) << "\n";
}
else
{
uint32_t dev_account_count = options["dev-account-count"].as<uint32_t>();
std::string dev_account_prefix = options["dev-account-prefix"].as<std::string>();
for(uint32_t i=0;i<dev_account_count;i++)
@ -165,6 +245,8 @@ int main( int argc, char** argv )
wit_acct.owner_key = get_dev_key( "wit-owner-", i );
wit_acct.active_key = get_dev_key( "wit-active-", i );
}
}
}
fc::path output_filename = options["out"].as<boost::filesystem::path>();
fc::json::save_to_file( genesis, output_filename );