Merge branch 'main' into android-150

Concordium · Nov 28, 2023 · 67b98a6 · 67b98a6
2 parents 30ab823 + 48ed95c
commit 67b98a6
Show file tree

Hide file tree

Showing 50 changed files with 256 additions and 18,575 deletions.
diff --git a/source/academy/tutorials/fractionalized-nft/burn.rst b/source/academy/tutorials/fractionalized-nft/burn.rst
@@ -41,7 +41,7 @@ Run the command below after the necessary changes in the parameter JSON.
 
 .. code-block:: console
 
-    concordium-client contract update <YOUR-CONTRACT-INSTANCE> --entrypoint transfer --parameter-json cis2-fractionalizer/burn-20.json --schema dist/schema.bin --sender <YOUR-ADDRESS> --energy 6000 --grpc-port 10000 --grpc-ip node.testnet.concordium.com
+    concordium-client contract update <YOUR-CONTRACT-INSTANCE> --entrypoint transfer --parameter-json cis2-fractionalizer/burn-20.json --schema dist/schema.bin --sender <YOUR-ADDRESS> --energy 6000 --grpc-port 20000 --grpc-ip node.testnet.concordium.com
 
 As usual, after a change, check the state.
 
@@ -78,7 +78,7 @@ Run the transfer command below.
 
 .. code-block:: console
 
-    concordium-client contract update <YOUR-CONTRACT-INSTANCE> --entrypoint transfer --parameter-json cis2-fractionalizer/transfer-account.json --schema dist/schema.bin --sender <YOUR-ADDRESS>  --energy 6000 --grpc-port 10000 --grpc-ip node.testnet.concordium.com
+    concordium-client contract update <YOUR-CONTRACT-INSTANCE> --entrypoint transfer --parameter-json cis2-fractionalizer/transfer-account.json --schema dist/schema.bin --sender <YOUR-ADDRESS>  --energy 6000 --grpc-port 20000 --grpc-ip node.testnet.concordium.com
 
 .. image:: ../../images/mid-fractnft-burn2.png
 

diff --git a/source/academy/tutorials/fractionalized-nft/mint.rst b/source/academy/tutorials/fractionalized-nft/mint.rst
@@ -25,7 +25,7 @@ Check the state by calling the ``view()`` function as shown below.
 
 .. code-block:: console
 
-    concordium-client contract invoke <YOUR-TOKEN-CONTRACT-INDEX>--entrypoint view --schema ../cis2-multi/dist/schema.bin --grpc-port 10000 --grpc-ip node.testnet.concordium.com
+    concordium-client contract invoke <YOUR-TOKEN-CONTRACT-INDEX>--entrypoint view --schema ../cis2-multi/dist/schema.bin --grpc-port 20000 --grpc-ip node.testnet.concordium.com
 
 .. image:: ../../images/mid-fractnft-mint2.png
 
@@ -64,7 +64,7 @@ Run the command below to transfer the token to the fractionalizer.
 
 .. code-block:: console
 
-    concordium-client contract update <YOUR-TOKEN-CONTRACT-INSTANCE> --entrypoint transfer --parameter-json cis2-fractionalizer/cis2-multi-transfer.json --schema multi/dist/schema.bin --sender <YOUR-ADDRESS> --energy 6000 --grpc-port 10000 --grpc-ip node.testnet.concordium.com
+    concordium-client contract update <YOUR-TOKEN-CONTRACT-INSTANCE> --entrypoint transfer --parameter-json cis2-fractionalizer/cis2-multi-transfer.json --schema multi/dist/schema.bin --sender <YOUR-ADDRESS> --energy 6000 --grpc-port 20000 --grpc-ip node.testnet.concordium.com
 
 .. image:: ../../images/mid-fractnft-mint3.png
 
@@ -111,15 +111,15 @@ Then run the following command to mint the fractions.
 
 .. code-block:: console
 
