Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use ipnisync with libp2phttp #1638

Merged
merged 27 commits into from
Sep 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
bcaaaec
Use ipnisync with libp2phttp
gammazero Aug 21, 2023
0f18deb
Add config to fall back to legacy data-transfer sync
gammazero Aug 23, 2023
23256de
Update config doc
gammazero Aug 23, 2023
4033088
Need to sync entries chain
gammazero Aug 23, 2023
78ca163
Fix expected error text in test case
gammazero Aug 23, 2023
97a367a
Fix lint warning
gammazero Aug 23, 2023
c0d9641
Update comment
gammazero Aug 26, 2023
e9845cf
Fork mplex since libp2p no longer supports it
gammazero Aug 29, 2023
6bc9781
gostream relocated, deps updated
gammazero Aug 29, 2023
0948f9a
update circle CI config to use latest version of go
gammazero Aug 29, 2023
57013d7
update libp2p
gammazero Aug 30, 2023
2d78b30
Do not import car/v2 from boxo
gammazero Aug 30, 2023
b031ed1
Update index-provider config
gammazero Sep 1, 2023
5140f94
Update to latest index-provider
gammazero Sep 1, 2023
95fcc3a
Update lotus, filecoin-ffi submodule, and lotus API parameter
gammazero Sep 9, 2023
3ff892d
doc gen
gammazero Sep 9, 2023
b4e75ae
Update circle-ci image versions
gammazero Sep 9, 2023
584561e
Fix itest
gammazero Sep 9, 2023
fb86b27
cbor-gen
gammazero Sep 9, 2023
066738a
Update circieci lid-docker-compose image
gammazero Sep 9, 2023
6eecd5b
Fix circieci image
gammazero Sep 9, 2023
1a4ac18
update circleci docker version
gammazero Sep 9, 2023
ca43f3d
update devnet golang docker image
gammazero Sep 9, 2023
58f9bd6
Upgrade devnet docker to ubuntu 22.04
gammazero Sep 9, 2023
c33b23a
Update go-car
gammazero Sep 11, 2023
909025b
Use lotus version [email protected]
gammazero Sep 16, 2023
0b0091b
rebase and mod tidy
gammazero Sep 22, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ orbs:
executors:
golang:
docker:
- image: cimg/go:1.19.7
- image: cimg/go:1.21
resource_class: 2xlarge
ubuntu:
docker:
- image: ubuntu:20.04
- image: ubuntu:22.04

commands:
install-deps:
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
lid-docker-compose:
description: 'Run LID integration tests'
machine:
image: ubuntu-2004:202104-01
image: ubuntu-2204:2023.07.2
resource_class: xlarge
steps:
- checkout
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
# local index directory tests so it may be worth refactoring so that it's
# only included for local index directory
- setup_remote_docker:
version: 20.10.18
version: 20.10.23
docker_layer_caching: true
- run:
name: go test
Expand All @@ -155,8 +155,8 @@ jobs:
- run:
name: Install go
command: |
curl -O https://dl.google.com/go/go1.19.5.darwin-amd64.pkg && \
sudo installer -pkg go1.19.5.darwin-amd64.pkg -target /
curl -O https://dl.google.com/go/go1.21.0.darwin-amd64.pkg && \
sudo installer -pkg go1.21.0.darwin-amd64.pkg -target /
- run:
name: Install pkg-config
command: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ GOCC?=go

ARCH?=$(shell arch)
GOVERSION:=$(shell $(GOCC) version | tr ' ' '\n' | grep go1 | sed 's/^go//' | awk -F. '{printf "%d%03d%03d", $$1, $$2, $$3}')
ifeq ($(shell expr $(GOVERSION) \< 1016000), 1)
ifeq ($(shell expr $(GOVERSION) \< 1020000), 1)
$(warning Your Golang version is go$(shell expr $(GOVERSION) / 1000000).$(shell expr $(GOVERSION) % 1000000 / 1000).$(shell expr $(GOVERSION) % 1000))
$(error Update Golang to version to at least 1.16.0)
$(error Update Golang to version to at least 1.20.0)
endif

ALLOWED_NODE_VERSIONS := 16 18
Expand Down Expand Up @@ -217,7 +217,7 @@ docsgen-openrpc-boost: docsgen-openrpc-bin

## DOCKER IMAGES
docker_user?=filecoin
lotus_version?=v1.23.3
lotus_version?=lotus@v1.23.4-rc1
ffi_from_source?=0
build_lotus?=0
build_boost?=1
Expand Down
2 changes: 1 addition & 1 deletion cmd/booster-bitswap/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
mh "github.com/multiformats/go-multihash"

"github.com/filecoin-project/boost/cmd/booster-bitswap/bitswap"
"github.com/filecoin-project/boost/p2p/muxer/mplex"
lotus_blockstore "github.com/filecoin-project/lotus/blockstore"
lcli "github.com/filecoin-project/lotus/cli"
"github.com/ipfs/boxo/bitswap/client"
Expand All @@ -30,7 +31,6 @@ import (
"github.com/libp2p/go-libp2p/core/crypto"
"github.com/libp2p/go-libp2p/core/network"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/libp2p/go-libp2p/p2p/muxer/mplex"
"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
quic "github.com/libp2p/go-libp2p/p2p/transport/quic"
"github.com/libp2p/go-libp2p/p2p/transport/tcp"
Expand Down
2 changes: 1 addition & 1 deletion cmd/booster-bitswap/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"os"
"path/filepath"

"github.com/filecoin-project/boost/p2p/muxer/mplex"
"github.com/libp2p/go-libp2p"
crypto "github.com/libp2p/go-libp2p/core/crypto"
"github.com/libp2p/go-libp2p/core/host"
"github.com/libp2p/go-libp2p/core/network"
peer "github.com/libp2p/go-libp2p/core/peer"
"github.com/libp2p/go-libp2p/p2p/muxer/mplex"
"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
quic "github.com/libp2p/go-libp2p/p2p/transport/quic"
"github.com/libp2p/go-libp2p/p2p/transport/tcp"
Expand Down
6 changes: 3 additions & 3 deletions docker/boost-client/Dockerfile.source
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#########################################################################################
FROM golang:1.20-bullseye as builder
FROM golang:1.21-bullseye as builder

RUN apt update && apt install -y \
build-essential \
Expand Down Expand Up @@ -34,7 +34,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/go/pkg/mod \
make boost
#########################################################################################
FROM ubuntu:20.04 as runner
FROM ubuntu:22.04 as runner

RUN apt update && apt install -y \
curl \
Expand Down Expand Up @@ -68,4 +68,4 @@ EXPOSE 8080
COPY --from=builder /go/src/boost /usr/local/bin/
COPY docker/boost-client/entrypoint.sh /app/

ENTRYPOINT ["./entrypoint.sh"]
ENTRYPOINT ["./entrypoint.sh"]
4 changes: 2 additions & 2 deletions docker/devnet/Dockerfile.source
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ COPY gql /src/gql
RUN npm_config_legacy_peer_deps=yes npm ci --no-audit --prefix react&& \
npm run --prefix react build
#########################################################################################
FROM golang:1.19-bullseye as builder
FROM golang:1.21-bullseye as builder

RUN apt update && apt install -y \
build-essential \
Expand Down Expand Up @@ -74,7 +74,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/go/pkg/mod \
make debug
#########################################################################################
FROM ubuntu:20.04 as runner
FROM ubuntu:22.04 as runner

RUN apt update && apt install -y \
curl \
Expand Down
Loading