balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Michelson documentation: tez should be mutez

Browse Source 
X-this-metadata-hash-v1: cr7e7yi4cBfaH2JA4ayG7moExgEttOxSHKy+86Zzz1z1Kd4/JkR6lmzWreG1u1boYQcmuE/AR24vi8MNgvWhTEYP1/i+Gc0Y4slp9+t8Dp564jXljc5O+uVYrl4XhbY3nduyaFEKX6/0ty0F6pn9zQJizZfhw3j5QH4P2bWuxUyqx66Vsl2AnIDGPX97qbNCNLUBwp1XvHb1aIJH78X2I22vT1IAAAAAAAAAtQ==
X-this-diff-hash-v1: mO0NIkv+QDqmHsRuDD0EU6hCOcAWVid7hoPtv3qDDFuJY54CfzlD7xZuwlOsf20KoldfzKliOd7ytMhBtn1OxxNK/IOeKcrFntFObh+MFEg76E9t62Q/NijuK1Fa+GiiQMSWn+MrD3hGrGOS1bZSxkVnxHezlWSM4fMPqR77yeDxU259A2PL2VF4RRbBtchN4LWSr5FuZDNOTPKekpq6UCkeMZAAAAAAAAARDQ==
X-this-tree-hash-v1: VkoKJM94S5VQJ1s7WZAofHCgOWzmlT3QpQAuPONxB3XOagRK4C8Rhjh6ndjEiQhV2HA4YzL57U0BTd/8WjnueTxdEJWA7aiPztXT5pEWKAFTmglN8x7VwF/z3/5IS9qGqik96pIxNHifVXVxqjgqxO3Lfsb+RlSEW33NOEce8dhW1MfU7o6RXmQUnGu0QtP8f1wQG7mmpnepM+0R6jfk9vHHJEkAAAAAAJ+z/w==
X-parents-hash-v1: RVHL1TYdshBuYh8ZI/KYQUZexrIe/J4TJwTzkTp1U8nUG8au5aNEawHhAs5RTBMT6aYWZBd5JmxUE8J/6VHQC7+gWahU3bzQXGG+1FDcCNLBgWMD3f3gYjxKIdEyU2GnNzeCcjPVv4f0MDP1OKvb/RcHaHQbM6WB57DsInSDC54s+uuD9ItJWLiPC2/PAaK4n1hxduIUBQh3fmzhfSPMkHPJHKIAAAAAAAABcw==
X-replaces-v1: none
X-number-by-author-v1: 000001
X-previous-commit-by-author-hash-v1: first
X-previous-strong-commit-hash-v1: first

