Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge

This commit is contained in:
Roman Olearski 2017-07-19 10:31:27 +02:00
commit a70c3799e5

View file

@ -1,322 +1,254 @@
{ {
"initial_timestamp": "2017-05-20T14:00:00", "initial_timestamp": "2017-07-18T18:33:30",
"max_core_supply": "1446053259451", "max_core_supply": "1000000000000000",
"initial_parameters": { "initial_parameters": {
"current_fees": { "current_fees": {
"parameters": [ "parameters": [[
[ 0,{
0, "fee": 2000000,
{ "price_per_kbyte": 1000000
"fee": 200,
"price_per_kbyte": 1000
} }
], ],[
[ 1,{
1, "fee": 500000
{
"fee": 50
} }
], ],[
[ 2,{
2,
{
"fee": 0 "fee": 0
} }
], ],[
[ 3,{
3, "fee": 2000000
{
"fee": 200
} }
], ],[
[ 4,{}
4, ],[
{} 5,{
], "basic_fee": 500000,
[ "premium_fee": 200000000,
5, "price_per_kbyte": 100000
{
"basic_fee": 500,
"premium_fee": 2000,
"price_per_kbyte": 100
} }
], ],[
[ 6,{
6, "fee": 2000000,
{ "price_per_kbyte": 100000
"fee": 200,
"price_per_kbyte": 100
} }
], ],[
[ 7,{
7, "fee": 300000
{
"fee": 300
} }
], ],[
[ 8,{
8, "membership_annual_fee": 200000000,
{ "membership_lifetime_fee": 1000000000
"membership_annual_fee": 20000,
"membership_lifetime_fee": 10000
} }
], ],[
[ 9,{
9, "fee": 50000000
{
"fee": 5000
} }
], ],[
[ 10,{
10, "symbol3": "50000000000",
{ "symbol4": "30000000000",
"symbol3": "5000000", "long_symbol": 500000000,
"symbol4": "3000000",
"long_symbol": 5000,
"price_per_kbyte": 10 "price_per_kbyte": 10
} }
], ],[
[ 11,{
11, "fee": 50000000,
{
"fee": 5000,
"price_per_kbyte": 10 "price_per_kbyte": 10
} }
], ],[
[ 12,{
12, "fee": 50000000
{
"fee": 5000
} }
], ],[
[ 13,{
13, "fee": 50000000
{
"fee": 5000
} }
], ],[
[ 14,{
14, "fee": 2000000,
{ "price_per_kbyte": 100000
"fee": 200,
"price_per_kbyte": 100
} }
], ],[
[ 15,{
15, "fee": 2000000
{
"fee": 200
} }
], ],[
[ 16,{
16, "fee": 100000
{
"fee": 100
} }
], ],[
[ 17,{
17, "fee": 10000000
{
"fee": 100
} }
], ],[
[ 18,{
18, "fee": 50000000
{
"fee": 5000
} }
], ],[
[ 19,{
19, "fee": 100000
{
"fee": 100
} }
], ],[
[ 20,{
20, "fee": 500000000
{
"fee": 5000
} }
], ],[
[ 21,{
21, "fee": 2000000
{
"fee": 200
} }
], ],[
[ 22,{
22, "fee": 2000000,
{
"fee": 200,
"price_per_kbyte": 10 "price_per_kbyte": 10
} }
], ],[
[ 23,{
23, "fee": 2000000,
{
"fee": 200,
"price_per_kbyte": 10 "price_per_kbyte": 10
} }
], ],[
[ 24,{
24, "fee": 100000
{
"fee": 100
} }
], ],[
[ 25,{
25, "fee": 100000
{
"fee": 100
} }
], ],[
[ 26,{
26, "fee": 100000
{
"fee": 100
} }
], ],[
[ 27,{
27, "fee": 2000000,
{
"fee": 200,
"price_per_kbyte": 10 "price_per_kbyte": 10
} }
], ],[
[ 28,{
28,
{
"fee": 0 "fee": 0
} }
], ],[
[ 29,{
29, "fee": 500000000
{
"fee": 5000
} }
], ],[
[ 30,{
30, "fee": 2000000
{
"fee": 200
} }
], ],[
[ 31,{
31, "fee": 100000
{
"fee": 100
} }
], ],[
[ 32,{
32, "fee": 100000
{
"fee": 100
} }
], ],[
[ 33,{
33, "fee": 2000000
{
"fee": 200
} }
], ],[
[ 34,{
34, "fee": 500000000
{
"fee": 5000
} }
], ],[
[ 35,{
35, "fee": 100000,
{
"fee": 100,
"price_per_kbyte": 10 "price_per_kbyte": 10
} }
], ],[
[ 36,{
36, "fee": 100000
{
"fee": 100
} }
], ],[
[ 37,{}
37, ],[
{} 38,{
], "fee": 2000000,
[
38,
{
"fee": 200,
"price_per_kbyte": 10 "price_per_kbyte": 10
} }
], ],[
[ 39,{
39, "fee": 500000,
{ "price_per_output": 500000
"fee": 500,
"price_per_output": 500
} }
], ],[
[ 40,{
40, "fee": 500000,
{ "price_per_output": 500000
"fee": 500,
"price_per_output": 500
} }
], ],[
[ 41,{
41, "fee": 500000
{
"fee": 500
} }
], ],[
[ 42,{}
42, ],[
{} 43,{
], "fee": 2000000
[
43,
{
"fee": 200
} }
], ],[
[ 44,{}
44, ],[
{} 45,{
], "fee": 50000000
[
45,
{
"fee": 100
} }
], ],[
[ 46,{
46,
{
"fee": 100
}
],
[
47,
{
"fee": 100
}
],
[
48,
{
"fee": 500
}
],
[
49,
{
"distribution_base_fee": 0, "distribution_base_fee": 0,
"distribution_fee_per_holder": 0 "distribution_fee_per_holder": 0
} }
], ],[
[ 47,{
50, "fee": 100000
{} }
],[
48,{
"fee": 100000
}
],[
49,{
"fee": 100000
}
],[
50,{
"fee": 100000
}
],[
51,{
"fee": 100000
}
],[
52,{
"fee": 100000
}
],[
53,{
"fee": 100000
}
],[
54,{
"fee": 100000
}
],[
55,{}
],[
56,{
"fee": 100000
}
],[
57,{
"fee": 100000
}
],[
58,{}
],[
59,{
"fee": 100000
}
] ]
], ],
"scale": 10000 "scale": 10000
@ -348,6 +280,42 @@
"accounts_per_fee_scale": 1000, "accounts_per_fee_scale": 1000,
"account_fee_scale_bitshifts": 4, "account_fee_scale_bitshifts": 4,
"max_authority_depth": 2, "max_authority_depth": 2,
"min_bet_multiplier": 10100,
"max_bet_multiplier": 10000000,
"betting_rake_fee_percentage": 300,
"permitted_betting_odds_increments": [[
20000,
100
],[
30000,
200
],[
40000,
500
],[
60000,
1000
],[
100000,
2000
],[
200000,
5000
],[
300000,
10000
],[
500000,
20000
],[
1000000,
50000
],[
10000000,
100000
]
],
"witness_schedule_algorithm": 1,
"min_round_delay": 0, "min_round_delay": 0,
"max_round_delay": 600, "max_round_delay": 600,
"min_time_per_commit_move": 0, "min_time_per_commit_move": 0,
@ -356,215 +324,160 @@
"max_time_per_reveal_move": 600, "max_time_per_reveal_move": 600,
"rake_fee_percentage": 300, "rake_fee_percentage": 300,
"maximum_registration_deadline": 2592000, "maximum_registration_deadline": 2592000,
"maximum_players_in_tournament": 256,
"maximum_tournament_whitelist_length": 1000,
"maximum_tournament_start_time_in_future": 2419200,
"maximum_tournament_start_delay": 604800,
"maximum_tournament_number_of_wins": 100,
"extensions": [] "extensions": []
}, },
"initial_bts_accounts": [], "initial_bts_accounts": [],
"initial_accounts": [ "initial_accounts": [{
{
"name": "init0", "name": "init0",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true "is_lifetime_member": true
}, },{
{
"name": "init1", "name": "init1",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true "is_lifetime_member": true
}, },{
{
"name": "init2", "name": "init2",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true "is_lifetime_member": true
}, },{
{
"name": "init3", "name": "init3",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true "is_lifetime_member": true
}, },{
{
"name": "init4", "name": "init4",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true "is_lifetime_member": true
}, },{
{
"name": "init5", "name": "init5",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true "is_lifetime_member": true
}, },{
{
"name": "init6", "name": "init6",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true "is_lifetime_member": true
}, },{
{
"name": "init7", "name": "init7",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true "is_lifetime_member": true
}, },{
{
"name": "init8", "name": "init8",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true "is_lifetime_member": true
}, },{
{
"name": "init9", "name": "init9",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true "is_lifetime_member": true
}, },{
{
"name": "init10", "name": "init10",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true "is_lifetime_member": true
}, },{
{
"name": "nathan", "name": "nathan",
"owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "owner_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "active_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
"is_lifetime_member": true "is_lifetime_member": false
},
{
"name": "pixel-gateway",
"owner_key": "PPY8dkWexMv9Z7fwoCdfKZfqpBUFB77D1PzfPBU2hHwMpN9B5t6wZ",
"active_key": "PPY8dkWexMv9Z7fwoCdfKZfqpBUFB77D1PzfPBU2hHwMpN9B5t6wZ",
"is_lifetime_member": true
}
],
"initial_assets": [
{
"accumulated_fees": 0,
"collateral_records": [
{
"collateral": -1,
"debt": 1000000000000000,
"owner": "PPY6eTLvHVD1Qg5rUoEnKgTvpXaW2p7xHyce"
} }
], ],
"initial_assets": [{
"symbol": "PIXEL.BITCOIN",
"issuer_name": "committee-account",
"description": "1 bitcoin", "description": "1 bitcoin",
"is_bitasset": true,
"issuer_name": "pixel-gateway",
"max_supply": "10000000000000000",
"precision": 3, "precision": 3,
"symbol": "PIXEL.BITCOIN" "max_supply": "10000000000000000",
},
{
"accumulated_fees": 0, "accumulated_fees": 0,
"collateral_records": [
{
"collateral": -1,
"debt": 1000000000000000,
"owner": "PPY6eTLvHVD1Qg5rUoEnKgTvpXaW2p7xHyce"
}
],
"description": "1 steem",
"is_bitasset": true, "is_bitasset": true,
"issuer_name": "pixel-gateway", "collateral_records": []
"max_supply": "10000000000000000", },{
"symbol": "PIXEL.STEEM",
"issuer_name": "committee-account",
"description": "1 steem",
"precision": 3, "precision": 3,
"symbol": "PIXEL.STEEM" "max_supply": "10000000000000000",
"accumulated_fees": 0,
"is_bitasset": true,
"collateral_records": []
} }
], ],
"initial_balances": [ "initial_balances": [{
{
"owner": "PPYFAbAx7yuxt725qSZvfwWqkdCwp9ZnUama", "owner": "PPYFAbAx7yuxt725qSZvfwWqkdCwp9ZnUama",
"asset_symbol": "PPY", "asset_symbol": "PPY",
"amount": "10000000000000" "amount": "1000000000000000"
},{
"owner": "PPY51B1EWJZQsJhZQnbiF1j2adGPrDufNXbw",
"xowner": "1CgspkHAGoziG3rPTUxgq7f3TcT69GjVpV",
"asset_symbol": "PPY",
"amount": "12345"
} }
], ],
"initial_vesting_balances": [], "initial_vesting_balances": [],
"initial_active_witnesses": 11, "initial_active_witnesses": 11,
"initial_witness_candidates": [ "initial_witness_candidates": [{
{
"owner_name": "init0", "owner_name": "init0",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" "block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
}, },{
{
"owner_name": "init1", "owner_name": "init1",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" "block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
}, },{
{
"owner_name": "init2", "owner_name": "init2",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" "block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
}, },{
{
"owner_name": "init3", "owner_name": "init3",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" "block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
}, },{
{
"owner_name": "init4", "owner_name": "init4",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" "block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
}, },{
{
"owner_name": "init5", "owner_name": "init5",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" "block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
}, },{
{
"owner_name": "init6", "owner_name": "init6",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" "block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
}, },{
{
"owner_name": "init7", "owner_name": "init7",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" "block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
}, },{
{
"owner_name": "init8", "owner_name": "init8",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" "block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
}, },{
{
"owner_name": "init9", "owner_name": "init9",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" "block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
}, },{
{
"owner_name": "init10", "owner_name": "init10",
"block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" "block_signing_key": "PPY6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
} }
], ],
"initial_committee_candidates": [ "initial_committee_candidates": [{
{
"owner_name": "init0" "owner_name": "init0"
}, },{
{
"owner_name": "init1" "owner_name": "init1"
}, },{
{
"owner_name": "init2" "owner_name": "init2"
}, },{
{
"owner_name": "init3" "owner_name": "init3"
}, },{
{
"owner_name": "init4" "owner_name": "init4"
}, },{
{
"owner_name": "init5" "owner_name": "init5"
}, },{
{
"owner_name": "init6" "owner_name": "init6"
}, },{
{
"owner_name": "init7" "owner_name": "init7"
}, },{
{
"owner_name": "init8" "owner_name": "init8"
}, },{
{
"owner_name": "init9" "owner_name": "init9"
}, },{
{
"owner_name": "init10" "owner_name": "init10"
} }
], ],