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.

Sign up for GitHub

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

feat: Ipnisync #1731

Merged
merged 8 commits into from
Oct 3, 2023
Merged

feat: Ipnisync #1731

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
38d7088
Use ipnisync with libp2phttp (#1638)
gammazero Sep 26, 2023
bec158a
add defaults, streamline go version
Sep 26, 2023
89d71fd
Merge branch 'main' into ipnisync
LexLuthr Oct 3, 2023
a468255
Update node/config/types.go
LexLuthr Oct 3, 2023
97607f4
update UI
Oct 3, 2023
8aec648
fix variable names
Oct 3, 2023
5eebf77
remove mplex lib and mux from bitswap
Oct 3, 2023
11adafa
mod tidy
Oct 3, 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
10 changes: 5 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ orbs:
executors:
golang:
docker:
- image: cimg/go:1.19.7
- image: cimg/go:1.20.7
resource_class: 2xlarge
ubuntu:
docker:
- image: ubuntu:20.04
- image: ubuntu:22.04

commands:
install-deps:
Expand Down Expand Up @@ -87,7 +87,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 @@ -132,7 +132,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 @@ -154,7 +154,7 @@ jobs:
linux: false
darwin: true
- golang/install:
version: "1.19.5"
version: "1.20.7"
- run:
name: Install pkg-config
command: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
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?=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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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.20-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
2 changes: 1 addition & 1 deletion extern/filecoin-ffi
Open in desktop
Submodule filecoin-ffi updated 22 files
+63 −91 .circleci/config.yml
+2 −2 build.sh
+6 −9 cgo/extern.go
+2 −3 cgo/interface.go
+36 −0 cgo/proofs.go
+5 −6 install-filcrypto
+19 −0 proofs.go
+1,092 −848 rust/Cargo.lock
+13 −18 rust/Cargo.toml
+0 −1 rust/rust-toolchain
+3 −0 rust/rust-toolchain.toml
+14 −25 rust/scripts/build-release.sh
+3 −3 rust/src/fvm/blockstore/cgo.rs
+1 −1 rust/src/fvm/cgo/error.rs
+0 −6 rust/src/fvm/cgo/externs.rs
+35 −20 rust/src/fvm/engine.rs
+8 −42 rust/src/fvm/externs.rs
+28 −6 rust/src/fvm/machine.rs
+1 −1 rust/src/fvm/types.rs
+142 −25 rust/src/proofs/api.rs
+8 −0 rust/src/proofs/types.rs
+1 −1 rust/src/util/types.rs
Loading