Merge branch 'main' into mainnet-632-release

source/mainnet/net/desktop-wallet/accounts-desktop.rst

@@ -116,9 +116,9 @@ Node settings
 
 Here you specify which node on the blockchain that you want to connect to.
 
-- If you're running the **mainnet** version of the Desktop Wallet, you must connect to a mainnet node. In the **Address field**, enter ``127.0.0.1`` and in the **Port field** enter ``10000``.
+- If you're running the **mainnet** version of the Desktop Wallet, you must connect to a mainnet node. In the **Address field**, enter ``127.0.0.1`` and in the **Port field** enter ``20000``.
 
-- If you're running the **testnet** version of the Desktop Wallet, you must connect to a testnet node. In the **Address** field, enter ``127.0.0.1`` and in the **Port field** enter ``10001``.
+- If you're running the **testnet** version of the Desktop Wallet, you must connect to a testnet node. In the **Address** field, enter ``127.0.0.1`` and in the **Port field** enter ``20001``.
 
 - Select **Set connection**. If the connection works, there's a message saying **Successfully connected**.
 

source/mainnet/net/guides/add-delegation.rst

@@ -169,10 +169,6 @@ When you delegate some stake to a staking pool, it can influence the chances of
 
  #. Tap the hamburger menu |hamburger| and tap **Delegation**. If you are delegating for the first time, you see some information about delegation.
 
- .. image:: ../images/mobile-wallet/account-hamburger-menu.png
- :width: 50%
- :alt: screen with hamburger menu expanded
-
  #. Tap **Register delegation**.
 
  #. If you want to delegate to a specific pool tap **Staking pool** and enter the Validator ID of the pool owner. If you are delegating to passive delegation, tap **Passive delegation**. Tap **Continue**.

source/mainnet/net/guides/become-baker.rst

@@ -327,7 +327,7 @@ Use ``validator configure`` to configure a validator and open a staking pool. Th
 
 .. code-block:: console
 
- $concordium-client validator configure --sender "acc1" --stake 500001 --open-delegation-for existing --delegation-transaction-fee-commission 0.1 --delegation-baking-commission 0.1 --delegation-finalization-commission 1.0 --validator-url https://example.com/validator --keys-in MyBakerKeys.json --keys-out <concordium-data-dir>/validator-credentials.json
+ $concordium-client validator configure --sender "acc1" --stake 500001 --open-delegation-for existing --delegation-transaction-fee-commission 0.1 --delegation-block-reward-commission 0.1 --validator-url https://example.com/validator --keys-in MyBakerKeys.json --keys-out <concordium-data-dir>/validator-credentials.json
 
 Configure validator has the following optional arguments:
 
@@ -340,8 +340,7 @@ Configure validator has the following optional arguments:
 - ``--keys-in`` specifies the name of the file containing the validator keys.
 - ``--keys-out`` can be used to write a validator credential file containing the validator ID (and the supplied keys) to use when starting a validator node. Replace ``<concordium-data-dir>`` with any path of your choice.
 - ``--delegation-transaction-fee-commission`` specifies the transaction fee commission for the staking pool.
-- ``--delegation-baking-commission`` specifies the validator commission for the staking pool.
-- ``--delegation-finalization-commission`` specifies the finalization commission for the staking pool.
+- ``--delegation-block-reward-commission`` specifies the block commission for the staking pool.
 
 .. Note::
 

source/mainnet/net/guides/overview-desktop.rst

@@ -32,9 +32,9 @@ Before you start, make sure you’ve completed the following steps:
 
  #. If this is the first time you're opening the Desktop Wallet, you're asked to connect to a node. If you don't see this message, go to **Settings**, and then select **Node settings**. The Virtual Hive node (concordiumwalletnode.com) is inserted by default, but you can change this to any other node that you prefer or the node provided by your third-party provider. Enter the **Address** and **Port** of the node you’re running. The address is the network address of the node.
 
- - If you're running the mainnet version of the Desktop Wallet, you must connect to a mainnet node. In the **Address field**, enter *127.0.0.1*, and in the **Port field** enter *10000*.
+ - If you're running the mainnet version of the Desktop Wallet, you must connect to a mainnet node. In the **Address field**, enter *127.0.0.1*, and in the **Port field** enter *20000*.
 
- - If you're running the testnet version of the Desktop Wallet, you must connect to a testnet node. In the **Address** field, enter *127.0.0.1*, and in the **Port field** enter *10001*.
+ - If you're running the testnet version of the Desktop Wallet, you must connect to a testnet node. In the **Address** field, enter *127.0.0.1*, and in the **Port field** enter *20001*.
 
  .. image:: ../images/run-node/Node-setup-win-9.png
  :width: 60%

source/mainnet/net/guides/run-node-macos.rst

