Skip to content
This repository was archived by the owner on Jan 24, 2025. It is now read-only.

Commit 5b66c5f

Browse files
muXxermuXxer
committed
Merge branch 'develop' of github.com:iotaledger/iota-core into fix/retained-tx-first
2 parents 541388b + e07c2f6 commit 5b66c5f

File tree

7 files changed

+106
-101
lines changed

7 files changed

+106
-101
lines changed

‎components/restapi/core/component.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,14 @@ func configure() error {
5050

5151
routeGroup.GET(api.CoreEndpointNetworkHealth, func(c echo.Context) error {
5252
if deps.RequestHandler.IsNetworkHealthy() {
53-
return c.NoContent(http.StatusOK)
53+
return httpserver.JSONResponse(c, http.StatusOK, &api.NetworkHealthResponse{
54+
IsNetworkHealthy: true,
55+
})
5456
}
5557

56-
return c.NoContent(http.StatusServiceUnavailable)
58+
return httpserver.JSONResponse(c, http.StatusServiceUnavailable, &api.NetworkHealthResponse{
59+
IsNetworkHealthy: false,
60+
})
5761
})
5862

5963
routeGroup.GET(api.CoreEndpointNetworkMetrics, func(c echo.Context) error {

‎components/restapi/routes.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,14 @@ type RoutesResponse struct {
1616
func setupRoutes() {
1717
deps.Echo.GET(api.RouteHealth, func(c echo.Context) error {
1818
if deps.Protocol.Engines.Main.Get().SyncManager.IsNodeSynced() {
19-
return c.NoContent(http.StatusOK)
19+
return httpserver.JSONResponse(c, http.StatusOK, &api.HealthResponse{
20+
IsHealthy: true,
21+
})
2022
}
2123

22-
return c.NoContent(http.StatusServiceUnavailable)
24+
return httpserver.JSONResponse(c, http.StatusServiceUnavailable, &api.HealthResponse{
25+
IsHealthy: false,
26+
})
2327
})
2428

2529
deps.Echo.GET(api.RouteRoutes, func(c echo.Context) error {

‎go.mod

+15-15
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@ require (
1414
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
1515
github.com/iotaledger/hive.go/ads v0.0.0-20240315104458-b689cbcfddbd
1616
github.com/iotaledger/hive.go/app v0.0.0-20240315104458-b689cbcfddbd
17-
github.com/iotaledger/hive.go/constraints v0.0.0-20240315104458-b689cbcfddbd
18-
github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20240315104458-b689cbcfddbd
19-
github.com/iotaledger/hive.go/crypto v0.0.0-20240315104458-b689cbcfddbd
17+
github.com/iotaledger/hive.go/constraints v0.0.0-20240320122938-13a946cf3c7a
18+
github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20240320122938-13a946cf3c7a
19+
github.com/iotaledger/hive.go/crypto v0.0.0-20240320122938-13a946cf3c7a
2020
github.com/iotaledger/hive.go/db v0.0.0-20240315104458-b689cbcfddbd
21-
github.com/iotaledger/hive.go/ds v0.0.0-20240315104458-b689cbcfddbd
22-
github.com/iotaledger/hive.go/ierrors v0.0.0-20240315104458-b689cbcfddbd
21+
github.com/iotaledger/hive.go/ds v0.0.0-20240320122938-13a946cf3c7a
22+
github.com/iotaledger/hive.go/ierrors v0.0.0-20240320122938-13a946cf3c7a
2323
github.com/iotaledger/hive.go/kvstore v0.0.0-20240315104458-b689cbcfddbd
24-
github.com/iotaledger/hive.go/lo v0.0.0-20240315104458-b689cbcfddbd
24+
github.com/iotaledger/hive.go/lo v0.0.0-20240320122938-13a946cf3c7a
2525
github.com/iotaledger/hive.go/log v0.0.0-20240315104458-b689cbcfddbd
26-
github.com/iotaledger/hive.go/runtime v0.0.0-20240315104458-b689cbcfddbd
27-
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20240315104458-b689cbcfddbd
26+
github.com/iotaledger/hive.go/runtime v0.0.0-20240320122938-13a946cf3c7a
27+
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20240320122938-13a946cf3c7a
2828
github.com/iotaledger/hive.go/sql v0.0.0-20240315104458-b689cbcfddbd
29-
github.com/iotaledger/hive.go/stringify v0.0.0-20240315104458-b689cbcfddbd
29+
github.com/iotaledger/hive.go/stringify v0.0.0-20240320122938-13a946cf3c7a
3030
github.com/iotaledger/inx-app v1.0.0-rc.3.0.20240307101848-db58eb9353ec
3131
github.com/iotaledger/inx/go v1.0.0-rc.2.0.20240307100839-48553e1d2022
32-
github.com/iotaledger/iota.go/v4 v4.0.0-20240319114032-b6fcc3585c99
32+
github.com/iotaledger/iota.go/v4 v4.0.0-20240321164059-d61818989ece
3333
github.com/labstack/echo/v4 v4.11.4
3434
github.com/labstack/gommon v0.4.2
35-
github.com/libp2p/go-libp2p v0.33.0
35+
github.com/libp2p/go-libp2p v0.33.1
3636
github.com/libp2p/go-libp2p-kad-dht v0.25.2
3737
github.com/mr-tron/base58 v1.2.0
3838
github.com/multiformats/go-multiaddr v0.12.2
@@ -41,7 +41,7 @@ require (
4141
github.com/prometheus/client_golang v1.19.0
4242
github.com/sajari/regression v1.0.1
4343
github.com/spf13/pflag v1.0.5
44-
github.com/stretchr/testify v1.8.4
44+
github.com/stretchr/testify v1.9.0
4545
github.com/zyedidia/generic v1.2.1
4646
go.uber.org/atomic v1.11.0
4747
go.uber.org/dig v1.17.1
@@ -93,7 +93,7 @@ require (
9393
github.com/huin/goupnp v1.3.0 // indirect
9494
github.com/iancoleman/orderedmap v0.3.0 // indirect
9595
github.com/iotaledger/grocksdb v1.7.5-0.20230220105546-5162e18885c7 // indirect
96-
github.com/iotaledger/iota-crypto-demo v0.0.0-20240216103559-27ca8dffd1e7 // indirect
96+
github.com/iotaledger/iota-crypto-demo v0.0.0-20240320124000-d02f37a4fdff // indirect
9797
github.com/ipfs/boxo v0.18.0 // indirect
9898
github.com/ipfs/go-cid v0.4.1 // indirect
9999
github.com/ipfs/go-datastore v0.6.0 // indirect
@@ -150,7 +150,7 @@ require (
150150
github.com/opentracing/opentracing-go v1.2.0 // indirect
151151
github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c // indirect
152152
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
153-
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
153+
github.com/pelletier/go-toml/v2 v2.2.0 // indirect
154154
github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect
155155
github.com/pkg/errors v0.9.1 // indirect
156156
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -160,7 +160,7 @@ require (
160160
github.com/prometheus/common v0.50.0 // indirect
161161
github.com/prometheus/procfs v0.12.0 // indirect
162162
github.com/quic-go/qpack v0.4.0 // indirect
163-
github.com/quic-go/quic-go v0.41.0 // indirect
163+
github.com/quic-go/quic-go v0.42.0 // indirect
164164
github.com/quic-go/webtransport-go v0.6.0 // indirect
165165
github.com/raulk/go-watchdog v1.3.0 // indirect
166166
github.com/sasha-s/go-deadlock v0.3.1 // indirect

‎go.sum

+31-29
Original file line numberDiff line numberDiff line change
@@ -293,40 +293,40 @@ github.com/iotaledger/hive.go/ads v0.0.0-20240315104458-b689cbcfddbd h1:VKd76foX
293293
github.com/iotaledger/hive.go/ads v0.0.0-20240315104458-b689cbcfddbd/go.mod h1:tkWq2sJR/vWkbht1BJNIvNP6hJAaRye99wid0A2oU9I=
294294
github.com/iotaledger/hive.go/app v0.0.0-20240315104458-b689cbcfddbd h1:iPJuddZjwPMdUijkonpYKnP+xfaTJCpQr8O5dFiOABw=
295295
github.com/iotaledger/hive.go/app v0.0.0-20240315104458-b689cbcfddbd/go.mod h1:EMUpj6oDb/QSiVpIe5nYwyDKSpO6ue7mdkzmK/VoBn8=
296-
github.com/iotaledger/hive.go/constraints v0.0.0-20240315104458-b689cbcfddbd h1:O35lbQcbEmgycIDWKYzyvnEeN6GcHlx76YknqGPnVPA=
297-
github.com/iotaledger/hive.go/constraints v0.0.0-20240315104458-b689cbcfddbd/go.mod h1:JF7jjkL6tSUOXm23SWadBzBrl7eJk1DQRLc/fNoVZ+o=
298-
github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20240315104458-b689cbcfddbd h1:Xi7wg5GkOzrV/ogmumiE5kJm0rh62E3fQDY8yG7uTQU=
299-
github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20240315104458-b689cbcfddbd/go.mod h1:73ODTHUJxAoGUN0InOtuQ29LVq85pDf7GckM9d0ziqo=
300-
github.com/iotaledger/hive.go/crypto v0.0.0-20240315104458-b689cbcfddbd h1:pQQGxs8hJ8CIYA37QVGoOeAEZDBnA/OiH4iGVpwX1kA=
301-
github.com/iotaledger/hive.go/crypto v0.0.0-20240315104458-b689cbcfddbd/go.mod h1:aREIB19gIhSYdY0Hl/37sg1JRH7+j3ajeJxBIQf6mig=
296+
github.com/iotaledger/hive.go/constraints v0.0.0-20240320122938-13a946cf3c7a h1:utdBWBurkt1DyATIR5ciGbU9DzBsv7lsh5O1lIPQvt0=
297+
github.com/iotaledger/hive.go/constraints v0.0.0-20240320122938-13a946cf3c7a/go.mod h1:JF7jjkL6tSUOXm23SWadBzBrl7eJk1DQRLc/fNoVZ+o=
298+
github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20240320122938-13a946cf3c7a h1:m9dJP6aScnyVi7dKHqr9/MhWbvhsqDYfoDApPEog2Jo=
299+
github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20240320122938-13a946cf3c7a/go.mod h1:DCIdeNKBJDtkkIBCyixInwFJs6rUv9PFK1U5MEH5hkY=
300+
github.com/iotaledger/hive.go/crypto v0.0.0-20240320122938-13a946cf3c7a h1:61yy+tno2oFxsDHGtoP95S/gPmZWJMuVXYJAoHdbOF0=
301+
github.com/iotaledger/hive.go/crypto v0.0.0-20240320122938-13a946cf3c7a/go.mod h1:Xq2i06mX6g+NlAPMJVicwKx7FHSmIhWVS67dyxup2VU=
302302
github.com/iotaledger/hive.go/db v0.0.0-20240315104458-b689cbcfddbd h1:JMWsW/QODcvOSxiSl3exdH93XGyPVgpnJdNd5EpQr3U=
303303
github.com/iotaledger/hive.go/db v0.0.0-20240315104458-b689cbcfddbd/go.mod h1:8Y5vqE5NK5zG4Af0JV2UQeW67iLlymPLsT1KkOn4qY8=
304-
github.com/iotaledger/hive.go/ds v0.0.0-20240315104458-b689cbcfddbd h1:q7nvD+1SMBX1GjhnlzldAnyyEeFgdBfaeoq3e+qf0mM=
305-
github.com/iotaledger/hive.go/ds v0.0.0-20240315104458-b689cbcfddbd/go.mod h1:wfjeJj9B+MM/3yeUHfvT8Gj8bRsdl9utyh2dZg+1+B0=
306-
github.com/iotaledger/hive.go/ierrors v0.0.0-20240315104458-b689cbcfddbd h1:nvQc2sjO2G3yMiuVWY/iJkyAAHjxgM/2qEZ4wxmXm0s=
307-
github.com/iotaledger/hive.go/ierrors v0.0.0-20240315104458-b689cbcfddbd/go.mod h1:GQY0/35sjgT9Poi1Vrs9kFVvAkuKzGXfVh4j6CBXsAA=
304+
github.com/iotaledger/hive.go/ds v0.0.0-20240320122938-13a946cf3c7a h1:6WKdn9mf4L0p8+QqSziSW0vOEIHLBADHEzVe0yoEwkY=
305+
github.com/iotaledger/hive.go/ds v0.0.0-20240320122938-13a946cf3c7a/go.mod h1:PU8vmnyWDAM7Nbl/j9pRIemNfMEO/vPQ/tN3wks55lE=
306+
github.com/iotaledger/hive.go/ierrors v0.0.0-20240320122938-13a946cf3c7a h1:LkNT/KWU52l/YLQQO9VC+TfOap514Y6AI0LI1EvsDJA=
307+
github.com/iotaledger/hive.go/ierrors v0.0.0-20240320122938-13a946cf3c7a/go.mod h1:GQY0/35sjgT9Poi1Vrs9kFVvAkuKzGXfVh4j6CBXsAA=
308308
github.com/iotaledger/hive.go/kvstore v0.0.0-20240315104458-b689cbcfddbd h1:HegZpJKGZLq0NAE1Tgxs9Y+EHC0mItpyHeodCSYgdEI=
309309
github.com/iotaledger/hive.go/kvstore v0.0.0-20240315104458-b689cbcfddbd/go.mod h1:dCgv8YMOihhGNxQu37Vh5XqT/7wLbIJst2WePqo1z8Y=
310-
github.com/iotaledger/hive.go/lo v0.0.0-20240315104458-b689cbcfddbd h1:bUWLJquwEJXEo93J29R9JsLBHb/d3r++SCuKVhfsNJc=
311-
github.com/iotaledger/hive.go/lo v0.0.0-20240315104458-b689cbcfddbd/go.mod h1:67oLzWYiBLGt5PN7IBVHdbt9P6oBYCx9UvMEL8ExDAc=
310+
github.com/iotaledger/hive.go/lo v0.0.0-20240320122938-13a946cf3c7a h1:OMGfUIguLzYfLVbrMeCH/1q+k+Ddam5klNTxq7WI/DM=
311+
github.com/iotaledger/hive.go/lo v0.0.0-20240320122938-13a946cf3c7a/go.mod h1:V6O70RMPKU1vVN1JqmLbOFeQbR11MmQha9ZboaD3q0Q=
312312
github.com/iotaledger/hive.go/log v0.0.0-20240315104458-b689cbcfddbd h1:AzcvTlArc0zqrC/jyN7jEmsKMAFetsbXp8/ubbcLtsg=
313313
github.com/iotaledger/hive.go/log v0.0.0-20240315104458-b689cbcfddbd/go.mod h1:H5tmswUbT3o5+QiM6UPtBv7VnPf+lJtlantgpp2lzUI=
314-
github.com/iotaledger/hive.go/runtime v0.0.0-20240315104458-b689cbcfddbd h1:+HDX4N/l7geVOZTIICG/6Znrujek+qO2YClXp/ghTAI=
315-
github.com/iotaledger/hive.go/runtime v0.0.0-20240315104458-b689cbcfddbd/go.mod h1:OKoOmZd+qDjm0WsisIB5FYbKhMm5iPx4/mDJL/8SjsU=
316-
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20240315104458-b689cbcfddbd h1:do82iHBwx14vjJ9VYNK3ZpKxwhb0YQVZKAd4uiqphQ0=
317-
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20240315104458-b689cbcfddbd/go.mod h1:NK05G4PxwZF1m4jGANJWLhAQ2hP1Nt0L8mgCTFLsSCw=
314+
github.com/iotaledger/hive.go/runtime v0.0.0-20240320122938-13a946cf3c7a h1:Gi3goUvvdETcAcKfikjYRtDQzqzKduRVtIGJHkffudI=
315+
github.com/iotaledger/hive.go/runtime v0.0.0-20240320122938-13a946cf3c7a/go.mod h1:eyKTWoVdSj6RRaaOrDLVnFuaOWUydk88ofEXHb+/Ryo=
316+
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20240320122938-13a946cf3c7a h1:cPyDaEIjqN43UQLsdVO9Ma3wBj6uY5VXeuSt4SuNeQ8=
317+
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20240320122938-13a946cf3c7a/go.mod h1:DVwHG6s3mWf/5NXr+CKmLXsqzLZZrhgDR2HE0ti5g7o=
318318
github.com/iotaledger/hive.go/sql v0.0.0-20240315104458-b689cbcfddbd h1:jLUMNfEYZGx41IsXv2jjlKywzqhv0z2F7hzfDTDpbPU=
319319
github.com/iotaledger/hive.go/sql v0.0.0-20240315104458-b689cbcfddbd/go.mod h1:O9R4vLdoSBhEO+WyEEmBHKChlD80oz9EVi7vjuxE+J8=
320-
github.com/iotaledger/hive.go/stringify v0.0.0-20240315104458-b689cbcfddbd h1:pgBMXWsZ2oEoPOSPv4Ycq2Ygy0qt7UNx0B39HhV7Z1E=
321-
github.com/iotaledger/hive.go/stringify v0.0.0-20240315104458-b689cbcfddbd/go.mod h1:O4p7UmsfoeLqtAUwrKbq0lXMxjY/MLQSpZSavvvvGig=
320+
github.com/iotaledger/hive.go/stringify v0.0.0-20240320122938-13a946cf3c7a h1:5C2yVhObYmXJSQyEaepYCf1fG+FZ73WBCB12UGXWiE8=
321+
github.com/iotaledger/hive.go/stringify v0.0.0-20240320122938-13a946cf3c7a/go.mod h1:O4p7UmsfoeLqtAUwrKbq0lXMxjY/MLQSpZSavvvvGig=
322322
github.com/iotaledger/inx-app v1.0.0-rc.3.0.20240307101848-db58eb9353ec h1:8pasR6AxVTr1AqTbyAgPmrgmEE+Z5Tn4DOQy/Eu8jN8=
323323
github.com/iotaledger/inx-app v1.0.0-rc.3.0.20240307101848-db58eb9353ec/go.mod h1:LrPLgC2QeGvsgyhS7SYoqH449z4C4ro4HOByg1PXqHw=
324324
github.com/iotaledger/inx/go v1.0.0-rc.2.0.20240307100839-48553e1d2022 h1:I178SaWPhSxTvntKKvUVIdeogXIiLDALTbstKvbCuVc=
325325
github.com/iotaledger/inx/go v1.0.0-rc.2.0.20240307100839-48553e1d2022/go.mod h1:jTFxIWiMUdAwO263jlJCSWcNLqEkgYEVOFXfjp5aNJM=
326-
github.com/iotaledger/iota-crypto-demo v0.0.0-20240216103559-27ca8dffd1e7 h1:t6k4MqiUov0FrBb2o2JhKlOVSdlPbIQWM8ivYHL0G0g=
327-
github.com/iotaledger/iota-crypto-demo v0.0.0-20240216103559-27ca8dffd1e7/go.mod h1:do+N3LpeDEi9qselEC4XcjqGoRc7cWGiqBtIeBOKEMs=
328-
github.com/iotaledger/iota.go/v4 v4.0.0-20240319114032-b6fcc3585c99 h1:Fs4LqQ8VavnOkv4fRkEex8hVvnnqt1uVSY6R9hocPSU=
329-
github.com/iotaledger/iota.go/v4 v4.0.0-20240319114032-b6fcc3585c99/go.mod h1:8UQOTI7CC5R/3TurawUFuBZbkb37RzW8m4q8Hp7ct30=
326+
github.com/iotaledger/iota-crypto-demo v0.0.0-20240320124000-d02f37a4fdff h1:Do8fakxvFaj7dLckoo/z+mRyBdZo8QvT8HcgnQlG2Sg=
327+
github.com/iotaledger/iota-crypto-demo v0.0.0-20240320124000-d02f37a4fdff/go.mod h1:aVEutEWFnhDNJBxtVuzy2BeTN+8FAlnR83k7hKV0CFE=
328+
github.com/iotaledger/iota.go/v4 v4.0.0-20240321164059-d61818989ece h1:pQPzLYGd7PDG/FhX8v8ptYiGrKZ1o0fbWV9gYjfg8NY=
329+
github.com/iotaledger/iota.go/v4 v4.0.0-20240321164059-d61818989ece/go.mod h1:qn/63CB0/jE1em6ewqDSiz+ovS+E/os7K5b7g2pmJFg=
330330
github.com/ipfs/boxo v0.18.0 h1:MOL9/AgoV3e7jlVMInicaSdbgralfqSsbkc31dZ9tmw=
331331
github.com/ipfs/boxo v0.18.0/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
332332
github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=
@@ -413,8 +413,8 @@ github.com/libp2p/go-cidranger v1.1.0 h1:ewPN8EZ0dd1LSnrtuwd4709PXVcITVeuwbag38y
413413
github.com/libp2p/go-cidranger v1.1.0/go.mod h1:KWZTfSr+r9qEo9OkI9/SIEeAtw+NNoU0dXIXt15Okic=
414414
github.com/libp2p/go-flow-metrics v0.1.0 h1:0iPhMI8PskQwzh57jB9WxIuIOQ0r+15PChFGkx3Q3WM=
415415
github.com/libp2p/go-flow-metrics v0.1.0/go.mod h1:4Xi8MX8wj5aWNDAZttg6UPmc0ZrnFNsMtpsYUClFtro=
416-
github.com/libp2p/go-libp2p v0.33.0 h1:yTPSr8sJRbfeEYXyeN8VPVSlTlFjtMUwGDRniwaf/xQ=
417-
github.com/libp2p/go-libp2p v0.33.0/go.mod h1:RIJFRQVUBKy82dnW7J5f1homqqv6NcsDJAl3e7CRGfE=
416+
github.com/libp2p/go-libp2p v0.33.1 h1:tvJl9b9M6nSLBtZSXSguq+/lRhRj2oLRkyhBmQNMFLA=
417+
github.com/libp2p/go-libp2p v0.33.1/go.mod h1:zOUTMjG4I7TXwMndNyOBn/CNtVBLlvBlnxfi+8xzx+E=
418418
github.com/libp2p/go-libp2p-asn-util v0.4.1 h1:xqL7++IKD9TBFMgnLPZR6/6iYhawHKHl950SO9L6n94=
419419
github.com/libp2p/go-libp2p-asn-util v0.4.1/go.mod h1:d/NI6XZ9qxw67b4e+NgpQexCIiFYJjErASrYW4PFDN8=
420420
github.com/libp2p/go-libp2p-kad-dht v0.25.2 h1:FOIk9gHoe4YRWXTu8SY9Z1d0RILol0TrtApsMDPjAVQ=
@@ -552,8 +552,8 @@ github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2D
552552
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
553553
github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI=
554554
github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
555-
github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI=
556-
github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
555+
github.com/pelletier/go-toml/v2 v2.2.0 h1:QLgLl2yMN7N+ruc31VynXs1vhMZa7CeHHejIeBAsoHo=
556+
github.com/pelletier/go-toml/v2 v2.2.0/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
557557
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
558558
github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 h1:jik8PHtAIsPlCRJjJzl4udgEf7hawInF9texMeO2jrU=
559559
github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
@@ -598,8 +598,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k
598598
github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
599599
github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
600600
github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
601-
github.com/quic-go/quic-go v0.41.0 h1:aD8MmHfgqTURWNJy48IYFg2OnxwHT3JL7ahGs73lb4k=
602-
github.com/quic-go/quic-go v0.41.0/go.mod h1:qCkNjqczPEvgsOnxZ0eCD14lv+B2LHlFAB++CNOh9hA=
601+
github.com/quic-go/quic-go v0.42.0 h1:uSfdap0eveIl8KXnipv9K7nlwZ5IqLlYOpJ58u5utpM=
602+
github.com/quic-go/quic-go v0.42.0/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M=
603603
github.com/quic-go/webtransport-go v0.6.0 h1:CvNsKqc4W2HljHJnoT+rMmbRJybShZ0YPFDD3NxaZLY=
604604
github.com/quic-go/webtransport-go v0.6.0/go.mod h1:9KjU4AEBqEQidGHNDkZrb8CAa1abRaosM2yGOyiikEc=
605605
github.com/raulk/go-watchdog v1.3.0 h1:oUmdlHxdkXRJlwfG0O9omj8ukerm8MEQavSiDTEtBsk=
@@ -665,6 +665,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
665665
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
666666
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
667667
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
668+
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
668669
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
669670
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
670671
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -674,8 +675,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
674675
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
675676
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
676677
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
677-
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
678678
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
679+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
680+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
679681
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
680682
github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e h1:IWllFTiDjjLIf2oeKxpIUmtiDV5sn71VgeQgg6vcE7k=
681683
github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e/go.mod h1:d7u6HkTYKSv5m6MCKkOQlHwaShTMl3HjqSGW3XtVhXM=

‎pkg/protocol/engine/syncmanager/trivialsyncmanager/syncmanager.go

+3-10
Original file line numberDiff line numberDiff line change
@@ -260,23 +260,16 @@ func (s *SyncManager) IsNodeSynced() bool {
260260
return s.isSynced
261261
}
262262

263-
func (s *SyncManager) updateIsFinalizationDelayed(latestFinalizedSlot iotago.SlotIndex, latestCommitmentSlot iotago.SlotIndex) (changed bool) {
263+
func (s *SyncManager) updateIsFinalizationDelayed(latestFinalizedSlot iotago.SlotIndex, latestCommitmentSlot iotago.SlotIndex) {
264264
s.isFinalizationDelayedLock.Lock()
265265
defer s.isFinalizationDelayedLock.Unlock()
266266

267267
if latestCommitmentSlot < latestFinalizedSlot {
268268
// This should never happen, but if it does, we don't want to panic.
269-
return false
269+
return
270270
}
271271

272-
isFinalizationDelayed := latestCommitmentSlot-latestFinalizedSlot > s.engine.CommittedAPI().ProtocolParameters().MaxCommittableAge()
273-
if s.isFinalizationDelayed != isFinalizationDelayed {
274-
s.isFinalizationDelayed = isFinalizationDelayed
275-
276-
return true
277-
}
278-
279-
return false
272+
s.isFinalizationDelayed = latestCommitmentSlot-latestFinalizedSlot > s.engine.CommittedAPI().ProtocolParameters().MaxCommittableAge()
280273
}
281274

282275
func (s *SyncManager) IsFinalizationDelayed() bool {

0 commit comments

Comments
 (0)