X-review-sign-reason-base64: MDAwMDAxIGF1dGhvcmVkLWRpZmYgcmV2aWV3ZWQtZGlmZiBwYXRjaC1udW1iZXIgc2lnbmluZy1udW1iZXIgc2lnbmluZy1jaGFpbgo=
X-review-previous-signed: 000001 first
X-review-filename: 000001-000001-doc-tez-mutez.patch.signed
X-review-signature: -----BEGIN PGP SIGNATURE-----  iQIzBAABCAAdFiEEx+nLZ4fM6DOL0DiERkFcBrIgV+0FAlvokj4ACgkQRkFcBrIg V+3x+g//QiGgw2x0NJFkthQFa5VwjGqydB8eOBxgC8egPMNMuKGc+8lJK5LX7HmV GmDAyyT0TtXZt27xIX6P0bNSI6mERn/dq60vajWnePWPHm9vRZmSrW1ABoJmgZYu OTbD5Nt8EyCaHbAk8uutxLJAago3kzD26zkzfgSxg4qDNEY/sIS4PMHFXjn0Ypvb 1tSNQDGEwTXz/nK3unvz+5m4WJE8lQcmUd38LlLbJOF+t8qKrij2wuZPjii5BNoq aDE90d7Yi/jbDU2NB54Ws8jAMLi1/MBhyK7Av/mF0r7PTQS+3dbPvhLihGbMCgYe zaeYooUiRCMzHtfxpOxezHWONw48O3l7043K+d4m+2GkwVb30NjfqqGO4SRpyK3K wLtobVX2FquSj5qVNFxsSWPdV1+LYpMzX26+t52QRRLpW3EVpF1WocT7qc4HdbXx NI1B8z8eGzEQoJL9PhLadboGBGAlO1YHhx/ftw1Hbm6BvQAuVVPJrEjugijIkOJl bK3qajAqp0RiopLwHMmctEGwFru6fjafp2feXsyICM5Gyc7FkF/nnG6ZjHCF87Ni 7/bLm1+OiOrCVyhXDK8EOc9Cn3Y55KNMowCvmH5iPHH4HPmit8uZW2tZal/M6Amr jPFMy747cweELmZuRes60K/RxhIMHQ2isvQqkZSaM9GKZltKsfs= =IWuW -----END PGP SIGNATURE-----
X-sign-reason: 000002 authored-diff-weak reviewed-diff-weak patch-number signing-number signing-chain
X-previous-signed: 000002 -----BEGIN PGP SIGNATURE-----  iQIzBAABCAAdFiEEx+nLZ4fM6DOL0DiERkFcBrIgV+0FAlvokj4ACgkQRkFcBrIg V+3x+g//QiGgw2x0NJFkthQFa5VwjGqydB8eOBxgC8egPMNMuKGc+8lJK5LX7HmV GmDAyyT0TtXZt27xIX6P0bNSI6mERn/dq60vajWnePWPHm9vRZmSrW1ABoJmgZYu OTbD5Nt8EyCaHbAk8uutxLJAago3kzD26zkzfgSxg4qDNEY/sIS4PMHFXjn0Ypvb 1tSNQDGEwTXz/nK3unvz+5m4WJE8lQcmUd38LlLbJOF+t8qKrij2wuZPjii5BNoq aDE90d7Yi/jbDU2NB54Ws8jAMLi1/MBhyK7Av/mF0r7PTQS+3dbPvhLihGbMCgYe zaeYooUiRCMzHtfxpOxezHWONw48O3l7043K+d4m+2GkwVb30NjfqqGO4SRpyK3K wLtobVX2FquSj5qVNFxsSWPdV1+LYpMzX26+t52QRRLpW3EVpF1WocT7qc4HdbXx NI1B8z8eGzEQoJL9PhLadboGBGAlO1YHhx/ftw1Hbm6BvQAuVVPJrEjugijIkOJl bK3qajAqp0RiopLwHMmctEGwFru6fjafp2feXsyICM5Gyc7FkF/nnG6ZjHCF87Ni 7/bLm1+OiOrCVyhXDK8EOc9Cn3Y55KNMowCvmH5iPHH4HPmit8uZW2tZal/M6Amr jPFMy747cweELmZuRes60K/RxhIMHQ2isvQqkZSaM9GKZltKsfs= =IWuW -----END PGP SIGNATURE-----
This commit is contained in:
Georges Dupéron 2018-10-17 15:23:30 +02:00
parent 56fa339937
commit 5e4bd12d3b
No known key found for this signature in database
GPG Key ID: 46415C06B22057ED
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
docs/whitedoc/michelson.rst
View File

