add Curio indicator

filecoin-project · Jun 11, 2024 · 50b1acc · 50b1acc
1 parent 649235a
commit 50b1acc
Show file tree

Hide file tree

Showing 16 changed files with 97 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@ orbs:
 executors:
   golang:
     docker:
-      - image: cimg/go:1.21.7
+      - image: cimg/go:1.22.3
     resource_class: 2xlarge
   ubuntu:
     docker:
@@ -154,7 +154,7 @@ jobs:
           linux: false
           darwin: true
       - golang/install:
-          version: "1.21.7"
+          version: "1.22.3"
       - run:
           name: Install pkg-config
           command: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config

diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml
@@ -16,7 +16,7 @@ jobs:
       contents: read
       packages: write
     env:
-      LOTUS_VERSION: 'v1.26.1'
+      LOTUS_VERSION: 'v1.27.0'
       LOTUS_SOURCE_IMAGE: 'ghcr.io/filecoin-shipyard/lotus-containers:lotus'
       NETWORK_NAME: 'devnet'
       FFI_BUILD_FROM_SOURCE: '0'

diff --git a/Makefile b/Makefile
@@ -217,11 +217,11 @@ docsgen-openrpc-boost: docsgen-openrpc-bin
 
 ## DOCKER IMAGES
 docker_user?=filecoin
-lotus_version?=v1.26.1
+lotus_version?=v1.27.0
 ffi_from_source?=0
 build_lotus?=0
 build_boost?=1
-boost_version?=v2.2.0-rc1
+boost_version?=v2.3.0-rc2
 ifeq ($(build_boost),1)
 #v1: build boost images currently checked out branch
 	boost_build_cmd=docker/boost

diff --git a/docker/boost-client/Dockerfile.source b/docker/boost-client/Dockerfile.source
@@ -1,5 +1,5 @@
 #########################################################################################
-FROM golang:1.21-bullseye as builder
+FROM golang:1.22-bullseye as builder
 
 RUN apt update && apt install -y \
       build-essential \

diff --git a/docker/devnet/Dockerfile.source b/docker/devnet/Dockerfile.source
@@ -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.21-bullseye as builder
+FROM golang:1.22-bullseye as builder
 
 RUN apt update && apt install -y \
       build-essential \

diff --git a/extern/boostd-data/Dockerfile.test b/extern/boostd-data/Dockerfile.test
@@ -1,4 +1,4 @@
-FROM golang:1.21-alpine
+FROM golang:1.22-alpine
 
 WORKDIR /go/src/
 

diff --git a/extern/boostd-data/go.mod b/extern/boostd-data/go.mod
@@ -1,6 +1,6 @@
 module github.com/filecoin-project/boost/extern/boostd-data
 
