From b2038cf3c6ffd246c614756df5e31a4304d6669d Mon Sep 17 00:00:00 2001 From: Nicolas Ayache Date: Wed, 23 Aug 2023 14:39:51 +0200 Subject: [PATCH 1/3] Doc/Michelson: adapt syntax for deprecated instructions. --- docs/alpha/michelson.rst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/alpha/michelson.rst b/docs/alpha/michelson.rst index 2906c14ce62f..893bd2af57bb 100644 --- a/docs/alpha/michelson.rst +++ b/docs/alpha/michelson.rst @@ -908,13 +908,14 @@ Removed instructions and types contract used these on Mainnet before they got deprecated, they have been removed. The Michelson type-checker will reject any contract using them. -- ``CREATE_CONTRACT { storage 'g ; parameter 'p ; code ... }``: +- ``CREATE_CONTRACT { parameter 'p ; storage 'g ; code ... }``: Forge a new contract from a literal. :: + Γ ⊢ CREATE_CONTRACT { parameter 'p ; storage 'g ; code ... } :: key_hash : option key_hash : bool : bool : mutez : 'g : 'S - -> operation : address : 'S + ⇒ operation : address : 'S See the documentation of the new ``CREATE_CONTRACT`` instruction. The first, third, and fourth parameters are ignored. @@ -923,8 +924,8 @@ first, third, and fourth parameters are ignored. :: - :: key_hash : option key_hash : bool : mutez : 'S - -> operation : address : 'S + Γ ⊢ CREATE_ACCOUNT :: key_hash : option key_hash : bool : mutez : 'S + ⇒ operation : address : 'S Takes as argument the manager, optional delegate, the delegatable flag and finally the initial amount taken from the currently executed @@ -938,7 +939,7 @@ parameter if the sender is the contract's manager. :: - :: 'S -> nat : 'S + Γ ⊢ STEPS_TO_QUOTA :: 'S ⇒ nat : 'S :doc:`../protocols/016_mumbai` deprecated the following type. Because no smart contract used it on Mainnet before it got -- GitLab From 5ef13543d0a903a4ff56acffc6e4a43859c1fcdf Mon Sep 17 00:00:00 2001 From: Nicolas Ayache Date: Fri, 8 Sep 2023 19:46:51 +0200 Subject: [PATCH 2/3] Doc/Michelson: improve a doc. --- docs/alpha/michelson.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/alpha/michelson.rst b/docs/alpha/michelson.rst index 893bd2af57bb..cb12b5d8c218 100644 --- a/docs/alpha/michelson.rst +++ b/docs/alpha/michelson.rst @@ -917,8 +917,7 @@ removed. The Michelson type-checker will reject any contract using them. :: key_hash : option key_hash : bool : bool : mutez : 'g : 'S ⇒ operation : address : 'S -See the documentation of the new ``CREATE_CONTRACT`` instruction. The -first, third, and fourth parameters are ignored. +There is a new version of this instruction, see its `documentation `__. - ``CREATE_ACCOUNT``: Forge an account creation operation. -- GitLab From fa31a9b2302ea3bb1424929915a1dd1b0495be1e Mon Sep 17 00:00:00 2001 From: Nicolas Ayache Date: Wed, 27 Sep 2023 13:23:48 +0200 Subject: [PATCH 3/3] Doc/Michelson: fix itemization. --- docs/alpha/michelson.rst | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/alpha/michelson.rst b/docs/alpha/michelson.rst index cb12b5d8c218..b3e784ec2515 100644 --- a/docs/alpha/michelson.rst +++ b/docs/alpha/michelson.rst @@ -911,34 +911,34 @@ removed. The Michelson type-checker will reject any contract using them. - ``CREATE_CONTRACT { parameter 'p ; storage 'g ; code ... }``: Forge a new contract from a literal. -:: + :: - Γ ⊢ CREATE_CONTRACT { parameter 'p ; storage 'g ; code ... } - :: key_hash : option key_hash : bool : bool : mutez : 'g : 'S - ⇒ operation : address : 'S + Γ ⊢ CREATE_CONTRACT { parameter 'p ; storage 'g ; code ... } + :: key_hash : option key_hash : bool : bool : mutez : 'g : 'S + ⇒ operation : address : 'S -There is a new version of this instruction, see its `documentation `__. + There is a new version of this instruction, see its `documentation `__. - ``CREATE_ACCOUNT``: Forge an account creation operation. -:: + :: - Γ ⊢ CREATE_ACCOUNT :: key_hash : option key_hash : bool : mutez : 'S - ⇒ operation : address : 'S + Γ ⊢ CREATE_ACCOUNT :: key_hash : option key_hash : bool : mutez : 'S + ⇒ operation : address : 'S -Takes as argument the manager, optional delegate, the delegatable flag -and finally the initial amount taken from the currently executed -contract. This instruction originates a contract with two entrypoints; -``%default`` of type ``unit`` that does nothing and ``%do`` of type -``lambda unit (list operation)`` that executes and returns the -parameter if the sender is the contract's manager. + Takes as argument the manager, optional delegate, the delegatable flag + and finally the initial amount taken from the currently executed + contract. This instruction originates a contract with two entrypoints; + ``%default`` of type ``unit`` that does nothing and ``%do`` of type + ``lambda unit (list operation)`` that executes and returns the + parameter if the sender is the contract's manager. - ``STEPS_TO_QUOTA``: Push the remaining steps before the contract execution must terminate. -:: + :: - Γ ⊢ STEPS_TO_QUOTA :: 'S ⇒ nat : 'S + Γ ⊢ STEPS_TO_QUOTA :: 'S ⇒ nat : 'S :doc:`../protocols/016_mumbai` deprecated the following type. Because no smart contract used it on Mainnet before it got -- GitLab