merge main into release/lotus1.17.2

Author: nonsense

.dockerignore

@@ -1,5 +1,6 @@
 docker/devnet/data
 react/node_modules
+react/build
 # filecoin-ffi installation
 build/.filecoin-install
 extern/filecoin-ffi/.install-filcrypto

Makefile

@@ -197,3 +197,46 @@ docsgen-openrpc-boost: docsgen-openrpc-bin
 	./docgen-openrpc "api/api.go" "Boost" "api" "./api" -gzip > build/openrpc/boost.json.gz
 
 .PHONY: docsgen docsgen-md-bin docsgen-openrpc-bin
+
+## DOCKER IMAGES
+docker_user?=filecoin
+lotus_version?=1.17.1-rc2
+lotus_src_dir?=
+ 
+ifeq ($(lotus_src_dir),)
+    lotus_src_dir=/tmp/lotus-$(lotus_version)
+    lotus_checkout_dir=$(lotus_src_dir)
+else
+    lotus_version=dev
+    lotus_checkout_dir=
+endif
+lotus_test_image=$(docker_user)/lotus-test:$(lotus_version)
+docker_build_cmd=docker build --build-arg LOTUS_TEST_IMAGE=$(lotus_test_image) $(docker_args)
+
+### lotus test docker image
+info/lotus-test:
+	@echo Lotus dir = $(lotus_src_dir)
+	@echo Lotus ver = $(lotus_version)
+.PHONY: info/lotus-test	
+$(lotus_checkout_dir):
+	git clone --depth 1 --branch v$(lotus_version) https://github.com/filecoin-project/lotus $@
+docker/lotus-test: info/lotus-test | $(lotus_checkout_dir)
+	cd $(lotus_src_dir) && $(docker_build_cmd) -f Dockerfile.lotus --target lotus-test \
+		-t $(lotus_test_image) .
+.PHONY: docker/lotus-test
+
+### devnet images
+docker/%: docker/lotus-test
+	cd docker/devnet/$* && $(docker_build_cmd) -t $(docker_user)/$*-dev:$(lotus_version) \
+		--build-arg BUILD_VERSION=$(lotus_version) .
+docker/boost: build/.update-modules docker/lotus-test
+	DOCKER_BUILDKIT=1 $(docker_build_cmd) \
+		-t $(docker_user)/boost-dev:dev --build-arg BUILD_VERSION=dev \
+		-f docker/devnet/boost/Dockerfile.source .
+.PHONY: docker/boost
+docker/booster-http: 
+	$(docker_build_cmd) -t $(docker_user)/booster-http-dev:dev --build-arg BUILD_VERSION=dev \
+		-f docker/devnet/booster-http/Dockerfile.source .
+.PHONY: docker/booster-http
+docker/all: docker/boost docker/booster-http docker/lotus docker/lotus-miner 
+.PHONY: docker/all

README.md

@@ -206,18 +206,13 @@ Note also that the provider address is `t01000` and you will need to supply an a
 
 ### Building Docker images
 
