Skip to content

Commit 8718313

Browse files
Eslam-NawaraEslam-Nawara
authored
Merge pull request #1368 from threefoldtech/development-update-packages
update packages
2 parents bbf3ee0 + e02de4f commit 8718313

File tree

44 files changed

+327
-393
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+327
-393
lines changed

‎.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
go-version: 1.23
1919

2020
- name: Run golangci-lint
21-
uses: golangci/golangci-lint-action@v6
21+
uses: golangci/golangci-lint-action@v8
2222
with:
2323
working-directory: ${{ matrix.dir }}
2424
args: --config=../.golangci.yml

‎.github/workflows/publish-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
id: version
4949

5050
- name: Log in to the Container registry
51-
uses: docker/login-action@v3.3.0
51+
uses: docker/login-action@v3.4.0
5252
with:
5353
registry: ghcr.io
5454
username: ${{ github.actor }}

‎.golangci.yml

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,26 @@
1+
version: "2"
12
linters:
23
enable:
3-
- errcheck
44
- goconst
5-
- gofmt
6-
- govet
7-
- ineffassign
85
- misspell
96
- unconvert
10-
enable-all: false
11-
run:
12-
timeout: 20m
7+
exclusions:
8+
generated: lax
9+
presets:
10+
- comments
11+
- common-false-positives
12+
- legacy
13+
- std-error-handling
14+
paths:
15+
- third_party$
16+
- builtin$
17+
- examples$
18+
formatters:
19+
enable:
20+
- gofmt
21+
exclusions:
22+
generated: lax
23+
paths:
24+
- third_party$
25+
- builtin$
26+
- examples$

‎activation-service/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/cosmos/go-bip39 v1.0.0
99
github.com/gorilla/mux v1.8.1
1010
github.com/hashicorp/go-envparse v0.1.0
11-
github.com/rs/zerolog v1.33.0
11+
github.com/rs/zerolog v1.34.0
1212
github.com/spf13/cobra v1.9.1
1313
github.com/stretchr/testify v1.10.0
1414
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20241127100051-77e684bcb1b2

‎activation-service/go.sum

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t
7676
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
7777
github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo=
7878
github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
79-
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
80-
github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
81-
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
79+
github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
80+
github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
81+
github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
8282
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
8383
github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
8484
github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=

‎farmerbot/go.mod

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/hashicorp/go-envparse v0.1.0
1212
github.com/jedib0t/go-pretty/v6 v6.5.3
1313
github.com/pkg/errors v0.9.1
14-
github.com/rs/zerolog v1.33.0
14+
github.com/rs/zerolog v1.34.0
1515
github.com/spf13/cobra v1.8.1
1616
github.com/stretchr/testify v1.10.0
1717
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20241127100051-77e684bcb1b2
@@ -34,7 +34,6 @@ require (
3434
github.com/go-stack/stack v1.8.1 // indirect
3535
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
3636
github.com/gomodule/redigo v2.0.0+incompatible // indirect
37-
github.com/google/go-cmp v0.7.0 // indirect
3837
github.com/google/uuid v1.6.0 // indirect
3938
github.com/gorilla/schema v1.4.1 // indirect
4039
github.com/gorilla/websocket v1.5.3 // indirect
@@ -52,17 +51,14 @@ require (
5251
github.com/pierrec/xxHash v0.1.5 // indirect
5352
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
5453
github.com/rivo/uniseg v0.4.7 // indirect
55-
github.com/rogpeppe/go-internal v1.14.1 // indirect
5654
github.com/rs/cors v1.10.1 // indirect
5755
github.com/spf13/pflag v1.0.5 // indirect
5856
github.com/threefoldtech/zos v0.5.6-0.20240902110349-172a0a29a6ee // indirect
59-
github.com/tklauser/go-sysconf v0.3.12 // indirect
60-
github.com/yusufpapurcu/wmi v1.2.4 // indirect
57+
github.com/tklauser/numcpus v0.6.1 // indirect
6158
golang.org/x/crypto v0.33.0 // indirect
62-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
6359
golang.org/x/sys v0.30.0 // indirect
64-
gonum.org/v1/gonum v0.15.0 // indirect
65-
google.golang.org/protobuf v1.36.4 // indirect
60+
gonum.org/v1/gonum v0.16.0 // indirect
61+
google.golang.org/protobuf v1.36.6 // indirect
6662
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
6763
)
6864

‎farmerbot/go.sum

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t
100100
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
101101
github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo=
102102
github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
103-
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
104-
github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
105-
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
103+
github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
104+
github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
105+
github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
106106
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
107107
github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
108108
github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
@@ -134,8 +134,6 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
134134
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
135135
golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
136136
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
137-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
138-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
139137
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
140138
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
141139
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -144,14 +142,12 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
144142
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
145143
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
146144
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
147-
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
148145
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
149146
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
150147
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
151148
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
152149
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
153150
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
154-
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
155151
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
156152
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
157153
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
@@ -164,10 +160,10 @@ golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
164160
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
165161
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
166162
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
167-
gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ=
168-
gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo=
169-
google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
170-
google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
163+
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
164+
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
165+
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
166+
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
171167
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
172168
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
173169
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎farmerbot/internal/farmerbot.go

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func (f *FarmerBot) serve(ctx context.Context) error {
185185
return nil, fmt.Errorf("failed to include node with id %d with error: %w", nodeID, err)
186186
}
187187

188-
f.state.addNode(node)
188+
f.addNode(node)
189189
return nil, nil
190190
})
191191

@@ -206,7 +206,7 @@ func (f *FarmerBot) serve(ctx context.Context) error {
206206
// Exclude node from farmerbot management
207207
// (It is not allowed if we tried to power on a node the farmer decided to power off)
208208
// the farmer should include it again if he wants to the bot to manage it
209-
f.state.deleteNode(nodeID)
209+
f.deleteNode(nodeID)
210210
return nil, nil
211211
})
212212

@@ -227,7 +227,7 @@ func (f *FarmerBot) serve(ctx context.Context) error {
227227
// Exclude node from farmerbot management
228228
// (It is not allowed if we tried to power off a node the farmer decided to power on)
229229
// the farmer should include it again if he wants to the bot to manage it
230-
f.state.deleteNode(nodeID)
230+
f.deleteNode(nodeID)
231231
return nil, nil
232232
})
233233

@@ -240,7 +240,6 @@ func (f *FarmerBot) serve(ctx context.Context) error {
240240
peer.WithSession(fmt.Sprintf("farmerbot-%d", f.farm.ID)),
241241
peer.WithKeyType(f.keyType),
242242
)
243-
244243
if err != nil {
245244
return fmt.Errorf("failed to create farmerbot direct peer with error: %w", err)
246245
}
@@ -253,28 +252,28 @@ func (f *FarmerBot) iterateOnNodes(ctx context.Context, subConn Substrate) error
253252
var wakeUpCalls uint8
254253

255254
log.Debug().Msg("Fetch nodes")
256-
farmNodes, err := subConn.GetNodes(uint32(f.state.farm.ID))
255+
farmNodes, err := subConn.GetNodes(uint32(f.farm.ID))
257256
if err != nil {
258257
return err
259258
}
260259

