diff --git a/cli/initiator/initiator.go b/cli/initiator/initiator.go index b7a758cc..750d1948 100644 --- a/cli/initiator/initiator.go +++ b/cli/initiator/initiator.go @@ -63,9 +63,9 @@ var StartDKG = &cobra.Command{ if err != nil { logger.Fatal("😥 Failed to load operators: ", zap.Error(err)) } - ethNetwork := e2m_core.NetworkFromString(flags.Network) - if ethNetwork == "" { - logger.Fatal("😥 Cant recognize eth network") + ethNetwork, err := e2m_core.NetworkFromString(flags.Network) + if err != nil { + logger.Fatal("😥 Cant recognize eth network: ", zap.Error(err)) } // start the ceremony ctx := context.Background() diff --git a/cli/initiator/reshare.go b/cli/initiator/reshare.go index 22c6c77a..ebb907f6 100644 --- a/cli/initiator/reshare.go +++ b/cli/initiator/reshare.go @@ -72,9 +72,9 @@ var GenerateReshareMsg = &cobra.Command{ logger.Fatal("😥 Failed to read proofs string:", zap.Error(err)) } } - ethNetwork := e2m_core.NetworkFromString(flags.Network) - if ethNetwork == "" { - logger.Fatal("😥 Cant recognize eth network") + ethNetwork, err := e2m_core.NetworkFromString(flags.Network) + if err != nil { + logger.Fatal("😥 Cant recognize eth network: ", zap.Error(err)) } rMsgs := []*wire.ReshareMessage{} for i := 0; i < len(signedProofs); i++ { @@ -174,9 +174,9 @@ var StartReshare = &cobra.Command{ logger.Fatal("😥 Failed to read proofs string:", zap.Error(err)) } } - ethNetwork := e2m_core.NetworkFromString(flags.Network) - if ethNetwork == "" { - logger.Fatal("😥 Cant recognize eth network") + ethNetwork, err := e2m_core.NetworkFromString(flags.Network) + if err != nil { + logger.Fatal("😥 Cant recognize eth network: ", zap.Error(err)) } signatures, err := cli_utils.SignaturesStringToBytes(flags.Signatures) if err != nil { diff --git a/cli/initiator/resigning.go b/cli/initiator/resigning.go index b5f07826..d7f14c49 100644 --- a/cli/initiator/resigning.go +++ b/cli/initiator/resigning.go @@ -50,9 +50,9 @@ var GenerateResignMsg = &cobra.Command{ if err != nil { logger.Fatal("😥 Failed to load participants: ", zap.Error(err)) } - ethNetwork := e2m_core.NetworkFromString(flags.Network) - if ethNetwork == "" { - logger.Fatal("😥 Cant recognize eth network") + ethNetwork, err := e2m_core.NetworkFromString(flags.Network) + if err != nil { + logger.Fatal("😥 Cant recognize eth network: ", zap.Error(err)) } var signedProofs [][]*spec.SignedProof if flags.ProofsFilePath != "" { @@ -144,9 +144,9 @@ var StartResigning = &cobra.Command{ if err != nil { logger.Fatal("😥 Failed to load operator IDs: ", zap.Error(err)) } - ethNetwork := e2m_core.NetworkFromString(flags.Network) - if ethNetwork == "" { - logger.Fatal("😥 Cant recognize eth network") + ethNetwork, err := e2m_core.NetworkFromString(flags.Network) + if err != nil { + logger.Fatal("😥 Cant recognize eth network: ", zap.Error(err)) } var signedProofs [][]*spec.SignedProof if flags.ProofsFilePath != "" { diff --git a/go.mod b/go.mod index c7d8f157..68ddf488 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/ssvlabs/ssv-dkg go 1.24 -toolchain go1.24.0 +toolchain go1.24.5 require ( github.com/aquasecurity/table v1.8.0 @@ -21,8 +21,8 @@ require ( github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.6 github.com/spf13/viper v1.16.0 - github.com/ssvlabs/dkg-spec v1.0.2 - github.com/ssvlabs/eth2-key-manager v1.5.3 + github.com/ssvlabs/dkg-spec v1.0.3-0.20250709083546-e795d8f9f6a0 + github.com/ssvlabs/eth2-key-manager v1.5.4 github.com/ssvlabs/ssv-spec v1.1.3 github.com/stretchr/testify v1.10.0 github.com/wealdtech/go-eth2-util v1.8.2 @@ -49,7 +49,6 @@ require ( github.com/ethereum/c-kzg-4844 v1.0.3 // indirect github.com/ethereum/go-verkle v0.2.2 // indirect github.com/fsnotify/fsnotify v1.8.0 // indirect - github.com/gaukas/godicttls v0.0.3 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/goccy/go-yaml v1.15.23 // indirect diff --git a/go.sum b/go.sum index b465869f..01024535 100644 --- a/go.sum +++ b/go.sum @@ -44,8 +44,6 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI= github.com/VictoriaMetrics/fastcache v1.12.2/go.mod h1:AmC+Nzz1+3G2eCPapF6UcsnkThDcMsQicp4xDukwJYI= -github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= -github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/aquasecurity/table v1.8.0 h1:9ntpSwrUfjrM6/YviArlx/ZBGd6ix8W+MtojQcM7tv0= @@ -106,8 +104,6 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvw github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= github.com/drand/kyber v1.3.1 h1:E0p6M3II+loMVwTlAp5zu4+GGZFNiRfq02qZxzw2T+Y= github.com/drand/kyber v1.3.1/go.mod h1:f+mNHjiGT++CuueBrpeMhFNdKZAsy0tu03bKq9D5LPA= -github.com/drand/kyber-bls12381 v0.3.1 h1:KWb8l/zYTP5yrvKTgvhOrk2eNPscbMiUOIeWBnmUxGo= -github.com/drand/kyber-bls12381 v0.3.1/go.mod h1:H4y9bLPu7KZA/1efDg+jtJ7emKx+ro3PU7/jWUVt140= github.com/drand/kyber-bls12381 v0.3.3 h1:sLl0ILJtB4+POHAKq6tdnWyg+iXADE0LjVKN91RI8JI= github.com/drand/kyber-bls12381 v0.3.3/go.mod h1:uVRWtcZDAApOWFMwoJVcTfC4csVxXmpkdoSCUZJ5QOY= github.com/emicklei/dot v1.7.0 h1:qoWBmCkk6eNVy4/oktL63M7/8eEd5859Sasb+zHKoYg= @@ -131,12 +127,8 @@ github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0X github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= -github.com/gaukas/godicttls v0.0.3 h1:YNDIf0d9adcxOijiLrEzpfZGAkNwLRzPaG6OjU7EITk= -github.com/gaukas/godicttls v0.0.3/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI= github.com/getsentry/sentry-go v0.27.0 h1:Pv98CIbtB3LkMWmXi4Joa5OOcwbmnX88sF5qbK3r3Ps= github.com/getsentry/sentry-go v0.27.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= -github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk= -github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618= github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops= github.com/go-chi/httprate v0.7.4 h1:a2GIjv8he9LRf3712zxxnRdckQCm7I8y8yQhkJ84V6M= @@ -144,8 +136,8 @@ github.com/go-chi/httprate v0.7.4/go.mod h1:6GOYBSwnpra4CQfAKXu8sQZg+nZ0M1g9QnyF github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= @@ -217,8 +209,6 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 h1:hR7/MlvK23p6+lIw9SN1TigNLn9ZnF3W4SYRKq2gAHs= -github.com/google/pprof v0.0.0-20230602150820-91b7bce49751/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA= github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 h1:y3N7Bm7Y9/CtpiVkw/ZWj6lSlDF3F74SfKwfTCer72Q= github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= @@ -262,8 +252,6 @@ github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imroc/req/v3 v3.37.2 h1:vEemuA0cq9zJ6lhe+mSRhsZm951bT0CdiSH47+KTn6I= -github.com/imroc/req/v3 v3.37.2/go.mod h1:DECzjVIrj6jcUr5n6e+z0ygmCO93rx4Jy0RjOEe1YCI= github.com/imroc/req/v3 v3.43.4 h1:NSXlB5dELZuxzGEFRWLWEQ9dQmh8d9pUMPa7MevK1K4= github.com/imroc/req/v3 v3.43.4/go.mod h1:SQIz5iYop16MJxbo8ib+4LnostGCok8NQf8ToyQc2xA= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= @@ -277,8 +265,6 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/kilic/bls12-381 v0.1.0 h1:encrdjqKMEvabVQ7qYOKu1OvhqpK4s47wDYtNiPtlp4= github.com/kilic/bls12-381 v0.1.0/go.mod h1:vDTTHJONJ6G+P2R74EhnyotQDTliQDnFEwhdmfzw1ig= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI= -github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= @@ -320,12 +306,10 @@ github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqky github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= -github.com/onsi/ginkgo/v2 v2.10.0 h1:sfUl4qgLdvkChZrWCYndY2EAu9BRIw1YphNAzy1VNWs= -github.com/onsi/ginkgo/v2 v2.10.0/go.mod h1:UDQOh5wbQUlMnkLfVaIUMtQ1Vus92oM+P2JX1aulgcE= github.com/onsi/ginkgo/v2 v2.16.0 h1:7q1w9frJDzninhXxjZd+Y/x54XNjG/UlRLIYPZafsPM= github.com/onsi/ginkgo/v2 v2.16.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= -github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU= -github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRahPmr4= +github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= +github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= github.com/pion/dtls/v2 v2.2.7 h1:cSUBsETxepsCSFSxC3mc/aDo14qQLMSL+O6IjG28yV8= @@ -360,8 +344,6 @@ github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= github.com/quic-go/quic-go v0.46.0 h1:uuwLClEEyk1DNvchH8uCByQVjo3yKL9opKulExNDs7Y= github.com/quic-go/quic-go v0.46.0/go.mod h1:1dLehS7TIR64+vxGR70GDcatWTOtMX2PUtnKsjbTurI= -github.com/refraction-networking/utls v1.3.2 h1:o+AkWB57mkcoW36ET7uJ002CpBWHu0KPxi6vzxvPnv8= -github.com/refraction-networking/utls v1.3.2/go.mod h1:fmoaOww2bxzzEpIKOebIsnBvjQpqP7L2vcm/9KUfm/E= github.com/refraction-networking/utls v1.6.3 h1:MFOfRN35sSx6K5AZNIoESsBuBxS2LCgRilRIdHb6fDc= github.com/refraction-networking/utls v1.6.3/go.mod h1:yil9+7qSl+gBwJqztoQseO6Pr3h62pQoY1lXiNR/FPs= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -388,16 +370,15 @@ github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= -github.com/ssvlabs/dkg-spec v1.0.2 h1:wimkCQOLQcVwXx4A7xa6/cwcMyP28Py+oOesdFaDTXo= -github.com/ssvlabs/dkg-spec v1.0.2/go.mod h1:I17IZg8ugxN0FU8ySUGwm/DChjUBAFKWUI0fysXP1DM= -github.com/ssvlabs/eth2-key-manager v1.5.3 h1:B9U+mrdQpWMWfIEhWGW2m3b95IqvzFv9sLtq7kQEcyI= -github.com/ssvlabs/eth2-key-manager v1.5.3/go.mod h1:yeUzAP+SBJXgeXPiGBrLeLuHIQCpeJZV7Jz3Fwzm/zk= +github.com/ssvlabs/dkg-spec v1.0.3-0.20250709083546-e795d8f9f6a0 h1:V4r2dbAs0kH4zz1GGxKcDZKmiwJU5EN+LQKvc5qySVM= +github.com/ssvlabs/dkg-spec v1.0.3-0.20250709083546-e795d8f9f6a0/go.mod h1:LfokZtUAjnKiPpVXdBZzU/dur0YVI9tRH+LpATsdGQ4= +github.com/ssvlabs/eth2-key-manager v1.5.4 h1:TnKbS3HeWE+txUyxf0n0EhSIxeFWSKpLwm5VfmMeegw= +github.com/ssvlabs/eth2-key-manager v1.5.4/go.mod h1:yeUzAP+SBJXgeXPiGBrLeLuHIQCpeJZV7Jz3Fwzm/zk= github.com/ssvlabs/ssv-spec v1.1.3 h1:46K31kI4/vA7Vp3DaOuN7t2IABAmzeiMniCqYfzzpo8= github.com/ssvlabs/ssv-spec v1.1.3/go.mod h1:pto7dDv99uVfCZidiLrrKgFR6VYy6WY3PGI1TiGCsIU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/pkgs/crypto/deposit_data.go b/pkgs/crypto/deposit_data.go index bfd88b53..80ca723c 100644 --- a/pkgs/crypto/deposit_data.go +++ b/pkgs/crypto/deposit_data.go @@ -9,14 +9,14 @@ import ( "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/ethereum/go-ethereum/common" "github.com/hashicorp/go-version" - "github.com/ssvlabs/eth2-key-manager/core" + e2m_core "github.com/ssvlabs/eth2-key-manager/core" spec "github.com/ssvlabs/dkg-spec" spec_crypto "github.com/ssvlabs/dkg-spec/crypto" "github.com/ssvlabs/ssv-dkg/pkgs/wire" ) -func BuildDepositDataCLI(network core.Network, depositData *phase0.DepositData, depositCLIVersion string) (*wire.DepositDataCLI, error) { +func BuildDepositDataCLI(network e2m_core.Network, depositData *phase0.DepositData, depositCLIVersion string) (*wire.DepositDataCLI, error) { depositMsg := &phase0.DepositMessage{ WithdrawalCredentials: depositData.WithdrawalCredentials, Amount: depositData.Amount, @@ -160,7 +160,7 @@ func verifyDepositRoots(d *wire.DepositDataCLI) error { if len(fork) != 4 { return fmt.Errorf("fork version has wrong length") } - network, err := spec_crypto.GetNetworkByFork([4]byte(fork)) + network, err := e2m_core.NetworkFromForkVersion([4]byte(fork)) if err != nil { return fmt.Errorf("failed to get network by fork: %w", err) } diff --git a/pkgs/initiator/initiator.go b/pkgs/initiator/initiator.go index cd9930a3..7eedbbdd 100644 --- a/pkgs/initiator/initiator.go +++ b/pkgs/initiator/initiator.go @@ -597,7 +597,7 @@ func (c *Initiator) processDKGResultResponse(dkgResults []*spec.Result, if err != nil { return nil, nil, err } - network, err := spec_crypto.GetNetworkByFork(fork) + network, err := eth2_key_manager_core.NetworkFromForkVersion(fork) if err != nil { return nil, nil, err } diff --git a/pkgs/initiator/initiator_test.go b/pkgs/initiator/initiator_test.go index 06598db6..884c0ff6 100644 --- a/pkgs/initiator/initiator_test.go +++ b/pkgs/initiator/initiator_test.go @@ -456,11 +456,13 @@ func TestDKGFailWithOperatorsMisbehave(t *testing.T) { ops, err := initiator.ValidatedOperatorData(ids, intr.Operators) require.NoError(t, err) threshold := utils.GetThreshold(ids) + fork, err := e2m_core.NetworkFromString("mainnet") + require.NoError(t, err) init := &spec.Init{ Operators: ops, T: uint64(threshold), WithdrawalCredentials: withdraw.Bytes(), - Fork: e2m_core.NetworkFromString("mainnet").GenesisForkVersion(), + Fork: fork.GenesisForkVersion(), Owner: owner, Nonce: 0, Amount: uint64(spec_crypto.MIN_ACTIVATION_BALANCE), diff --git a/pkgs/validator/validator_test.go b/pkgs/validator/validator_test.go index bc879172..f8c58bca 100644 --- a/pkgs/validator/validator_test.go +++ b/pkgs/validator/validator_test.go @@ -91,7 +91,7 @@ func TestDepositDataJSON(t *testing.T) { { filename: "testdata/depositdata--invalid-fork.json", expectedWithdrawalCredentials: common.HexToAddress("0x81592c3de184a3e2c0dcb5a261bc107bfa91f494"), - expectedErr: "failed to get network by fork: unknown network", + expectedErr: "network not found for the given fork version", }, }