@ -2167,11 +2167,11 @@ annotations will see only their top-most stack type elements annotated.
:: ::
CREATE_ACCOUNT @op @addr 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 -> @op operation : @addr address : 'S
CREATE_ACCOUNT @op CREATE_ACCOUNT @op
:: key_hash : option key_hash : bool : tez : 'S :: key_hash : option key_hash : bool : mutez : 'S
-> @op operation : address : 'S -> @op operation : address : 'S
A no-op instruction ``RENAME`` allows to rename variables in the stack 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 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 SOURCE :: 'S -> @source address : 'S
@ -2411,7 +2411,7 @@ A similar mechanism is used for context dependent instructions:
SELF :: 'S -> @self contract 'p : 'S SELF :: 'S -> @self contract 'p : 'S
AMOUNT :: 'S -> @amount tez : 'S AMOUNT :: 'S -> @amount mutez : 'S
STEPS_TO_QUOTA :: 'S -> @steps nat : 'S STEPS_TO_QUOTA :: 'S -> @steps nat : 'S
@ -2536,7 +2536,7 @@ Hence, the global data of the contract has the following type
'g = 'g =
pair pair
(pair timestamp tez) (pair timestamp mutez)
(pair (contract unit) (contract unit)) (pair (contract unit) (contract unit))
Following the contract calling convention, the code is a lambda of type Following the contract calling convention, the code is a lambda of type
@ -2555,12 +2555,12 @@ written as
(pair (pair
unit unit
(pair (pair
(pair timestamp tez) (pair timestamp mutez)
(pair (contract unit) (contract unit)))) (pair (contract unit) (contract unit))))
(pair (pair
(list operation) (list operation)
(pair (pair
(pair timestamp tez) (pair timestamp mutez)
(pair (contract unit) (contract unit)))) (pair (contract unit) (contract unit))))
The complete source ``reservoir.tz`` is: The complete source ``reservoir.tz`` is:
@ -2570,7 +2570,7 @@ The complete source ``reservoir.tz`` is:
parameter unit ; parameter unit ;
storage storage
(pair (pair
(pair (timestamp %T) (tez %N)) # T N (pair (timestamp %T) (mutez %N)) # T N
(pair (contract %A unit) (contract %B unit))) ; # A B (pair (contract %A unit) (contract %B unit))) ; # A B
code code
{ CDR ; DUP ; CAAR %T; # T { CDR ; DUP ; CAAR %T; # T
@ -2710,7 +2710,7 @@ of type
pair pair
(pair nat (pair timestamp timestamp)) (pair nat (pair timestamp timestamp))
(pair (pair
(pair tez tez) (pair mutez mutez)
(pair (pair account account) account)) (pair (pair account account) account))
The 24 hours after timestamp ``Z`` are for the buyer and seller to store 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 parameter, matching ``"buyer"`` or ``"seller"`` indicating the party for
which the tokens are transferred. At the end of this day, each of them 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 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. left component is the buyer and the right one the seller.
After the first day, nothing cam happen until ``T``. After the first day, nothing cam happen until ``T``.
@ -2758,11 +2758,11 @@ of type
:: ::
pair pair
(pair nat (pair tez tez)) (pair nat (pair mutez mutez))
(pair (pair
(pair nat (pair timestamp timestamp)) (pair nat (pair timestamp timestamp))
(pair (pair
(pair tez tez) (pair mutez mutez)
(pair (pair account account) account))) (pair (pair account account) account)))
The parameter of the transaction will be either a transfer from the 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) ; (or string nat) ;
storage storage
(pair (pair
(pair nat (pair tez tez)) # counter from_buyer from_seller (pair nat (pair mutez mutez)) # counter from_buyer from_seller
(pair (pair
(pair nat (pair timestamp timestamp)) # Q T Z (pair nat (pair timestamp timestamp)) # Q T Z
(pair (pair
(pair tez tez) # K C (pair mutez mutez) # K C
(pair (pair
(pair (contract unit) (contract unit)) # B S (pair (contract unit) (contract unit)) # B S
(contract unit))))) ; # W (contract unit))))) ; # W
@ -2947,7 +2947,7 @@ XII - Full grammar
| <signature string constant> | <signature string constant>
| <key string constant> | <key string constant>
| <key_hash string constant> | <key_hash string constant>
| <tez string constant> | <mutez string constant>
| <contract string constant> | <contract string constant>
| Unit | Unit
| True | True