261260
// remove nodes that don't exist anymore in the farm
262-
for _, node := range f.state.nodes {
261+
for _, node := range f.nodes {
263262
if !slices.Contains(farmNodes, uint32(node.ID)) {
264-
f.state.deleteNode(uint32(node.ID))
263+
f.deleteNode(uint32(node.ID))
265264
}
266265
}
267266

268-
farmNodes = addPriorityToNodes(f.state.config.PriorityNodes, farmNodes)
267+
farmNodes = addPriorityToNodes(f.config.PriorityNodes, farmNodes)
269268

270269
for _, nodeID := range farmNodes {
271-
if slices.Contains(f.state.config.ExcludedNodes, nodeID) {
270+
if slices.Contains(f.config.ExcludedNodes, nodeID) {
272271
continue
273272
}
274273

275274
// if the user specified included nodes or
276275
// no nodes are specified so all nodes will be added (except excluded)
277-
if !slices.Contains(f.state.config.IncludedNodes, nodeID) && len(f.state.config.IncludedNodes) > 0 {
276+
if !slices.Contains(f.config.IncludedNodes, nodeID) && len(f.config.IncludedNodes) > 0 {
278277
continue
279278
}
280279

@@ -284,7 +283,7 @@ func (f *FarmerBot) iterateOnNodes(ctx context.Context, subConn Substrate) error
284283
log.Error().Err(err).Send()
285284
}
286285

287-
_, node, err := f.state.getNode(nodeID)
286+
_, node, err := f.getNode(nodeID)
288287
if err != nil {
289288
log.Error().Err(err).Send()
290289
}
@@ -300,14 +299,14 @@ func (f *FarmerBot) iterateOnNodes(ctx context.Context, subConn Substrate) error
300299
if roundStart.Day() == 1 && roundStart.Hour() == 1 && roundStart.Minute() < int(timeoutUpdate.Minutes()) {
301300
log.Debug().Uint32("nodeID", nodeID).Msg("Reset random wake-up times the first day of the month")
302301
node.timesRandomWakeUps = 0
303-
err = f.state.updateNode(node)
302+
err = f.updateNode(node)
304303
if err != nil {
305304
log.Error().Err(err).Send()
306305
}
307306
}
308307

309308
if f.shouldWakeUp(ctx, &node, roundStart, wakeUpCalls) {
310-
err = f.state.updateNode(node)
309+
err = f.updateNode(node)
311310
if err != nil {
312311
log.Error().Err(err).Send()
313312
}
@@ -355,14 +354,14 @@ func addPriorityToNodes(priorityNodes, farmNodes []uint32) []uint32 {
355354
}
356355

357356
func (f *FarmerBot) addOrUpdateNode(ctx context.Context, subConn Substrate, nodeID uint32) error {
358-
neverShutDown := slices.Contains(f.state.config.NeverShutDownNodes, nodeID)
357+
neverShutDown := slices.Contains(f.config.NeverShutDownNodes, nodeID)
359358

360-
_, oldNode, err := f.state.getNode(nodeID)
359+
_, oldNode, err := f.getNode(nodeID)
361360
if err == nil { // node exists
362-
updateErr := oldNode.update(ctx, subConn, f.rmbNodeClient, neverShutDown, f.state.farm.DedicatedFarm, f.config.ContinueOnPoweringOnErr)
361+
updateErr := oldNode.update(ctx, subConn, f.rmbNodeClient, neverShutDown, f.farm.DedicatedFarm, f.config.ContinueOnPoweringOnErr)
363362

364363
// update old node state even if it failed
365-
if err := f.state.updateNode(oldNode); err != nil {
364+
if err := f.updateNode(oldNode); err != nil {
366365
return fmt.Errorf("failed to update node state %d with error: %w", uint32(oldNode.ID), err)
367366
}
368367

@@ -375,12 +374,12 @@ func (f *FarmerBot) addOrUpdateNode(ctx context.Context, subConn Substrate, node
375374
}
376375

377376
// if node doesn't exist, we should add it
378-
nodeObj, err := getNode(ctx, subConn, f.rmbNodeClient, nodeID, f.config.ContinueOnPoweringOnErr, neverShutDown, false, f.state.farm.DedicatedFarm, on)
377+
nodeObj, err := getNode(ctx, subConn, f.rmbNodeClient, nodeID, f.config.ContinueOnPoweringOnErr, neverShutDown, false, f.farm.DedicatedFarm, on)
379378
if err != nil {
380379
return fmt.Errorf("failed to get node %d: %w", nodeID, err)
381380
}
382381

383-
f.state.addNode(nodeObj)
382+
f.addNode(nodeObj)
384383
log.Debug().Uint32("nodeID", nodeID).Msg("Node is added with latest changes successfully")
385384
return nil
386385
}

0 commit comments

Comments
 (0)