Merge branch 'main' into PostgreSQL-update

Author: atharva-vaish240

.devcontainer/devcontainer.json

@@ -0,0 +1,37 @@
+{
+  "name": "Hyperledger Cello",
+  "image": "mcr.microsoft.com/devcontainers/base:ubuntu-22.04",
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker:1": {},
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "20"
+    },
+    "ghcr.io/devcontainers/features/python:1": {
+      "version": "3.10"
+    }
+  },
+  "containerEnv": {
+    "CELLO_STORAGE_PATH": "/opt/cello"
+  },
+  "forwardPorts": [8080, 8081],
+  "portsAttributes": {
+    "8080": {
+      "label": "API Engine",
+      "onAutoForward": "notify"
+    },
+    "8081": {
+      "label": "Dashboard",
+      "onAutoForward": "notify"
+    }
+  },
+  "postCreateCommand": "make local",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-azuretools.vscode-docker",
+        "ms-python.python",
+        "dbaeumer.vscode-eslint"
+      ]
+    }
+  }
+}

.github/workflows/lint-check.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Install Nodejs dependencies
         working-directory: src/dashboard
         run: |
-          yarn install --frozen-lockfile
-  
+          corepack yarn install --frozen-lockfile
+
       - name: Check code
         run: make check

docs/reference/configuration/server.md

@@ -3,134 +3,134 @@
     ```bash
     $ CONFIG_VAR=xxx make start
     ```
-    
+
 ## 1. Api Engine
 
 all related configuration variable is written in ==.makerc/api-engine==.
 
 ???+ info "API_ENGINE_WEBROOT"
 
     **default**: `/engine`
-    
+
     **description**: {>>Web ROOT for api engine, which defined the url where user can visit to api engine.<<}
-    
+
     **usage**:
     ```bash
     $ API_ENGINE_WEBROOT=/engine make start
     ```
-    
-    
+
+
 ???+ info "API_ENGINE_SERVICE_PORT"
 
     **default**: `8085`
-    
+
     **description**: {>>External port of api engine, only work for docker-compose deploy.<<}
-    
+
     **usage**:
     ```bash
     $ API_ENGINE_SERVICE_PORT=8085 make start
     ```
-    
+
 ???+ info "API_ENGINE_ADMIN_TOKEN"
 
     **default**: `administrator`
-    
+
     **description**: {>>Default operator token of api engine, which have the maximum rights.<<}
-    
+
     **usage**:
     ```bash
     $ API_ENGINE_ADMIN_TOKEN=administrator make start
     ```
-    
+
 ???+ info "API_ENGINE_ADMIN_USERNAME"
 
     **default**: `admin`
-    
+
     **description**: {>>Default operator username of api engine, who have the maximum rights.<<}
-    
+
     **usage**:
     ```bash
     $ API_ENGINE_ADMIN_USERNAME=admin make start
     ```
-    
+
 ???+ info "API_ENGINE_ADMIN_PASSWORD"
 
     **default**: `pass`
-    
+
     **description**: {>>Default operator pass of api engine, who have the maximum rights.<<}
-    
+
     **usage**:
     ```bash
     $ API_ENGINE_ADMIN_PASSWORD=pass make start
     ```
-    
+
 ???+ info "API_ENGINE_ADMIN_EMAIL"
 
     **default**: `admin@cello.com`
-    
+
     **description**: {>>Default admin email of api engine, who have the maximum rights.<<}
-    
+
     **usage**:
     ```bash
     $ API_ENGINE_ADMIN_EMAIL=admin@cello.com make start
     ```
-    
+
 ???+ info "API_DOCKER_HOST"
 
     **default**: `unix://var/run/docker.sock`
