Merge branch 'main' into f-3-docs

Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '41 19 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      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
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      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@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ 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
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

integration/nwo/token/dlog.go

@@ -0,0 +1,50 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+package token
+
+import (
+	"io/ioutil"
+	"path/filepath"
+	"strconv"
+
+	"github.com/hyperledger/fabric/msp"
+
+	cryptodlog "github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/crypto"
+)
+
+type DLogPublicParamsGenerator struct {
+}
+
+func (d *DLogPublicParamsGenerator) Generate(p *Platform, tms *TMS) ([]byte, error) {
+	path := filepath.Join(p.FabricNetwork.DefaultIdemixOrgMSPDir(), msp.IdemixConfigDirMsp, msp.IdemixConfigFileIssuerPublicKey)
+	ipkBytes, err := ioutil.ReadFile(path)
+	if err != nil {
+		return nil, err
+	}
+
+	base, err := strconv.ParseInt(tms.TokenChaincode.PublicParamsGenArgs[0], 10, 64)
+	if err != nil {
+		return nil, err
+	}
+	exp, err := strconv.ParseInt(tms.TokenChaincode.PublicParamsGenArgs[1], 10, 32)
+	if err != nil {
+		return nil, err
+	}
+	pp, err := cryptodlog.Setup(
+		base,
+		int(exp),
+		ipkBytes,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	ppRaw, err := pp.Serialize()
+	if err != nil {
+		return nil, err
+	}
+	return ppRaw, nil
+}

integration/nwo/token/fabtoken.go

@@ -0,0 +1,25 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+package token
+
+import (
+	cryptofabtoken "github.com/hyperledger-labs/fabric-token-sdk/token/core/fabtoken"
+)
+
+type FabTokenPublicParamsGenerator struct {
+}
+
+func (f *FabTokenPublicParamsGenerator) Generate(p *Platform, tms *TMS) ([]byte, error) {
+	pp, err := cryptofabtoken.Setup()
+	if err != nil {
+		return nil, err
+	}
+	ppRaw, err := pp.Serialize()
+	if err != nil {
+		return nil, err
+	}
+	return ppRaw, nil
+}