Merge pull request #6039 from filecoin-project/feat/0x5459/upgrade-bu…

…iltin-actors-v1.23.1 feat: upgrade builtin actors to v1.23.1
filecoin-project · Jun 28, 2023 · 86b7a31 · 86b7a31
2 parents 62a0e38 + 8405d7e
commit 86b7a31
Show file tree

Hide file tree

Showing 90 changed files with 1,660 additions and 1,659 deletions.
diff --git a/app/node/node.go b/app/node/node.go
@@ -8,7 +8,6 @@ import (
 	"os"
 	"syscall"
 
-	"contrib.go.opencensus.io/exporter/jaeger"
 	"github.com/awnumar/memguard"
 	"github.com/etherlabsio/healthcheck/v2"
 	"github.com/filecoin-project/go-jsonrpc"
@@ -42,6 +41,7 @@ import (
 	manet "github.com/multiformats/go-multiaddr/net"
 	"github.com/pkg/errors"
 	"go.opencensus.io/tag"
+	tracesdk "go.opentelemetry.io/otel/sdk/trace"
 )
 
 var log = logging.Logger("node") // nolint: deadcode
@@ -102,8 +102,8 @@ type Node struct {
 	//
 	jsonRPCService, jsonRPCServiceV1 *jsonrpc.RPCServer
 
-	jaegerExporter *jaeger.Exporter
-	remoteAuth     jwtclient.IJwtAuthClient
+	jaeger     *tracesdk.TracerProvider
+	remoteAuth jwtclient.IJwtAuthClient
 }
 
 func (node *Node) Chain() *chain2.ChainSubmodule {
@@ -157,7 +157,7 @@ func (node *Node) Start(ctx context.Context) error {
 		return errors.Wrap(err, "failed to setup metrics")
 	}
 
-	if node.jaegerExporter, err = metrics.RegisterJaeger(node.network.Host.ID().Pretty(),
+	if node.jaeger, err = metrics.SetupJaegerTracing(node.network.Host.ID().Pretty(),
 		node.repo.Config().Observability.Tracing); err != nil {
 		return errors.Wrap(err, "failed to setup tracing")
 	}
@@ -234,8 +234,10 @@ func (node *Node) Stop(ctx context.Context) {
 		_ = logging.Logger(name).Sync()
 	}
 
-	if node.jaegerExporter != nil {
-		node.jaegerExporter.Flush()
+	if node.jaeger != nil {
+		if err := metrics.ShutdownJaeger(ctx, node.jaeger); err != nil {
+			log.Warnf("error shutdown jaeger-tracing: %w", err)
+		}
 	}
 }
 

diff --git a/app/submodule/blockstore/blockstore_api.go b/app/submodule/blockstore/blockstore_api.go
@@ -7,11 +7,11 @@ import (
 
 	"github.com/filecoin-project/venus/venus-shared/types"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-cid"
 	offline "github.com/ipfs/go-ipfs-exchange-offline"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"github.com/ipfs/go-merkledag"
 
 	v1api "github.com/filecoin-project/venus/venus-shared/api/chain/v1"

diff --git a/app/submodule/network/network_submodule.go b/app/submodule/network/network_submodule.go
@@ -10,6 +10,9 @@ import (
 	"github.com/filecoin-project/venus/pkg/net/helloprotocol"
 
 	"github.com/dchest/blake2b"
+	"github.com/ipfs/boxo/bitswap"
+	bsnet "github.com/ipfs/boxo/bitswap/network"
+	blocks "github.com/ipfs/go-block-format"
 	bserv "github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-datastore"
@@ -20,8 +23,6 @@ import (
 	"github.com/ipfs/go-graphsync/storeutil"
 	exchange "github.com/ipfs/go-ipfs-exchange-interface"
 	cbor "github.com/ipfs/go-ipld-cbor"
-	bsnet "github.com/ipfs/go-libipfs/bitswap/network"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	logging "github.com/ipfs/go-log"
 	"github.com/libp2p/go-libp2p"
 	dht "github.com/libp2p/go-libp2p-kad-dht"
@@ -36,11 +37,10 @@ import (
 	ma "github.com/multiformats/go-multiaddr"
 	"github.com/pkg/errors"
 
-	datatransfer "github.com/filecoin-project/go-data-transfer"
-	dtimpl "github.com/filecoin-project/go-data-transfer/impl"
-	dtnet "github.com/filecoin-project/go-data-transfer/network"
-	dtgstransport "github.com/filecoin-project/go-data-transfer/transport/graphsync"
-	"github.com/ipfs/go-libipfs/bitswap"
+	datatransfer "github.com/filecoin-project/go-data-transfer/v2"
+	dtimpl "github.com/filecoin-project/go-data-transfer/v2/impl"
+	dtnet "github.com/filecoin-project/go-data-transfer/v2/network"
+	dtgstransport "github.com/filecoin-project/go-data-transfer/v2/transport/graphsync"
 
 	"github.com/filecoin-project/venus/pkg/chain"
 	"github.com/filecoin-project/venus/pkg/config"
@@ -343,7 +343,7 @@ func buildHost(ctx context.Context, config networkConfig, libP2pOpts []libp2p.Op
 
 		relayHost, err := libp2p.New(
 			libp2p.EnableRelay(),
-			libp2p.EnableAutoRelay(),
+			libp2p.EnableAutoRelayWithStaticRelays([]peer.AddrInfo{}),
 			publicAddrFactory,
 			libp2p.ChainOptions(libP2pOpts...),
 			libp2p.Ping(true),

diff --git a/cmd/address.go b/cmd/address.go
@@ -13,7 +13,7 @@ import (
 	"github.com/howeyc/gopass"
 
 	cmds "github.com/ipfs/go-ipfs-cmds"
-	files "github.com/ipfs/go-ipfs-files"
+	files "github.com/ipfs/go-libipfs/files"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/big"

diff --git a/cmd/swarm.go b/cmd/swarm.go
@@ -521,8 +521,8 @@ var reachabilityCmd = &cmds.Command{
 		writer := NewSilentWriter(buf)
 
 		writer.Println("AutoNAT status: ", i.Reachability.String())
-		if i.PublicAddr != "" {
-			writer.Println("Public address: ", i.PublicAddr)
+		if len(i.PublicAddrs) > 0 {
+			writer.Println("Public address:", i.PublicAddrs)
 		}
 
 		return re.Emit(buf)