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.

Sign up for GitHub

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

Jump to bottom

chore: simplify genesis.json #368

Closed
wants to merge 13 commits into from
Closed

chore: simplify genesis.json #368

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3d37361
chore: spork activation command changes
Oct 13, 2022
87e6499
Merge remote-tracking branch 'origin/spork-update' into simplify-genesis
strophy Oct 17, 2022
4db9424
chore: remove unnecessary stubs from genesis.json
strophy Oct 17, 2022
00b9e1a
chore: restore some deleted fields
strophy Oct 20, 2022
f4145d4
fix: faucet shows connection error on payout (#402)
strophy Nov 23, 2022
eb57e6c
fix: collaterals being spent when creating protx (#400)
strophy Nov 24, 2022
f3182c5
chore: bump version to 0.23.0-dev.4 (#403)
strophy Nov 25, 2022
aa5dff5
Merge branch 'v0.23-dev' into v0.24-dev
strophy Nov 30, 2022
481c9d9
Merge branch 'v0.24-dev' into simplify-genesis
strophy Nov 30, 2022
092dd3f
chore: genesis.json should only include chain_id
strophy Nov 30, 2022
5476b13
chore: set create-proof-block-range = 1
strophy Dec 6, 2022
ac472d4
chore: update field names and init values
strophy Dec 6, 2022
59be8d6
chore: add back consensus_params
strophy Dec 9, 2022
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
2 changes: 1 addition & 1 deletion ansible/roles/activate-dashd-sporks/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
register: active_sporks

- name: activate non active sporks
shell: dash-cli spork {{item}} 0
shell: dash-cli sporkupdate {{item}} 0
with_items:
- SPORK_2_INSTANTSEND_ENABLED
- SPORK_3_INSTANTSEND_BLOCK_FILTERING
Expand Down
42 changes: 1 addition & 41 deletions ansible/roles/mn-evo-services/templates/tendermint/genesis.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,3 @@
{
"genesis_time": "{{ genesis_time }}",
"chain_id": "dash-{{ ( 'devnet-' + dash_devnet_name if dash_network == 'devnet' else dash_network ) if tenderdash_chain_id is not defined else tenderdash_chain_id }}",
"initial_height": "0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would keep genesis_time, initial_height, initial_core_chain_locked_height, consensus_params, and quorum_type to make it more verbose and reduce future confusions.

@lklimek shall we rename:

  • threshold_public_key -> validator_quorum_threshold_public_key
  • quorum_type -> validator_quorum_type
  • quorum_hash -> validator_quorum_hash

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fields renamed in PR dashpay/tenderdash#515 , started image build with tag rename-genesis-fields

"initial_core_chain_locked_height": {{ platform_initial_core_chain_locked_height | int }},
"initial_proposal_core_chain_lock": null,
"consensus_params": {
"block": {
"max_bytes": "22020096",
"max_gas": "-1",
"time_iota_ms": "5000"
},
"evidence": {
"max_age": "100000",
"max_age_num_blocks": "100000",
"max_age_duration": "172800000000000"
},
"validator": {
"pub_key_types": [
"bls12381"
]
},
"version": {}
},
"validators": [
{
"pub_key": {
"type": "tendermint/PubKeyBLS12381",
"value": "imxjukh5hRY91Mvm/sfhQp6iSnICyvKMMdhY5Sq6Ej0QJyB3vtN4UfYwvmxdzOVM"
},
"power": 100,
"name": "",
"pro_tx_hash": "F3D506822A24E7E4BE318A6ED7371CC1E1527880A594FE04629F50A1618DB8E7"
}
],
"threshold_public_key": {
"type": "tendermint/PubKeyBLS12381",
"value": "imxjukh5hRY91Mvm/sfhQp6iSnICyvKMMdhY5Sq6Ej0QJyB3vtN4UfYwvmxdzOVM"
},
"quorum_type": {{ platform_drive_validator_set_llmq_type }},
"quorum_hash": "43FF39CC1F41B9FC63DFA5B1EDF3F0CA3AD5CAFAE4B12B4FE9263B08BB50C4CC",
"app_hash": ""
"chain_id": "dash-{{ ( 'devnet-' + dash_devnet_name if dash_network == 'devnet' else dash_network ) if tenderdash_chain_id is not defined else tenderdash_chain_id }}"
}