updates to integration the fabricx notification service into the token-sdk (#1125)

fix(config)!: Update the keep alive configuration for grpc
fix(nwo): Fix Query Service Port
update(queryservice): Expose GetTransactionStatus

Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>

Author: adecaro

docs/configuration.md

@@ -62,21 +62,32 @@ fsc:
         files:
         - /path/to/client/tls/ca.crt
 
-    # GRPC Server keepalive parameters
+    # GRPC Server keepalive parameters. 
+    # This section can be omitted.
     keepalive:
-      # minInterval is the minimum permitted time between client pings.
-      # If clients send pings more frequently, the peer server will
-      # disconnect them
-      # If not specified, default is 60 seconds
-      minInterval: 60s
-      # interval is the duration after which if the server does not see
-      # any activity from the client it pings the client to see if it's alive
-      # If not specified, default is 2 hours
-      interval: 300s
-      # Timeout is the duration the server waits for a response
-      # from the client after sending a ping before closing the connection
-      # If not specified, default is 20 seconds
-      timeout: 600s
+      # MaxConnectionIdle: send GOAWAY and gracefully close if connection is idle this long (no RPCs).
+      # Format: Go duration string (e.g. "5m", "30s"). Zero/omitted disables.
+      max-connection-idle: "5m"
+      # MaxConnectionAge: maximum lifetime of a connection before server initiates close to rotate connections.
+      # Format: Go duration string. Zero/omitted disables.
+      max-connection-age: "2h"
+      # MaxConnectionAgeGrace: additional grace period after MaxConnectionAge to allow in-flight RPCs to finish.
+      # Format: Go duration string.
+      max-connection-age-grace: "5m"
+      # Time: server's expectation for how often the client should send keepalive pings.
+      # Format: Go duration string.
+      time: "2m"
+      # Timeout: how long the server waits for a keepalive ping ACK before considering the connection dead.
+      # Format: Go duration string.
+      timeout: "20s"
+      # EnforcementPolicy: maps to keepalive.EnforcementPolicy; may be omitted to disable enforcement.
+      enforcement-policy:
+        # MinTime: minimum allowed time between client pings; server may close connections that ping more often.
+        # Format: Go duration string.
+        min-time: "1m"
+        # PermitWithoutStream: allow keepalive pings even when there are no active RPC streams.
+        # true = permit pings without streams (recommended if clients ping periodically).
+        permit-without-stream: true
 
   # ------------------- P2P Configuration -------------------------
   p2p:
@@ -295,14 +306,19 @@ fabric:
       clientKey:
         file: /path/to/client.key
 
-    # Client keepalive settings for GRPC
+    # Client keepalive settings for GRPC.
+    # This section can be omitted.
     keepalive:
-      # If not provided, the default is 60 seconds
-      interval: 60s
-      # If not provided, the default is 20 seconds
-      timeout: 600s
-      # If not provided, the default is 10 seconds
-      connectionTimeout: 10s
+      # Time: how often the client sends keepalive pings to the server.
+      # Format: Go duration string (e.g. "30s", "2m"). Zero/omitted disables.
+      time: "2m"
+      # Timeout: how long the client waits for a keepalive ACK from the server
+      # before considering the connection dead.
+      # Format: Go duration string. Should be noticeably smaller than `time`.
+      timeout: "20s"
+      # PermitWithoutStream: allow keepalive pings even when there are no active RPCs.
+      # true = permit pings without active streams (recommended for many clients).
+      permit-without-stream: true
 
     ordering:
       # number of retries to attempt to send a transaction to an orderer

integration/benchmark/grpc/grpc_bench_test.go

@@ -184,7 +184,7 @@ func WithServerECDSASigner(certPath, keyPath string) ServerOption {
 		require.NoError(tb, err)
 		c.signer = signer
 		serialized, _ := signer.Serialize()
-		c.idProvider = &benchmark.MockIdentityProvider{DefaultSigner: view.Identity(serialized)}
+		c.idProvider = &benchmark.MockIdentityProvider{DefaultSigner: serialized}
 	}
 }
 
@@ -237,7 +237,6 @@ func setupServer(tb testing.TB, opts ...ServerOption) string {
 			Key:         keyPEM,
 			UseTLS:      true,
 		},
-		KaOpts:             grpc.KeepaliveOptions{},
 		Logger:             nil,
 		HealthCheckEnabled: false,
 	})
@@ -285,7 +284,6 @@ func setupClient(tb testing.TB, srvEndpoint string, opts ...ClientOption) (*benc
 			ServerRootCAs: [][]byte{certPEM},
 			UseTLS:        true,
 		},
-		KaOpts:       grpc.KeepaliveOptions{},
 		Timeout:      5 * time.Second,
 		AsyncConnect: false,
 	})

integration/benchmark/grpc/remote/server/main.go

@@ -48,7 +48,6 @@ func main() {
 			Key:         keyPEM,
 			UseTLS:      true,
 		},
-		KaOpts:             grpc.KeepaliveOptions{},
 		Logger:             nil,
 		HealthCheckEnabled: false,
 	})