-    concordium-client contract update <YOUR-CONTRACT-INSTANCE> --entrypoint mint --parameter-json ../sample-artifacts/cis2-fractionalizer/mint.json --schema ../cis2-fractionalizer/schema.bin --sender $ACCOUNT --energy 6000 --grpc-port 10000 --grpc-ip node.testnet.concordium.com
+    concordium-client contract update <YOUR-CONTRACT-INSTANCE> --entrypoint mint --parameter-json ../sample-artifacts/cis2-fractionalizer/mint.json --schema ../cis2-fractionalizer/schema.bin --sender $ACCOUNT --energy 6000 --grpc-port 20000 --grpc-ip node.testnet.concordium.com
 
 .. image:: ../../images/mid-fractnft-mint6.png
 
 Now, check the fractionalizer’s state with the command below.
 
 .. code-block:: console
 
-    concordium-client contract invoke <YOUR-FRACTIONALIZER-CONTRACT-INDEX> --entrypoint view --schema dist/schema.bin  --grpc-port 10000 --grpc-ip node.testnet.concordium.com
+    concordium-client contract invoke <YOUR-FRACTIONALIZER-CONTRACT-INDEX> --entrypoint view --schema dist/schema.bin  --grpc-port 20000 --grpc-ip node.testnet.concordium.com
 
 .. image:: ../../images/mid-fractnft-mint7.png
 

diff --git a/source/mainnet/conf.py b/source/mainnet/conf.py
@@ -406,6 +406,7 @@
     "./net/installation/downloads-testnet": "net/installation/downloads.html",
     "./net/resources/legal": "net/resources/terms-and-conditions.html",
     "./en/mainnet/smart-contracts/onboarding-guide-solana-developers/index": "en/mainnet/smart-contracts/onboarding-guide-solana-developers/overview.html",
+    "./net/references/grpc": "net/references/grpc2.html",
 }
 
 # -- Tags that enables the .. only option ----------------

diff --git a/source/mainnet/net/guides/company-identities.rst b/source/mainnet/net/guides/company-identities.rst
diff --git a/source/mainnet/net/guides/developer-page.rst b/source/mainnet/net/guides/developer-page.rst
@@ -38,7 +38,7 @@ Official resources
 
 - See :ref:`dApp examples<dapp-examples>` for a list of dApp examples and their resources.
 
-- For testing purposes, a node is available on testnet to use when testing smart contracts and dApps. You can use this node for API calls of chain methods only with GRPC v1, gRPC v2, and gRPC web. The address is node.testnet.concordium.com on port 10000 (GRPCv1) and port 20000 (gRPCv2 and gRPC-web). This node is maintained by Concordium, but Concordium does not guarantee availability. The status of this node is available on the `Testnet status page <https://status.testnet.concordium.software>`__.
+- For testing purposes, a node is available on testnet to use when testing smart contracts and dApps. You can use this node for API calls of chain methods only with gRPC v2 and gRPC web. The address is node.testnet.concordium.com on port 20000 (gRPCv2 and gRPC-web). You can use this node for API calls of *chain methods only*. This node is maintained by Concordium, but Concordium does not guarantee availability. The status of this node is available on the `Testnet status page <https://status.testnet.concordium.software>`__.
 
 - The `VSCode extension <https://marketplace.visualstudio.com/items?itemName=Concordium.concordium-smart-contracts>`__ can help you develop Concordium smart contracts. The extension sets up the editor for development, installs the ``cargo-concordium`` smart contract development tool for all supported platforms, and provides commands in the editor for the essential workflows, such as building and testing smart contracts.
 
@@ -121,4 +121,3 @@ Community resources
     ../resources/dashboards
     ../references/developer-tools
     ../references/grpc2
-    ../references/grpc
diff --git a/source/mainnet/net/guides/sdks-apis.rst b/source/mainnet/net/guides/sdks-apis.rst
@@ -8,7 +8,6 @@ SDKs and APIs
 The following SDKs and APIs exist for developing on the Concordium network.
 
 - :ref:`Concordium gRPC V2 API<grpc2-documentation>`
-- :ref:`Concordium gRPC API<grpc-documentation>`
 - `Concordium Rust SDK <https://github.com/Concordium/concordium-rust-sdk>`_
 - `Concordium Javascript (Node / Web) SDK <https://github.com/Concordium/concordium-node-sdk-js>`_
 - `Concordium Java SDK <https://github.com/Concordium/concordium-java-sdk>`_

