diff --git a/docs/whitedoc/michelson.rst b/docs/whitedoc/michelson.rst index e90e519ba..685b3a1c0 100644 --- a/docs/whitedoc/michelson.rst +++ b/docs/whitedoc/michelson.rst @@ -2167,11 +2167,11 @@ annotations will see only their top-most stack type elements annotated. :: CREATE_ACCOUNT @op @addr - :: key_hash : option key_hash : bool : tez : 'S + :: key_hash : option key_hash : bool : mutez : 'S -> @op operation : @addr address : 'S CREATE_ACCOUNT @op - :: key_hash : option key_hash : bool : tez : 'S + :: key_hash : option key_hash : bool : mutez : 'S -> @op operation : address : 'S A no-op instruction ``RENAME`` allows to rename variables in the stack @@ -2403,7 +2403,7 @@ A similar mechanism is used for context dependent instructions: CONTRACT 'p :: @a address : 'S -> @a.contract contract 'p : 'S - BALANCE :: 'S -> @balance tez : 'S + BALANCE :: 'S -> @balance mutez : 'S SOURCE :: 'S -> @source address : 'S @@ -2411,7 +2411,7 @@ A similar mechanism is used for context dependent instructions: SELF :: 'S -> @self contract 'p : 'S - AMOUNT :: 'S -> @amount tez : 'S + AMOUNT :: 'S -> @amount mutez : 'S STEPS_TO_QUOTA :: 'S -> @steps nat : 'S @@ -2536,7 +2536,7 @@ Hence, the global data of the contract has the following type 'g = pair - (pair timestamp tez) + (pair timestamp mutez) (pair (contract unit) (contract unit)) Following the contract calling convention, the code is a lambda of type @@ -2555,12 +2555,12 @@ written as (pair unit (pair - (pair timestamp tez) + (pair timestamp mutez) (pair (contract unit) (contract unit)))) (pair (list operation) (pair - (pair timestamp tez) + (pair timestamp mutez) (pair (contract unit) (contract unit)))) The complete source ``reservoir.tz`` is: @@ -2570,7 +2570,7 @@ The complete source ``reservoir.tz`` is: parameter unit ; storage (pair - (pair (timestamp %T) (tez %N)) # T N + (pair (timestamp %T) (mutez %N)) # T N (pair (contract %A unit) (contract %B unit))) ; # A B code { CDR ; DUP ; CAAR %T; # T @@ -2710,7 +2710,7 @@ of type pair (pair nat (pair timestamp timestamp)) (pair - (pair tez tez) + (pair mutez mutez) (pair (pair account account) account)) The 24 hours after timestamp ``Z`` are for the buyer and seller to store @@ -2718,7 +2718,7 @@ their collateral ``(Q * C)``. For this, the contract takes a string as parameter, matching ``"buyer"`` or ``"seller"`` indicating the party for which the tokens are transferred. At the end of this day, each of them can send a transaction to send its tokens back. For this, we need to -store who already paid and how much, as a ``(pair tez tez)`` where the +store who already paid and how much, as a ``(pair mutez mutez)`` where the left component is the buyer and the right one the seller. After the first day, nothing cam happen until ``T``. @@ -2758,11 +2758,11 @@ of type :: pair - (pair nat (pair tez tez)) + (pair nat (pair mutez mutez)) (pair (pair nat (pair timestamp timestamp)) (pair - (pair tez tez) + (pair mutez mutez) (pair (pair account account) account))) The parameter of the transaction will be either a transfer from the @@ -2793,11 +2793,11 @@ The complete source ``forward.tz`` is: (or string nat) ; storage (pair - (pair nat (pair tez tez)) # counter from_buyer from_seller + (pair nat (pair mutez mutez)) # counter from_buyer from_seller (pair (pair nat (pair timestamp timestamp)) # Q T Z (pair - (pair tez tez) # K C + (pair mutez mutez) # K C (pair (pair (contract unit) (contract unit)) # B S (contract unit))))) ; # W @@ -2947,7 +2947,7 @@ XII - Full grammar | | | - | + | | | Unit | True