@@ -166,9 +166,9 @@ You can also verify that a node is running by connecting it to the Desktop Walle
 
 #. In the Desktop Wallet, go to **Settings**, and then select **Node settings**.
 
- - If you're running the **mainnet** version of the Desktop Wallet, you must connect to a mainnet node. In the **Address field**, enter ``127.0.0.1`` and in the **Port field** enter ``10000``.
+ - If you're running the **mainnet** version of the Desktop Wallet, you must connect to a mainnet node. In the **Address field**, enter ``127.0.0.1`` and in the **Port field** enter ``20000``.
 
- - If you're running the **testnet** version of the Desktop Wallet, you must connect to a testnet node. In the **Address field**, enter ``127.0.0.1`` and in the **Port field** enter ``10001``.
+ - If you're running the **testnet** version of the Desktop Wallet, you must connect to a testnet node. In the **Address field**, enter ``127.0.0.1`` and in the **Port field** enter ``20001``.
 
 #. Select **Set connection**. If the connection works and the node is running properly, there’s a message saying *Successfully connected*.
 

source/mainnet/net/guides/run-node-windows.rst

@@ -148,9 +148,9 @@ You can also verify that a node is running by connecting it to the Desktop Walle
 
 #. In the Desktop Wallet, go to **Settings**, and then select **Node settings**.
 
- - If you're running the mainnet version of the Desktop Wallet, you must connect to a mainnet node. In the **Address field**, enter *127.0.0.1* and in the **Port field** enter *10000*.
+ - If you're running the mainnet version of the Desktop Wallet, you must connect to a mainnet node. In the **Address field**, enter *127.0.0.1* and in the **Port field** enter *20000*.
 
- - If you're running the testnet version of the Desktop Wallet, you must connect to a testnet node. In the **Address** field, enter *127.0.0.1* and in the **Port field** enter *10001*.
+ - If you're running the testnet version of the Desktop Wallet, you must connect to a testnet node. In the **Address** field, enter *127.0.0.1* and in the **Port field** enter *20001*.
 
  .. image:: ../images/run-node/Node-setup-win-9.png
  :width: 60%

source/mainnet/net/guides/run-node.rst

@@ -357,7 +357,6 @@ The main differences from the testnet configuration are:
  <https://hub.docker.com/r/concordium/mainnet-node>`_
  for a list of currently available versions.
 - the node listens on port 8888 instead of 8889 by default
-- the node's GRPC interface is exposed on port 10000 instead of 10001
 - the node’s GRPC V2 listens on port 20000 instead of 20001
 - the database directory is ``/var/lib/concordium-mainnet`` instead of
  ``/var/lib/concordium-testnet``
@@ -401,10 +400,6 @@ To retrieve mainnet node logs run:
  - CONCORDIUM_NODE_CONNECTION_DESIRED_NODES=5
  # Maximum number of __nodes__ the node will be connected to.
  - CONCORDIUM_NODE_CONNECTION_MAX_ALLOWED_NODES=10
- # Address of the GRPC server
- - CONCORDIUM_NODE_RPC_SERVER_ADDR=0.0.0.0
- # And its port
- - CONCORDIUM_NODE_RPC_SERVER_PORT=10000
  # Address of the V2 GRPC server.
  - CONCORDIUM_NODE_GRPC2_LISTEN_ADDRESS=0.0.0.0
  # And its port which has to be the same as in `CONCORDIUM_NODE_COLLECTOR_GRPC_HOST`
@@ -438,7 +433,6 @@ To retrieve mainnet node logs run:
  # the node's gRPC interface will not be available from the host.
  ports:
  - "8888:8888"
- - "10000:10000"
  - "20000:20000"
  volumes:
  # The node's database should be stored in a persistent volume so that it

source/mainnet/net/index.rst

@@ -29,6 +29,12 @@ index
  resources/ccd-scan
  Concordium Standards <https://proposals.concordium.software/index.html>
 
+.. toctree::
+ :caption: Indexers
+
+ indexers/intro
+ indexers/subquery
+
 .. toctree::
  :includehidden:
  :caption: Smart Contracts
@@ -42,3 +48,22 @@ index
 
  Smart contract tutorials <../smart-contracts/tutorials/index>
  Using ID tutorial <guides/gallery/index>
+
+.. toctree::
+ :includehidden:
+ :caption: Smart Contracts v0
+
+ V0 smart contract documentation <../smart-contracts-v0/sc-v0-rollup>
+
+.. toctree::
+ :caption: Legal
+
+ resources/terms-and-conditions
+ resources/terms-and-conditions-dw
+ resources/terms-and-conditions-mw
+ resources/terms-and-conditions-concordia
+ resources/third-party-licenses
+ resources/third-party-notices
+ resources/bw-licenses
+ resources/dw-licenses
+ resources/ar-idp-contact