diff --git a/source/mainnet/net/images/company-id-acct-keys.png b/source/mainnet/net/images/company-id-acct-keys.png
diff --git a/source/mainnet/net/images/company-id-create-acct.png b/source/mainnet/net/images/company-id-create-acct.png
diff --git a/source/mainnet/net/images/company-id-recover.png b/source/mainnet/net/images/company-id-recover.png
diff --git a/source/mainnet/net/images/company-id-request.png b/source/mainnet/net/images/company-id-request.png
diff --git a/source/mainnet/net/installation/downloads.rst b/source/mainnet/net/installation/downloads.rst
@@ -154,7 +154,7 @@ The |mw-gen1| is available for iOS and Android™. The |mw-gen1| supports iOS 13
 Concordium Client |client-version|
 ===================================
 
--  `Download the Mainnet Concordium Client for Linux <https://distribution.concordium.software/tools/linux/concordium-client_6.1.0-1>`_
+-  `Download the Mainnet Concordium Client for Linux <https://distribution.concordium.software/tools/linux/concordium-client_6.2.1-0>`_
 
       - SHA256 checksum of the download: :substitution-code:`|client-linux-checksum|`
       - :ref:`Verification instructions <verification-client-linux>`
@@ -167,13 +167,13 @@ Concordium Client |client-version|
 
    where you replace `*` with |client-version|.
 
--  `Download the Mainnet Concordium Client for macOS <https://distribution.concordium.software/tools/macos/signed/concordium-client-6.1.0-1.pkg>`_
+-  `Download the Mainnet Concordium Client for macOS <https://distribution.concordium.software/tools/macos/signed/concordium-client-6.2.1-0.pkg>`_
 
    - The macOS distribution is an installer that places an alias to the binary
      into the folder ``/usr/local/bin``. So after installing, you should have
      ``concordium-client`` on your path.
 
--  `Download the Mainnet Concordium Client for Windows <https://distribution.concordium.software/tools/windows/signed/concordium-client_6.1.0-0.exe>`_
+-  `Download the Mainnet Concordium Client for Windows <https://distribution.concordium.software/tools/windows/signed/concordium-client_6.2.1-0.exe>`_
 
 .. _cargo-concordium-testnet:
 
@@ -240,9 +240,9 @@ For the system requirements to run a node, see :ref:`System requirements to run
 
    .. dropdown:: Ubuntu |testnet-node-version|
 
-      To run a node on a server with Ubuntu, `download a Testnet Debian package <https://distribution.testnet.concordium.com/deb/concordium-testnet-node_6.1.7-0_amd64.deb>`_.
+      To run a node on a server with Ubuntu, `download a Testnet Debian package <https://distribution.testnet.concordium.com/deb/concordium-testnet-node_6.2.3-0_amd64.deb>`_.
 
-      - SHA256 checksum of the download: ``b1b1e1c5e2e9e8100094a2e1d9fced47dc98e9dfcf0897e89755011adc44781a``
+      - SHA256 checksum of the download: ``5e97f77f3dedfd8921045a3ed4623600281b5331d37e527424a2f01068e6b2b1``
 
       To learn how to run a node with Ubuntu, see :ref:`Run a node on a server with Ubuntu <run-node-ubuntu>`.
 
@@ -256,13 +256,13 @@ For the system requirements to run a node, see :ref:`System requirements to run
 
    .. dropdown:: Windows |testnet-node-version|
 
-      To run a node on Windows, `download a Testnet Windows Installer package <https://distribution.concordium.software/windows/Signed/Node-6.1.7-0.msi>`_. **Please be aware that you should backup your configuration, as the installer will overwrite the current configuration with a standard configuration.**
+      To run a node on Windows, `download a Testnet Windows Installer package <https://distribution.concordium.software/windows/Signed/Node-6.2.3-0.msi>`_. **Please be aware that you should backup your configuration, as the installer will overwrite the current configuration with a standard configuration.**
 
       To learn how to run a node on Windows, see :ref:`Run and manage a node on Windows <run-node-windows>`.
 
    .. dropdown:: Mac |testnet-node-version|
 
