grassrootseconomics
/
openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update Callisto block reward code to support HF1 (#9811) 

* Add Callisto Mainnet support

* Remove merge failure

* EIP-649 removed

* Remove eip649Reward

* Modify difficultyBombDelays

* Callisto reward smart contract

* Remove ethash params

* Fix merge

* Update bootnodes

* Update block reward to support HF1
This commit is contained in:
Yohan Graterol 2018-11-06 01:07:59 -05:00 committed by Wei Tang
parent 59daf95859
commit c4469514db
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ethcore/res/ethereum/callisto.json
View File

@ -9,7 +9,7 @@
"durationLimit": "0x0d",
"blockReward": "0x16c4abbebea0100000",
"homesteadTransition": 0,
"blockRewardContractCode": "0x6080604052600436106100405763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663f91c28988114610045575b600080fd5b34801561005157600080fd5b50610071602460048035828101929082013591813591820191013561010a565b604051808060200180602001838103835285818151815260200191508051906020019060200280838360005b838110156100b557818101518382015260200161009d565b50505050905001838103825284818151815260200191508051906020019060200280838360005b838110156100f45781810151838201526020016100dc565b5050505090500194505050505060405180910390f35b606080808060008080803373fffffffffffffffffffffffffffffffffffffffe1461013457600080fd5b8a891461014057600080fd5b604080516003808252608082019092529060208201606080388339505060408051600380825260808201909252929850905060208201606080388339019050509450733c06f218ce6dd8e2c535a8925a2edf81674984d98660018151811015156101a657fe5b73ffffffffffffffffffffffffffffffffffffffff9092166020928302909101909101528451680340aad21b3b70000090869060019081106101e457fe5b6020908102909101015285517374682fc32007af0b6118f259cbe7bccc21641600908790600290811061021357fe5b73ffffffffffffffffffffffffffffffffffffffff909216602092830290910190910152845168068155a43676e00000908690600290811061025157fe5b60209081029091010152600093505b8a8410156103ce5789898581811061027457fe5b9050602002013561ffff1661ffff16600014156103235767b6255df5f50080006000198c01026816c4abbebea01000000192508b8b858181106102b357fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff168660008151811015156102df57fe5b73ffffffffffffffffffffffffffffffffffffffff909216602092830290910190910152845183908690600090811061031457fe5b602090810290910101526103c3565b60648a8a8681811061033157fe5b9050602002013561ffff1661ffff161015156103c35760648a8a8681811061035557fe5b9050602002013561ffff1603915060038260080361ffff166816c4abbebea0100000029060020a900490506103b4868d8d87818110151561039257fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff166103e0565b95506103c085826104b7565b94505b600190930192610260565b50939a92995091975050505050505050565b60608060008451600101604051908082528060200260200182016040528015610413578160200160208202803883390190505b509150600090505b845181101561047657848181518110151561043257fe5b90602001906020020151828281518110151561044a57fe5b73ffffffffffffffffffffffffffffffffffffffff90921660209283029091019091015260010161041b565b8382600184510381518110151561048957fe5b73ffffffffffffffffffffffffffffffffffffffff9290921660209283029190910190910152509392505050565b606080600084516001016040519080825280602002602001820160405280156104ea578160200160208202803883390190505b509150600090505b845181101561053357848181518110151561050957fe5b90602001906020020151828281518110151561052157fe5b602090810290910101526001016104f2565b8382600184510381518110151561054657fe5b60209081029190910101525093925050505600a165627a7a7230582056d78ee4f7397a0950a3692a9e267500e619b5d3eb5937b9142689bc9ee137f10029",
"blockRewardContractCode": "0x6080604052600436106100405763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663f91c28988114610045575b600080fd5b34801561005157600080fd5b50610071602460048035828101929082013591813591820191013561010a565b604051808060200180602001838103835285818151815260200191508051906020019060200280838360005b838110156100b557818101518382015260200161009d565b50505050905001838103825284818151815260200191508051906020019060200280838360005b838110156100f45781810151838201526020016100dc565b5050505090500194505050505060405180910390f35b606080808060008080803373fffffffffffffffffffffffffffffffffffffffe1461013457600080fd5b8a891461014057600080fd5b60408051600380825260808201909252906020820160608038833950506040805160038082526080820190925292985090506020820160608038833901905050945061018a6103cd565b86600181518110151561019957fe5b73ffffffffffffffffffffffffffffffffffffffff9092166020928302909101909101526101c561040e565b8560018151811015156101d457fe5b6020908102909101015285517374682fc32007af0b6118f259cbe7bccc21641600908790600290811061020357fe5b73ffffffffffffffffffffffffffffffffffffffff90921660209283029091019091015261022f610438565b85600281518110151561023e57fe5b60209081029091010152600093505b8a8410156103bb5789898581811061026157fe5b9050602002013561ffff1661ffff16600014156103105767b6255df5f50080006000198c01026816c4abbebea01000000192508b8b858181106102a057fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff168660008151811015156102cc57fe5b73ffffffffffffffffffffffffffffffffffffffff909216602092830290910190910152845183908690600090811061030157fe5b602090810290910101526103b0565b60648a8a8681811061031e57fe5b9050602002013561ffff1661ffff161015156103b05760648a8a8681811061034257fe5b9050602002013561ffff1603915060038260080361ffff166816c4abbebea0100000029060020a900490506103a1868d8d87818110151561037f57fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff16610462565b95506103ad8582610539565b94505b60019093019261024d565b50939a92995091975050505050505050565b600062155cc043106103f4575073d813419749b3c2cdc94a2f9cfcf154113264a9d661040b565b50733c06f218ce6dd8e2c535a8925a2edf81674984d95b90565b600062155cc0431061042a575068068155a43676e0000061040b565b50680340aad21b3b70000090565b600062155cc043106104545750680340aad21b3b70000061040b565b5068068155a43676e0000090565b60608060008451600101604051908082528060200260200182016040528015610495578160200160208202803883390190505b509150600090505b84518110156104f85784818151811015156104b457fe5b9060200190602002015182828151811015156104cc57fe5b73ffffffffffffffffffffffffffffffffffffffff90921660209283029091019091015260010161049d565b8382600184510381518110151561050b57fe5b73ffffffffffffffffffffffffffffffffffffffff9290921660209283029190910190910152509392505050565b6060806000845160010160405190808252806020026020018201604052801561056c578160200160208202803883390190505b509150600090505b84518110156105b557848181518110151561058b57fe5b9060200190602002015182828151811015156105a357fe5b60209081029091010152600101610574565b838260018451038151811015156105c857fe5b60209081029190910101525093925050505600a165627a7a72305820688daf5d035cad147f6386ed782d90bb84846c46a2a9165c38b86c25c73b929a0029",
"eip100bTransition": 20,
"difficultyBombDelays": {
"20": 3000000
@ -58,11 +58,14 @@
"enode://9e2d9dc2639e02893aa17c80e6ba8e8803fd3166083b622a841fc852161112720281514436f7605c89041d5efa1738215185c4c4024ff812b0f500c403cc0ab1@206.189.47.198:30303",
"enode://149ba679e8851c3e0d030e0dc0336984b97c83ef649e68ec113dcf266449364cc1ec8ee27950f71b00c2182ef504894fa7bff19f6741978ced67e9e4b6536d2a@206.189.45.31:30303",
"enode://eeb3b1680f651b291a19454345721b5196a2a689dcd280e5f66dc3207636366d4b25e84d205303c2f8aa0a38467dad9e6f2536e195a4760df56aeac428ebea0b@199.247.18.157:30303",
"enode://eeb3b1680f651b291a19454345721b5196a2a689dcd280e5f66dc3207636366d4b25e84d205303c2f8aa0a38467dad9e6f2536e195a4760df56aeac428ebea0b@199.247.18.157:30303",
"enode://c21418c02f5ba480d64fbdf3dd7e1a276cbea441f9d55b8bb1c653fa3a05cc07e32a332f63df53f51d275dadc9b50925375a699dd39bdad991594326d6b8afab@199.247.3.3:30303",
"enode://40aa8ff2c3d98ffc12004cb6a3636e7c9b79400153667163cfc24123f2ee3ee693ac45775183f5f6a7e315a4884899ac32ef0616e26cdd23a7b00f80d07cdeae@45.32.126.82:30303",
"enode://3beb80913887d985a857076621baca66ea27b62ff159c5a41243d02a8614f537003c03ba1fe082b63a47e7f6f7ba1caf6bb14343560dbff6ba1e456e99e6119d@144.202.73.111:30303",
"enode://b79a50393b16b76a6c94d7ddae80c44464c9e5ecc59fc2b7e83d0c248190de781e7e2aebeab8d466b3869677e6388e6fac8bd36f3925cbeebbe4cf0372a7eac1@207.148.31.238:30303"
"enode://b79a50393b16b76a6c94d7ddae80c44464c9e5ecc59fc2b7e83d0c248190de781e7e2aebeab8d466b3869677e6388e6fac8bd36f3925cbeebbe4cf0372a7eac1@207.148.31.238:30303",
"enode://dcc091d6da928681e76993cffa047e434b0c0b1388c33330499cd006547de6641f8e5b885c2be12dee07f79d8bd86612cd1b16b4ab2536cbcdfceb278bf403f7@165.227.5.237:30303",
"enode://019faf0a35f3bcf6ac47c54d9d73917378f82acc6ae7197e0cdc037325e934cf12c7587bcbf0358abb2ab5b139780c97ed7d15ec2bd7784a5570e2cc58479bed@104.156.230.179:30303",
"enode://cd85a09fddddfed9ad6858ba1cffb7b6688e4197b85b722f79ccd8b97a7ee8d6d6ef173af91618c24032b5dbaff3265b63bb85dc768d58d830e9aa654cc51838@46.101.190.119:30303",
"enode://d34e34dc0d57694a71611d9bb3df73c928ef77feb05f1e6e3a6243d26b75034c09a6eab37872f7ce830890d87ca180a8d359fa0a649c2d12a05c853c52bae264@159.65.237.29:30303"
],
"accounts": {
"0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },