Skip to content

Commit e91fe37

Browse files
authored
release v2.4.4 (#2018)
* release v2.4.4 * update lotus v1.33.1 * update frisbii, lint tool, go version * fix CI go version * make gen * fix http tests * disable identity cid test * fix docker test
1 parent 73c430a commit e91fe37

File tree

128 files changed

+1727
-877
lines changed

Some content is hidden

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

128 files changed

+1727
-877
lines changed

.circleci/config.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ orbs:
66
executors:
77
golang:
88
docker:
9-
- image: cimg/go:1.23.7
9+
- image: cimg/go:1.24.7
1010
resource_class: 2xlarge
1111
ubuntu:
1212
docker:
@@ -87,7 +87,7 @@ jobs:
8787
lid-docker-compose:
8888
description: 'Run LID integration tests'
8989
docker:
90-
- image: cimg/go:1.23.7 # Primary container to run Go tests
90+
- image: cimg/go:1.24.7 # Primary container to run Go tests
9191
environment:
9292
YUGABYTE_HOST: yugabyte
9393
- image: yugabytedb/yugabyte:2024.1.3.0-b105 # Service container for YugabyteDB
@@ -172,7 +172,7 @@ jobs:
172172
linux: false
173173
darwin: true
174174
- golang/install:
175-
version: "1.23.7"
175+
version: "1.24.7"
176176
- run:
177177
name: Install pkg-config
178178
command: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config
@@ -271,7 +271,7 @@ jobs:
271271
default: golang
272272
golangci-lint-version:
273273
type: string
274-
default: 1.60.1
274+
default: 2.4.0
275275
concurrency:
276276
type: string
277277
default: '2'
@@ -336,10 +336,10 @@ workflows:
336336
suite: itest-dummydeal
337337
target: "./itests/dummydeal_test.go"
338338

339-
- test:
340-
name: test-graphsync_identity_cid
341-
suite: itest-graphsync_identity_cid
342-
target: "./itests/graphsync_identity_cid_test.go"
339+
# - test:
340+
# name: test-graphsync_identity_cid
341+
# suite: itest-graphsync_identity_cid
342+
# target: "./itests/graphsync_identity_cid_test.go"
343343

344344
- test:
345345
name: test-itest-retrieval

.github/image/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## This image is used to github action runner for this repo
22
# Use the official Golang image as the base image
3-
FROM golang:1.23-bullseye AS builder
3+
FROM golang:1.24-bullseye AS builder
44

55
# Set the working directory inside the container
66
WORKDIR /app
@@ -23,7 +23,7 @@ RUN git submodule update --init
2323
RUN go mod download
2424

2525
# Stage 2: Install Lotus binary
26-
FROM ghcr.io/filecoin-shipyard/lotus-containers:lotus-v1.32.1-devnet AS lotus-test
26+
FROM ghcr.io/filecoin-shipyard/lotus-containers:lotus-v1.34.0-rc2-devnet AS lotus-test
2727

2828
# Stage 3: Build the final image
2929
FROM myoung34/github-runner AS curio-github-runner

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- main
1010

1111
env:
12-
GO_VERSION: 1.23.7
12+
GO_VERSION: 1.24.7
1313

1414
jobs:
1515
ci-lint:
@@ -73,8 +73,8 @@ jobs:
7373
target: "./itests/dummydeal_offline_test.go"
7474
- name: test-itest-dummydeal
7575
target: "./itests/dummydeal_test.go"
76-
- name: test-graphsync_identity_cid
77-
target: "./itests/graphsync_identity_cid_test.go"
76+
# - name: test-graphsync_identity_cid
77+
# target: "./itests/graphsync_identity_cid_test.go"
7878
- name: test-itest-retrieval
7979
target: "./itests/graphsync_retrieval_test.go"
8080
- name: test-itest-direct_deal
@@ -144,7 +144,7 @@ jobs:
144144

145145
- name: Install golangci-lint
146146
run: |
147-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.60.1
147+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.4.0
148148
shell: bash
149149

150150
- name: Lint

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $(warning Your Golang version is go$(shell expr $(GOVERSION) / 1000000).$(shell
1414
$(error Update Golang to version to at least 1.20.0)
1515
endif
1616

17-
ALLOWED_NODE_VERSIONS := 16 18 20
17+
ALLOWED_NODE_VERSIONS := 16 18 20 22 24
1818
validate-node-version:
1919
ifeq ($(filter $(shell node -v | cut -c2-3),$(ALLOWED_NODE_VERSIONS)),)
2020
@echo "Unsupported Node.js version. Please install one of the following versions: $(ALLOWED_NODE_VERSIONS)"
@@ -217,7 +217,7 @@ docsgen-openrpc-boost: docsgen-openrpc-bin
217217

218218
## DOCKER IMAGES
219219
docker_user?=filecoin
220-
lotus_version?=v1.32.1
220+
lotus_version?=v1.34.0-rc2
221221
ffi_from_source?=0
222222
build_lotus?=0
223223
ifeq ($(build_lotus),1)

build/openrpc/boost.json.gz

0 Bytes
Binary file not shown.

build/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func BuildTypeString() string {
3131
}
3232
}
3333

34-
const BuildVersion = "2.4.3"
34+
const BuildVersion = "2.4.4"
3535

3636
func UserVersion() string {
3737
return BuildVersion + BuildTypeString() + CurrentCommit

car/car_offset_writer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"io"
88

99
"github.com/ipfs/boxo/blockservice"
10-
blockstore "github.com/ipfs/boxo/blockstore"
11-
offline "github.com/ipfs/boxo/exchange/offline"
10+
"github.com/ipfs/boxo/blockstore"
11+
"github.com/ipfs/boxo/exchange/offline"
1212
"github.com/ipfs/boxo/ipld/merkledag"
1313
"github.com/ipfs/go-cid"
1414
format "github.com/ipfs/go-ipld-format"

car/car_offset_writer_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"github.com/ipld/go-car"
2323
mh "github.com/multiformats/go-multihash"
2424
"github.com/stretchr/testify/require"
25+
"google.golang.org/protobuf/proto"
2526
)
2627

2728
func TestCarOffsetWriterDagOrder(t *testing.T) {
@@ -46,7 +47,7 @@ func TestCarOffsetWriterDagOrder(t *testing.T) {
4647
{Hash: aaaaBlk.Cid().Bytes(), Name: &aaaa},
4748
},
4849
}
49-
rootByts, err := pbn.Marshal()
50+
rootByts, err := proto.Marshal(pbn)
5051
require.NoError(t, err)
5152
rootBlk := blocks.NewBlock(rootByts)
5253
require.NoError(t, bserv.AddBlock(ctx, rootBlk))

cli/node/node.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ package node
33
import (
44
"bytes"
55
"context"
6+
"crypto/rand"
67
"errors"
78
"fmt"
89
"os"
910
"path/filepath"
1011

11-
crand "crypto/rand"
12-
1312
"github.com/filecoin-project/boost/lib/keystore"
1413
"github.com/filecoin-project/go-address"
1514
"github.com/filecoin-project/lotus/chain/types"
@@ -33,7 +32,7 @@ func Setup(cfgdir string) (*Node, error) {
3332

3433
_, err = os.Stat(cfgdir)
3534
if err != nil && errors.Is(err, os.ErrNotExist) {
36-
return nil, errors.New("repo dir doesn't exist. run `boost init` first.")
35+
return nil, errors.New("repo dir doesn't exist. run `boost init` first")
3736
}
3837

3938
peerkey, err := loadOrInitPeerKey(keyPath(cfgdir))
@@ -67,7 +66,7 @@ func loadOrInitPeerKey(kf string) (crypto.PrivKey, error) {
6766
return nil, err
6867
}
6968

70-
k, _, err := crypto.GenerateEd25519Key(crand.Reader)
69+
k, _, err := crypto.GenerateEd25519Key(rand.Reader)
7170
if err != nil {
7271
return nil, err
7372
}

cmd/boost/deal_cmd.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func dealCmdAction(cctx *cli.Context, isOnline bool) error {
135135
return err
136136
}
137137

138-
api, closer, err := lcli.GetGatewayAPI(cctx)
138+
api, closer, err := lcli.GetGatewayAPIV1(cctx)
139139
if err != nil {
140140
return fmt.Errorf("cant setup gateway connection: %w", err)
141141
}
@@ -282,7 +282,9 @@ func dealCmdAction(cctx *cli.Context, isOnline bool) error {
282282
if err != nil {
283283
return fmt.Errorf("failed to open stream to peer %s: %w", addrInfo.ID, err)
284284
}
285-
defer s.Close()
285+
defer func() {
286+
_ = s.Close()
287+
}()
286288

287289
var resp types.DealResponse
288290
if err := doRpc(ctx, s, &dealParams, &resp); err != nil {

0 commit comments

Comments
 (0)