Monitoring of nodes using prometheus

.github/workflows/e2e-tests.yaml

@@ -0,0 +1,85 @@
+name: End-to-End Tests
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - '**/*.md'
+      - 'docs/**'
+
+jobs:
+  e2e-tests:
+    name: Run E2E Tests
+    runs-on: ubuntu-latest
+
+    services:
+      # Mailhog for email testing
+      mailhog:
+        image: mailhog/mailhog
+        ports:
+          - 1025:1025 # SMTP server
+          - 8025:8025 # Web interface
+
+    env:
+      API_BASE_URL: http://localhost:8100/api/v1
+      CYPRESS_BASE_URL: http://localhost:8100
+      CYPRESS_API_URL: http://localhost:8100/api/v1
+      CHAINLAUNCH_USER: admin
+      CHAINLAUNCH_PASSWORD: admin123
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.23.4'
+          cache: true
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
+
+      - name: Install dependencies
+        run: |
+          go mod download
+          sudo apt-get update
+          sudo apt-get install -y build-essential
+
+      - name: Build the application
+        run: |
+          go build -v -o chainlaunch ./main.go
+          chmod +x chainlaunch
+
+      - name: Start the application
+        run: |
+          # Create test data directory
+          mkdir -p testdata
+
+          # Start the application in the background
+          ./chainlaunch serve --db data.db &
+          sleep 10  # Wait for the application to start
+
+      - name: Run API tests
+        run: |
+          go test -v ./tests/e2e/... -tags=e2e
+
+      - name: Run UI tests
+        run: |
+          cd web
+          bun install
+          bun run test:e2e
+
+      - name: Upload test results
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results
+          path: |
+            web/cypress/videos
+            web/cypress/screenshots
+            test-results.xml 

.vscode/launch.json

@@ -18,7 +18,7 @@
 			"env": {
 				"CHAINLAUNCH_USER": "admin",
 				"CHAINLAUNCH_PASSWORD": "admin123",
-				"JAVA_HOME": "/opt/homebrew/opt/openjdk@21"
+				"JAVA_HOME": "/opt/homebrew/Cellar/openjdk/23.0.2"
 			}
 		},
 		{

cmd/common/client.go

@@ -27,9 +27,9 @@ func NewClientFromEnv() (*Client, error) {
 		apiURL = defaultAPIURL
 	}
 
-	username := os.Getenv("CHAINLAUNCH_USERNAME")
+	username := os.Getenv("CHAINLAUNCH_USER")
 	if username == "" {
-		return nil, fmt.Errorf("CHAINLAUNCH_USERNAME environment variable is not set")
+		return nil, fmt.Errorf("CHAINLAUNCH_USER environment variable is not set")
 	}
 
 	password := os.Getenv("CHAINLAUNCH_PASSWORD")

cmd/fabric/install/install.go

@@ -12,9 +12,9 @@ import (
 	"path/filepath"
 
 	"github.com/chainlaunch/chainlaunch/pkg/logger"
-	"google.golang.org/protobuf/proto"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
+	"google.golang.org/protobuf/proto"
 
 	"io"
 	"strings"
@@ -32,7 +32,7 @@ import (
 type installCmd struct {
 	chaincode        string
 	channel          string
-	networkConfig    string
+	networkConfigs   []string
 	users            []string
 	organizations    []string
 	signaturePolicy  string
@@ -64,14 +64,21 @@ func (c *installCmd) getPeerAndIdentityForOrg(nc *networkconfig.NetworkConfig, o
 	if !ok {
 		return nil, nil, fmt.Errorf("user %s not found in network config", userID)
 	}
+
+	// Get user certificate
 	userCert, err := gwidentity.CertificateFromPEM([]byte(user.Cert.PEM))
 	if err != nil {
 		return nil, nil, errors.Wrapf(err, "failed to read user certificate for user %s and org %s", userID, org)
 	}
+
+	// Get user private key
 	userPrivateKey, err := gwidentity.PrivateKeyFromPEM([]byte(user.Key.PEM))
 	if err != nil {
 		return nil, nil, errors.Wrapf(err, "failed to read user private key for user %s and org %s", userID, org)
 	}
+	// Log certificate and private key PEM content for debugging
+	c.logger.Infof("User certificate for %s in org %s: %s", userID, org, user.Cert.PEM)
+	c.logger.Infof("User private key for %s in org %s: %s", userID, org, user.Key.PEM)
 	userIdentity, err := identity.NewPrivateKeySigningIdentity(org, userCert, userPrivateKey)
 	if err != nil {
 		return nil, nil, errors.Wrapf(err, "failed to create user identity for user %s and org %s", userID, org)
@@ -120,27 +127,103 @@ func (c installCmd) start() error {
 	_ = pkg
 	packageID := chaincode.GetPackageID(label, pkg)
 	c.logger.Infof("packageID: %s", packageID)
-	nc, err := networkconfig.LoadFromFile(c.networkConfig)
-	if err != nil {
-		return err
+
+	// Load network configs
+	networkConfigs := make([]*networkconfig.NetworkConfig, len(c.organizations))
+	if len(c.networkConfigs) == 0 {
+		return fmt.Errorf("at least one network config file is required")
 	}
 
-	// // install chaincode in peers
-	// configBackend := config.FromFile(c.networkConfig)
-
-	// clientsMap := map[string]*resmgmt.Client{}
-	// sdk, err := fabsdk.New(configBackend)
-	// if err != nil {
-	// 	return err
-	// }
-	// for idx, mspID := range c.organizations {
-	// 	clientContext := sdk.Context(fabsdk.WithUser(c.users[idx]), fabsdk.WithOrg(mspID))
-	// 	clientsMap[mspID], err = resmgmt.New(clientContext)
-	// 	if err != nil {
-	// 		return err
-	// 	}
-	// }
+	// If only one config is provided, use it for all organizations
+	if len(c.networkConfigs) == 1 {
+		nc, err := networkconfig.LoadFromFile(c.networkConfigs[0])
+		if err != nil {
+			return err
+		}
+		for i := range c.organizations {
+			networkConfigs[i] = nc
+		}
+	} else {
+		// If multiple configs are provided, validate the count matches organizations
+		if len(c.networkConfigs) != len(c.organizations) {
+			return fmt.Errorf("number of network configs (%d) must match number of organizations (%d)", len(c.networkConfigs), len(c.organizations))
+		}
+		// Load each config
+		for i, configPath := range c.networkConfigs {
+			nc, err := networkconfig.LoadFromFile(configPath)
+			if err != nil {
+				return fmt.Errorf("failed to load network config %s: %w", configPath, err)
+			}
+			networkConfigs[i] = nc
+		}
+	}
+	// Log debug information about the installation parameters
+	c.logger.Infof("Debug information for chaincode installation:")
+	c.logger.Infof("Chaincode: %s", c.chaincode)
+	c.logger.Infof("Channel: %s", c.channel)
+	c.logger.Infof("Package ID: %s", packageID)
+
+	// Log organizations
+	c.logger.Infof("Organizations (%d):", len(c.organizations))
+	for i, org := range c.organizations {
+		c.logger.Infof("  [%d] %s", i, org)
+	}
+
+	// Log network configs
+	c.logger.Infof("Network configs (%d):", len(c.networkConfigs))
+	for i, configPath := range c.networkConfigs {
+		c.logger.Infof("  [%d] %s", i, configPath)
+	}
+
+	// Log users
+	c.logger.Infof("Users (%d):", len(c.users))
+	for i, user := range c.users {
+		c.logger.Infof("  [%d] %s", i, user)
+	}
+
+	// Log detailed network configuration information
+	for i, nc := range networkConfigs {
+		orgName := ""
+		if i < len(c.organizations) {
+			orgName = c.organizations[i]
+		}
+		c.logger.Infof("Network config [%d] details for org %s:", i, orgName)
+
+		if orgName != "" {
+			if orgConfig, ok := nc.Organizations[orgName]; ok {
+				c.logger.Infof("  MSPID: %s", orgConfig.MSPID)
+				c.logger.Infof("  Peers (%d):", len(orgConfig.Peers))
+				for j, peerID := range orgConfig.Peers {
+					if peerConfig, ok := nc.Peers[peerID]; ok {
+						c.logger.Infof("    [%d] %s - URL: %s", j, peerID, peerConfig.URL)
+					} else {
+						c.logger.Infof("    [%d] %s - Not found in peers configuration", j, peerID)
+					}
+				}
+				c.logger.Infof("  Users (%d):", len(orgConfig.Users))
+				for userName := range orgConfig.Users {
+					c.logger.Infof("    %s", userName)
+				}
+			} else {
+				c.logger.Infof("  Organization %s not found in network config", orgName)
+			}
+		}
+	}
+
+	// Log other parameters
+	c.logger.Infof("Chaincode address: %s", c.chaincodeAddress)
+	c.logger.Infof("Signature policy: %s", c.signaturePolicy)
+	c.logger.Infof("Local mode: %v", c.local)
+	if c.pdcFile != "" {
+		c.logger.Infof("PDC file: %s", c.pdcFile)
+	}
+	if c.metaInfPath != "" {
+		c.logger.Infof("META-INF path: %s", c.metaInfPath)
+	}
+
+	// Install chaincode in peers
 	for idx, org := range c.organizations {
+		nc := networkConfigs[idx]
 		orgConfig, ok := nc.Organizations[org]
 		if !ok {
 			return fmt.Errorf("organization %s not found in network config", org)
@@ -168,10 +251,6 @@ func (c installCmd) start() error {
 		}
 	}
 
-	// sp, err := policydsl.FromString(c.signaturePolicy)
-	// if err != nil {
-	// 	return err
-	// }
 	applicationPolicy, err := chaincode.NewApplicationPolicy(c.signaturePolicy, "")
 	if err != nil {
 		return err
@@ -181,6 +260,7 @@ func (c installCmd) start() error {
 	sequence := 1
 	allOrgGateways := []*chaincode.Gateway{}
 	for idx, org := range c.organizations {
+		nc := networkConfigs[idx]
 		orgConfig, ok := nc.Organizations[org]
 		if !ok {
 			return fmt.Errorf("organization %s not found in network config", org)
@@ -208,7 +288,6 @@ func (c installCmd) start() error {
 
 	var collections []*pb.CollectionConfig
 	if c.pdcFile != "" {
-		//
 		pdcBytes, err := ioutil.ReadFile(c.pdcFile)
 		if err != nil {
 			return err
@@ -277,18 +356,6 @@ func (c installCmd) start() error {
 		c.logger.Infof("Chaincode already committed, version=%s sequence=%d", version, sequence)
 	}
 	c.logger.Infof("Should commit=%v", shouldCommit)
-	// // approve chaincode in orgs
-	// approveCCRequest := resmgmt.LifecycleApproveCCRequest{
-	// 	Name:              label,
-	// 	Version:           version,
-	// 	PackageID:         packageID,
-	// 	Sequence:          int64(sequence),
-	// 	CollectionConfig:  collections,
-	// 	EndorsementPlugin: "escc",
-	// 	ValidationPlugin:  "vscc",
-	// 	SignaturePolicy:   sp,
-	// 	InitRequired:      false,
-	// }
 
 	chaincodeDef := &chaincode.Definition{
 		ChannelName:       c.channel,
@@ -305,17 +372,17 @@ func (c installCmd) start() error {
 	for idx, gateway := range allOrgGateways {
 		err := gateway.Approve(ctx, chaincodeDef)
 		if err != nil {
-			c.logger.Errorf("Error when approving chaincode: %v", err)
-			return err
-		}
-		if err != nil && !strings.Contains(err.Error(), "redefine uncommitted") {
-			c.logger.Errorf("Error when approving chaincode: %v", err)
-			return err
+			if strings.Contains(err.Error(), "redefine uncommitted") {
+				c.logger.Infof("Chaincode already committed, org=%s", c.organizations[idx])
+			} else {
+				c.logger.Errorf("Error when approving chaincode: %v", err)
+				return err
+			}
 		}
+
 		c.logger.Infof("Chaincode approved, org=%s", c.organizations[idx])
 	}
 	if shouldCommit {
-
 		// commit chaincode in orgs
 		err := firstGateway.Commit(
 			ctx,
@@ -326,7 +393,6 @@ func (c installCmd) start() error {
 			return err
 		}
 		c.logger.Infof("Chaincode committed")
-
 	}
 
 	if c.envFile != "" {
@@ -546,7 +612,7 @@ func NewInstallCmd(logger *logger.Logger) *cobra.Command {
 	f := cmd.Flags()
 	f.StringVar(&c.chaincode, "chaincode", "", "chaincode name within the channel")
 	f.StringVar(&c.channel, "channel", "", "Channel name")
-	f.StringVar(&c.networkConfig, "config", "", "Network config file")
+	f.StringArrayVar(&c.networkConfigs, "config", []string{}, "Network config files (one per organization, if only one is provided it will be used for all organizations)")
 	f.StringVar(&c.signaturePolicy, "policy", "", "Signature policy for the chaincode")
 	f.StringArrayVarP(&c.organizations, "organizations", "o", []string{}, "Organizations to connect to ")
 	f.StringArrayVarP(&c.users, "users", "u", []string{}, "Users to use")