LF-Decentralized-Trust-labs
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 1 deletion b/‎.gitignore‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎.vscode/launch.json‎
Lines changed: 0 additions & 68 deletions b/‎.vscode/launch.json‎
Lines changed: 0 additions & 68 deletions
diff --git a/‎cmd/fabric/invoke/invoke.go‎
Lines changed: 20 additions & 4 deletions b/‎cmd/fabric/invoke/invoke.go‎
Lines changed: 20 additions & 4 deletions
diff --git a/‎cmd/fabric/query/query.go‎
Lines changed: 36 additions & 4 deletions b/‎cmd/fabric/query/query.go‎
Lines changed: 36 additions & 4 deletions
@@ -38,4 +38,5 @@ tasks.json
 tasks/ 
 .roo
 .taskmasterconfig
-scripts
+scripts
+projects-data-node1
@@ -11,9 +11,11 @@ import (
 	"github.com/hyperledger/fabric-admin-sdk/pkg/network"
 	"github.com/hyperledger/fabric-gateway/pkg/client"
 	"github.com/hyperledger/fabric-gateway/pkg/identity"
+	"github.com/hyperledger/fabric-protos-go-apiv2/gateway"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/status"
 )
 
 type invokeChaincodeCmd struct {
@@ -112,12 +114,12 @@ func (c *invokeChaincodeCmd) run(out io.Writer) error {
 		return err
 	}
 	defer conn.Close()
-	gateway, err := client.Connect(userIdentity, client.WithSign(userPK), client.WithClientConnection(conn))
+	gatewayClient, err := client.Connect(userIdentity, client.WithSign(userPK), client.WithClientConnection(conn))
 	if err != nil {
 		return err
 	}
-	defer gateway.Close()
-	network := gateway.GetNetwork(c.channel)
+	defer gatewayClient.Close()
+	network := gatewayClient.GetNetwork(c.channel)
 	contract := network.GetContract(c.chaincode)
 	args := [][]byte{}
 	for _, arg := range c.args {
@@ -134,7 +136,21 @@ func (c *invokeChaincodeCmd) run(out io.Writer) error {
 	}
 	submitResponse, err := endorseResponse.Submit()
 	if err != nil {
-		return errors.Wrapf(err, "failed to submit proposal")
+		endorseError, ok := err.(*client.EndorseError)
+		if ok {
+			detailsStr := []string{}
+			for _, detail := range status.Convert(err).Details() {
+				switch detail := detail.(type) {
+				case *gateway.ErrorDetail:
+					detailsStr = append(detailsStr, fmt.Sprintf("- address: %s; mspId: %s; message: %s\n", detail.GetAddress(), detail.GetMspId(), detail.GetMessage()))
+
+				}
+			}
+			return fmt.Errorf("failed to submit transaction: %s (gRPC status: %s)",
+				endorseError.TransactionError.Error(),
+				strings.Join(detailsStr, "\n"))
+		}
+		return fmt.Errorf("failed to submit transaction: %w", err)
 	}
 	responseBytes, err := submitResponse.Bytes()
 	if err != nil {
 
@@ -11,9 +11,11 @@ import (
 	"github.com/hyperledger/fabric-admin-sdk/pkg/network"
 	"github.com/hyperledger/fabric-gateway/pkg/client"
 	"github.com/hyperledger/fabric-gateway/pkg/identity"
+	"github.com/hyperledger/fabric-protos-go-apiv2/gateway"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/status"
 )
 
 type queryChaincodeCmd struct {
@@ -109,18 +111,48 @@ func (c *queryChaincodeCmd) run(out io.Writer) error {
 	}
 	defer conn.Close()
 
-	gateway, err := client.Connect(userIdentity, client.WithSign(userPK), client.WithClientConnection(conn))
+	gatewayFabric, err := client.Connect(userIdentity, client.WithSign(userPK), client.WithClientConnection(conn))
 	if err != nil {
 		return err
 	}
-	defer gateway.Close()
+	defer gatewayFabric.Close()
 
-	network := gateway.GetNetwork(c.channel)
+	network := gatewayFabric.GetNetwork(c.channel)
 	contract := network.GetContract(c.chaincode)
 
 	result, err := contract.EvaluateTransaction(c.fcn, c.args...)
 	if err != nil {
-		return errors.Wrapf(err, "failed to evaluate transaction")
+		endorseError, ok := err.(*client.EndorseError)
+		if ok {
+			detailsStr := []string{}
+			for _, detail := range status.Convert(err).Details() {
+				switch detail := detail.(type) {
+				case *gateway.ErrorDetail:
+					detailsStr = append(detailsStr, fmt.Sprintf("- address: %s; mspId: %s; message: %s\n", detail.GetAddress(), detail.GetMspId(), detail.GetMessage()))
+
+				}
+			}
+			return fmt.Errorf("failed to submit transaction: %s (gRPC status: %s)",
+				endorseError.TransactionError.Error(),
+				strings.Join(detailsStr, "\n"))
+		}
+		statusError := status.Convert(err)
+		if statusError != nil {
+			detailsStr := []string{}
+			for _, detail := range statusError.Details() {
+				switch detail := detail.(type) {
+				case *gateway.ErrorDetail:
+					detailsStr = append(detailsStr, fmt.Sprintf("- address: %s; mspId: %s; message: %s",
+						detail.GetAddress(),
+						detail.GetMspId(),
+						detail.GetMessage()))
+				}
+			}
+			return fmt.Errorf("failed to submit transaction: %s (gRPC status details: %s)",
+				statusError.Message(),
+				strings.Join(detailsStr, "\n"))
+		}
+		return fmt.Errorf("failed to submit transaction: %w", err)
 	}
 
 	_, err = fmt.Fprint(out, string(result))