ObolNetwork · KaloyanTanev · Feb 19, 2026
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -21,7 +21,7 @@ on:
     - cron: "18 19 * * 6"
 
 env:
-  GOLANG_VERSION: "1.25"
+  GOLANG_VERSION: "1.26"
 
 jobs:
   analyze:

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -19,4 +19,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
         with:
-          version: v2.9.0
+          version: v2.10.1
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,6 +1,6 @@
 version: "2"
 run:
-  go: "1.25"
+  go: "1.26"
 linters:
   default: all
   disable:
@@ -62,6 +62,9 @@ linters:
     gosec:
       excludes:
         - G115
+        - G703
+        - G704
+        - G705
     govet:
       disable:
         - fieldalignment

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -15,7 +15,7 @@ repos:
     rev: v0.0.6
     hooks:
       - id: check-go-version
-        args: [-v=go1.25] # Only check minor version locally
+        args: [-v=go1.26] # Only check minor version locally
         pass_filenames: false
         additional_dependencies: [packaging]
       - id: check-licence-header

diff --git a/.pre-commit/run_linter.sh b/.pre-commit/run_linter.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION="v2.5.0"
+VERSION="2.10.1"
 
 if ! command -v golangci-lint &>/dev/null; then
     echo "golangci-lint could not be found"

diff --git a/CLAUDE.md b/CLAUDE.md
@@ -121,7 +121,7 @@ testutil/     # Test utilities, mocks, golden files
 ## Code Style and Guidelines
 
 ### Go Version
-Requires Go 1.25 (enforced by pre-commit hooks)
+Requires Go 1.26 (enforced by pre-commit hooks)
 
 ### Core Principles (from [docs/goguidelines.md](docs/goguidelines.md))
 1. **Functions over methods**: Prefer stateless functions over stateful objects