source/mainnet/net/indexers/intro.rst

@@ -0,0 +1,9 @@
+=================
+What are indexers
+=================
+
+Indexers, in a broad context, play a fundamental role in organizing and optimizing data retrieval within various systems. These tools act as navigational aids, allowing efficient access to specific information by creating structured indexes. In the realm of databases and information management, indexers enhance query performance by creating a roadmap to swiftly locate data entries.
+
+In the context of blockchain and dApps, indexers go beyond traditional databases, facilitating streamlined access to on-chain data. This includes transaction histories, smart contract states, and event logs. In the dynamic and decentralized world of blockchain, indexers contribute to the efficiency of data queries, supporting real-time updates and ensuring the seamless functionality of diverse applications and platforms.
+
+There are several indexer solutions available, each offering different levels of decentralization, ease of development, and performance for you to consider. These solutions serve as intermediaries to assist in indexing the Concordium network.

source/mainnet/net/indexers/subquery.rst

@@ -0,0 +1,35 @@
+========
+SubQuery
+========
+
+SubQuery is a leading blockchain data indexer that provides developers with fast, flexible, universal, open-source, and decentralized APIs for web3 projects. SubQuery SDK allows developers to get rich indexed data and build intuitive and immersive decentralized applications in a faster and more efficient way. SubQuery supports 100+ ecosystems including Concordium, Ethereum, Polygon, Polkadot, Algorand, NEAR, and Avalanche.
+
+Another of SubQuery's competitive advantages is the ability to aggregate data not only within a chain but across multiple blockchains all within a single project. This allows the creation of feature-rich dashboard analytics and multi-chain block scanners.
+
+Other advantages include superior performance with multiple RPC endpoint configurations, multi-worker capabilities, and a configurable caching architecture. To find out more, visit SubQuery's `documentation <https://academy.subquery/>`_.
+
+**Useful resources**:
+
+- SubQuery Docs: `SubQuery Academy (Documentation) <https://academy.subquery.network/>`_
+
+- Intro Quick Start Guide: `1. Create a New Project <https://academy.subquery.network/quickstart/quickstart.html>`_
+
+- `Concordium Quick Start Guide <https://academy.subquery.network/quickstart/quickstart_chains/concordium.html>`_
+
+Getting Started
+---------------
+
+Take a look at this SubQuery Starter Project that introduces SubQuery's Concordium support by indexing `Concordium <https://github.com/subquery/concordium-subql-starter/tree/main/Concordium/concordium-testnet-starter>`_.
+
+You can also follow this `step-by-step guide <https://academy.subquery.network/quickstart/quickstart.html>`_ to get familiar with SubQuery.
+
+Running and Hosting your Concordium SubQuery APIs
+-------------------------------------------------
+
+SubQuery is open-source, meaning you have the freedom to run it in the following three ways:
+
+- Locally on your own computer (or a cloud provider of your choosing), `view the instructions on how to run SubQuery Locally <https://academy.subquery.network/run_publish/run.html>`_.
+
+- You can publish it to SubQuery's enterprise-level `Managed Service <https://managedservice.subquery.network/>`_, where SubQuery will host your SubQuery project in production-ready services for mission critical data with zero-downtime blue/green deployments. There is even a generous free tier. `Find out how <https://academy.subquery.network/run_publish/publish.html>`_.
+
+- You can publish it to the decentralized `SubQuery Network <https://subquery.network/network>`_, the most open, performant, reliable, and scalable data service for dApp developers. The SubQuery Network indexes and services data to the global community in an incentivized and verifiable way and supports Concordium from launch.

source/mainnet/net/installation/downloads.rst

@@ -147,7 +147,7 @@ The |mw-gen1| is available for iOS and Android™. The |mw-gen1| supports iOS 13
 
  **Android**
 
- - `Download the Android version of Concordium Mobile Wallet for Testnet <https://distribution.testnet.concordium.com/tools/android/concordium-mobile-wallet_3.2.0(111).apk>`_
+ - `Download the Android version of Concordium Mobile Wallet for Testnet <https://distribution.testnet.concordium.com/tools/android/concordium-mobile-wallet_3.2.1(115).apk>`_
 
 .. _concordium-node-and-client-download:
 

source/mainnet/net/installation/previous-node-downloads.rst

@@ -86,7 +86,7 @@ macOS - Mainnet and Testnet
 Ubuntu - Mainnet
 ================
 
-Default GRPC port is set to 10000
+Default GRPC port is set to 20000
 Default listen port is set to 8888
 
 `6.1.7 <https://distribution.mainnet.concordium.software/deb/concordium-mainnet-node_6.1.7-0_amd64.deb>`__
@@ -219,7 +219,7 @@ Default listen port is set to 8888
 Ubuntu - Testnet
 ================
 
