Explicitly specify hash in client applications

For some signing implementations, such as ed25519, a non-default hash
implementation must be specified when creating the Gateway connection in
client applications. Rather than relying on the default hash algorithm,
it is probably good practice in general to specify an algorithm that is
compatible with your signing implementation.

This change explicitly specifies the hash algorithm to raise visibility
of the option to select the hash algorithm.

Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>

asset-transfer-basic/application-gateway-go/assetTransfer.go

@@ -18,6 +18,7 @@ import (
 	"time"
 
 	"github.com/hyperledger/fabric-gateway/pkg/client"
+	"github.com/hyperledger/fabric-gateway/pkg/hash"
 	"github.com/hyperledger/fabric-gateway/pkg/identity"
 	"github.com/hyperledger/fabric-protos-go-apiv2/gateway"
 	"google.golang.org/grpc"
@@ -50,6 +51,7 @@ func main() {
 	gw, err := client.Connect(
 		id,
 		client.WithSign(sign),
+		client.WithHash(hash.SHA256),
 		client.WithClientConnection(clientConnection),
 		// Default timeouts for different gRPC calls
 		client.WithEvaluateTimeout(5*time.Second),

asset-transfer-basic/application-gateway-java/src/main/java/App.java

@@ -16,6 +16,7 @@ import org.hyperledger.fabric.client.Contract;
 import org.hyperledger.fabric.client.EndorseException;
 import org.hyperledger.fabric.client.Gateway;
 import org.hyperledger.fabric.client.GatewayException;
+import org.hyperledger.fabric.client.Hash;
 import org.hyperledger.fabric.client.SubmitException;
 import org.hyperledger.fabric.client.identity.Identities;
 import org.hyperledger.fabric.client.identity.Identity;
@@ -60,7 +61,11 @@ public final class App {
 		// this endpoint.
 		var channel = newGrpcConnection();
 
-		var builder = Gateway.newInstance().identity(newIdentity()).signer(newSigner()).connection(channel)
+		var builder = Gateway.newInstance()
+                .identity(newIdentity())
+                .signer(newSigner())
+                .hash(Hash.SHA256)
+                .connection(channel)
 				// Default timeouts for different gRPC calls
 				.evaluateOptions(options -> options.withDeadlineAfter(5, TimeUnit.SECONDS))
 				.endorseOptions(options -> options.withDeadlineAfter(15, TimeUnit.SECONDS))

asset-transfer-basic/application-gateway-javascript/src/app.js

@@ -5,7 +5,7 @@
  */
 
 const grpc = require('@grpc/grpc-js');
-const { connect, signers } = require('@hyperledger/fabric-gateway');
+const { connect, hash, signers } = require('@hyperledger/fabric-gateway');
 const crypto = require('node:crypto');
 const fs = require('node:fs/promises');
 const path = require('node:path');
@@ -79,6 +79,7 @@ async function main() {
         client,
         identity: await newIdentity(),
         signer: await newSigner(),
+        hash: hash.sha256,
         // Default timeouts for different gRPC calls
         evaluateOptions: () => {
             return { deadline: Date.now() + 5000 }; // 5 seconds

asset-transfer-basic/application-gateway-typescript/src/app.ts

@@ -5,7 +5,7 @@
  */
 
 import * as grpc from '@grpc/grpc-js';
-import { connect, Contract, Identity, Signer, signers } from '@hyperledger/fabric-gateway';
+import { connect, Contract, hash, Identity, Signer, signers } from '@hyperledger/fabric-gateway';
 import * as crypto from 'crypto';
 import { promises as fs } from 'fs';
 import * as path from 'path';
@@ -46,6 +46,7 @@ async function main(): Promise<void> {
         client,
         identity: await newIdentity(),
         signer: await newSigner(),
+        hash: hash.sha256,
         // Default timeouts for different gRPC calls
         evaluateOptions: () => {
             return { deadline: Date.now() + 5000 }; // 5 seconds

asset-transfer-basic/rest-api-go/web/initialize.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/hyperledger/fabric-gateway/pkg/client"
+	"github.com/hyperledger/fabric-gateway/pkg/hash"
 	"github.com/hyperledger/fabric-gateway/pkg/identity"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
@@ -24,6 +25,7 @@ func Initialize(setup OrgSetup) (*OrgSetup, error) {
 	gateway, err := client.Connect(
 		id,
 		client.WithSign(sign),
+		client.WithHash(hash.SHA256),
 		client.WithClientConnection(clientConnection),
 		client.WithEvaluateTimeout(5*time.Second),
 		client.WithEndorseTimeout(15*time.Second),

asset-transfer-events/application-gateway-go/app.go

@@ -15,6 +15,7 @@ import (
 	"time"
 
 	"github.com/hyperledger/fabric-gateway/pkg/client"
+	"github.com/hyperledger/fabric-gateway/pkg/hash"
 )
 
 const (
@@ -35,6 +36,7 @@ func main() {
 	gateway, err := client.Connect(
 		id,
 		client.WithSign(sign),
+		client.WithHash(hash.SHA256),
 		client.WithClientConnection(clientConnection),
 		client.WithEvaluateTimeout(5*time.Second),
 		client.WithEndorseTimeout(15*time.Second),

asset-transfer-events/application-gateway-java/src/main/java/App.java

@@ -16,6 +16,7 @@ import org.hyperledger.fabric.client.Contract;
 import org.hyperledger.fabric.client.EndorseException;
 import org.hyperledger.fabric.client.Gateway;
 import org.hyperledger.fabric.client.GatewayRuntimeException;
+import org.hyperledger.fabric.client.Hash;
 import org.hyperledger.fabric.client.Network;
 import org.hyperledger.fabric.client.SubmitException;
 
@@ -40,6 +41,7 @@ public final class App implements AutoCloseable {
         var builder = Gateway.newInstance()
                 .identity(Connections.newIdentity())
                 .signer(Connections.newSigner())
+                .hash(Hash.SHA256)
                 .connection(grpcChannel)
                 .evaluateOptions(options -> options.withDeadlineAfter(5, TimeUnit.SECONDS))
                 .endorseOptions(options -> options.withDeadlineAfter(15, TimeUnit.SECONDS))

asset-transfer-events/application-gateway-typescript/src/app.ts

@@ -5,7 +5,7 @@
  */
 
 import * as grpc from '@grpc/grpc-js';
-import { ChaincodeEvent, CloseableAsyncIterable, connect, Contract, GatewayError, Network } from '@hyperledger/fabric-gateway';
+import { ChaincodeEvent, CloseableAsyncIterable, connect, Contract, GatewayError, hash, Network } from '@hyperledger/fabric-gateway';
 import { TextDecoder } from 'util';
 import { newGrpcConnection, newIdentity, newSigner } from './connect';
 
@@ -23,6 +23,7 @@ async function main(): Promise<void> {
         client,
         identity: await newIdentity(),
         signer: await newSigner(),
+        hash: hash.sha256,
         evaluateOptions: () => {
             return { deadline: Date.now() + 5000 }; // 5 seconds
         },

asset-transfer-private-data/application-gateway-typescript/src/app.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { connect, Contract } from '@hyperledger/fabric-gateway';
+import { connect, Contract, hash } from '@hyperledger/fabric-gateway';
 import { TextDecoder } from 'util';
 import {
     certDirectoryPathOrg1, certDirectoryPathOrg2, keyDirectoryPathOrg1, keyDirectoryPathOrg2, newGrpcConnection, newIdentity,
@@ -41,6 +41,7 @@ async function main(): Promise<void> {
         client: clientOrg1,
         identity: await newIdentity(certDirectoryPathOrg1, mspIdOrg1),
         signer: await newSigner(keyDirectoryPathOrg1),
+        hash: hash.sha256,
     });
 
     const clientOrg2 = await newGrpcConnection(
@@ -53,6 +54,7 @@ async function main(): Promise<void> {
         client: clientOrg2,
         identity: await newIdentity(certDirectoryPathOrg2, mspIdOrg2),
         signer: await newSigner(keyDirectoryPathOrg2),
+        hash: hash.sha256,
     });
 
     try {

asset-transfer-secured-agreement/application-gateway-typescript/src/app.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { connect } from '@hyperledger/fabric-gateway';
+import { connect, hash } from '@hyperledger/fabric-gateway';
 
 import { newGrpcConnection, newIdentity, newSigner, tlsCertPathOrg1, peerEndpointOrg1, peerNameOrg1, certDirectoryPathOrg1, mspIdOrg1, keyDirectoryPathOrg1, tlsCertPathOrg2, peerEndpointOrg2, peerNameOrg2, certDirectoryPathOrg2, mspIdOrg2, keyDirectoryPathOrg2 } from './connect';
 import { ContractWrapper } from './contractWrapper';
@@ -30,6 +30,7 @@ async function main(): Promise<void> {
         client: clientOrg1,
         identity: await newIdentity(certDirectoryPathOrg1, mspIdOrg1),
         signer: await newSigner(keyDirectoryPathOrg1),
+        hash: hash.sha256,
     });
 
     // The gRPC client connection from org2 should be shared by all Gateway connections to this endpoint.
@@ -43,6 +44,7 @@ async function main(): Promise<void> {
         client: clientOrg2,
         identity: await newIdentity(certDirectoryPathOrg2, mspIdOrg2),
         signer: await newSigner(keyDirectoryPathOrg2),
+        hash: hash.sha256,
     });
 
 

full-stack-asset-transfer-guide/applications/conga-cards/src/connect.ts

@@ -5,7 +5,7 @@
  */
 
 import * as grpc from '@grpc/grpc-js';
-import { connect, Gateway, Identity, Signer, signers } from '@hyperledger/fabric-gateway';
+import { connect, Gateway, hash, Identity, Signer, signers } from '@hyperledger/fabric-gateway';
 import * as crypto from 'crypto';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -34,6 +34,7 @@ export async function newGatewayConnection(client: grpc.Client): Promise<Gateway
         client,
         identity: await newIdentity(),
         signer: await newSigner(),
+        hash: hash.sha256,
         // Default timeouts for different gRPC calls
         evaluateOptions: () => {
             return { deadline: Date.now() + 5000 }; // 5 seconds

full-stack-asset-transfer-guide/applications/ping-chaincode/src/app.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { connect, Contract, Identity, Signer, signers } from '@hyperledger/fabric-gateway';
+import { connect, Contract, hash } from '@hyperledger/fabric-gateway';
 import * as path from 'path';
 import { TextDecoder } from 'util';
 import { ConnectionHelper } from './fabric-connection-profile';
@@ -13,8 +13,8 @@ import JSONIDAdapter from './jsonid-adapter';
 import { dump } from 'js-yaml';
 
 import { config } from 'dotenv';
+import * as env from 'env-var';
 config({path:'app.env'});
-import * as env from 'env-var'
 
 const channelName = env.get('CHANNEL_NAME').default('mychannel').asString();
 const chaincodeName = env.get('CHAINCODE_NAME').default('conga-nft-contract').asString();
@@ -46,6 +46,7 @@ async function main(): Promise<void> {
         client,
         identity,
         signer,
+        hash: hash.sha256,
         // Default timeouts for different gRPC calls
         evaluateOptions: () => {
             return { deadline: Date.now() + 5000 }; // 5 seconds
@@ -95,4 +96,3 @@ async function ping(contract: Contract): Promise<void> {
     console.log('*** Result:');
     console.log(dump(result));
 }
-

full-stack-asset-transfer-guide/applications/ping-chaincode/src/jsonid-adapter.ts

@@ -5,10 +5,9 @@
  */
 
 import { Identity, Signer, signers } from '@hyperledger/fabric-gateway';
+import * as crypto from 'crypto';
 import { promises as fs } from 'fs';
 import * as path from 'path';
-import * as crypto from 'crypto';
-import { errorMonitor } from 'events';
 
 /** Internal interface used to describe all the possible components
  * of the identity

full-stack-asset-transfer-guide/applications/rest-api/src/connection.ts

@@ -1,5 +1,5 @@
 import * as grpc from '@grpc/grpc-js';
-import { connect, Contract, Identity, Signer, signers } from '@hyperledger/fabric-gateway';
+import { connect, Contract, hash, Identity, Signer, signers } from '@hyperledger/fabric-gateway';
 import * as crypto from 'crypto';
 import * as path from 'path';
 
@@ -37,6 +37,7 @@ async function initFabric(): Promise<void> {
         client,
         identity: await newIdentity(),
         signer: await newSigner(),
+        hash: hash.sha256,
         // Default timeouts for different gRPC calls
         evaluateOptions: () => {
             return { deadline: Date.now() + 5000 }; // 5 seconds

full-stack-asset-transfer-guide/applications/trader-typescript/src/connect.ts

@@ -5,7 +5,7 @@
  */
 
 import * as grpc from '@grpc/grpc-js';
-import { connect, Gateway, Identity, Signer, signers } from '@hyperledger/fabric-gateway';
+import { connect, Gateway, hash, Identity, Signer, signers } from '@hyperledger/fabric-gateway';
 import * as crypto from 'crypto';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -34,6 +34,7 @@ export async function newGatewayConnection(client: grpc.Client): Promise<Gateway
         client,
         identity: await newIdentity(),
         signer: await newSigner(),
+        hash: hash.sha256,
         // Default timeouts for different gRPC calls
         evaluateOptions: () => {
             return { deadline: Date.now() + 5000 }; // 5 seconds

hardware-security-module/application-go/hsm-sample.go

@@ -24,6 +24,7 @@ import (
 	"time"
 
 	"github.com/hyperledger/fabric-gateway/pkg/client"
+	"github.com/hyperledger/fabric-gateway/pkg/hash"
 	"github.com/hyperledger/fabric-gateway/pkg/identity"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
@@ -63,7 +64,8 @@ func main() {
 	defer hsmSignClose()
 
 	// Create a Gateway connection for a specific client identity
-	gateway, err := client.Connect(id, client.WithSign(hsmSign), client.WithClientConnection(clientConnection))
+	gateway, err := client.Connect(id, client.WithSign(hsmSign), client.WithHash(hash.SHA256),
+		client.WithClientConnection(clientConnection))
 	if err != nil {
 		panic(err)
 	}

hardware-security-module/application-typescript/src/hsm-sample.ts

@@ -5,7 +5,7 @@
  */
 
 import * as grpc from '@grpc/grpc-js';
-import { connect, Gateway, HSMSigner, HSMSignerFactory, HSMSignerOptions, signers } from '@hyperledger/fabric-gateway';
+import { connect, Gateway, hash, HSMSigner, HSMSignerFactory, HSMSignerOptions, signers } from '@hyperledger/fabric-gateway';
 import * as crypto from 'crypto';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -46,6 +46,7 @@ async function main() {
             client,
             identity: { mspId, credentials },
             signer:hsmSigner.signer,
+            hash: hash.sha256,
         });
 
         await exampleTransaction(gateway);

off_chain_data/application-java/app/src/main/java/Connections.java

@@ -9,6 +9,7 @@ import io.grpc.Grpc;
 import io.grpc.ManagedChannel;
 import io.grpc.TlsChannelCredentials;
 import org.hyperledger.fabric.client.Gateway;
+import org.hyperledger.fabric.client.Hash;
 import org.hyperledger.fabric.client.identity.Identities;
 import org.hyperledger.fabric.client.identity.Identity;
 import org.hyperledger.fabric.client.identity.Signer;
@@ -86,6 +87,7 @@ public final class Connections {
         return Gateway.newInstance()
                 .identity(newIdentity())
                 .signer(newSigner())
+                .hash(Hash.SHA256)
                 .connection(grpcChannel)
                 .evaluateOptions(options -> options.withDeadlineAfter(EVALUATE_TIMEOUT_SECONDS, TimeUnit.SECONDS))
                 .endorseOptions(options -> options.withDeadlineAfter(ENDORSE_TIMEOUT_SECONDS, TimeUnit.SECONDS))

off_chain_data/application-typescript/src/connect.ts

@@ -5,7 +5,7 @@
  */
 
 import * as grpc from '@grpc/grpc-js';
-import { ConnectOptions, Identity, Signer, signers } from '@hyperledger/fabric-gateway';
+import { ConnectOptions, hash, Identity, Signer, signers } from '@hyperledger/fabric-gateway';
 import * as crypto from 'crypto';
 import { promises as fs } from 'fs';
 import * as path from 'path';
@@ -47,6 +47,7 @@ export async function newConnectOptions(client: grpc.Client): Promise<ConnectOpt
         client,
         identity: await newIdentity(),
         signer: await newSigner(),
+        hash: hash.sha256,
         // Default timeouts for different gRPC calls
         evaluateOptions: () => {
             return { deadline: Date.now() + 5000 }; // 5 seconds