-go 1.18
+go 1.22
 
 require (
 	contrib.go.opencensus.io/exporter/prometheus v0.4.2

diff --git a/extern/boostd-data/go.sum b/extern/boostd-data/go.sum
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/filecoin-project/boost
 
-go 1.21
+go 1.22
 
 replace github.com/filecoin-project/filecoin-ffi => ./extern/filecoin-ffi
 

diff --git a/go.work b/go.work
@@ -1,4 +1,4 @@
-go 1.21
+go 1.22
 
 use (
  .

diff --git a/go.work.sum b/go.work.sum
@@ -28,6 +28,8 @@ cloud.google.com/go v0.110.2/go.mod h1:k04UEeEtb6ZBRTv3dZz4CeJC3jKGxyhl0sAiVVqux
 cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk=
 cloud.google.com/go v0.111.0 h1:YHLKNupSD1KqjDbQ3+LVdQ81h/UJbJyZG203cEfnQgM=
 cloud.google.com/go v0.111.0/go.mod h1:0mibmpKP1TyOOFYQY5izo0LnT+ecvOQ0Sg3OdmMiNRU=
+cloud.google.com/go v0.112.1 h1:uJSeirPke5UNZHIb4SxfZklVSiWWVqW4oXlETwZziwM=
+cloud.google.com/go v0.112.1/go.mod h1:+Vbu+Y1UU+I1rjmzeMOb/8RfkKJK2Gyxi1X6jJCZLo4=
 cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4=
 cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw=
 cloud.google.com/go/accessapproval v1.6.0 h1:x0cEHro/JFPd7eS4BlEWNTMecIj2HdXjOVB5BtvwER0=
@@ -1678,6 +1680,8 @@ github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38
 github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI=
 github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas=
 github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=
+github.com/googleapis/gax-go/v2 v2.12.2 h1:mhN09QQW1jEWeMF74zGR81R30z4VJzjZsfkUhuHF+DA=
+github.com/googleapis/gax-go/v2 v2.12.2/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc=
 github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g=
 github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA=
@@ -1786,6 +1790,8 @@ github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb h1:EPRgaDqX
 github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE=
 github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0=
 github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
+github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=
+github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
 github.com/ianlancetaylor/demangle v0.0.0-20220517205856-0058ec4f073c/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
@@ -2623,6 +2629,8 @@ github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
 github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
+github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY=
+github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
 github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw=
@@ -3178,6 +3186,8 @@ google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvy
 google.golang.org/api v0.128.0/go.mod h1:Y611qgqaE92On/7g65MQgxYul3c0rEB894kniWLY750=
 google.golang.org/api v0.149.0 h1:b2CqT6kG+zqJIVKRQ3ELJVLN1PwHZ6DJ3dW8yl82rgY=
 google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI=
+google.golang.org/api v0.169.0 h1:QwWPy71FgMWqJN/l6jVlFHUa29a7dcUy02I8o799nPY=
+google.golang.org/api v0.169.0/go.mod h1:gpNOiMA2tZ4mf5R9Iwf4rK/Dcz0fbdIgWYWVoxmsyLg=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
@@ -3286,6 +3296,8 @@ google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaL
 google.golang.org/genproto v0.0.0-20230525234025-438c736192d0/go.mod h1:9ExIQyXL5hZrHzQceCwuSYwZZ5QZBazOcprJ5rgs3lY=
 google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97/go.mod h1:t1VqOqqvce95G3hIDCT5FeO3YUc6Q4Oe24L/+rNMxRk=
 google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:CgAqfJo+Xmu0GwA0411Ht3OU3OntXwsGmrmjI8ioGXI=
+google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY=
+google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo=
 google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a/go.mod h1:ts19tUU+Z0ZShN1y3aPyq2+O3d5FUNNgT6FtOzmrNn8=
 google.golang.org/genproto/googleapis/api v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
 google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=

diff --git a/gql/resolver_maddr.go b/gql/resolver_maddr.go
@@ -1,7 +1,15 @@
 package gql
 
-func (r *resolver) MinerAddress() string {
-	return r.provider.Address.String()
+type minerAddress struct {
+	MinerID string
+	IsCurio bool
+}
+
+func (r *resolver) MinerAddress() minerAddress {
+	return minerAddress{
+		MinerID: r.provider.Address.String(),
+		IsCurio: r.curio,
+	}
 }
 
 func (r *resolver) GraphsyncRetrievalMinerAddresses() []string {

diff --git a/gql/schema.graphql b/gql/schema.graphql
@@ -524,12 +524,17 @@ type PiecePayload {
   Multihash: String!
 }
 
+type MinerAddress {
+  MinerID: String!
+  IsCurio: Boolean!
+}
+
 type RootQuery {
   """Get height of chain"""
   epoch: EpochInfo!
 
   """Get miner address"""
-  minerAddress: String!
+  minerAddress: MinerAddress!
 
   """Get list of miners that graphsync can retrieve data from"""
   graphsyncRetrievalMinerAddresses: [String!]!

diff --git a/react/src/MinerAddress.js b/react/src/MinerAddress.js
@@ -10,8 +10,13 @@ export function MinerAddress() {
     }
 
     return (
-        <div className="miner-address">
-            {data.minerAddress}
-        </div>
+        data.minerAddress.IsCurio === true ?
+            <div className="miner-address">
+                {data.minerAddress.MinerID} (Curio)
+            </div>
+            :
+            <div className="miner-address">
+                {data.minerAddress.MinerID}
+            </div>
     )
 }
diff --git a/react/src/RetrievalLogs.js b/react/src/RetrievalLogs.js
@@ -41,7 +41,7 @@ function RetrievalMinerAddrs() {
         return null
     }
 
-    const minerAddr = minerAddrQuery.data.minerAddress
+    const minerAddr = minerAddrQuery.data.minerAddress.MinerID
     const retrievalMinerAddrs = gsRetrievalMinerAddrsQuery.data.graphsyncRetrievalMinerAddresses
 
     if (retrievalMinerAddrs.length === 1 && retrievalMinerAddrs[0] === minerAddr) {

diff --git a/react/src/gql.js b/react/src/gql.js
@@ -71,7 +71,10 @@ const EpochQuery = gql`
 
 const MinerAddressQuery = gql`
     query AppMinerAddressQuery {
-        minerAddress
+        minerAddress {
+            MinerID
+            IsCurio
+        }
     }
 `;