-1. Select Lotus version, for example: `lotus_version=1.17.1-rc2`. It must be the tag name of [the Lotus git repo](https://github.com/filecoin-project/lotus/tags) without `v` prefix.
-
-2. Select Boost version, for example: `boost_version=1.3.0-rc1`.
-
-3. Build images
+1. Build images
 
 ```
-cd docker/devnet
-make build/all
+make docker/all
 ```
 
-If you need to build a different version, edit the `.env` file.
+If you need to build containers using a specific version of lotus then provide the version as a parameter, e.g. `make docker/all lotus_version=1.17.0`. The version must be a tag name of [Lotus git repo](https://github.com/filecoin-project/lotus/tags) without `v` prefix. Or you can build using a local source of lotus - `make docker/all lotus_src_dir=<path of lotus source>`. Also, before starting devnet, you need to update versions in the [.env](docker/devnet/.env) file.
 
 ### Start devnet docker stack
 

build/openrpc/boost.json.gz

@@ -2,7 +2,7 @@ package build
 
 var CurrentCommit string
 
-const BuildVersion = "1.4.0-rc2"
+const BuildVersion = "1.4.0"
 
 func UserVersion() string {
 	return BuildVersion + CurrentCommit

build/version.go

@@ -3,6 +3,7 @@ package main
 import (
 	"os"
 
+	"github.com/filecoin-project/boost/cmd"
 	logging "github.com/ipfs/go-log/v2"
 	"github.com/urfave/cli/v2"
 
@@ -29,6 +30,7 @@ func main() {
 				Usage:   "boost repo path",
 				Value:   "~/.boost",
 			},
+			cmd.FlagJson,
 			cliutil.FlagVeryVerbose,
 		},
 		Commands: []*cli.Command{

cmd/boostd/main.go

@@ -6,6 +6,7 @@ import (
 	"text/tabwriter"
 
 	bcli "github.com/filecoin-project/boost/cli"
+	"github.com/filecoin-project/boost/cmd"
 	lcli "github.com/filecoin-project/lotus/cli"
 	"github.com/filecoin-project/lotus/lib/tablewriter"
 	"github.com/ipfs/go-cid"
@@ -40,9 +41,18 @@ var piecesListPiecesCmd = &cli.Command{
 			return err
 		}
 
+		if cctx.Bool("json") {
+
+			pieceCidsJson := map[string]interface{}{
+				"pieceCids": pieceCids,
+			}
+			return cmd.PrintJson(pieceCidsJson)
+		}
+
 		for _, pc := range pieceCids {
 			fmt.Println(pc)
 		}
+
 		return nil
 	},
 }
@@ -69,6 +79,14 @@ var piecesListCidInfosCmd = &cli.Command{
 			return err
 		}
 
+		if cctx.Bool("json") && !cctx.Bool("verbose") {
+			dataCidsJson := map[string]interface{}{
+				"dataCids": cids,
+			}
+
+			return cmd.PrintJson(dataCidsJson)
+		}
+
 		w := tablewriter.New(tablewriter.Col("CID"),
 			tablewriter.Col("Piece"),
 			tablewriter.Col("BlockOffset"),
@@ -79,12 +97,18 @@ var piecesListCidInfosCmd = &cli.Command{
 			tablewriter.Col("DealLen"),
 		)
 
+		type dataCids map[string]interface{}
+		var out []dataCids
+
 		for _, c := range cids {
 			if !cctx.Bool("verbose") {
 				fmt.Println(c)
 				continue
 			}
 
+			type pbl map[string]interface{}
+			var pbls []pbl
+
 			ci, err := nodeApi.PiecesGetCIDInfo(ctx, c)
 			if err != nil {
 				fmt.Printf("Error getting CID info: %s\n", err)
@@ -109,8 +133,34 @@ var piecesListCidInfosCmd = &cli.Command{
 						"DealOffset":  deal.Offset,
 						"DealLen":     deal.Length,
 					})
+
+					deal := map[string]interface{}{
+						"ID":     deal.DealID,
+						"Sector": deal.SectorID,
+						"Offset": deal.Offset,
+						"Length": deal.Length,
+					}
+					tpbl := pbl{
+						"PieceCid":    pi.PieceCID,
+						"BlockOffset": location.RelOffset,
+						"BlockLength": location.BlockSize,
+						"Deal":        deal,
+					}
+
+					pbls = append(pbls, tpbl)
 				}
 			}
+
+			tdataCids := dataCids{
+				"DataCid":            c,
+				"PieceBlockLocation": pbls,
+			}
+
+			out = append(out, tdataCids)
+		}
+
+		if cctx.Bool("json") && cctx.Bool("verbose") {
+			return cmd.PrintJson(out)
 		}
 
 		if cctx.Bool("verbose") {
@@ -146,6 +196,28 @@ var piecesInfoCmd = &cli.Command{
 			return err
 		}
 
+		if cctx.Bool("json") {
+
+			type deal map[string]interface{}
+			var deals []deal
+			for _, d := range pi.Deals {
+				dl := deal{
+					"ID":       d.DealID,
+					"SectorID": d.SectorID,
+					"Offset":   d.Offset,
+					"Length":   d.Length,
+				}
+				deals = append(deals, dl)
+			}
+
+			pieceinfo := map[string]interface{}{
+				"PieceCid": pi.PieceCID,
+				"Deals":    deals,
+			}
+
+			return cmd.PrintJson(pieceinfo)
+		}
+
 		fmt.Println("Piece: ", pi.PieceCID)
 		w := tabwriter.NewWriter(os.Stdout, 4, 4, 2, ' ', 0)
 		fmt.Fprintln(w, "Deals:\nDealID\tSectorID\tLength\tOffset")
@@ -181,6 +253,31 @@ var piecesCidInfoCmd = &cli.Command{
 			return err
 		}
 
+		if cctx.Bool("json") {
+
+			type pbl map[string]interface{}
+			type bl map[string]interface{}
+			var pbls []pbl
+			for _, d := range ci.PieceBlockLocations {
+				tbp := bl{
+					"RelOffset": d.RelOffset,
+					"BlockSize": d.BlockSize,
+				}
+				tpbl := pbl{
+					"PieceCid":      d.PieceCID,
+					"BlockLocation": tbp,
+				}
+				pbls = append(pbls, tpbl)
+			}
+
+			pieceinfo := map[string]interface{}{
+				"DataCid":            ci.CID,
+				"PieceBlockLocation": pbls,
+			}
+
+			return cmd.PrintJson(pieceinfo)
+		}
+
 		fmt.Println("Info for: ", ci.CID)
 
 		w := tabwriter.NewWriter(os.Stdout, 4, 4, 2, ' ', 0)

cmd/boostd/pieces.go

@@ -4,6 +4,15 @@
 ARG LOTUS_TEST_IMAGE=filecoin/lotus-test:latest
 FROM ${LOTUS_TEST_IMAGE} as lotus-dev
 #########################################################################################
+FROM node:16.16-alpine3.15 AS react-builder
+
+WORKDIR /src
+COPY react /src/react
+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.18-bullseye as builder
 
 RUN apt update && apt install -y \
@@ -31,6 +40,8 @@ RUN make build/.filecoin-install
 ##############################################
 COPY . /go/src
 ##############################################
+COPY --from=react-builder /src/react/build /go/src/react/build
+
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
       make debug