-    
-    **description**: {>>Docker host for launch agent container, can be unix socket or ip:port, 
+
+    **description**: {>>Docker host for launch agent container, can be unix socket or ip:port,
     if use remote docker host, remember download all agent images.<<}
-    
+
     **usage**:
     ```bash
     $ API_DOCKER_HOST=unix://var/run/docker.sock make start
     ```
-    
+
 ???+ info "API_VERSION"
 
     **default**: `master`
-    
+
     **description**: {>>API version shown in swagger.<<}
-    
+
     **usage**:
     ```bash
     $ API_VERSION=master make start
     ```
 
 ## 2. Dashboard
-    
+
 ???+ info "DASHBOARD_SERVICE_PORT"
 
     **default**: `8085`
-    
+
     **description**: {>>External port for dashboard, only work for docker-compose.<<}
-    
+
     **usage**:
     ```bash
     $ DASHBOARD_SERVICE_PORT=8085 make start
     ```
 
 Below configurations only work for `make start-dashboard-dev`, and must install all need node modules under the src/dashboard folder.
-    
+
 ???+ info "MOCK"
 
     **default**: `True`
-    
+
     **description**: {>>Whether start the dashboard with mock mode, all the data is mock.<<}
-    
+
     **usage**:
     ```bash
     $ Mock=True make start-dashboard-dev
     ```
-    
+
 ???+ info "PROXY"
 
     **default**: `empty`
-    
+
     **description**: {>>When MOCK=False, this variable will have effect,
     set the api engine server url, where the api request will redirect to.<<}
-    
+
     **usage**:
     ```bash
     $ PROXY=http://api-engine-server:8085/engine make start-dashboard-dev

docs/setup/server.md

@@ -63,22 +63,22 @@ As Docker Compose V1 will reach its [end of life](https://www.docker.com/blog/an
     * Solution:
       ```bash
       $ sudo mkdir /opt/cello
-      
+
       # Then go to Docker Desktop -> Preferences... -> Resources -> File Sharing
       # Add the path /opt/cello into the File Sharing list, apply the change and restart Docker Desktop
       ```
 
   * Operation not permitted when using Docker Desktop
     * Error message:
       ```bash
-      Error response from daemon: 
+      Error response from daemon:
       error while creating mount source path '/opt/cello/pgdata': mkdir /opt/cello/pgdata: permission denied
       make: *** [start-docker-compose] Error 1
       ```
     * Solution:
       ```bash
       $ sudo chmod -R 777 /opt/cello
-      
+
       # Then go to Docker Desktop -> Preferences... -> General -> Choose file sharing implementation for your containers
       # Choose osxfs, apply the change and restart Docker Desktop
       ```

docs/tutorials/agent.md

@@ -52,5 +52,5 @@ See you then👋!
 
     to set up a *Hyperledger Cello* **server and agent** in the same place as quick as possible.
 
-    However, in order to give you a deeper understanding of how everything works, 
+    However, in order to give you a deeper understanding of how everything works,
     we instead walked through the entire setup step-by-step in this tutorial.

docs/tutorials/server.md

@@ -73,5 +73,5 @@ See you then👋!
 
     to set up a *Hyperledger Cello* **server and agent** in the same place as quick as possible.
 
-    However, in order to give you a deeper understanding of how everything works, 
+    However, in order to give you a deeper understanding of how everything works,
     we instead walked through the entire setup step-by-step in this tutorial.

src/agents/hyperledger-fabric/channel/serializers.py

@@ -1,10 +1,42 @@
 from rest_framework import serializers
 
-from channel.service import create_channel
+from channel.service import create_channel, generate_invitation_definition, sign_config_update, join_channel
 
 class ChannelSerializer(serializers.Serializer):
     name = serializers.CharField(help_text="Channel Name")
 
     def create(self, validated_data):
         create_channel(validated_data["name"])
         return self
+
+
+class InvitationDefinitionSerializer(serializers.Serializer):
+    organization_msp_ids = serializers.ListField(
+        child=serializers.CharField(help_text="Organization MSP ID"),
+        help_text="List of MSP IDs for invited organizations",
+    )
+
+    def create(self, validated_data):
+        channel_name = self.context["channel_name"]
+        artifact = generate_invitation_definition(
+            channel_name,
+            validated_data["organization_msp_ids"],
+        )
+        validated_data["artifact"] = artifact
+        return validated_data
+
+
+class InvitationSignSerializer(serializers.Serializer):
+    def create(self, validated_data):
+        channel_name = self.context["channel_name"]
+        artifact_bytes = self.context["artifact_bytes"]
+        signed = sign_config_update(channel_name, artifact_bytes)
+        return {"artifact": signed}
+
+
+class InvitationJoinSerializer(serializers.Serializer):
+    def create(self, validated_data):
+        channel_name = self.context["channel_name"]
+        artifact_bytes = self.context["artifact_bytes"]
+        join_channel(channel_name, artifact_bytes)
+        return validated_data