-Default GRPC port is set to 10001
+Default GRPC port is set to 20001
 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>`__

source/mainnet/net/mobile-wallet/add-baker-mw.rst

@@ -306,16 +306,8 @@ Prior to becoming a validator, read :ref:`Validator management<baker-pool>` to l
 
  7. Once you have saved the keys, you see an overview screen of the add validator transaction. Review the information then tap **Submit validator transaction**.
 
- .. image:: ../images/mobile-wallet/add-baker-submit-mw.png
- :width: 50%
- :alt: screen to review validator submit transaction
-
  8. The wallet shows that the transaction has been submitted to the chain. Tap **Finish**. Once the transaction is approved, the active validator screen appears where you have the possibility to update validator settings.
 
- .. image:: ../images/mobile-wallet/add-baker-finish-mw.png
- :width: 50%
- :alt: screen to show transaction submitted
-
  9. You need to import your validator keys file to your node in order to start producing blocks. It is preferable to update them on the node as close to the next :term:`pay day` as possible to prevent the node from being down as a validator for a longer time.
 
  - :ref:`Windows<baker-windows>`

source/mainnet/net/nodes/node-runner-service-configuration.rst

@@ -124,9 +124,9 @@ rpc.port
 
 .. code-block:: TOML
 
- rpc.port = 10000
+ rpc.port = 20000
 
-The port on which the node accepts incoming GRPC requests. This is the port that the desktop wallet and ``concordium-client`` use to connect to the node. If not specified, this uses the default determined by ``concordium-node.exe`` (which is **10000**). Note that multiple nodes cannot listen on the same port, and a node will fail to start if the port is already in use.
+The port on which the node accepts incoming GRPC requests. This is the port that the desktop wallet and ``concordium-client`` use to connect to the node. If not specified, this uses the default determined by ``concordium-node.exe`` (which is **20000**). Note that multiple nodes cannot listen on the same port, and a node will fail to start if the port is already in use.
 
 rpc.address
 -----------

source/mainnet/net/release-notes/release-notes-lp.rst

@@ -395,12 +395,16 @@ Desktop Wallet
 |mw-gen1| for iOS
 -----------------
 
- August 8, 2023
+ November 30, 2023
 
-  |mw-gen1| 3.2.1 ensures support for the upcoming protocol version 6.
+ |mw-gen1| 3.2.2 implements the renaming of bakers to validators throughout the wallet. The other changes related to Concordium's tokenomics updates have also been applied. Note that in the |mw-gen1| wallet staking pool commissions are locked at 10%. If you have a staking pool and you want to change your commissions, you must migrate to |mw-gen2| or |bw|. For information about how to migrate, see the :ref:`FAQ<wallet-migrate>` for |mw-gen2|.
 
  .. dropdown:: Previous releases
 
+ .. dropdown:: |mw-gen1| 3.2.1 - August 8, 2023
+
+ |mw-gen1| 3.2.1 ensures support for the upcoming protocol version 6.
+
  .. dropdown:: |mw-gen1| 3.2.0 - May 30, 2023
 
  In |mw-gen1| for iOS 3.2.0 identity and account creation has been locked in |mw-gen1| for iOS devices. This means that you cannot create new identities or accounts in |mw-gen1| on an iOS device. You can continue to use |mw-gen1|, but if you need to create a new identity or account you must use |mw-gen2|. You can also still recover your wallet from a backup file in |mw-gen1| on an iOS device.
@@ -476,12 +480,16 @@ Desktop Wallet
 |mw-gen1| for Android
 ---------------------
 
- February 6, 2023
+ December 1, 2023
 
- In version 3.2.0 we changed the text in the "Suggest update" alert to suggest that the user update to the |mw-gen2| so it matches the download button.
+  |mw-gen1| 3.2.1 implements the renaming of bakers to validators throughout the wallet. The other changes related to Concordium's tokenomics updates have also been applied. Note that in the |mw-gen1| wallet staking pool commissions are locked at 10%. If you have a staking pool and you want to change your commissions, you must migrate to |mw-gen2| or |bw|. For information about how to migrate, see the :ref:`FAQ<wallet-migrate>` for |mw-gen2|.
 
  .. dropdown:: Previous releases
 
+ .. dropdown:: 3.2.0 - February 6, 2023
+
+ In version 3.2.0 we changed the text in the "Suggest update" alert to suggest that the user update to the |mw-gen2| so it matches the download button.
+
  .. dropdown:: 3.0.3 - November 17, 2022
 
  Identity and account creation has been locked in |mw-gen1| for Android devices. This means that you cannot create new identities or accounts in |mw-gen1| on an Android device. You can continue to use |mw-gen1|, but if you need to create a new identity or account you must use |mw-gen2|. You can also still recover your wallet from a backup file in |mw-gen1| on an Android device.