diff --git a/cluster/cluster_test.go b/cluster/cluster_test.go
@@ -308,7 +308,7 @@ func TestDefinitionPeers(t *testing.T) {
 	peers, err := lock.Peers()
 	require.NoError(t, err)
 
-	names := []string{"curious-land", "adventurous-age", "witty-industry", "cute-group"}
+	names := []string{"worried-mirror", "cautious-face", "nervous-jewelry", "jolly-pillow"}
 
 	for i, peer := range peers {
 		require.Equal(t, i, peer.Index)

diff --git a/cluster/definition.go b/cluster/definition.go
@@ -140,7 +140,7 @@ func NewDefinition(name string, numVals int, threshold int, feeRecipientAddresse
 
 // Definition defines an intended charon cluster configuration excluding validators.
 // Note the following struct tag meanings:
-//   - json: json field name. Suffix 0xhex indicates bytes are formatted as 0x prefixed hex strings.
+//   - json: json field name.
 //   - ssz: ssz equivalent. Either uint64 for numbers, BytesN for fixed length bytes, ByteList[MaxN]
 //     for variable length strings, or CompositeList[MaxN] for nested object arrays.
 //   - config_hash: field ordering when calculating config hash. Some fields are excluded indicated by `-`.
@@ -169,7 +169,7 @@ type Definition struct {
 	DKGAlgorithm string `config_hash:"6" definition_hash:"6" json:"dkg_algorithm" ssz:"ByteList[32]"`
 
 	// ForkVersion defines the cluster's 4 byte beacon chain fork version (network/chain identifier).
-	ForkVersion []byte `json:"fork_version,0xhex" ssz:"Bytes4" config_hash:"7" definition_hash:"7"`
+	ForkVersion []byte `config_hash:"7" definition_hash:"7" json:"fork_version" ssz:"Bytes4"`
 
 	// Operators define the charon nodes in the cluster and their operators. Max 256 operators.
 	Operators []Operator `config_hash:"8" definition_hash:"8" json:"operators" ssz:"CompositeList[256]"`
@@ -193,10 +193,10 @@ type Definition struct {
 	Compounding bool `config_hash:"14" definition_hash:"14" json:"compounding" ssz:"bool"`
 
 	// ConfigHash uniquely identifies a cluster definition excluding operator ENRs and signatures.
-	ConfigHash []byte `json:"config_hash,0xhex" ssz:"Bytes32" config_hash:"-" definition_hash:"15"`
+	ConfigHash []byte `config_hash:"-" definition_hash:"15" json:"config_hash" ssz:"Bytes32"`
 
 	// DefinitionHash uniquely identifies a cluster definition including operator ENRs and signatures.
-	DefinitionHash []byte `json:"definition_hash,0xhex" ssz:"Bytes32" config_hash:"-" definition_hash:"-"`
+	DefinitionHash []byte `config_hash:"-" definition_hash:"-" json:"definition_hash" ssz:"Bytes32"`
 }
 
 // NodeIdx returns the node index for the peer.
@@ -1130,17 +1130,17 @@ type definitionJSONv1x10 struct {
 
 // Creator identifies the creator of a cluster definition.
 // Note the following struct tag meanings:
-//   - json: json field name. Suffix 0xhex indicates bytes are formatted as 0x prefixed hex strings.
+//   - json: json field name.
 //   - ssz: ssz equivalent. Either uint64 for numbers, BytesN for fixed length bytes, ByteList[MaxN]
 //     for variable length strings, or CompositeList[MaxN] for nested object arrays.
 //   - config_hash: field ordering when calculating config hash. Some fields are excluded indicated by `-`.
 //   - definition_hash: field ordering when calculating definition hash. Some fields are excluded indicated by `-`.
 type Creator struct {
 	// The 20 byte Ethereum address of the creator
-	Address string `json:"address,0xhex" ssz:"Bytes20" config_hash:"0" definition_hash:"0"`
+	Address string `config_hash:"0" definition_hash:"0" json:"address" ssz:"Bytes20"`
 
 	// ConfigSignature is an EIP712 signature of the config_hash using privkey corresponding to creator Ethereum Address.
-	ConfigSignature []byte `json:"config_signature,0xhex" ssz:"Bytes65" config_hash:"-" definition_hash:"1"`
+	ConfigSignature []byte `config_hash:"-" definition_hash:"1" json:"config_signature" ssz:"Bytes65"`
 }
 
 // creatorJSON is the json formatter of Creator.
@@ -1152,10 +1152,10 @@ type creatorJSON struct {
 // ValidatorAddresses defines addresses of a validator.
 type ValidatorAddresses struct {
 	// FeeRecipientAddress 20 byte Ethereum address.
-	FeeRecipientAddress string `json:"fee_recipient_address,0xhex" ssz:"Bytes20" config_hash:"0" definition_hash:"0"`
+	FeeRecipientAddress string `config_hash:"0" definition_hash:"0" json:"fee_recipient_address" ssz:"Bytes20"`
 
 	// WithdrawalAddress 20 byte Ethereum address.
-	WithdrawalAddress string `json:"withdrawal_address,0xhex" ssz:"Bytes20" config_hash:"1" definition_hash:"1"`
+	WithdrawalAddress string `config_hash:"1" definition_hash:"1" json:"withdrawal_address" ssz:"Bytes20"`
 }
 
 // validatorAddressesJSON is the json formatter of ValidatorAddresses.

diff --git a/cluster/load_test.go b/cluster/load_test.go
@@ -29,7 +29,7 @@ func TestLoadClusterLock(t *testing.T) {
 
 	// Verify first operator
 	require.Equal(t, "0xe0255aa5b7d44bec40f84c892b9bffd43629b022", lock.Operators[0].Address)
-	require.Contains(t, lock.Operators[0].ENR, "enr:-HW4QNHE5aL5CrfBtTF9Hi2VrssawbiC4xuTUzuk0Mu3wRQSL2mA")
+	require.Contains(t, lock.Operators[0].ENR, "enr:-HW4QODeB3AVJFkDYomS49MS5zbgdawwMP9X9jdldV3DeNiDCnYxAQVQ-DXcZYzu7Qk0AjXaWMdpykStZDy035vViLWAgmlkgnY0iXNlY3AyNTZrMaECJ-LHSLqRGKa3j7oOwpC2TjLLOBtKYEKxUZEkAw3bUac")
 
 	// Verify first distributed validator
 	require.Equal(t, "0x6865fcf92b0c3a17c9028be9914eb7649c6c9347800979d1830356f2a54c3deab2a4b4475d63afbe8fb56987c77f5818", lock.Validators[0].PublicKeyHex())

diff --git a/cluster/operator.go b/cluster/operator.go
@@ -8,23 +8,23 @@ import (
 
 // Operator identifies the operator of a charon node and its ENR.
 // Note the following struct tag meanings:
-//   - json: json field name. Suffix 0xhex indicates bytes are formatted as 0x prefixed hex strings.
+//   - json: json field name.
 //   - ssz: ssz equivalent. Either uint64 for numbers, BytesN for fixed length bytes, ByteList[MaxN]
 //     for variable length strings, or CompositeList[MaxN] for nested object arrays.
 //   - config_hash: field ordering when calculating config hash. Some fields are excluded indicated by `-`.
 //   - definition_hash: field ordering when calculating definition hash. Some fields are excluded indicated by `-`.
 type Operator struct {
 	// The 20 byte Ethereum address of the operator
-	Address string `json:"address,0xhex" ssz:"Bytes20" config_hash:"0" definition_hash:"0"`
+	Address string `config_hash:"0" definition_hash:"0" json:"address" ssz:"Bytes20"`
 
 	// ENR identifies the charon node. Max 1024 chars.
 	ENR string `config_hash:"-" definition_hash:"1" json:"enr" ssz:"ByteList[1024]"`
 
 	// ConfigSignature is an EIP712 signature of the config_hash using privkey corresponding to operator Ethereum Address.
-	ConfigSignature []byte `json:"config_signature,0xhex" ssz:"Bytes65" config_hash:"-" definition_hash:"2"`
+	ConfigSignature []byte `config_hash:"-" definition_hash:"2" json:"config_signature" ssz:"Bytes65"`
 
 	// ENRSignature is a EIP712 signature of the ENR by the Address, authorising the charon node to act on behalf of the operator in the cluster.
-	ENRSignature []byte `json:"enr_signature,0xhex" ssz:"Bytes65" config_hash:"-" definition_hash:"3"`
+	ENRSignature []byte `config_hash:"-" definition_hash:"3" json:"enr_signature" ssz:"Bytes65"`
 }
 
 // operatorJSONv1x1 is the json formatter of Operator for versions v1.0.0 and v1.1.0.

diff --git a/cluster/testdata/cluster_definition_v1_0_0.json b/cluster/testdata/cluster_definition_v1_0_0.json
@@ -3,14 +3,14 @@
  "operators": [
   {
    "address": "0x86b14323a6bc8f9e7df1d929333ff993933bea6f",
-   "enr": "enr:-HW4QMIZ10BTPuSp6xOGrD15Enk-TM1WbNARH6yPJmGSWkWdfUUaSNg1T4BHao3RUJdboINPCKsm_X38Xyj1uFPKdoWAgmlkgnY0iXNlY3AyNTZrMaEDTLCHkTEDlpKqN4fRxuEsh_Amst07WBUyiL8z1_ba8Qw",
+   "enr": "enr:-HW4QO65Nqk0Fh7y1DbN1Hq1y2yFpLIHJTyfPDK80tpzASr9cXxctwIh9Os68JzmLMbBqfjUS-7_K0Q51gh-s03fwc2AgmlkgnY0iXNlY3AyNTZrMaEDRqBTGTdOxbk4moVEfgKES8-35U0lbqRq6X8t-qQXwAk",
    "nonce": 0,
    "config_signature": "",
    "enr_signature": ""
   },
   {
    "address": "0x40e9a1d007f033c2823061bdd0eaa59f8e4da643",
-   "enr": "enr:-HW4QBt3PTM5MBcYQKiUA0hgcqopF-42-R8sCs6PoLPI11qCAoftNLfKq6cLrKfhhmrGD9w5CWAuJsBSNUo08y2PTyGAgmlkgnY0iXNlY3AyNTZrMaED8Lz22L8jIlhbkAo5dMNIhVgcPg-8-1_7XeYejqxno-4",
+   "enr": "enr:-HW4QDP7PLpjtH9ezawlXODXgJhoM6UvtutPf3vpcvksY95eejYHaboINe-V9sFn9tyeRtR3nWgV4wx2edtwxnapb5GAgmlkgnY0iXNlY3AyNTZrMaECqGWQO_QwtVqFv-Q9bvNrlz9fW3duWwnh0OYkQbgbCHo",
    "nonce": 0,
    "config_signature": "",
    "enr_signature": ""
@@ -26,5 +26,5 @@
  "dkg_algorithm": "default",
  "fork_version": "0x90000069",
  "config_hash": "JSNZW161qkmBRJw50hFXoXAgxBgGR02yZsoOWs00lMA=",
- "definition_hash": "cxiiCHLD1/2uq0pOp/zKfaEti6JEDhLZeHZLl1zOBlQ="
+ "definition_hash": "fzzQkicXSL5ESuZ+l7Si/abrioDZk3+bE1ri8TqJMYY="
 }
diff --git a/cluster/testdata/cluster_definition_v1_10_0.json b/cluster/testdata/cluster_definition_v1_10_0.json
@@ -7,13 +7,13 @@
  "operators": [
   {
    "address": "0xe0255aa5b7d44bec40f84c892b9bffd43629b022",
-   "enr": "enr:-HW4QNHE5aL5CrfBtTF9Hi2VrssawbiC4xuTUzuk0Mu3wRQSL2mA-XQtlmSQ7brloyZAZKKagpag6KJHOa124gXyklOAgmlkgnY0iXNlY3AyNTZrMaECdAJRmH_MYH0n6WfA_wtyIp3jHSHnNAivFMYGZJlY9Hk",
+   "enr": "enr:-HW4QODeB3AVJFkDYomS49MS5zbgdawwMP9X9jdldV3DeNiDCnYxAQVQ-DXcZYzu7Qk0AjXaWMdpykStZDy035vViLWAgmlkgnY0iXNlY3AyNTZrMaECJ-LHSLqRGKa3j7oOwpC2TjLLOBtKYEKxUZEkAw3bUac",
    "config_signature": "0x4294040374f6924b98cbf8713f8d962d7c8d019192c24224e2cafccae3a61fb586b14323a6bc8f9e7df1d929333ff993933bea6f5b3af6de0374366c4719e43a00",
    "enr_signature": "0x067d89bc7f01f1f573981659a44ff17a4c7215a3b539eb1e5849c6077dbb5722f5717a289a266f97647981998ebea89c0b4b373970115e82ed6f4125c8fa73111b"
   },
   {
    "address": "0xd7defa922daae7786667f7e936cd4f24abf7df86",
-   "enr": "enr:-HW4QHWdfdJ6sz5b0NUvnc8gVkv-uBLNhKmPK-uh2CzWzcnFP-TZZoGZkJj9Aavr47GinAQTrOTdvXKYe_0dkvkXnYmAgmlkgnY0iXNlY3AyNTZrMaECRm1_yuVj5csJoNGHC7WANEgEYXh5oUlJzyIoXxuuPyc",
+   "enr": "enr:-HW4QNytPitaPqLC7PRLYbP7pKoF7TC2IRnthkiDejNiGQ5qEKqZ_u3zI-a1LpKLTd5oqbpgrEvUI9ehue-uDPZw9DuAgmlkgnY0iXNlY3AyNTZrMaEDKkUr0_RzAWCHn6i6_d76CGaGOZClTFwSdoj1SfoS6-o",
    "config_signature": "0xf4a8b0993ebdf8883a0ad8be9c3978b04883e56a156a8de563afa467d49dec6a40e9a1d007f033c2823061bdd0eaa59f8e4da6430105220d0b29688b734b8ea000",
    "enr_signature": "0xca9936e8461f10d77c96ea80a7a665f606f6a63b7f3dfd2567c18979e4d60f26686d9bf2fb26c901ff354cde1607ee294b39f32b7c7822ba64f84ab43ca0c6e61b"
   }
@@ -43,5 +43,5 @@
  "target_gas_limit": 30000000,
  "compounding": false,
  "config_hash": "0x225c67b648abd8b459265cd84b18b86265e2c5da8e352c488ac6f0e63b2422bc",
- "definition_hash": "0x77084e268288dd34970af16f55b8dcbbe26dce196e0e91be193450f24726e76e"
+ "definition_hash": "0x29f54c92e0380e19a1136b5977bb5479e194dc6cf03f1f4c128f1d38262da95f"
 }
diff --git a/cluster/testdata/cluster_definition_v1_1_0.json b/cluster/testdata/cluster_definition_v1_1_0.json
@@ -3,14 +3,14 @@
  "operators": [
   {
    "address": "0x86b14323a6bc8f9e7df1d929333ff993933bea6f",
-   "enr": "enr:-HW4QMIZ10BTPuSp6xOGrD15Enk-TM1WbNARH6yPJmGSWkWdfUUaSNg1T4BHao3RUJdboINPCKsm_X38Xyj1uFPKdoWAgmlkgnY0iXNlY3AyNTZrMaEDTLCHkTEDlpKqN4fRxuEsh_Amst07WBUyiL8z1_ba8Qw",
+   "enr": "enr:-HW4QO65Nqk0Fh7y1DbN1Hq1y2yFpLIHJTyfPDK80tpzASr9cXxctwIh9Os68JzmLMbBqfjUS-7_K0Q51gh-s03fwc2AgmlkgnY0iXNlY3AyNTZrMaEDRqBTGTdOxbk4moVEfgKES8-35U0lbqRq6X8t-qQXwAk",
    "nonce": 0,
    "config_signature": "",
    "enr_signature": ""
   },
   {
    "address": "0x40e9a1d007f033c2823061bdd0eaa59f8e4da643",
-   "enr": "enr:-HW4QBt3PTM5MBcYQKiUA0hgcqopF-42-R8sCs6PoLPI11qCAoftNLfKq6cLrKfhhmrGD9w5CWAuJsBSNUo08y2PTyGAgmlkgnY0iXNlY3AyNTZrMaED8Lz22L8jIlhbkAo5dMNIhVgcPg-8-1_7XeYejqxno-4",
+   "enr": "enr:-HW4QDP7PLpjtH9ezawlXODXgJhoM6UvtutPf3vpcvksY95eejYHaboINe-V9sFn9tyeRtR3nWgV4wx2edtwxnapb5GAgmlkgnY0iXNlY3AyNTZrMaECqGWQO_QwtVqFv-Q9bvNrlz9fW3duWwnh0OYkQbgbCHo",
    "nonce": 0,
    "config_signature": "",
    "enr_signature": ""
@@ -26,5 +26,5 @@
  "dkg_algorithm": "default",
  "fork_version": "0x90000069",
  "config_hash": "NAvx68ME/uWLpWBAtn/rWc+APaG88LHCkxpoGU8KT7U=",
- "definition_hash": "FTTSEPZtKLkoVwJhM5U9Ij+rxig+7f9uUjpv+u7ngic="
+ "definition_hash": "kAi2+HLkFueLxnEtSsQRokK97Q/q1J7PXJOraQdtOkM="
 }
diff --git a/cluster/testdata/cluster_definition_v1_2_0.json b/cluster/testdata/cluster_definition_v1_2_0.json
@@ -3,13 +3,13 @@
  "operators": [
   {
    "address": "0x86b14323a6bc8f9e7df1d929333ff993933bea6f",
-   "enr": "enr:-HW4QMIZ10BTPuSp6xOGrD15Enk-TM1WbNARH6yPJmGSWkWdfUUaSNg1T4BHao3RUJdboINPCKsm_X38Xyj1uFPKdoWAgmlkgnY0iXNlY3AyNTZrMaEDTLCHkTEDlpKqN4fRxuEsh_Amst07WBUyiL8z1_ba8Qw",
+   "enr": "enr:-HW4QO65Nqk0Fh7y1DbN1Hq1y2yFpLIHJTyfPDK80tpzASr9cXxctwIh9Os68JzmLMbBqfjUS-7_K0Q51gh-s03fwc2AgmlkgnY0iXNlY3AyNTZrMaEDRqBTGTdOxbk4moVEfgKES8-35U0lbqRq6X8t-qQXwAk",
    "config_signature": "",
    "enr_signature": ""
   },
   {
    "address": "0x40e9a1d007f033c2823061bdd0eaa59f8e4da643",
-   "enr": "enr:-HW4QBt3PTM5MBcYQKiUA0hgcqopF-42-R8sCs6PoLPI11qCAoftNLfKq6cLrKfhhmrGD9w5CWAuJsBSNUo08y2PTyGAgmlkgnY0iXNlY3AyNTZrMaED8Lz22L8jIlhbkAo5dMNIhVgcPg-8-1_7XeYejqxno-4",
+   "enr": "enr:-HW4QDP7PLpjtH9ezawlXODXgJhoM6UvtutPf3vpcvksY95eejYHaboINe-V9sFn9tyeRtR3nWgV4wx2edtwxnapb5GAgmlkgnY0iXNlY3AyNTZrMaECqGWQO_QwtVqFv-Q9bvNrlz9fW3duWwnh0OYkQbgbCHo",
    "config_signature": "",
    "enr_signature": ""
   }
@@ -24,5 +24,5 @@
  "dkg_algorithm": "default",
  "fork_version": "0x90000069",
  "config_hash": "0xf61eafe230658b03bb4f90d7a910f8b6c56b0849ee3d70f12e688583b4e7f8a3",
- "definition_hash": "0x45d87ed12ccf5f137da6acd03c0aa9378bdd8a25e9ec856b681b1427165a6ee3"
+ "definition_hash": "0xc80e378affe3fca6698179fd1cf3882b20196e171e7cb63c1b1c57596e26fc41"
 }
diff --git a/cluster/testdata/cluster_definition_v1_3_0.json b/cluster/testdata/cluster_definition_v1_3_0.json
@@ -3,13 +3,13 @@
  "operators": [
   {
    "address": "0x86b14323a6bc8f9e7df1d929333ff993933bea6f",
-   "enr": "enr:-HW4QMIZ10BTPuSp6xOGrD15Enk-TM1WbNARH6yPJmGSWkWdfUUaSNg1T4BHao3RUJdboINPCKsm_X38Xyj1uFPKdoWAgmlkgnY0iXNlY3AyNTZrMaEDTLCHkTEDlpKqN4fRxuEsh_Amst07WBUyiL8z1_ba8Qw",
+   "enr": "enr:-HW4QO65Nqk0Fh7y1DbN1Hq1y2yFpLIHJTyfPDK80tpzASr9cXxctwIh9Os68JzmLMbBqfjUS-7_K0Q51gh-s03fwc2AgmlkgnY0iXNlY3AyNTZrMaEDRqBTGTdOxbk4moVEfgKES8-35U0lbqRq6X8t-qQXwAk",
    "config_signature": "0x1b067d89bc7f01f1f573981659a44ff17a4c7215a3b539eb1e5849c6077dbb5722f5717a289a266f97647981998ebea89c0b4b373970115e82ed6f4125c8fa7301",
    "enr_signature": "0xe4d7defa922daae7786667f7e936cd4f24abf7df866baa56038367ad6145de1ee8f4a8b0993ebdf8883a0ad8be9c3978b04883e56a156a8de563afa467d49dec1b"
   },
   {
    "address": "0x40e9a1d007f033c2823061bdd0eaa59f8e4da643",
-   "enr": "enr:-HW4QBt3PTM5MBcYQKiUA0hgcqopF-42-R8sCs6PoLPI11qCAoftNLfKq6cLrKfhhmrGD9w5CWAuJsBSNUo08y2PTyGAgmlkgnY0iXNlY3AyNTZrMaED8Lz22L8jIlhbkAo5dMNIhVgcPg-8-1_7XeYejqxno-4",
+   "enr": "enr:-HW4QDP7PLpjtH9ezawlXODXgJhoM6UvtutPf3vpcvksY95eejYHaboINe-V9sFn9tyeRtR3nWgV4wx2edtwxnapb5GAgmlkgnY0iXNlY3AyNTZrMaECqGWQO_QwtVqFv-Q9bvNrlz9fW3duWwnh0OYkQbgbCHo",
    "config_signature": "0xf3ca9936e8461f10d77c96ea80a7a665f606f6a63b7f3dfd2567c18979e4d60f26686d9bf2fb26c901ff354cde1607ee294b39f32b7c7822ba64f84ab43ca0c601",
    "enr_signature": "0xb91c1fd3be8990434179d3af4491a369012db92d184fc39d1734ff5716428953bb6865fcf92b0c3a17c9028be9914eb7649c6c9347800979d1830356f2a54c3d01"
   }
@@ -24,5 +24,5 @@
  "dkg_algorithm": "default",
  "fork_version": "0x90000069",
  "config_hash": "0xfa71973a6ba32e6c933ace935b0cfc7aebfe27d6ad338cc4c8ae2c77a30aa6d0",
- "definition_hash": "0xed4bca0a33e950c0bc6836227a411b631d308d6a7eeaa227d9829f92f5985dd8"
+ "definition_hash": "0x1fd867553e7dd1f851e08b1fba8bbd3f521ac6cdcff78275c08f439a2aa2bd10"
 }
diff --git a/cluster/testdata/cluster_definition_v1_4_0.json b/cluster/testdata/cluster_definition_v1_4_0.json
@@ -7,13 +7,13 @@
  "operators": [
   {
    "address": "0x86b14323a6bc8f9e7df1d929333ff993933bea6f",
-   "enr": "enr:-HW4QMIZ10BTPuSp6xOGrD15Enk-TM1WbNARH6yPJmGSWkWdfUUaSNg1T4BHao3RUJdboINPCKsm_X38Xyj1uFPKdoWAgmlkgnY0iXNlY3AyNTZrMaEDTLCHkTEDlpKqN4fRxuEsh_Amst07WBUyiL8z1_ba8Qw",
+   "enr": "enr:-HW4QO65Nqk0Fh7y1DbN1Hq1y2yFpLIHJTyfPDK80tpzASr9cXxctwIh9Os68JzmLMbBqfjUS-7_K0Q51gh-s03fwc2AgmlkgnY0iXNlY3AyNTZrMaEDRqBTGTdOxbk4moVEfgKES8-35U0lbqRq6X8t-qQXwAk",
    "config_signature": "0x1b067d89bc7f01f1f573981659a44ff17a4c7215a3b539eb1e5849c6077dbb5722f5717a289a266f97647981998ebea89c0b4b373970115e82ed6f4125c8fa7301",
    "enr_signature": "0xe4d7defa922daae7786667f7e936cd4f24abf7df866baa56038367ad6145de1ee8f4a8b0993ebdf8883a0ad8be9c3978b04883e56a156a8de563afa467d49dec1b"
   },
   {
    "address": "0x40e9a1d007f033c2823061bdd0eaa59f8e4da643",
-   "enr": "enr:-HW4QBt3PTM5MBcYQKiUA0hgcqopF-42-R8sCs6PoLPI11qCAoftNLfKq6cLrKfhhmrGD9w5CWAuJsBSNUo08y2PTyGAgmlkgnY0iXNlY3AyNTZrMaED8Lz22L8jIlhbkAo5dMNIhVgcPg-8-1_7XeYejqxno-4",
+   "enr": "enr:-HW4QDP7PLpjtH9ezawlXODXgJhoM6UvtutPf3vpcvksY95eejYHaboINe-V9sFn9tyeRtR3nWgV4wx2edtwxnapb5GAgmlkgnY0iXNlY3AyNTZrMaECqGWQO_QwtVqFv-Q9bvNrlz9fW3duWwnh0OYkQbgbCHo",
    "config_signature": "0xf3ca9936e8461f10d77c96ea80a7a665f606f6a63b7f3dfd2567c18979e4d60f26686d9bf2fb26c901ff354cde1607ee294b39f32b7c7822ba64f84ab43ca0c601",
    "enr_signature": "0xb91c1fd3be8990434179d3af4491a369012db92d184fc39d1734ff5716428953bb6865fcf92b0c3a17c9028be9914eb7649c6c9347800979d1830356f2a54c3d01"
   }
@@ -28,5 +28,5 @@
  "dkg_algorithm": "default",
  "fork_version": "0x90000069",
  "config_hash": "0x6ba0d3f2c53ed01e6e2de90561e7c6c4163bb5d609c558b69c282f98dc07c766",
- "definition_hash": "0x06c80b10950ee2469c02716de7fd85fb70c17d84b464ec66bbe32cb48fa329c6"
+ "definition_hash": "0xe206896f7aadecef895a3d20b9f04ddd3be0e6c3dd03c0be33bd968e16b61471"
 }
diff --git a/cluster/testdata/cluster_definition_v1_5_0.json b/cluster/testdata/cluster_definition_v1_5_0.json
@@ -7,13 +7,13 @@
  "operators": [
   {
    "address": "0xe0255aa5b7d44bec40f84c892b9bffd43629b022",
-   "enr": "enr:-HW4QNHE5aL5CrfBtTF9Hi2VrssawbiC4xuTUzuk0Mu3wRQSL2mA-XQtlmSQ7brloyZAZKKagpag6KJHOa124gXyklOAgmlkgnY0iXNlY3AyNTZrMaECdAJRmH_MYH0n6WfA_wtyIp3jHSHnNAivFMYGZJlY9Hk",
+   "enr": "enr:-HW4QODeB3AVJFkDYomS49MS5zbgdawwMP9X9jdldV3DeNiDCnYxAQVQ-DXcZYzu7Qk0AjXaWMdpykStZDy035vViLWAgmlkgnY0iXNlY3AyNTZrMaECJ-LHSLqRGKa3j7oOwpC2TjLLOBtKYEKxUZEkAw3bUac",
    "config_signature": "0x4294040374f6924b98cbf8713f8d962d7c8d019192c24224e2cafccae3a61fb586b14323a6bc8f9e7df1d929333ff993933bea6f5b3af6de0374366c4719e43a00",
    "enr_signature": "0x067d89bc7f01f1f573981659a44ff17a4c7215a3b539eb1e5849c6077dbb5722f5717a289a266f97647981998ebea89c0b4b373970115e82ed6f4125c8fa73111b"
   },
   {
    "address": "0xd7defa922daae7786667f7e936cd4f24abf7df86",
-   "enr": "enr:-HW4QHWdfdJ6sz5b0NUvnc8gVkv-uBLNhKmPK-uh2CzWzcnFP-TZZoGZkJj9Aavr47GinAQTrOTdvXKYe_0dkvkXnYmAgmlkgnY0iXNlY3AyNTZrMaECRm1_yuVj5csJoNGHC7WANEgEYXh5oUlJzyIoXxuuPyc",
+   "enr": "enr:-HW4QNytPitaPqLC7PRLYbP7pKoF7TC2IRnthkiDejNiGQ5qEKqZ_u3zI-a1LpKLTd5oqbpgrEvUI9ehue-uDPZw9DuAgmlkgnY0iXNlY3AyNTZrMaEDKkUr0_RzAWCHn6i6_d76CGaGOZClTFwSdoj1SfoS6-o",
    "config_signature": "0xf4a8b0993ebdf8883a0ad8be9c3978b04883e56a156a8de563afa467d49dec6a40e9a1d007f033c2823061bdd0eaa59f8e4da6430105220d0b29688b734b8ea000",
    "enr_signature": "0xca9936e8461f10d77c96ea80a7a665f606f6a63b7f3dfd2567c18979e4d60f26686d9bf2fb26c901ff354cde1607ee294b39f32b7c7822ba64f84ab43ca0c6e61b"
   }
@@ -36,5 +36,5 @@
  "dkg_algorithm": "default",
  "fork_version": "0x90000069",
  "config_hash": "0x50afebc6e36c3d31e42d782cfada36bae422ef47b102d356943bbdc20e4b73a7",
- "definition_hash": "0xb0876460555b5c02faa09e4dcba322ff15e53a4170acec0e584a78cbdbe2a9cc"
+ "definition_hash": "0x0c857d42a053f99488d25fbdbd8cd0d4275bee89b5a8f250472b8e9b580c0a11"
 }