integration/fsc/pingpong/README.md

@@ -452,18 +452,6 @@ fsc:
       files:
       - ./../../crypto/peerOrganizations/fsc.example.com/peers/initiator.fsc.example.com/tls/ca.crt
     rootCertFile: ./../../crypto/ca-certs.pem
-  # Keepalive settings for node server and clients
-  keepalive:
-    # MinInterval is the minimum permitted time between client pings.
-    # If clients send pings more frequently, the peer server will
-    # disconnect them
-    minInterval: 60s
-    # Interval is the duration after which if the server does not see
-    # any activity from the client it pings the client to see if it's alive
-    interval: 300s
-    # Timeout is the duration the server waits for a response
-    # from the client after sending a ping before closing the connection
-    timeout: 600s
   # P2P configuration
   p2p:
     # Listening address

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

@@ -38,20 +38,6 @@ fsc:
       # Private key used for TLS server
       key:
         file: ./../../crypto/peerOrganizations/fsc.example.com/peers/initiator.fsc.example.com/tls/server.key
-      # If mutual TLS is enabled, clientRootCAs.files contains a list of additional root certificates
-      # used for verifying certificates of client connections.
-    # Keepalive settings for node server and clients
-    keepalive:
-      # MinInterval is the minimum permitted time between client pings.
-      # If clients send pings more frequently, the peer server will
-      # disconnect them
-      minInterval: 60s
-      # Interval is the duration after which if the server does not see
-      # any activity from the client it pings the client to see if it's alive
-      interval: 300s
-      # Timeout is the duration the server waits for a response
-      # from the client after sending a ping before closing the connection
-      timeout: 600s
   # P2P configuration
   p2p:
     # Type of p2p communication. Currently supported: libp2p (default), rest

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

@@ -38,20 +38,6 @@ fsc:
       # Private key used for TLS server
       key:
         file: ./../../crypto/peerOrganizations/fsc.example.com/peers/responder.fsc.example.com/tls/server.key
-      # If mutual TLS is enabled, clientRootCAs.files contains a list of additional root certificates
-      # used for verifying certificates of client connections.
-    # Keepalive settings for node server and clients
-    keepalive:
-      # MinInterval is the minimum permitted time between client pings.
-      # If clients send pings more frequently, the peer server will
-      # disconnect them
-      minInterval: 60s
-      # Interval is the duration after which if the server does not see
-      # any activity from the client it pings the client to see if it's alive
-      interval: 300s
-      # Timeout is the duration the server waits for a response
-      # from the client after sending a ping before closing the connection
-      timeout: 600s
   # P2P configuration
   p2p:
     # Type of p2p communication. Currently supported: libp2p (default), rest

integration/nwo/fabric/topology/core_template.go

@@ -281,10 +281,6 @@ fabric:
       clientKey:
         file: {{ .PeerLocalTLSDir Peer }}/server.key
       {{- end }} 
-    keepalive:
-      interval: 60s
-      timeout: 600s
-      connectionTimeout: 10s
     ordering:
       numRetries: 3
       retryInterval: 3s

integration/nwo/fabricx/extensions/scv2/ext.go

@@ -59,7 +59,7 @@ func (e *Extension) CheckTopology() {
 
 func (e *Extension) GenerateArtifacts() {
 	generateQSExtension(e.network)
-	generateNSExtension(e.network)
+	generateNSExtension(e.network, e.sidecar.Ports[fabric_network.ListenPort])
 }
 
 func (e *Extension) PostRun(load bool) {

integration/nwo/fabricx/extensions/scv2/notificationservice.go

@@ -23,7 +23,7 @@ import (
 )
 
 // generateNSExtensions adds the committers notification service information to the config
-func generateNSExtension(n *network.Network) {
+func generateNSExtension(n *network.Network, notificationServicePort uint16) {
 	context := n.Context
 
 	fscTop, ok := context.TopologyByName("fsc").(*fsc.Topology)
@@ -33,7 +33,6 @@ func generateNSExtension(n *network.Network) {
 
 	// TODO set correct values
 	notificationServiceHost := "localhost"
-	notificationServicePort := 5411
 
 	// TODO: most of this logic should go somewhere
 

integration/nwo/fsc/node/core_template.go

@@ -57,18 +57,6 @@ fsc:
         files:
         - {{ .NodeLocalTLSDir Peer }}/ca.crt
       {{- end }}
-    # Keepalive settings for node server and clients
-    keepalive:
-      # MinInterval is the minimum permitted time between client pings.
-      # If clients send pings more frequently, the peer server will
-      # disconnect them
-      minInterval: 60s
-      # Interval is the duration after which if the server does not see
-      # any activity from the client it pings the client to see if it's alive
-      interval: 300s
-      # Timeout is the duration the server waits for a response
-      # from the client after sending a ping before closing the connection
-      timeout: 600s
   # P2P configuration
   p2p:
     # Type of p2p communication. Currently supported: libp2p (default), rest