upgrade go and dependencies

Signed-off-by: Arne Rutjes <[email protected]>

Author: arner

go.mod

@@ -487,19 +487,19 @@ fsc:
         id: initiator
         path: ./../../crypto/peerOrganizations/fsc.example.com/peers/initiator.fsc.example.com/msp/signcerts/initiator.fsc.example.com-cert.pem
       addresses:
-         Listen: 127.0.0.1:20000
-         P2P: 127.0.0.1:20001
-         View: 127.0.0.1:20000
+        Listen: 127.0.0.1:20000
+        P2P: 127.0.0.1:20001
+        View: 127.0.0.1:20000
     - name: responder
       domain: fsc.example.com
       identity:
         id: responder
         path: ./../../crypto/peerOrganizations/fsc.example.com/peers/responder.fsc.example.com/msp/signcerts/responder.fsc.example.com-cert.pem
       addresses:
-         # GRPC Server listening address
-         Listen: 127.0.0.1:20002
-         # P2P listening address
-         P2P: 127.0.0.1:20003
-         # View Service listening address (usually the same as Listen)
-         View: 127.0.0.1:20002
-````
+        # GRPC Server listening address
+        Listen: 127.0.0.1:20002
+        # P2P listening address
+        P2P: 127.0.0.1:20003
+        # View Service listening address (usually the same as Listen)
+        View: 127.0.0.1:20002
+````

go.sum

@@ -125,8 +125,6 @@ fsc:
       identity:
         path: ./../../crypto/peerOrganizations/fsc.example.com/peers/initiator.fsc.example.com/msp/signcerts/initiator.fsc.example.com-cert.pem
       addresses: 
-         P2P: 127.0.0.1:21001
+        P2P: 127.0.0.1:21001
       aliases: 
         - alice
-
-

integration/fsc/pingpong/README.md

@@ -16,7 +16,7 @@ topologies:
         Aliases:
         - bob
   logging:
-    spec: grpc=error:info
+    spec: grpc=error,view-sdk.services.comm,view-sdk=debug:info
     format: '''%{color}%{time:2006-01-02 15:04:05.000 MST} [%{module}] %{shortfunc}
       -> %{level:.4s} %{id:03x}%{color:reset} %{message}'''
   monitoring:

integration/fsc/pingpong/testdata/fsc/nodes/responder.0/core.yaml

@@ -17,6 +17,7 @@ func Topology(commType fsc.P2PCommunicationType, replicationOpts *integration.Re
 	topology := fsc.NewTopology()
 	topology.WebEnabled = true
 	topology.P2PCommunicationType = commType
+	topology.Logging.Spec = "view-sdk.services.comm,view-sdk=debug:info"
 
 	// Add the initiator fsc node
 	topology.AddNodeByName("initiator").

integration/fsc/pingpong/testdata/topology.yaml

@@ -171,7 +171,7 @@ func (n *Network) CheckTopologyFabricPeers() {
 			ports[portName] = n.Context.ReservePort()
 		}
 		n.Context.SetPortsByPeerID(n.Prefix, p.ID(), ports)
-		n.Context.SetHostByPeerID(n.Prefix, p.ID(), "0.0.0.0")
+		n.Context.SetHostByPeerID(n.Prefix, p.ID(), "127.0.0.1")
 	}
 }
 

integration/fsc/pingpong/topology.go

@@ -60,7 +60,7 @@ func (n *Network) AddOrg(o *topology.Organization, peers ...*topology.Peer) {
 			ports[portName] = n.Context.ReservePort()
 		}
 		n.Context.SetPortsByPeerID(n.Prefix, p.ID(), ports)
-		n.Context.SetHostByPeerID(n.Prefix, p.ID(), "0.0.0.0")
+		n.Context.SetHostByPeerID(n.Prefix, p.ID(), "127.0.0.1")
 		n.Peers = append(n.Peers, p)
 	}
 

integration/nwo/fabric/network/checks.go

@@ -343,7 +343,7 @@ func (p *Platform) CheckTopology() {
 				ports[portName] = p.Context.ReservePort()
 			}
 			p.Context.SetPortsByPeerID("fsc", peer.ID(), ports)
-			p.Context.SetHostByPeerID("fsc", peer.ID(), "0.0.0.0")
+			p.Context.SetHostByPeerID("fsc", peer.ID(), "127.0.0.1")
 			p.Peers = append(p.Peers, peer)
 			users[orgName] = users[orgName] + 1
 			userNames[orgName] = append(userNames[orgName], node.Name)

integration/nwo/fabric/network/network_support.go