-      To run a node on macOS, `download a Testnet macOS installer package <https://distribution.concordium.software/macos/signed/concordium-node-6.1.7-1.pkg>`_.
+      To run a node on macOS, `download a Testnet macOS installer package <https://distribution.concordium.software/macos/signed/concordium-node-6.2.3-0.pkg>`_.
 
       To learn how to run a node on Mac, see :ref:`Run and manage a node on macOS <run-node-macos>`.
 
@@ -299,7 +299,7 @@ Download the block separately to inspect it or to run a node in a custom configu
 Auxiliary tools
 ===============
 
-Auxiliary tools are a collection of tools that can be used by developers to perform actions as needed.
+Auxiliary tools are a collection of tools that can be used to perform actions as needed.
 
 Encrypt/decrypt tool v1.0.0
 ---------------------------
@@ -312,6 +312,37 @@ Encrypt/decrypt tool v1.0.0
 
 For information about how to use the encrypt/decrypt tool, see :ref:`Auxiliary tools <developer-tools>`.
 
+Company identity management tool v1.0.2
+---------------------------------------
+
+Use this tool to create a company identity, request accounts using a company identity, and recover a company identity.
+
+- `Download the Company identity management tool for Linux - Debian package <https://distribution.concordium.software/tools/linux/concordium-company-id_1.0.2_amd64.deb>`_
+
+   - Verification instructions
+
+      In a terminal:
+
+      #. Navigate to the download.
+      #. Paste the following into the terminal: $sha256sum concordium-company-id_1.0.2_amd64.deb
+      #. Verify that the output matches the SHA256 checksum ``c728dbe0b5ab950e4e705d7faceaee4b5ade615acd34b3bc6e75250acdedfaa9``.
+
+- `Download the Company identity management tool for Linux - App image <https://distribution.concordium.software/tools/linux/concordium-company-id_1.0.2_amd64.AppImage>`_
+
+   - Verification instructions
+
+      In a terminal:
+
+      #. Navigate to the download.
+      #. Paste the following into the terminal: $sha256sum concordium-company-id_1.0.2_amd64.AppImage
+      #. Verify that the output matches the SHA256 checksum ``8b6964d827808d3a8a9244d202e3aa8cdffeb2462edf44b3e32e7b41549b710f``.
+
+- `Download the Company identity management tool for Windows <https://distribution.concordium.software/tools/windows/signed/Concordium_Company_ID_1.0.2_x64_en-US.msi>`_
+
+- `Download the Company identity management tool for MacOS <https://distribution.concordium.software/tools/macos/signed/concordium_company_id_1.0.2-1_x64.dmg>`_
+
+For information about how to use the company identity management tool, see :ref:`company-identities`.
+
 .. toctree::
    :hidden:
    :maxdepth: 1

diff --git a/source/mainnet/net/installation/previous-node-downloads.rst b/source/mainnet/net/installation/previous-node-downloads.rst
@@ -14,6 +14,8 @@ Windows - Mainnet and Testnet
 
 **Please be aware that you should backup your configuration, as the installer will overwrite the current configuration with a standard configuration.**
 
+`Windows 6.1.7 <https://distribution.concordium.software/windows/Signed/Node-6.1.7-0.msi>`_
+
 `Windows 6.1.6 <https://distribution.concordium.software/windows/Signed/Node-6.1.6-0.msi>`_ (Testnet only)
 
 `Windows 6.0.4 <https://distribution.concordium.software/windows/Signed/Node-6.0.4-0.msi>`_
@@ -49,6 +51,8 @@ Windows - Mainnet and Testnet
 macOS - Mainnet and Testnet
 ===========================
 
+`macOS 6.1.7 <https://distribution.concordium.software/macos/signed/concordium-node-6.1.7-1.pkg>`_
+
 `macOS 6.1.6 <https://distribution.concordium.software/macos/signed/concordium-node-6.1.6-0.pkg>`_ (Testnet only)
 
 `macOS 6.0.4 <https://distribution.concordium.software/macos/signed/concordium-node-6.0.4-0.pkg>`_
@@ -208,6 +212,16 @@ Ubuntu - Testnet
 Default GRPC port is set to 10001
 Default listen port is set to 8889
 
