Go caching

.github/workflows/codeql-analysis.yml

@@ -13,59 +13,81 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ main ]
+    branches: [ "main" ]
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ main ]
+    branches: [ "main" ]
   schedule:
-    - cron: '32 1 * * 4'
+    - cron: '39 22 * * 5'
 
 jobs:
   analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
     permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
       actions: read
       contents: read
-      security-events: write
 
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'go' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
+        include:
+          - language: go
+            build-mode: autobuild
+        # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          build-mode: ${{ matrix.build-mode }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+          # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          # queries: security-extended,security-and-quality
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+      # If the analyze step fails for one of the languages you are analyzing with
+      # "We were unable to automatically build your code", modify the matrix above
+      # to set the build mode to "manual" for that language. Then modify this step
+      # to build your code.
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+      - if: matrix.build-mode == 'manual'
+        shell: bash
+        run: |
+          echo 'If you are using a "manual" build mode for one or more of the' \
+            'languages you are analyzing, replace this with the commands to build' \
+            'your code, for example:'
+          echo '  make bootstrap'
+          echo '  make release'
+          exit 1
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:${{matrix.language}}"

.github/workflows/tests.yml

@@ -5,9 +5,7 @@ on:
     branches: [ main ]
   pull_request:
     branches: [ main ]
-
-env:
-  FSC_PATH: "${{ github.workspace }}/fabric-smart-client"
+  workflow_dispatch:
 
 jobs:
 
@@ -16,21 +14,18 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          path: ${{ env.FSC_PATH }}
+        uses: actions/checkout@v4
 
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version-file: "${{ env.FSC_PATH }}/go.mod"
+          go-version-file: "go.mod"
+          cache-dependency-path: "**/*.sum"
 
       - name: Set up tools
-        working-directory: ${{ env.FSC_PATH }}
         run: make install-tools
 
       - name: Run checks
-        working-directory: ${{ env.FSC_PATH }}
         run: make checks
 
   utest:
@@ -42,21 +37,21 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          path: ${{ env.FSC_PATH }}
+        uses: actions/checkout@v4
 
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version-file: "${{ env.FSC_PATH }}/go.mod"
+          go-version-file: "go.mod"
+          cache-dependency-path: "**/*.sum"
 
       - name: Set up tools
-        working-directory: ${{ env.FSC_PATH }}
         run: make install-tools
 
+      - name: Download fabric binaries
+        run: make download-fabric
+
       - name: Run ${{ matrix.tests }}
-        working-directory: ${{ env.FSC_PATH }}
         run: make ${{ matrix.tests }}
 
   itest:
@@ -76,28 +71,31 @@ jobs:
           pingpong,
           stoprestart,
           twonets,
-          weaver-relay
+          weaver-relay,
+          chaincode-events
         ]
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          path: ${{ env.FSC_PATH }}
+        uses: actions/checkout@v4
 
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version-file: "${{ env.FSC_PATH }}/go.mod"
+          go-version-file: "go.mod"
+          cache-dependency-path: "**/*.sum"
 
       - name: Set up tools
-        working-directory: ${{ env.FSC_PATH }}
         run: make install-tools
 
+      - name: Download fabric binaries
+        run: make download-fabric
+
       - name: Docker
-        working-directory: ${{ env.FSC_PATH }}
         run: make docker-images
 
+      - name: Set up softhsm
+        run: make install-softhsm
+
       - name: Run ${{ matrix.tests }}
-        working-directory: ${{ env.FSC_PATH }}
-        run: make integration-tests-${{ matrix.tests }}
+        run: make integration-tests-${{ matrix.tests }}

.gitignore

@@ -8,3 +8,5 @@
 integration/**/testdata/
 integration/**/cmd/
 !integration/nwo/cmd/
+
+cmd/fsccli/cmd

MAINTAINERS.md

@@ -3,13 +3,18 @@ Maintainers
 
 **Active Maintainers**
 
-| Name | GitHub | Chat | email
-|------|--------|------|----------------------
-| Angelo De Caro | [adecaro][adecaro] | adecaro | <[email protected]>
-| Kaoutar Elkhiyaoui | [KElkhiyaoui][KElkhiyaoui] | KElkhiyaoui | <[email protected]>
-| Mathilde Ffrench | [mffrench][mffrench] | mffrench | <[email protected]>
-| Alessandro Sorniotti | [ale-linux][ale-linux] | aso | <[email protected]>
-| Marcus Brandenburger | [mbrandenburger][mbrandenburger] | bur | <[email protected]>
+| Name | GitHub | Chat | email |
+| --- | --- |
+| Angelo De Caro | [adecaro][adecaro] | adecaro | <[email protected]> |
+| Kaoutar Elkhiyaoui | [KElkhiyaoui][KElkhiyaoui] | KElkhiyaoui | <[email protected]> |
+| Alessandro Sorniotti | [ale-linux][ale-linux] | aso | <[email protected]> |
+| Marcus Brandenburger | [mbrandenburger][mbrandenburger] | bur | <[email protected]> |
+
+**Emeritus Maintainers**
+
+| Name | GitHub | Chat | email |
+| --- | --- |
+| Mathilde Ffrench | [mffrench][mffrench] | mffrench | <[email protected]> |
 
 [adecaro]: https://github.com/adecaro
 [KElkhiyaoui]: https://github.com/KElkhiyaoui