diff --git a/.gitignore b/.gitignore index ef6de2a..1e380e2 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,6 @@ coverage.html # Local TODO TODO.md + +# Intellij + friends. +.idea/ \ No newline at end of file diff --git a/.golangci.yml b/.golangci.yml index b68522c..6448aae 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -73,7 +73,7 @@ run: # output configuration options -output: +# output: # Format: colored-line-number|line-number|json|tab|checkstyle|code-climate|junit-xml|github-actions # # Multiple can be specified by separating them by comma, output can be provided @@ -121,8 +121,6 @@ linters-settings: ignore-generated-header: false severity: error confidence: 0.8 - errorCode: 0 - warningCode: 0 enable-all-rules: true rules: - name: add-constant @@ -168,10 +166,8 @@ linters: - depguard - dupl - err113 - - execinquery - exhaustive - exhaustruct - - exportloopref - forcetypeassert - funlen - gci @@ -179,7 +175,6 @@ linters: - gochecknoinits - gocognit - goconst - - gomnd - ireturn - lll - maintidx diff --git a/go.mod b/go.mod index 93cd9e6..4442e79 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ module github.com/wealdtech/comptrollerd -go 1.22.7 +go 1.23.0 -toolchain go1.23.2 +toolchain go1.24.5 require ( - github.com/attestantio/go-eth2-client v0.23.1 - github.com/attestantio/go-execution-client v0.9.4 - github.com/attestantio/go-relay-client v0.2.7 + github.com/attestantio/go-eth2-client v0.27.1 + github.com/attestantio/go-execution-client v0.10.2 + github.com/attestantio/go-relay-client v0.3.0 github.com/aws/aws-sdk-go v1.55.6 github.com/jackc/pgx-shopspring-decimal v0.0.0-20220624020537-1d36b5a1853e github.com/jackc/pgx-zerolog v0.0.0-20230315001418-f978528409eb @@ -39,7 +39,7 @@ require ( cloud.google.com/go/compute/metadata v0.6.0 // indirect cloud.google.com/go/iam v1.3.1 // indirect cloud.google.com/go/secretmanager v1.14.4 // indirect - github.com/attestantio/go-builder-client v0.5.3 // indirect + github.com/attestantio/go-builder-client v0.7.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect @@ -94,7 +94,7 @@ require ( go.opentelemetry.io/otel/metric v1.34.0 // indirect go.opentelemetry.io/proto/otlp v1.5.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.32.0 // indirect + golang.org/x/crypto v0.35.0 // indirect golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect golang.org/x/net v0.34.0 // indirect golang.org/x/oauth2 v0.26.0 // indirect diff --git a/go.sum b/go.sum index 73ba236..1c664c7 100644 --- a/go.sum +++ b/go.sum @@ -76,12 +76,20 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/attestantio/go-builder-client v0.5.3 h1:4YFT0u823JvF4Uesj7SEG8f0De1uxLrVioOgKZYPl3I= github.com/attestantio/go-builder-client v0.5.3/go.mod h1:RaWc8K2SjyU19sL5UinOQ8n4vTZBrEQzsNuMWpNmwK4= -github.com/attestantio/go-eth2-client v0.23.1 h1:aVBtTtS/ZmXT1we0sEzzmxtcO+N/v5sDjaLy53Y6+Mw= -github.com/attestantio/go-eth2-client v0.23.1/go.mod h1:m3TxvwYK7G79hdw6/V8RENCJusOwxlGYQQWLifj0mOM= +github.com/attestantio/go-builder-client v0.7.0 h1:Kxf5eTKQlU4syv3Uzt8v3vKKm7im1W4CjRAZiPYoqTQ= +github.com/attestantio/go-builder-client v0.7.0/go.mod h1:wGZ0U3QX8/F4lWwieJpqCPgXIl8gbfBxm8iViznrTFQ= +github.com/attestantio/go-eth2-client v0.26.1-0.20250829122455-ff89a2135a43 h1:v5l00W4U5WuYz6+Cux0URjN/VBKCupwzG6gCgRdn6Wo= +github.com/attestantio/go-eth2-client v0.26.1-0.20250829122455-ff89a2135a43/go.mod h1:fvULSL9WtNskkOB4i+Yyr6BKpNHXvmpGZj9969fCrfY= +github.com/attestantio/go-eth2-client v0.27.1 h1:g7bm+gG/p+gfzYdEuxuAepVWYb8EO+2KojV5/Lo2BxM= +github.com/attestantio/go-eth2-client v0.27.1/go.mod h1:fvULSL9WtNskkOB4i+Yyr6BKpNHXvmpGZj9969fCrfY= github.com/attestantio/go-execution-client v0.9.4 h1:wgFy0ISTaYl2Xxj2PHHUrwfAlSK4BHZudJs5P1GLeI8= github.com/attestantio/go-execution-client v0.9.4/go.mod h1:tUsr7Y0DgYfSIOhAwDrE+k3wV8IqmkFjyOvqr7BJ9Uk= +github.com/attestantio/go-execution-client v0.10.2 h1:plfOAROLXVE//Yz8Ujp8s8PAr8rzXTnVKrsULt8+OuA= +github.com/attestantio/go-execution-client v0.10.2/go.mod h1:ppLo3duaOxEpZYM/N6L7Kg/Ks931JKTY9YZnWBdtWSc= github.com/attestantio/go-relay-client v0.2.7 h1:qlRh+zdMjA3uqU12fpsxJwLME5L5uO84I4ElJCO6oLQ= github.com/attestantio/go-relay-client v0.2.7/go.mod h1:INcPeI0HNb4AGaFPvPDmAz8HUveh91g2XA9GMPhsftw= +github.com/attestantio/go-relay-client v0.3.0 h1:VcVO2yB9HvM5JdMNbBRYSpMA7b6MF/2I7l9bXiINV4g= +github.com/attestantio/go-relay-client v0.3.0/go.mod h1:c1lBJ/UxEIWTDbfpM8C9F7330YT/WX++//PLq2G3IyU= github.com/aws/aws-sdk-go v1.44.81/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go v1.55.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk= github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= @@ -436,8 +444,10 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= -golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= +golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= +golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= +golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= +golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= diff --git a/main.go b/main.go index 23bc784..bf68026 100644 --- a/main.go +++ b/main.go @@ -51,7 +51,7 @@ import ( ) // ReleaseVersion is the release version for the code. -var ReleaseVersion = "0.4.4" +var ReleaseVersion = "0.4.5" func main() { os.Exit(main2())