upgrade go and dependencies (#651)

arner · web-flow · commit 388a0330098a · 2024-08-17T10:04:10.000+02:00
Signed-off-by: Arne Rutjes &lt;arne123@gmail.com&gt;
Signed-off-by: Angelo De Caro &lt;adc@zurich.ibm.com&gt;
diff --git a/deps.go b/deps.go
@@ -9,6 +9,7 @@ SPDX-License-Identifier: Apache-2.0
 package deps
 
 import (
+	_ "github.com/IBM/idemix/tools/idemixgen"
 	_ "github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/statedb/statecouchdb"
 	_ "github.com/hyperledger/fabric/core/ledger/pvtdatastorage"
 	_ "github.com/hyperledger/fabric/orderer/common/server"
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/integration/fsc/pingpong/README.md b/integration/fsc/pingpong/README.md
@@ -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
+````
diff --git a/integration/fsc/pingpong/testdata/fsc/nodes/responder.0/core.yaml b/integration/fsc/pingpong/testdata/fsc/nodes/responder.0/core.yaml
@@ -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
-
-
diff --git a/integration/nwo/fabric/network/checks.go b/integration/nwo/fabric/network/checks.go
@@ -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")
 	}
 }
 
diff --git a/integration/nwo/fabric/network/network_support.go b/integration/nwo/fabric/network/network_support.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)
 	}
 
diff --git a/integration/nwo/fsc/fsc.go b/integration/nwo/fsc/fsc.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)
diff --git a/integration/nwo/orion/platform.go b/integration/nwo/orion/platform.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{
diff --git a/platform/fabric/core/generic/chaincode/chaincode.go b/platform/fabric/core/generic/chaincode/chaincode.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")
diff --git a/platform/view/services/comm/comm.go b/platform/view/services/comm/comm.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
 }
diff --git a/platform/view/services/comm/host/libp2p/host.go b/platform/view/services/comm/host/libp2p/host.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) {

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ func (n *Network) CheckTopologyFabricPeers() {`
`171`	`171`	`ports[portName] = n.Context.ReservePort()`
`172`	`172`	`}`
`173`	`173`	`n.Context.SetPortsByPeerID(n.Prefix, p.ID(), ports)`
`174`		`- n.Context.SetHostByPeerID(n.Prefix, p.ID(), "0.0.0.0")`
	`174`	`+ n.Context.SetHostByPeerID(n.Prefix, p.ID(), "127.0.0.1")`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func (n Network) AddOrg(o topology.Organization, peers ...*topology.Peer) {`
`60`	`60`	`ports[portName] = n.Context.ReservePort()`
`61`	`61`	`}`
`62`	`62`	`n.Context.SetPortsByPeerID(n.Prefix, p.ID(), ports)`
`63`		`- n.Context.SetHostByPeerID(n.Prefix, p.ID(), "0.0.0.0")`
	`63`	`+ n.Context.SetHostByPeerID(n.Prefix, p.ID(), "127.0.0.1")`
`64`	`64`	`n.Peers = append(n.Peers, p)`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,7 @@ func (p *Platform) CheckTopology() {`
`343`	`343`	`ports[portName] = p.Context.ReservePort()`
`344`	`344`	`}`
`345`	`345`	`p.Context.SetPortsByPeerID("fsc", peer.ID(), ports)`
`346`		`- p.Context.SetHostByPeerID("fsc", peer.ID(), "0.0.0.0")`
	`346`	`+ p.Context.SetHostByPeerID("fsc", peer.ID(), "127.0.0.1")`
`347`	`347`	`p.Peers = append(p.Peers, peer)`
`348`	`348`	`users[orgName] = users[orgName] + 1`
`349`	`349`	`userNames[orgName] = append(userNames[orgName], node.Name)`