Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove shielded feature from documentation #1032

Merged
merged 8 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions source/mainnet/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@

# -- Sphinx-reredirects for redirecting old paths to new ones ----------------
redirects = {
"./net/guides/shielded-transfer": "/net/guides/shield-ccd-wallets.html",
"./net/desktop-wallet/send-gtu-single-desktop": "/net/guides/send-ccd-wallets.html",
"./net/desktop-wallet/send-gtu-single-desktop": "/net/guides/send-ccd-wallets.html",
"./net/desktop-wallet/shield-gtu-desktop": "/net/guides/shield-ccd-wallets.html",
Expand Down
8 changes: 2 additions & 6 deletions source/mainnet/net/concepts/concepts-transactions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,8 @@ You can make transactions using either the Desktop Wallet, the |mw-gen2|, |mw-ge
+----------------------------+---------------+----------------+-------------------+---------------+-------------------+
| Send CCD with a schedule | | | | |check| | |check| |
+----------------------------+---------------+----------------+-------------------+---------------+-------------------+
| Shield CCD | |check| | |check| | | |check| | |check| |
+----------------------------+---------------+----------------+-------------------+---------------+-------------------+
| Unshield CCD | |check| | |check| | | |check| | |check| |
+----------------------------+---------------+----------------+-------------------+---------------+-------------------+
| Make shielded transfer | |check| | |check| | | |check| | |check| |
+----------------------------+---------------+----------------+-------------------+---------------+-------------------+
| Add validator | |check| | |check| | |check| | |check| | |check| |
+----------------------------+---------------+----------------+-------------------+---------------+-------------------+
| Remove validator | |check| | |check| | |check| | |check| | |check| |
Expand All @@ -44,8 +40,8 @@ You can make transactions using either the Desktop Wallet, the |mw-gen2|, |mw-ge
+----------------------------+---------------+----------------+-------------------+---------------+-------------------+

- |bw|: supports send CCD, receive CCD, connect to dApps, validator management, delegation.
- |mw-gen2|: supports send CCD, receive CCD, shield CCD and unshield CCD, validator management, delegation, connect to dApps, add and manage tokens.
- |mw-gen1|: supports send CCD, receive CCD, shield CCD and unshield CCD, validator management, delegation
- |mw-gen2|: supports send CCD, receive CCD, unshield CCD (:ref:`deprecated<shielded-balance-feature-deprecation>`), validator management, delegation, connect to dApps, add and manage tokens.
- |mw-gen1|: supports send CCD, receive CCD, unshield CCD (:ref:`deprecated<shielded-balance-feature-deprecation>`), validator management, delegation
- Desktop Wallet: supports all transaction types (except smart contract transactions).
- Concordium Client: supports all transaction types.

Expand Down
23 changes: 9 additions & 14 deletions source/mainnet/net/desktop-wallet/accounts-desktop.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,56 +12,51 @@ To view information about an account, go to **Accounts** and select the relevant
.. image:: ../images/desktop-wallet/dw-wallet-totals.png
:alt: area in desktop wallet showing totals

- **Wallet total** shows the total amount of CCDs in all accounts in this wallet, including shielded balances and CCDs that are scheduled to be released to your account on a future date.
- **Wallet total** shows the total amount of CCDs in all accounts in this wallet, including shielded balances (:ref:`deprecated<shielded-balance-feature-deprecation>`) and CCDs that are scheduled to be released to your account on a future date.

- **At disposal** shows the amount of CCDs you have available for transactions in all accounts in this wallet. This includes shielded balances but *not* staked amounts or CCDs that are scheduled to be released to your account on a future date.
- **At disposal** shows the amount of CCDs you have available for transactions in all accounts in this wallet. This includes shielded balances (:ref:`deprecated<shielded-balance-feature-deprecation>`) but *not* staked amounts or CCDs that are scheduled to be released to your account on a future date.

- **Stake** shows the amount of CCDs staked in all accounts for this wallet.

The most common tasks on an account are:

- **Send**: Send CCD to a recipient in your address book. See :ref:`Create CCD transfer in the Desktop Wallet <send-ccd-wallets>`.

- **Shield**: Transfer CCD from your public balance to your shielded balance. See :ref:`Shield CCD on an account <shield-ccd-wallets>`.

- **Receive**: Select this to display the account address. Select the icon to the right to copy the address if you want to share it with other participants in the network or let them scan the QR code.

In the account card in the accounts list, you can see the following information:

.. image:: ../images/desktop-wallet/dw-acct-card-in-list.png
:alt: example of account card with information, validator icon, ledger icon shown

- The **Account Total** shows the total number of CCDs on the account, which includes the CCDs that are available and any staked CCDs or shielded CCDs. It also includes CCDs that are scheduled to be released to your account on a future date.
- The **Account Total** shows the total number of CCDs on the account, which includes the CCDs that are available and any staked CCDs or shielded CCDs (:ref:`deprecated<shielded-balance-feature-deprecation>`). It also includes CCDs that are scheduled to be released to your account on a future date.

- The **Balance Total** shows the total number of CCD on the account, which includes the CCD that is available and any staked CCD or CCDs that are scheduled to be released to your account on a future date. It does *not* include shielded CCDs.
- The **Balance Total** shows the total number of CCD on the account, which includes the CCD that is available and any staked CCD or CCDs that are scheduled to be released to your account on a future date. It does *not* include shielded CCDs (:ref:`deprecated<shielded-balance-feature-deprecation>`).

- The **At disposal** amount is the amount you can use for transactions, which excludes staked CCD and CCD in a release schedule.

- The **Staked** amount shows the amount staked if the account is a validator or delegator.

- **Shielded balance** shows any shielded amounts on the account.
- **Shielded balance** shows any shielded amounts (:ref:`deprecated<shielded-balance-feature-deprecation>`) on the account.

In addition, you can see the following information about the selected account on the **Balance** tab in the account details:

.. image:: ../images/desktop-wallet/dw-balance-details.png
:alt: dark screen showing balance details for one account

- The **Balance Total** shows the total number of CCD on the account, which includes the CCD that is available and any staked CCD or CCDs that are scheduled to be released to your account on a future date. It does *not* include shielded CCDs.
- The **Balance Total** shows the total number of CCD on the account, which includes the CCD that is available and any staked CCD or CCDs that are scheduled to be released to your account on a future date. It does *not* include shielded CCDs (:ref:`deprecated<shielded-balance-feature-deprecation>`).

- The **At disposal** amount is the amount you can use for transactions, which excludes staked CCD and CCD in a release schedule.

- The **Staked with...** amount shows the amount staked if the account is a validator or delegator.

- The **Delegation to...** amount shows the amount delegated to a staking pool or passive delegation.

On the Shielded balance tab, you'll see:

- The **Shielded balance total** shows the amount of CCD that you've shielded. The **Balance total** is visible to all participants on the Concordium Blockchain, while the **Shielded balance total** is visible to you only.
On the Shielded balance tab (:ref:`deprecated<shielded-balance-feature-deprecation>`), you'll see:

.. Note::
Shielded transfers and Shielded balance is only available on accounts with a single credential. You can't make or receive shielded transfers on multi-signature accounts.
- The **Shielded balance total** (:ref:`deprecated<shielded-balance-feature-deprecation>`) shows the amount of CCD that you've shielded (:ref:`deprecated<shielded-balance-feature-deprecation>`). The **Balance total** is visible to all participants on the Concordium Blockchain, while the **Shielded balance total** (:ref:`deprecated<shielded-balance-feature-deprecation>`) is visible to you only.

The Transactions box contains the 10 latest transactions on the account including transfers to other accounts, shielded transfers, and scheduled transfers. When you select a transfer, you'll see the sender and recipient address, the transaction hash, and the block hash. Both successful and failed transactions are listed. If you have any log filters on the account they are also applied here.
The Transactions box contains the 10 latest transactions on the account including transfers to other accounts, shielded transfers (:ref:`deprecated<shielded-balance-feature-deprecation>`), and scheduled transfers. When you select a transfer, you'll see the sender and recipient address, the transaction hash, and the block hash. Both successful and failed transactions are listed. If you have any log filters on the account they are also applied here.

More options
============
Expand Down
2 changes: 1 addition & 1 deletion source/mainnet/net/guides/send-ccd-wallets.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ This topic describes how you can send CCD from an account when only one particip

.. image:: ../images/desktop-wallet/dw-send.png

#. In the right pane, enter the amount of CCD that you want to send. If the amount you want to transfer including the transfer fee exceeds the amount in your account, you’ll see a message saying **Insufficient funds**. This means that there's not enough CCD in the account, and you’ll have to change the amount. Enter a **Memo** if you want to send a message to the recipient along with the shielded amount. Note that there's a fee associated with sending a memo and the fee depends on the size of the memo in bytes. Click **Select Recipient**.
#. In the right pane, enter the amount of CCD that you want to send. If the amount you want to transfer including the transfer fee exceeds the amount in your account, you’ll see a message saying **Insufficient funds**. This means that there's not enough CCD in the account, and you’ll have to change the amount. Enter a **Memo** if you want to send a message to the recipient along with the amount. Note that there's a fee associated with sending a memo and the fee depends on the size of the memo in bytes. Click **Select Recipient**.

.. image:: ../images/desktop-wallet/dw-send-ccd.png

Expand Down
Loading
Loading