From ff2bbc0d20bf47d115f9775a2a7227fbfda933b8 Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Thu, 11 Dec 2025 19:49:10 +0100 Subject: [PATCH 1/2] doc: explain recovering funds from pre-babylon delegation --- docs/introduction/howtorun.rst | 6 ++++++ docs/protocols/005_babylon.rst | 3 +++ 2 files changed, 9 insertions(+) diff --git a/docs/introduction/howtorun.rst b/docs/introduction/howtorun.rst index 89a1e82c0347..c4a0a10ce956 100644 --- a/docs/introduction/howtorun.rst +++ b/docs/introduction/howtorun.rst @@ -55,6 +55,12 @@ delegation is by using the ``SET_DELEGATE`` Michelson instruction (see `the Michelson documentation `__ for more details). +.. note:: + + The possibility to choose a delegate for a user account :ref:`was introduced ` in the :doc:`Babylon protocol <../protocols/005_babylon>` back in 2019. + Even though this was long time ago, the simplest way to delegate tez at the time was to deposit them on a special kind of "scriptless" smart contract. + All these contracts have been converted during the Babylon update to regular smart contracts (keeping the same ``KT1`` address), and contain now a predefined manager script, which allows recovering funds using a :ref:`manual procedure `. + Some wallets such as the Kukai web wallet make it easier to recover the funds: they automatically recognize the old delegation situation when connecting to the delegating account. Notice that only user accounts can be delegates, so your delegate must be a *tz* address. diff --git a/docs/protocols/005_babylon.rst b/docs/protocols/005_babylon.rst index a12c54b1ebc1..6e5c828abfa2 100644 --- a/docs/protocols/005_babylon.rst +++ b/docs/protocols/005_babylon.rst @@ -142,6 +142,7 @@ moving average of the participation. `MR52. `_ +.. _babylon_introduced_delegation: Make implicit accounts delegatable ---------------------------------- @@ -394,6 +395,8 @@ do not get included in a block because of network latency will not survive the migration to Babylon. They will have to be emitted again in the new format. +.. _migrating_scriptless_contracts: + Migration from scriptless KT1s to ``manager.tz`` ------------------------------------------------------------------ -- GitLab From aa524ed205a967f9f2d48c8ec1e76371e746d951 Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Thu, 18 Dec 2025 12:50:31 +0100 Subject: [PATCH 2/2] doc: minor issues --- docs/alpha/sapling.rst | 6 +++--- docs/tallinn/sapling.rst | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/alpha/sapling.rst b/docs/alpha/sapling.rst index 9b3847c39c2e..7061119b2c0e 100644 --- a/docs/alpha/sapling.rst +++ b/docs/alpha/sapling.rst @@ -101,7 +101,7 @@ transparent token. It suffices to add more values in the outputs than in the inputs to mint and to have more in inputs than outputs to burn. -Preventing Malleability +Preventing malleability ~~~~~~~~~~~~~~~~~~~~~~~ A Sapling transaction contains a ``bound_data`` field with arbitrary @@ -273,7 +273,7 @@ Shielded tez An example contract implementing a shielded pool of tokens with a 1 to 1 conversion rate to mutez is available in the tests of the protocol at :src:`src/proto_alpha/lib_protocol/test/integration/michelson/contracts/sapling_contract.tz`. -Simple Voting Contract +Simple voting contract ^^^^^^^^^^^^^^^^^^^^^^ One might envision using Sapling to implement private voting (i.e., a secret ballot). @@ -455,7 +455,7 @@ the chain in case of loss. However disclosure of this file will reveal the balance and the unspent outputs of all viewing keys. Memo -^^^^^^ +^^^^ Sapling offers the possibility to add an arbitrary memo to any created output. The memo is encrypted and available to anyone diff --git a/docs/tallinn/sapling.rst b/docs/tallinn/sapling.rst index 295cc4497ad2..447c89080663 100644 --- a/docs/tallinn/sapling.rst +++ b/docs/tallinn/sapling.rst @@ -101,7 +101,7 @@ transparent token. It suffices to add more values in the outputs than in the inputs to mint and to have more in inputs than outputs to burn. -Preventing Malleability +Preventing malleability ~~~~~~~~~~~~~~~~~~~~~~~ A Sapling transaction contains a ``bound_data`` field with arbitrary @@ -455,7 +455,7 @@ the chain in case of loss. However disclosure of this file will reveal the balance and the unspent outputs of all viewing keys. Memo -^^^^^^ +^^^^ Sapling offers the possibility to add an arbitrary memo to any created output. The memo is encrypted and available to anyone -- GitLab