From 6577349b16a524fc187c220248d14ecb1962bd06 Mon Sep 17 00:00:00 2001 From: Kaloyan Tanev Date: Thu, 19 Feb 2026 12:14:51 +0100 Subject: [PATCH] Bump go, golangci-lint, fix tests, fix linting --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/golangci-lint.yml | 2 +- .golangci.yml | 5 ++++- .pre-commit-config.yaml | 2 +- .pre-commit/run_linter.sh | 2 +- CLAUDE.md | 2 +- cluster/cluster_test.go | 2 +- cluster/definition.go | 18 ++++++++-------- cluster/load_test.go | 2 +- cluster/operator.go | 8 +++---- .../testdata/cluster_definition_v1_0_0.json | 6 +++--- .../testdata/cluster_definition_v1_10_0.json | 6 +++--- .../testdata/cluster_definition_v1_1_0.json | 6 +++--- .../testdata/cluster_definition_v1_2_0.json | 6 +++--- .../testdata/cluster_definition_v1_3_0.json | 6 +++--- .../testdata/cluster_definition_v1_4_0.json | 6 +++--- .../testdata/cluster_definition_v1_5_0.json | 6 +++--- .../testdata/cluster_definition_v1_6_0.json | 6 +++--- .../testdata/cluster_definition_v1_7_0.json | 6 +++--- .../testdata/cluster_definition_v1_8_0.json | 6 +++--- .../testdata/cluster_definition_v1_9_0.json | 6 +++--- cluster/testdata/cluster_lock_v1_0_0.json | 8 +++---- cluster/testdata/cluster_lock_v1_10_0.json | 8 +++---- cluster/testdata/cluster_lock_v1_1_0.json | 8 +++---- cluster/testdata/cluster_lock_v1_2_0.json | 8 +++---- cluster/testdata/cluster_lock_v1_3_0.json | 8 +++---- cluster/testdata/cluster_lock_v1_4_0.json | 8 +++---- cluster/testdata/cluster_lock_v1_5_0.json | 8 +++---- cluster/testdata/cluster_lock_v1_6_0.json | 8 +++---- cluster/testdata/cluster_lock_v1_7_0.json | 8 +++---- cluster/testdata/cluster_lock_v1_8_0.json | 8 +++---- cluster/testdata/cluster_lock_v1_9_0.json | 8 +++---- cmd/createcluster.go | 6 +++--- cmd/createenr.go | 2 +- cmd/enr.go | 4 ++-- core/validatorapi/router.go | 10 ++++----- dkg/pedersen/logger.go | 2 +- eth2util/enr/enr_internal_test.go | 3 +++ eth2util/enr/enr_test.go | 2 +- go.mod | 2 +- p2p/peer_test.go | 2 +- ...stDockerCompose_define_dkg_template.golden | 2 +- .../TestDockerCompose_define_dkg_yml.golden | 2 +- testutil/random.go | 21 +++++++------------ 44 files changed, 128 insertions(+), 129 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b89145f7c0..a9a023cd0a 100644 --- 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 index 182f2f914f..70505b3f50 100644 --- 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 index 8f80c2c95f..c7e3b8b592 100644 --- 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 index 9cc205f45a..3ccc911529 100644 --- 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 index b910305cd0..af6134d0c5 100755 --- 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 index 78293e10e2..7568e5a192 100644 --- 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 index a3a2e434e1..349e28309f 100644 --- 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 index c71e20ff5f..82a8905a39 100644 --- 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 index 5f7e21fbca..d47fc751a7 100644 --- 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 index d019e64c8d..a54e43c513 100644 --- 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 index 6d0bcf0f2b..447724649e 100644 --- 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=" } \ No newline at end of file diff --git a/cluster/testdata/cluster_definition_v1_10_0.json b/cluster/testdata/cluster_definition_v1_10_0.json index 44ef80e538..6ac8921c81 100644 --- 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" } \ No newline at end of file diff --git a/cluster/testdata/cluster_definition_v1_1_0.json b/cluster/testdata/cluster_definition_v1_1_0.json index 544bc16937..2b5303c991 100644 --- 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=" } \ No newline at end of file diff --git a/cluster/testdata/cluster_definition_v1_2_0.json b/cluster/testdata/cluster_definition_v1_2_0.json index dcb2f41dba..063997bdc7 100644 --- 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" } \ No newline at end of file diff --git a/cluster/testdata/cluster_definition_v1_3_0.json b/cluster/testdata/cluster_definition_v1_3_0.json index 2523c31e97..789a73d371 100644 --- 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" } \ No newline at end of file diff --git a/cluster/testdata/cluster_definition_v1_4_0.json b/cluster/testdata/cluster_definition_v1_4_0.json index 8318a74d19..56e0844225 100644 --- 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" } \ No newline at end of file diff --git a/cluster/testdata/cluster_definition_v1_5_0.json b/cluster/testdata/cluster_definition_v1_5_0.json index 083ad55a3b..285ee9e2bf 100644 --- 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" } \ No newline at end of file diff --git a/cluster/testdata/cluster_definition_v1_6_0.json b/cluster/testdata/cluster_definition_v1_6_0.json index e08cf0ffe4..df103f48f2 100644 --- a/cluster/testdata/cluster_definition_v1_6_0.json +++ b/cluster/testdata/cluster_definition_v1_6_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": "0x71a0519d13c40b390aec9e8d0e291cab9105dde5b08f7038163110332c59e9c7", - "definition_hash": "0xe665fa83fa98c4769a99319e8bcb256984b7de196ca50821e51ddcc95041a6fe" + "definition_hash": "0x05fae3a93cc8a5486eabf3ce9a86e1ca4f39f0c59c4b752aec296c384e18a6df" } \ No newline at end of file diff --git a/cluster/testdata/cluster_definition_v1_7_0.json b/cluster/testdata/cluster_definition_v1_7_0.json index 7e401cb8c9..974d5dd8aa 100644 --- a/cluster/testdata/cluster_definition_v1_7_0.json +++ b/cluster/testdata/cluster_definition_v1_7_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": "0x552b6831cb8c45a46bc9e7c564636952e41c299a6a22c24d1775a9ee7fa9090e", - "definition_hash": "0xc0d498eca660af9a0f562683fe9e7746a48a29e676fd017febaa65135336b971" + "definition_hash": "0xd7e1019792ca2da31dd68109445438cf223259b4be866d4bde079e35f87efb27" } \ No newline at end of file diff --git a/cluster/testdata/cluster_definition_v1_8_0.json b/cluster/testdata/cluster_definition_v1_8_0.json index af9093791c..22a96a405c 100644 --- a/cluster/testdata/cluster_definition_v1_8_0.json +++ b/cluster/testdata/cluster_definition_v1_8_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" } @@ -40,5 +40,5 @@ "16000000000" ], "config_hash": "0xbe27726f562e31025947b013115e3e33cc1e832f57bea9ccff3bde4bde51bfa0", - "definition_hash": "0x43424dc5bc7748f41b6d68a0a8752d8ae8008913471068769be8887ecc485258" + "definition_hash": "0x7943e20552f77f416bac4495bff9759c14dedbcfc7fddca46ba880f02d6c8c01" } \ No newline at end of file diff --git a/cluster/testdata/cluster_definition_v1_9_0.json b/cluster/testdata/cluster_definition_v1_9_0.json index 251d0500a7..477b459173 100644 --- a/cluster/testdata/cluster_definition_v1_9_0.json +++ b/cluster/testdata/cluster_definition_v1_9_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" } @@ -41,5 +41,5 @@ ], "consensus_protocol": "abft", "config_hash": "0x106b5056b1f4ec7fa61fa5d5c62d555cada57d238f076b1f2b605ee192ca3249", - "definition_hash": "0x6ffb319725adc05b8bfce2b1fed2f98868ef2a4e67f3d32b9b11151014bc6b26" + "definition_hash": "0x45d67df9e040ec3923d99d8b7bc31b54a84965d0a6222c6e1de1d5f1fe828cea" } \ No newline at end of file diff --git a/cluster/testdata/cluster_lock_v1_0_0.json b/cluster/testdata/cluster_lock_v1_0_0.json index d3d37c1543..f050d755e1 100644 --- a/cluster/testdata/cluster_lock_v1_0_0.json +++ b/cluster/testdata/cluster_lock_v1_0_0.json @@ -4,14 +4,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": "" @@ -27,7 +27,7 @@ "dkg_algorithm": "default", "fork_version": "0x90000069", "config_hash": "JSNZW161qkmBRJw50hFXoXAgxBgGR02yZsoOWs00lMA=", - "definition_hash": "cxiiCHLD1/2uq0pOp/zKfaEti6JEDhLZeHZLl1zOBlQ=" + "definition_hash": "fzzQkicXSL5ESuZ+l7Si/abrioDZk3+bE1ri8TqJMYY=" }, "distributed_validators": [ { @@ -46,5 +46,5 @@ } ], "signature_aggregate": "sqS0R11jr76PtWmHx39YGFJvGBS+gjNQ6rE5NfMdhEg=", - "lock_hash": "GGj7/vrt/Dx0HVC86ULGjJc39Z+olAsvsGUxbpsMmhE=" + "lock_hash": "bu5i52f6keDkpGCsllSRKfcVTYjBKBi7JSXfBlKTu9s=" } \ No newline at end of file diff --git a/cluster/testdata/cluster_lock_v1_10_0.json b/cluster/testdata/cluster_lock_v1_10_0.json index 01b7814c6f..52df99a1e3 100644 --- a/cluster/testdata/cluster_lock_v1_10_0.json +++ b/cluster/testdata/cluster_lock_v1_10_0.json @@ -8,13 +8,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" } @@ -44,7 +44,7 @@ "target_gas_limit": 30000000, "compounding": false, "config_hash": "0x225c67b648abd8b459265cd84b18b86265e2c5da8e352c488ac6f0e63b2422bc", - "definition_hash": "0x77084e268288dd34970af16f55b8dcbbe26dce196e0e91be193450f24726e76e" + "definition_hash": "0x29f54c92e0380e19a1136b5977bb5479e194dc6cf03f1f4c128f1d38262da95f" }, "distributed_validators": [ { @@ -109,7 +109,7 @@ } ], "signature_aggregate": "0x1c1fd3be8990434179d3af4491a369012db92d184fc39d1734ff5716428953bb", - "lock_hash": "0xb1613824b71f57f877be2cdf230e0baa8ab2cc886f57171157be5180961764f0", + "lock_hash": "0xdbbce80cc376f86a0834042af18cc7c88408061cd32b13e8f461409c186d5aba", "node_signatures": [ "0xfa3f85b8a62708caebbac880b5b89b93da53810164402104e648b6226a1b7802", "0x1851f5d9ac0f313a89ddfc454c5f8f72ac89b38b19f53784c19e9beac03c875a" diff --git a/cluster/testdata/cluster_lock_v1_1_0.json b/cluster/testdata/cluster_lock_v1_1_0.json index 31b96647fc..09f1c474c4 100644 --- a/cluster/testdata/cluster_lock_v1_1_0.json +++ b/cluster/testdata/cluster_lock_v1_1_0.json @@ -4,14 +4,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": "" @@ -27,7 +27,7 @@ "dkg_algorithm": "default", "fork_version": "0x90000069", "config_hash": "NAvx68ME/uWLpWBAtn/rWc+APaG88LHCkxpoGU8KT7U=", - "definition_hash": "FTTSEPZtKLkoVwJhM5U9Ij+rxig+7f9uUjpv+u7ngic=" + "definition_hash": "kAi2+HLkFueLxnEtSsQRokK97Q/q1J7PXJOraQdtOkM=" }, "distributed_validators": [ { @@ -46,5 +46,5 @@ } ], "signature_aggregate": "sqS0R11jr76PtWmHx39YGFJvGBS+gjNQ6rE5NfMdhEg=", - "lock_hash": "vJv0y0sxA4IisRD0EORwTw9KzDL8AmoIZyo8WdTPrmM=" + "lock_hash": "g8dl5AyRnAyo6Dyuj+PrY83EE5VrMLe0oD7cY6xN2U4=" } \ No newline at end of file diff --git a/cluster/testdata/cluster_lock_v1_2_0.json b/cluster/testdata/cluster_lock_v1_2_0.json index b964e10fb9..29c2d4e27f 100644 --- a/cluster/testdata/cluster_lock_v1_2_0.json +++ b/cluster/testdata/cluster_lock_v1_2_0.json @@ -4,13 +4,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": "" } @@ -25,7 +25,7 @@ "dkg_algorithm": "default", "fork_version": "0x90000069", "config_hash": "0xf61eafe230658b03bb4f90d7a910f8b6c56b0849ee3d70f12e688583b4e7f8a3", - "definition_hash": "0x45d87ed12ccf5f137da6acd03c0aa9378bdd8a25e9ec856b681b1427165a6ee3" + "definition_hash": "0xc80e378affe3fca6698179fd1cf3882b20196e171e7cb63c1b1c57596e26fc41" }, "distributed_validators": [ { @@ -44,5 +44,5 @@ } ], "signature_aggregate": "0xb2a4b4475d63afbe8fb56987c77f5818526f1814be823350eab13935f31d8448", - "lock_hash": "0xac571367423f87187880d7b83b0cbf003841540fe9cb8d55ced56616666d9bc0" + "lock_hash": "0xbb6327125f99d1ae8f9514154c0fda5153a944d7ef4044727429090061582759" } \ No newline at end of file diff --git a/cluster/testdata/cluster_lock_v1_3_0.json b/cluster/testdata/cluster_lock_v1_3_0.json index d34dc1b3de..ac0e4f2cd2 100644 --- a/cluster/testdata/cluster_lock_v1_3_0.json +++ b/cluster/testdata/cluster_lock_v1_3_0.json @@ -4,13 +4,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" } @@ -25,7 +25,7 @@ "dkg_algorithm": "default", "fork_version": "0x90000069", "config_hash": "0xfa71973a6ba32e6c933ace935b0cfc7aebfe27d6ad338cc4c8ae2c77a30aa6d0", - "definition_hash": "0xed4bca0a33e950c0bc6836227a411b631d308d6a7eeaa227d9829f92f5985dd8" + "definition_hash": "0x1fd867553e7dd1f851e08b1fba8bbd3f521ac6cdcff78275c08f439a2aa2bd10" }, "distributed_validators": [ { @@ -44,5 +44,5 @@ } ], "signature_aggregate": "0xb2a4b4475d63afbe8fb56987c77f5818526f1814be823350eab13935f31d8448", - "lock_hash": "0xafcdd37f6bca760fee75c9b425425f1ba3320bacbe9949f874981a0363325259" + "lock_hash": "0x47b51f52d7d25447305d797adfedf8930e61034505eee5f603900421b0d51e6d" } \ No newline at end of file diff --git a/cluster/testdata/cluster_lock_v1_4_0.json b/cluster/testdata/cluster_lock_v1_4_0.json index 79e2892da5..bbdb001095 100644 --- a/cluster/testdata/cluster_lock_v1_4_0.json +++ b/cluster/testdata/cluster_lock_v1_4_0.json @@ -8,13 +8,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" } @@ -29,7 +29,7 @@ "dkg_algorithm": "default", "fork_version": "0x90000069", "config_hash": "0x6ba0d3f2c53ed01e6e2de90561e7c6c4163bb5d609c558b69c282f98dc07c766", - "definition_hash": "0x06c80b10950ee2469c02716de7fd85fb70c17d84b464ec66bbe32cb48fa329c6" + "definition_hash": "0xe206896f7aadecef895a3d20b9f04ddd3be0e6c3dd03c0be33bd968e16b61471" }, "distributed_validators": [ { @@ -48,5 +48,5 @@ } ], "signature_aggregate": "0xb2a4b4475d63afbe8fb56987c77f5818526f1814be823350eab13935f31d8448", - "lock_hash": "0x1ca04d20ca3a48100a4d4e2ee8c7081351879fe372691632f2cb1b7e02498a6e" + "lock_hash": "0xeb471aac17eb47310f4b0be1dafb4248428090c3d3e0f41c12778be192b65383" } \ No newline at end of file diff --git a/cluster/testdata/cluster_lock_v1_5_0.json b/cluster/testdata/cluster_lock_v1_5_0.json index ae553a5410..b5c0d60b3d 100644 --- a/cluster/testdata/cluster_lock_v1_5_0.json +++ b/cluster/testdata/cluster_lock_v1_5_0.json @@ -8,13 +8,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" } @@ -37,7 +37,7 @@ "dkg_algorithm": "default", "fork_version": "0x90000069", "config_hash": "0x50afebc6e36c3d31e42d782cfada36bae422ef47b102d356943bbdc20e4b73a7", - "definition_hash": "0xb0876460555b5c02faa09e4dcba322ff15e53a4170acec0e584a78cbdbe2a9cc" + "definition_hash": "0x0c857d42a053f99488d25fbdbd8cd0d4275bee89b5a8f250472b8e9b580c0a11" }, "distributed_validators": [ { @@ -56,5 +56,5 @@ } ], "signature_aggregate": "0x1c1fd3be8990434179d3af4491a369012db92d184fc39d1734ff5716428953bb", - "lock_hash": "0xf437572afcce5138cab7cb652abbfafa1fc0c248b1098cb430a275503ceea978" + "lock_hash": "0x51e9370af00fe9d4a24ef67a1d2631b61c5b7ff3d81283b92a8db948c9e66125" } \ No newline at end of file diff --git a/cluster/testdata/cluster_lock_v1_6_0.json b/cluster/testdata/cluster_lock_v1_6_0.json index 5bdbb84011..4b299e25a7 100644 --- a/cluster/testdata/cluster_lock_v1_6_0.json +++ b/cluster/testdata/cluster_lock_v1_6_0.json @@ -8,13 +8,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" } @@ -37,7 +37,7 @@ "dkg_algorithm": "default", "fork_version": "0x90000069", "config_hash": "0x71a0519d13c40b390aec9e8d0e291cab9105dde5b08f7038163110332c59e9c7", - "definition_hash": "0xe665fa83fa98c4769a99319e8bcb256984b7de196ca50821e51ddcc95041a6fe" + "definition_hash": "0x05fae3a93cc8a5486eabf3ce9a86e1ca4f39f0c59c4b752aec296c384e18a6df" }, "distributed_validators": [ { @@ -68,5 +68,5 @@ } ], "signature_aggregate": "0x1c1fd3be8990434179d3af4491a369012db92d184fc39d1734ff5716428953bb", - "lock_hash": "0x5931cc96a335b2dc6d781db06bc9a1e3e41550f2ff3b10dc5c757f225960de86" + "lock_hash": "0x073bda326c57cfe8e0633f2c562950bed7c5ba8f8767b383b533b2a9c2d76372" } \ No newline at end of file diff --git a/cluster/testdata/cluster_lock_v1_7_0.json b/cluster/testdata/cluster_lock_v1_7_0.json index 402b14cf05..f5be8b7f6e 100644 --- a/cluster/testdata/cluster_lock_v1_7_0.json +++ b/cluster/testdata/cluster_lock_v1_7_0.json @@ -8,13 +8,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" } @@ -37,7 +37,7 @@ "dkg_algorithm": "default", "fork_version": "0x90000069", "config_hash": "0x552b6831cb8c45a46bc9e7c564636952e41c299a6a22c24d1775a9ee7fa9090e", - "definition_hash": "0xc0d498eca660af9a0f562683fe9e7746a48a29e676fd017febaa65135336b971" + "definition_hash": "0xd7e1019792ca2da31dd68109445438cf223259b4be866d4bde079e35f87efb27" }, "distributed_validators": [ { @@ -86,7 +86,7 @@ } ], "signature_aggregate": "0x1c1fd3be8990434179d3af4491a369012db92d184fc39d1734ff5716428953bb", - "lock_hash": "0xbb0ce2dc50aa923842795e07b4f2a0a23c41177f1135855798ec5570a088926d", + "lock_hash": "0x00d9fe95b77bc4a303ec810164deb6dd9fd44c1252fc8219af628159f2c0163a", "node_signatures": [ "0xfa3f85b8a62708caebbac880b5b89b93da53810164402104e648b6226a1b7802", "0x1851f5d9ac0f313a89ddfc454c5f8f72ac89b38b19f53784c19e9beac03c875a" diff --git a/cluster/testdata/cluster_lock_v1_8_0.json b/cluster/testdata/cluster_lock_v1_8_0.json index da5e50e99b..5e3699bbad 100644 --- a/cluster/testdata/cluster_lock_v1_8_0.json +++ b/cluster/testdata/cluster_lock_v1_8_0.json @@ -8,13 +8,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" } @@ -41,7 +41,7 @@ "16000000000" ], "config_hash": "0xbe27726f562e31025947b013115e3e33cc1e832f57bea9ccff3bde4bde51bfa0", - "definition_hash": "0x43424dc5bc7748f41b6d68a0a8752d8ae8008913471068769be8887ecc485258" + "definition_hash": "0x7943e20552f77f416bac4495bff9759c14dedbcfc7fddca46ba880f02d6c8c01" }, "distributed_validators": [ { @@ -106,7 +106,7 @@ } ], "signature_aggregate": "0x1c1fd3be8990434179d3af4491a369012db92d184fc39d1734ff5716428953bb", - "lock_hash": "0xefbdb47840715c7a3bb0fa795089afd713a863c8f523bfcb46e0ff8950b01b0d", + "lock_hash": "0x8d8c170b43767add9310c9cb6e359e49a7bf76d1321eb5930f1d67329a4b3a2d", "node_signatures": [ "0xfa3f85b8a62708caebbac880b5b89b93da53810164402104e648b6226a1b7802", "0x1851f5d9ac0f313a89ddfc454c5f8f72ac89b38b19f53784c19e9beac03c875a" diff --git a/cluster/testdata/cluster_lock_v1_9_0.json b/cluster/testdata/cluster_lock_v1_9_0.json index 06c82e7bf2..5e4eac8b43 100644 --- a/cluster/testdata/cluster_lock_v1_9_0.json +++ b/cluster/testdata/cluster_lock_v1_9_0.json @@ -8,13 +8,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" } @@ -42,7 +42,7 @@ ], "consensus_protocol": "abft", "config_hash": "0x106b5056b1f4ec7fa61fa5d5c62d555cada57d238f076b1f2b605ee192ca3249", - "definition_hash": "0x6ffb319725adc05b8bfce2b1fed2f98868ef2a4e67f3d32b9b11151014bc6b26" + "definition_hash": "0x45d67df9e040ec3923d99d8b7bc31b54a84965d0a6222c6e1de1d5f1fe828cea" }, "distributed_validators": [ { @@ -107,7 +107,7 @@ } ], "signature_aggregate": "0x1c1fd3be8990434179d3af4491a369012db92d184fc39d1734ff5716428953bb", - "lock_hash": "0x6a2e65973460f2392c797ccee621cdce72dc4eb3536d3afa7a5d0947e2d2adc0", + "lock_hash": "0xe6370a37dcdf8f973917d5a6f1b598d3914b0b563951518fbda8f48d3a18bc4a", "node_signatures": [ "0xfa3f85b8a62708caebbac880b5b89b93da53810164402104e648b6226a1b7802", "0x1851f5d9ac0f313a89ddfc454c5f8f72ac89b38b19f53784c19e9beac03c875a" diff --git a/cmd/createcluster.go b/cmd/createcluster.go index 8a04034820..390042e857 100644 --- a/cmd/createcluster.go +++ b/cmd/createcluster.go @@ -963,10 +963,10 @@ func writeOutput(out io.Writer, splitKeys bool, clusterDir string, numNodes int, var sb strings.Builder _, _ = sb.WriteString("Created charon cluster:\n") - _, _ = sb.WriteString(fmt.Sprintf(" --split-existing-keys=%v\n", splitKeys)) + _, _ = fmt.Fprintf(&sb, " --split-existing-keys=%v\n", splitKeys) _, _ = sb.WriteString("\n") _, _ = sb.WriteString(strings.TrimSuffix(absClusterDir, "/") + "/\n") - _, _ = sb.WriteString(fmt.Sprintf("├─ node[0-%d]/\t\t\tDirectory for each node\n", numNodes-1)) + _, _ = fmt.Fprintf(&sb, "├─ node[0-%d]/\t\t\tDirectory for each node\n", numNodes-1) _, _ = sb.WriteString("│ ├─ charon-enr-private-key\tCharon networking private key for node authentication\n") _, _ = sb.WriteString("│ ├─ cluster-lock.json\t\tCluster lock defines the cluster lock file which is signed by all nodes\n") @@ -978,7 +978,7 @@ func writeOutput(out io.Writer, splitKeys bool, clusterDir string, numNodes int, } if zipped { - _, _ = sb.WriteString(fmt.Sprintf("\nFiles compressed and archived to:\n%s/cluster.tar.gz\n", absClusterDir)) + _, _ = fmt.Fprintf(&sb, "\nFiles compressed and archived to:\n%s/cluster.tar.gz\n", absClusterDir) } _, _ = fmt.Fprint(out, sb.String()) diff --git a/cmd/createenr.go b/cmd/createenr.go index 6158bb1bae..0c3ca750bb 100644 --- a/cmd/createenr.go +++ b/cmd/createenr.go @@ -68,7 +68,7 @@ func writeEnrWarning(w io.Writer, keyPath string) { _, _ = sb.WriteString("***************** WARNING: Backup key **********************\n") _, _ = sb.WriteString(" PLEASE BACKUP YOUR KEY IMMEDIATELY! IF YOU LOSE YOUR KEY,\n") _, _ = sb.WriteString(" YOU WON'T BE ABLE TO PARTICIPATE IN RUNNING A CHARON CLUSTER.\n\n") - _, _ = sb.WriteString(fmt.Sprintf(" YOU CAN FIND YOUR KEY IN %s\n", keyPath)) + _, _ = fmt.Fprintf(&sb, " YOU CAN FIND YOUR KEY IN %s\n", keyPath) _, _ = sb.WriteString("****************************************************************\n") _, _ = sb.WriteString("\n") diff --git a/cmd/enr.go b/cmd/enr.go index c38178f447..b75f0a6f13 100644 --- a/cmd/enr.go +++ b/cmd/enr.go @@ -71,8 +71,8 @@ func writeExpandedEnr(w io.Writer, r enr.Record, privKey *k1.PrivateKey) { _, _ = sb.WriteString("\n") _, _ = sb.WriteString("***************** Decoded ENR (see https://enr-viewer.com/ for additional fields) **********************\n") - _, _ = sb.WriteString(fmt.Sprintf("secp256k1 pubkey: %#x\n", privKey.PubKey().SerializeCompressed())) - _, _ = sb.WriteString(fmt.Sprintf("signature: %#x\n", r.Signature)) + _, _ = fmt.Fprintf(&sb, "secp256k1 pubkey: %#x\n", privKey.PubKey().SerializeCompressed()) + _, _ = fmt.Fprintf(&sb, "signature: %#x\n", r.Signature) _, _ = sb.WriteString("********************************************************************************************************\n") _, _ = sb.WriteString("\n") diff --git a/core/validatorapi/router.go b/core/validatorapi/router.go index 443af91459..be437c44b7 100644 --- a/core/validatorapi/router.go +++ b/core/validatorapi/router.go @@ -1656,19 +1656,19 @@ func eventsHandler(h Handler) http.HandlerFunc { proxy := httputil.NewSingleHostReverseProxy(targetURL) // Extend default proxy director with basic auth and host header - defaultDirector := proxy.Director - proxy.Director = func(req *http.Request) { + defaultDirector := proxy.Rewrite + proxy.Rewrite = func(req *httputil.ProxyRequest) { if targetURL.User != nil { password, _ := targetURL.User.Password() - req.SetBasicAuth(targetURL.User.Username(), password) + req.Out.SetBasicAuth(targetURL.User.Username(), password) } - req.Host = targetURL.Host + req.Out.Host = targetURL.Host defaultDirector(req) // Apply user provided beacon node headers for k, v := range headers { - req.Header.Set(k, v) + req.Out.Header.Set(k, v) } } diff --git a/dkg/pedersen/logger.go b/dkg/pedersen/logger.go index f99f4f373e..31c4741494 100644 --- a/dkg/pedersen/logger.go +++ b/dkg/pedersen/logger.go @@ -42,7 +42,7 @@ func concatKeyVals(keyvals []any) (str string, err error) { if maybeErr, ok := v.(error); ok { err = maybeErr } else { - strSb38.WriteString(fmt.Sprintf("%v", v)) + fmt.Fprintf(&strSb38, "%v", v) } } diff --git a/eth2util/enr/enr_internal_test.go b/eth2util/enr/enr_internal_test.go index a99a4380ad..2d67a16045 100644 --- a/eth2util/enr/enr_internal_test.go +++ b/eth2util/enr/enr_internal_test.go @@ -19,6 +19,9 @@ func TestBackwardsENR(t *testing.T) { k, err := ecdsa.GenerateKey(k1.S256(), random) require.NoError(t, err) + //nolint:staticcheck // We are using it in tests in a safely manner in testing. + // We expect a bit more utility functions to be implemented in the k1 package in the future + // This is currently the only way to get deterministic keys for testing. key := k1.PrivKeyFromBytes(k.D.Bytes()) record, err := New(key) diff --git a/eth2util/enr/enr_test.go b/eth2util/enr/enr_test.go index a47b9ed498..4098f83783 100644 --- a/eth2util/enr/enr_test.go +++ b/eth2util/enr/enr_test.go @@ -101,7 +101,7 @@ func TestNew(t *testing.T) { r, err := enr.New(privkey) require.NoError(t, err) - require.Equal(t, "enr:-HW4QEp-BLhP30tqTGFbR9n2PdUKWP9qc0zphIRmn8_jpm4BYkgekztXQaPA_znRW8RvNYHo0pUwyPEwUGGeZu26XlKAgmlkgnY0iXNlY3AyNTZrMaEDG4TFVnsSZECZXT7VqroFZdceGDRgSBn_nBf16dXdB48", r.String()) + require.Equal(t, "enr:-HW4QBw9borfkmpb5xeaTHMmfp7WAcdb7CH8bf24v6eAaijpfJhg5Q08WMxnJB6em5G8qz4qARuocKJk_wpw1meAILKAgmlkgnY0iXNlY3AyNTZrMaECuCIfkhjDeJcudF71FYmSoL9xBwxjvGAF877_5a4AB_U", r.String()) } const ( diff --git a/go.mod b/go.mod index 5af98d09ab..8b7420f297 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/obolnetwork/charon -go 1.25 +go 1.26 require ( github.com/OffchainLabs/go-bitfield v0.0.0-20251031151322-f427d04d8506 diff --git a/p2p/peer_test.go b/p2p/peer_test.go index db2411d39c..fe5f5609e5 100644 --- a/p2p/peer_test.go +++ b/p2p/peer_test.go @@ -25,7 +25,7 @@ func TestNewPeer(t *testing.T) { p, err := p2p.NewPeerFromENR(record, 0) require.NoError(t, err) - require.Equal(t, "16Uiu2HAkzdQ5Y9SYT91K1ue5SxXwgmajXntfScGnLYeip5hHyWmT", p.ID.String()) + require.Equal(t, "16Uiu2HAm3M9eZQnzWVvpT12qPmAVipHETMcnzUkmXLjPeU7sxqEa", p.ID.String()) } func TestNewTCPHost(t *testing.T) { diff --git a/testutil/compose/testdata/TestDockerCompose_define_dkg_template.golden b/testutil/compose/testdata/TestDockerCompose_define_dkg_template.golden index b44f450078..add34ca520 100644 --- a/testutil/compose/testdata/TestDockerCompose_define_dkg_template.golden +++ b/testutil/compose/testdata/TestDockerCompose_define_dkg_template.golden @@ -19,7 +19,7 @@ }, { "Key": "operator_enrs", - "Value": "enr:-HW4QEp-BLhP30tqTGFbR9n2PdUKWP9qc0zphIRmn8_jpm4BYkgekztXQaPA_znRW8RvNYHo0pUwyPEwUGGeZu26XlKAgmlkgnY0iXNlY3AyNTZrMaEDG4TFVnsSZECZXT7VqroFZdceGDRgSBn_nBf16dXdB48,enr:-HW4QEp-BLhP30tqTGFbR9n2PdUKWP9qc0zphIRmn8_jpm4BYkgekztXQaPA_znRW8RvNYHo0pUwyPEwUGGeZu26XlKAgmlkgnY0iXNlY3AyNTZrMaEDG4TFVnsSZECZXT7VqroFZdceGDRgSBn_nBf16dXdB48,enr:-HW4QEp-BLhP30tqTGFbR9n2PdUKWP9qc0zphIRmn8_jpm4BYkgekztXQaPA_znRW8RvNYHo0pUwyPEwUGGeZu26XlKAgmlkgnY0iXNlY3AyNTZrMaEDG4TFVnsSZECZXT7VqroFZdceGDRgSBn_nBf16dXdB48,enr:-HW4QEp-BLhP30tqTGFbR9n2PdUKWP9qc0zphIRmn8_jpm4BYkgekztXQaPA_znRW8RvNYHo0pUwyPEwUGGeZu26XlKAgmlkgnY0iXNlY3AyNTZrMaEDG4TFVnsSZECZXT7VqroFZdceGDRgSBn_nBf16dXdB48" + "Value": "enr:-HW4QBw9borfkmpb5xeaTHMmfp7WAcdb7CH8bf24v6eAaijpfJhg5Q08WMxnJB6em5G8qz4qARuocKJk_wpw1meAILKAgmlkgnY0iXNlY3AyNTZrMaECuCIfkhjDeJcudF71FYmSoL9xBwxjvGAF877_5a4AB_U,enr:-HW4QBw9borfkmpb5xeaTHMmfp7WAcdb7CH8bf24v6eAaijpfJhg5Q08WMxnJB6em5G8qz4qARuocKJk_wpw1meAILKAgmlkgnY0iXNlY3AyNTZrMaECuCIfkhjDeJcudF71FYmSoL9xBwxjvGAF877_5a4AB_U,enr:-HW4QBw9borfkmpb5xeaTHMmfp7WAcdb7CH8bf24v6eAaijpfJhg5Q08WMxnJB6em5G8qz4qARuocKJk_wpw1meAILKAgmlkgnY0iXNlY3AyNTZrMaECuCIfkhjDeJcudF71FYmSoL9xBwxjvGAF877_5a4AB_U,enr:-HW4QBw9borfkmpb5xeaTHMmfp7WAcdb7CH8bf24v6eAaijpfJhg5Q08WMxnJB6em5G8qz4qARuocKJk_wpw1meAILKAgmlkgnY0iXNlY3AyNTZrMaECuCIfkhjDeJcudF71FYmSoL9xBwxjvGAF877_5a4AB_U" }, { "Key": "threshold", diff --git a/testutil/compose/testdata/TestDockerCompose_define_dkg_yml.golden b/testutil/compose/testdata/TestDockerCompose_define_dkg_yml.golden index 759848355b..21a66f06a9 100644 --- a/testutil/compose/testdata/TestDockerCompose_define_dkg_yml.golden +++ b/testutil/compose/testdata/TestDockerCompose_define_dkg_yml.golden @@ -13,7 +13,7 @@ services: environment: CHARON_NAME: compose CHARON_NUM_VALIDATORS: 1 - CHARON_OPERATOR_ENRS: enr:-HW4QEp-BLhP30tqTGFbR9n2PdUKWP9qc0zphIRmn8_jpm4BYkgekztXQaPA_znRW8RvNYHo0pUwyPEwUGGeZu26XlKAgmlkgnY0iXNlY3AyNTZrMaEDG4TFVnsSZECZXT7VqroFZdceGDRgSBn_nBf16dXdB48,enr:-HW4QEp-BLhP30tqTGFbR9n2PdUKWP9qc0zphIRmn8_jpm4BYkgekztXQaPA_znRW8RvNYHo0pUwyPEwUGGeZu26XlKAgmlkgnY0iXNlY3AyNTZrMaEDG4TFVnsSZECZXT7VqroFZdceGDRgSBn_nBf16dXdB48,enr:-HW4QEp-BLhP30tqTGFbR9n2PdUKWP9qc0zphIRmn8_jpm4BYkgekztXQaPA_znRW8RvNYHo0pUwyPEwUGGeZu26XlKAgmlkgnY0iXNlY3AyNTZrMaEDG4TFVnsSZECZXT7VqroFZdceGDRgSBn_nBf16dXdB48,enr:-HW4QEp-BLhP30tqTGFbR9n2PdUKWP9qc0zphIRmn8_jpm4BYkgekztXQaPA_znRW8RvNYHo0pUwyPEwUGGeZu26XlKAgmlkgnY0iXNlY3AyNTZrMaEDG4TFVnsSZECZXT7VqroFZdceGDRgSBn_nBf16dXdB48 + CHARON_OPERATOR_ENRS: enr:-HW4QBw9borfkmpb5xeaTHMmfp7WAcdb7CH8bf24v6eAaijpfJhg5Q08WMxnJB6em5G8qz4qARuocKJk_wpw1meAILKAgmlkgnY0iXNlY3AyNTZrMaECuCIfkhjDeJcudF71FYmSoL9xBwxjvGAF877_5a4AB_U,enr:-HW4QBw9borfkmpb5xeaTHMmfp7WAcdb7CH8bf24v6eAaijpfJhg5Q08WMxnJB6em5G8qz4qARuocKJk_wpw1meAILKAgmlkgnY0iXNlY3AyNTZrMaECuCIfkhjDeJcudF71FYmSoL9xBwxjvGAF877_5a4AB_U,enr:-HW4QBw9borfkmpb5xeaTHMmfp7WAcdb7CH8bf24v6eAaijpfJhg5Q08WMxnJB6em5G8qz4qARuocKJk_wpw1meAILKAgmlkgnY0iXNlY3AyNTZrMaECuCIfkhjDeJcudF71FYmSoL9xBwxjvGAF877_5a4AB_U,enr:-HW4QBw9borfkmpb5xeaTHMmfp7WAcdb7CH8bf24v6eAaijpfJhg5Q08WMxnJB6em5G8qz4qARuocKJk_wpw1meAILKAgmlkgnY0iXNlY3AyNTZrMaECuCIfkhjDeJcudF71FYmSoL9xBwxjvGAF877_5a4AB_U CHARON_THRESHOLD: 3 CHARON_WITHDRAWAL_ADDRESSES: "0x0000000000000000000000000000000000000000" CHARON_FEE_RECIPIENT_ADDRESSES: "0x0000000000000000000000000000000000000000" diff --git a/testutil/random.go b/testutil/random.go index ecb723ce07..10745edea2 100644 --- a/testutil/random.go +++ b/testutil/random.go @@ -12,6 +12,7 @@ import ( "net" "strings" "testing" + "testing/cryptotest" "time" "github.com/OffchainLabs/go-bitfield" @@ -1666,28 +1667,20 @@ func RandomDepositMsg(t *testing.T) eth2p0.DepositMessage { } } -// constReader is a workaround. It counter-acts the Go library's attempt at -// making ECDSA signatures non-deterministic. -// Refer: https://cs.opensource.google/go/go/+/refs/tags/go1.20.2:src/crypto/ecdsa/ecdsa.go;l=155 -type constReader byte - -func (c constReader) Read(buf []byte) (int, error) { - for i := range len(buf) { - buf[i] = byte(c) - } - - return len(buf), nil -} - // GenerateInsecureK1Key returns a new deterministic insecure secp256k1 private using the provided seed for testing purposes only. // For random keys, rather use k1.GeneratePrivateKey(). func GenerateInsecureK1Key(t *testing.T, seed int) *k1.PrivateKey { t.Helper() // Add 1 to seed to avoid passing 0 as seed which can trigger infinite loop. - k, err := ecdsa.GenerateKey(k1.S256(), constReader(seed+1)) + cryptotest.SetGlobalRandom(t, uint64(seed+1)) + // Reader is nil as it was deprecated in go 1.26 and is ignored by the library. + k, err := ecdsa.GenerateKey(k1.S256(), nil) require.NoError(t, err) + //nolint:staticcheck // We are using it in tests in a safely manner in testing. + // We expect a bit more utility functions to be implemented in the k1 package in the future + // This is currently the only way to get deterministic keys for testing. return k1.PrivKeyFromBytes(k.D.Bytes()) }