Merge fixes.
This commit is contained in:
parent
c770aa3541
commit
4382c3c042
@ -24,11 +24,11 @@ type getBalance = {owner : address; callback : nat contract}
|
|||||||
type getTotalSupply = {callback : nat contract}
|
type getTotalSupply = {callback : nat contract}
|
||||||
|
|
||||||
type action =
|
type action =
|
||||||
Transfer of transfer
|
Transfer of transfer
|
||||||
| Approve of approve
|
| Approve of approve
|
||||||
| GetAllowance of getAllowance
|
| GetAllowance of getAllowance
|
||||||
| GetBalance of getBalance
|
| GetBalance of getBalance
|
||||||
| GetTotalSupply of getTotalSupply
|
| GetTotalSupply of getTotalSupply
|
||||||
|
|
||||||
let transfer (p, s : transfer * storage)
|
let transfer (p, s : transfer * storage)
|
||||||
: operation list * storage =
|
: operation list * storage =
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
let check_signature
|
let check_signature
|
||||||
(pk, signed, msg : key * signature * bytes) : bool =
|
(pk, signed, msg : key * signature * bytes) : bool =
|
||||||
Crypto.check pk signed msg
|
Crypto.check pk signed msg
|
||||||
|
|
||||||
let example : bool =
|
let example : bool =
|
||||||
|
Loading…
Reference in New Issue
Block a user