TTD flag is decimal in all consensus clients now, see ethereum/consen…

…sus-specs#2645
parithosh · Oct 11, 2021 · 4cd89a9 · 4cd89a9
1 parent 598bf2b
commit 4cd89a9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/amphora-testnet/inventory/group_vars/all.yaml b/amphora-testnet/inventory/group_vars/all.yaml
@@ -36,8 +36,7 @@ testnet_type: custom
 eth2_network_name: amphora
 
 # TODO: set TTD
-terminal_total_difficulty: "0x3938700"
-teku_terminal_total_difficulty: "60000000"
+terminal_total_difficulty: "60000000"
 
 # enter bootnodes here if needed
 bootnode_enrs:

diff --git a/amphora-testnet/inventory/group_vars/eth1client_nethermind.yml b/amphora-testnet/inventory/group_vars/eth1client_nethermind.yml
@@ -26,7 +26,7 @@ eth1_start_args: >
   --Network.DiscoveryPort=30303
   --Network.P2PPort=30303
   --Merge.Enabled=true
-  --Merge.TerminalTotalDifficulty={{teku_terminal_total_difficulty}}
+  --Merge.TerminalTotalDifficulty={{terminal_total_difficulty}}
 
 # run as root, the nethermind image doesn't handle running regular user well
 eth1_user_id: "0:0"
diff --git a/amphora-testnet/inventory/group_vars/eth2client_teku.yml b/amphora-testnet/inventory/group_vars/eth2client_teku.yml
@@ -51,7 +51,7 @@ beacon_start_args: >
   --metrics-host-allowlist="*"
   --rest-api-host-allowlist="*"
   --Xdata-storage-non-canonical-blocks-enabled=true
-  --Xnetwork-merge-total-terminal-difficulty={{teku_terminal_total_difficulty}}
+  --Xnetwork-merge-total-terminal-difficulty={{terminal_total_difficulty}}
 
 
 validator_start_args: >