@@ -299,8 +299,8 @@ func (p *Platform) writeConfigFile() {
 	p.nodePort = p.Context.PortsByOrdererID("", OrdererPortID)[Port]
 	p.peerPort = p.Context.PortsByPeerID("", PeerPortID)[Port]
 
-	nodeHost := utils.DefaultString(p.Context.HostByOrdererID("", OrdererPortID), "0.0.0.0")
-	peerHost := utils.DefaultString(p.Context.HostByPeerID("", PeerPortID), "0.0.0.0")
+	nodeHost := utils.DefaultString(p.Context.HostByOrdererID("", OrdererPortID), "127.0.0.1")
+	peerHost := utils.DefaultString(p.Context.HostByPeerID("", PeerPortID), "127.0.0.1")
 
 	p.localConfig = &config.LocalConfiguration{
 		Server: config.ServerConf{

integration/nwo/fsc/fsc.go

@@ -11,11 +11,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ReneKroon/ttlcache/v2"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/peer"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/grpc"
+	"github.com/jellydator/ttlcache/v2"
 )
 
 var logger = flogging.MustGetLogger("fabric-sdk.core.generic.chaincode")

integration/nwo/orion/platform.go

@@ -129,6 +129,7 @@ func (s *Service) init() error {
 	p2pBootstrapNode := s.ConfigService.GetString("fsc.p2p.opts.bootstrapNode")
 	keyFile := s.ConfigService.GetPath("fsc.identity.key.file")
 	certFile := s.ConfigService.GetPath("fsc.identity.cert.file")
+
 	if len(p2pBootstrapNode) == 0 {
 		// this is a bootstrap node
 		logger.Debugf("new p2p bootstrap node [%s]", p2pListenAddress)
@@ -141,30 +142,31 @@ func (s *Service) init() error {
 		if err != nil {
 			return errors.Wrapf(err, "failed to initialize bootstrap p2p node [%s]", p2pListenAddress)
 		}
-	} else {
-		bootstrapNodeID, err := s.EndpointService.GetIdentity(p2pBootstrapNode, nil)
-		if err != nil {
-			return errors.WithMessagef(err, "failed to get p2p bootstrap node's resolver entry [%s]", p2pBootstrapNode)
-		}
-		_, endpoints, pkID, err := s.EndpointService.Resolve(bootstrapNodeID)
-		if err != nil {
-			return errors.WithMessagef(err, "failed to resolve bootstrap node id [%s:%s]", p2pBootstrapNode, bootstrapNodeID)
-		}
+		return nil
+	}
 
-		addr, err := utils.AddressToEndpoint(endpoints[view.P2PPort])
-		if err != nil {
-			return errors.WithMessagef(err, "failed to get the endpoint of the bootstrap node from [%s:%s], [%s]", p2pBootstrapNode, bootstrapNodeID, endpoints[view.P2PPort])
-		}
-		addr = addr + "/p2p/" + string(pkID)
-		logger.Debugf("new p2p node [%s,%s]", p2pListenAddress, addr)
-		h, err := s.HostProvider.NewHost(p2pListenAddress, keyFile, certFile, addr)
-		if err != nil {
-			return err
-		}
-		s.Node, err = NewNode(h, s.tracerProvider, s.metricsProvider)
-		if err != nil {
-			return errors.Wrapf(err, "failed to initialize node p2p manager [%s,%s]", p2pListenAddress, addr)
-		}
+	bootstrapNodeID, err := s.EndpointService.GetIdentity(p2pBootstrapNode, nil)
+	if err != nil {
+		return errors.WithMessagef(err, "failed to get p2p bootstrap node's resolver entry [%s]", p2pBootstrapNode)
+	}
+	_, endpoints, pkID, err := s.EndpointService.Resolve(bootstrapNodeID)
+	if err != nil {
+		return errors.WithMessagef(err, "failed to resolve bootstrap node id [%s:%s]", p2pBootstrapNode, bootstrapNodeID)
+	}
+
+	bootstrap, err := utils.AddressToEndpoint(endpoints[view.P2PPort])
+	if err != nil {
+		return errors.WithMessagef(err, "failed to get the endpoint of the bootstrap node from [%s:%s], [%s]", p2pBootstrapNode, bootstrapNodeID, endpoints[view.P2PPort])
+	}
+	bootstrap = bootstrap + "/p2p/" + string(pkID)
+	logger.Debugf("new p2p node [%s,%s]", p2pListenAddress, bootstrap)
+	h, err := s.HostProvider.NewHost(p2pListenAddress, keyFile, certFile, bootstrap)
+	if err != nil {
+		return err
+	}
+	s.Node, err = NewNode(h, s.tracerProvider, s.metricsProvider)
+	if err != nil {
+		return errors.Wrapf(err, "failed to initialize node p2p manager [%s,%s]", p2pListenAddress, bootstrap)
 	}
 	return nil
 }

platform/fabric/core/generic/chaincode/chaincode.go

@@ -241,7 +241,7 @@ func (h *host) start(failAdv bool, newStreamCallback func(stream host2.P2PStream
 		if failAdv {
 			return errors.Wrap(err, "error while announcing")
 		}
-		logger.Errorf("error while announcing [%s]", err)
+		logger.Warnf("error while announcing [%s]", err)
 	}
 
 	h.Host.SetStreamHandler(viewProtocol, func(s network.Stream) {