feat: integrate tenderdash 0.4.x

Dockerfile

@@ -57,7 +57,7 @@ COPY ansible/requirements.yml /ansible-requirements.yml
 COPY package*.json ./
 
 RUN python3 -m pip install -U pip && \
-    python3 -m pip install --upgrade netaddr awscli ansible && \
+    python3 -m pip install --upgrade netaddr awscli jmespath ansible && \
     ansible-galaxy install -r /ansible-requirements.yml && \
     npm install
 

README.md

@@ -133,15 +133,15 @@ You can use the OpenVPN config generated during deployment (`<network_name>.ovpn
     git clone https://github.com/dashpay/dash-network-deploy.git
     ```
 
-2. Install Ansible and Terraform per instructions provided on the official websites:
+2. Install Ansible (v2.10.7+) and Terraform (v0.12.x) per instructions provided on the official websites:
 
     * [Ansible](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html)
     * [Terraform](https://www.terraform.io/intro/getting-started/install.html)
 
-3. Ensure Python netaddr package is installed locally
+3. Ensure Python netaddr and jmespath package is installed locally
 
     ```bash
-    pip install -U netaddr
+    pip install -U netaddr jmespath
     ```
 
     * Note: You may need to run the above command with "pip2" instead of "pip" if

ansible/group_vars/all

@@ -30,6 +30,7 @@ drive_image: dashpay/drive
 drive_log_stdout_level: info
 drive_log_pretty_file_level: silent
 drive_log_json_file_level: silent
+platform_drive_validator_set_llmq_type: 
 
 # Tendermint
 tendermint_image: dashpay/tenderdash
@@ -73,7 +74,7 @@ dashd_rpc_port: 20002
 
 dashd_zmq_port: 29998
 
-# Example sport address/privkey. Please provide your own spork key in network config:
+# Example spork address/privkey. Please provide your own spork key in network config:
 # dashd_sporkaddr: yMtULrhoxd8vRZrsnFobWgRTidtjg2Rnjm
 # dashd_sporkkey: cRsR7ywG6bhb5JsnpeRJ4c1fACabmYtK6WUVPiGG3GG4a5iYk6iL
 

ansible/roles/dashd/templates/dash.conf.j2

@@ -14,7 +14,7 @@ maxconnections=256
 debug={{ dashd_debug }}
 printtoconsole=1
 
-llmq-qvvec-sync=llmq_100_67:0
+
 
 {% if dashd_indexes %}
 # optional indices (required for Insight)
@@ -78,10 +78,13 @@ sporkkey={{ dashd_sporkkey }}
 [regtest]
 {% elif dash_network == 'mainnet' %}
 [main]
+llmq-qvvec-sync=llmq_100_67:0
 {% elif dash_network == 'testnet' %}
 [test]
+llmq-qvvec-sync=llmq_100_67:0
 {% elif dash_network == 'devnet' %}
 [devnet]
+llmq-qvvec-sync=llmq_50_60:0
 
 # First 1000 blocks should be mined with lowest difficulty (like in regtest, so it's instant)
 # and first 500 blocks are mined with a block subsidity multiplied by 10

ansible/roles/mn-evo-services/tasks/tendermint.yml

@@ -23,15 +23,24 @@
     chdir: '{{ mn_evo_services_path }}'
   register: tendermint_node_id
 
+- set_fact:
+    tendermint_node_id: '{{ tendermint_node_id.stdout }}'
+
 - name: get Tendermint validator key
   command: cat {{ mn_evo_services_path }}/tendermint/config/priv_validator_key.json
   register: tendermint_validator_key
 
 - set_fact:
-    tendermint_node_id: '{{ tendermint_node_id.stdout }}'
+    tendermint_validator_key: '{{ tendermint_validator_key.stdout }}'
+
+- name: get masternode status
+  command: dash-cli masternode status
+  register: core_masternode_status
+  when: inventory_hostname.find('masternode') != -1
 
 - set_fact:
-    tendermint_validator_key: '{{ tendermint_validator_key.stdout }}'
+    core_masternode_status: '{{ core_masternode_status.stdout }}'
+  when: inventory_hostname.find('masternode') != -1
 
 - name: create Tendermint config.toml
   template:

ansible/roles/mn-evo-services/templates/docker-compose.yml.j2

@@ -43,6 +43,7 @@ services:
       - FEATURE_FLAGS_CONTRACT_ID={{ platform_feature_flags_contract_id }}
       - FEATURE_FLAGS_CONTRACT_BLOCK_HEIGHT={{ platform_feature_flags_contract_block_height }}
       - FEATURE_FLAGS_TOP_LEVEL_IDENTITY={{ platform_feature_flags_top_level_identity }}
+      - VALIDATOR_SET_LLMQ_TYPE={{ platform_drive_validator_set_llmq_type }}
     ports:
       - 26658:26658
     depends_on:

ansible/roles/mn-evo-services/templates/tendermint/config.toml.j2

@@ -68,6 +68,19 @@ priv_validator_state_file = "data/priv_validator_state.json"
 # connections from an external PrivValidator process
 priv_validator_laddr = ""
 
+# Local Dash Core Host to connect to
+# If this is set, the node follows a Dash Core PrivValidator process
+priv_validator_core_rpc_host = "core:{{ dashd_rpc_port }}"
+
+# Local Dash Core RPC Username
+priv_validator_core_rpc_username = "{{ dashd_rpc_user }}"
+
+# Local Dash Core RPC Password
+priv_validator_core_rpc_password = "{{ dashd_rpc_password }}"
+
+# LLMQ Type used
+llmq_type_used = 100
+
 # Path to the JSON file containing the private key to use for node authentication in the p2p protocol
 node_key_file = "config/node_key.json"
 
@@ -354,6 +367,12 @@ skip_timeout_commit = false
 create_empty_blocks = true
 create_empty_blocks_interval = "3m"
 
+# Set the Dash Core quorum type
+quorum_type = 100
+
+# Set the App hash size
+app_hash_size = 20
+
 # Reactor sleep duration parameters
 peer_gossip_sleep_duration = "100ms"
 peer_query_maj23_sleep_duration = "2s"

ansible/roles/mn-evo-services/templates/tendermint/genesis.json.j2

@@ -1,6 +1,9 @@
 {
   "genesis_time": "{{ hostvars[groups.seed_nodes[0]].tendermint_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",
+  "initial_core_chain_locked_height": {{ platform_initial_core_chain_locked_height | int }},
+  "initial_proposal_core_chain_lock": null,
   "consensus_params": {
     "block": {
       "max_bytes": "22020096",
@@ -14,11 +17,11 @@
     },
     "validator": {
       "pub_key_types": [
-        "ed25519"
+        "bls12381"
       ]
-    }
+    },
+    "version": {}
   },
-  "initial_core_chain_locked_height": {{ platform_initial_core_chain_locked_height | int }},
   "validators": [
     {% for masternode in groups.masternodes[:tenderdash_max_validators_count] %}
         {
@@ -28,10 +31,17 @@
              "value": "{{ hostvars[masternode].tendermint_validator_key | json_query('pub_key.value') }}"
           },
           "power": "1",
-          "name": "{{ masternode }}"
+          "name": "{{ masternode }}",
+          "pro_tx_hash": "{{ hostvars[masternode].core_masternode_status | json_query('proTxHash') }}"
         }
         {% if not loop.last %},{% endif %}
     {% endfor %}
   ],
+  "threshold_public_key": {
+    "type": "tendermint/PubKeyBLS12381",
+    "value": "iWbSZVOrq5y5Fda8+y4h3EyHsK77v0eadVZ562pvH3Q4Iv18lopPj00KxuTgOcFV"
+  },
+  "quorum_type": "{{ platform_drive_validator_set_llmq_type }}",
+  "quorum_hash": "00000201a9d68294b1aa11d689eee77fa588a76247a80e09e903dd250e4ead83",
   "app_hash": ""
 }

ansible/roles/swap/tasks/main.yml

@@ -41,7 +41,7 @@
   become_user: root
   command: swapon -a
 
-- name: set swapiness
+- name: set swappiness
   become: yes
   become_user: root
   sysctl:

lib/configGenerator/generateAnsibleConfig.js

@@ -11,6 +11,17 @@ const crypto = require('crypto');
 async function generateAnsibleConfig(network, networkName, masternodesCount) {
   const config = {};
 
+  function getLLMQType() {
+    switch (network) {
+      case 'devnet': return 101;
+      case 'testnet': return 4;
+      case 'mainnet': return 4;
+      default: return 4;
+    }
+  }
+
+  config.platform_drive_validator_set_llmq_type = getLLMQType();
+
   if (network === 'devnet') {
     // eslint-disable-next-line no-param-reassign
     network = 'testnet';