+`6.1.7 <https://distribution.testnet.concordium.com/deb/concordium-testnet-node_6.1.7-0_amd64.deb>`__
+
+   - Verification instructions
+
+      In a terminal:
+
+      #. Navigate to the download.
+      #. Paste the following into the terminal: $sha256sum concordium-testnet-node_6.1.7-0_amd64.deb
+      #. Verify that the output matches the SHA256 checksum ``b1b1e1c5e2e9e8100094a2e1d9fced47dc98e9dfcf0897e89755011adc44781a``
+
 `6.1.6 <https://distribution.testnet.concordium.com/deb/concordium-testnet-node_6.0.4-0_amd64.deb>`__
 
    - Verification instructions

diff --git a/source/mainnet/net/nodes/baker-ubuntu.rst b/source/mainnet/net/nodes/baker-ubuntu.rst
@@ -70,7 +70,7 @@ Prerequisites
 
          [Service]
 
-         Environment=CONCORDIUM_NODE_BAKER_CREDENTIALS_FILE=%S/concordium-b6078154d6717e909ce0da4a45a25151b592824f31624b755900a74429e3073d/validator-credentials.json
+         Environment=CONCORDIUM_NODE_VALIDATOR_CREDENTIALS_FILE=%S/concordium-b6078154d6717e909ce0da4a45a25151b592824f31624b755900a74429e3073d/validator-credentials.json
          BindReadOnlyPaths=/home/user/concordium/validator-credentials.json:%S/concordium-b6078154d6717e909ce0da4a45a25151b592824f31624b755900a74429e3073d/validator-credentials.json
 
       Where you replace the path `/home/user/concordium/validator-credentials.json` with the actual location of the file.

diff --git a/source/mainnet/net/nodes/troubleshoot-docker.rst b/source/mainnet/net/nodes/troubleshoot-docker.rst
@@ -15,6 +15,7 @@ Your node state directory should look something like this:
 
 .. code-block:: console
 
+   accountmap
    blockstate-0.dat
    blockstate-1.dat
    blockstate-2.dat
@@ -26,6 +27,7 @@ But because of the error it might look like this:
 
 .. code-block:: console
 
+   accountmap
    blockstate-0.dat
    blockstate-1.dat
    blockstate-2.dat
@@ -55,6 +57,7 @@ The database directory should contain matching pairs of ``blockstate-$i.dat`` an
 
 .. code-block:: console
 
+   accountmap
    blockstate-0.dat
    blockstate-1.dat
    blockstate-2.dat

diff --git a/source/mainnet/net/nodes/troubleshoot-macos.rst b/source/mainnet/net/nodes/troubleshoot-macos.rst
@@ -21,6 +21,7 @@ The database directory should contain matching pairs of ``blockstate-$i.dat`` an
 
 .. code-block:: console
 
+   accountmap
    blockstate-0.dat
    blockstate-1.dat
    blockstate-2.dat

diff --git a/source/mainnet/net/nodes/troubleshoot-ubuntu.rst b/source/mainnet/net/nodes/troubleshoot-ubuntu.rst
@@ -15,6 +15,7 @@ Your node state directory should look something like this:
 
 .. code-block:: console
 
+   accountmap
    blockstate-0.dat
    blockstate-1.dat
    blockstate-2.dat
@@ -26,6 +27,7 @@ But because of the error it might look like this:
 
 .. code-block:: console
 
+   accountmap
    blockstate-0.dat
    blockstate-1.dat
    blockstate-2.dat
@@ -55,6 +57,7 @@ The database directory should contain matching pairs of ``blockstate-$i.dat`` an
 
 .. code-block:: console
 
+   accountmap
    blockstate-0.dat
    blockstate-1.dat
    blockstate-2.dat

diff --git a/source/mainnet/net/nodes/troubleshoot-windows.rst b/source/mainnet/net/nodes/troubleshoot-windows.rst
@@ -26,10 +26,9 @@ The solution is to delete the relevant portion of the database.
 
 The database directory should contain matching pairs of ``blockstate-$i.dat`` and ``treestate-$i`` files for some number of consecutive i's starting at 0. The number of the files differs depending on which protocol version is current.
 
-.. image:: ../images/run-node/windows-node-db-files.png
-
 .. code-block:: console
 
+   accountmap
    blockstate-0.dat
    blockstate-1.dat
    blockstate-2.dat