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

Docs: update Michelson spec to the new address type

Browse Source
This commit is contained in:
Benjamin Canou 2018-04-14 00:39:32 +02:00 committed by Grégoire Henry
parent 86c18bcd9d
commit 3cc88d0d81
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
docs/whitedoc/michelson.rst
View File

@ -1252,6 +1252,8 @@ VI - Domain specific data types
- ``contract 'param``: A contract, with the type of its code. - ``contract 'param``: A contract, with the type of its code.
- ``address``: An untyped contract address.
- ``operation``: An internal operation emitted by a contract. - ``operation``: An internal operation emitted by a contract.
- ``key``: A public cryptography key. - ``key``: A public cryptography key.
@ -1439,12 +1441,31 @@ contract, unit for an account.
:: 'S -> tez : 'S :: 'S -> tez : 'S
- ``SOURCE 'p``: Push the source contract of the current - ``ADDRESS``: Push the untyped version of a contract.
::
:: contract _ : 'S -> address : 'S
- ``CONTRACT 'p``: Push the untyped version of a contract.
::
:: address : 'S -> contract 'p : 'S
> CONTRACT / addr : S => Some addr : S
iff addr exists and is a contract of parameter type 'p
> CONTRACT / addr : S => Some addr : S
iff 'p = unit and addr is an implicit contract
> CONTRACT / addr : S => None : S
otherwise
- ``SOURCE``: Push the source contract of the current
transaction. transaction.
:: ::
:: 'S -> contract 'p : 'S :: 'S -> address : 'S
- ``SELF``: Push the current contract. - ``SELF``: Push the current contract.
@ -2327,7 +2348,7 @@ The complete source ``forward.tz`` is:
IF { # Between T + 24 and T + 48 IF { # Between T + 24 and T + 48
# We accept only delivery notifications, from W # We accept only delivery notifications, from W
DUP ; CDDDDDR ; MANAGER ; # W DUP ; CDDDDDR ; MANAGER ; # W
SOURCE unit ; MANAGER ; SOURCE ; MANAGER ;
COMPARE ; NEQ ; COMPARE ; NEQ ;
IF { FAIL } {} ; # fail if not the warehouse IF { FAIL } {} ; # fail if not the warehouse
DUP ; CAR ; # we must receive (Right amount) DUP ; CAR ; # we must receive (Right amount)

2
src/bin_client/test/contracts/forward.tz
View File

@ -112,7 +112,7 @@ code
IF { # Between T + 24 and T + 48 IF { # Between T + 24 and T + 48
# We accept only delivery notifications, from W # We accept only delivery notifications, from W
DUP ; CDDDDDR ; MANAGER ; # W DUP ; CDDDDDR ; MANAGER ; # W
SOURCE unit ; MANAGER ; SOURCE ; MANAGER ; IF_NONE { FAIL } {} ;
COMPARE ; NEQ ; COMPARE ; NEQ ;
IF { FAIL } {} ; # fail if not the warehouse IF { FAIL } {} ; # fail if not the warehouse
DUP ; CAR ; # we must receive (Right amount) DUP ; CAR ; # we must receive (Right amount)