Update to master

.github/ISSUE_TEMPLATE.md

@@ -1,3 +1,5 @@
+If you're proposing a new feature please follow the [VIP Template] (https://github.com/ethereum/viper/tree/master/.github/VIP_TEMPLATE.md)
+
 * viper Version: x.x.x
 * pyethereum Version: x.x.x
 * OS: osx/linux/win

.github/VIP_TEMPLATE.md

@@ -0,0 +1,31 @@
+This is the suggested template for new VIPs.
+
+## Preamble
+
+    VIP: <to be assigned>
+    Title: <VIP title>
+    Author: <list of authors' names and optionally, email addresses>
+    Type: <Standard Track | Informational | Meta>
+    Status: Draft
+    Created: <date created on, in ISO 8601 (yyyy-mm-dd) format>
+    Requires (*optional): <VIP number(s)>
+    Replaces (*optional): <VIP number(s)>
+
+
+## Simple Summary
+"If you can't explain it simply, you don't understand it well enough." Provide a simplified and layman-accessible explanation of the VIP.
+
+## Abstract
+A short description of the technical issue being addressed.
+
+## Motivation
+The motivation is critical for VIPs that add or change Viper's functionality. It should clearly explain why the existing Viper functionality is inadequate to address the problem that the VIP solves as well as how the VIP is in line with Viper's goals and design philosopy.
+
+## Specification
+The technical specification should describe the syntax and semantics of any new feature. The specification should be detailed enough to allow any developer to implement the functionality
+
+## Backwards Compatibility
+All VIPs that introduce backwards incompatibilities must include a section describing these incompatibilities and their severity. The VIP must explain how the author proposes to deal with these incompatibilities.
+
+## Copyright
+Copyright and related rights waived via [CC0](https://creativecommons.org/publicdomain/zero/1.0/)

.gitignore

@@ -29,3 +29,5 @@ htmlcov/
 docs/_build
 docs/modules.rst
 
+# IDEs
+.idea/

Dockerfile

@@ -1,13 +1,24 @@
-FROM python:3.6
+FROM python:3.6-slim
 
-MAINTAINER Obul <obulpathi@merkletree.vc>
+# Specify label-schema specific arguments and labels.
+ARG BUILD_DATE
+ARG VCS_REF
+LABEL org.label-schema.build-date=$BUILD_DATE \
+    org.label-schema.name="viper" \
+    org.label-schema.description="Viper is an experimental programming language" \
+    org.label-schema.url="https://viper.readthedocs.io/en/latest/" \
+    org.label-schema.vcs-ref=$VCS_REF \
+    org.label-schema.vcs-url="https://github.com/ethereum/viper" \
+    org.label-schema.vendor="Ethereum" \
+    org.label-schema.schema-version="1.0"
 
 # coincurve requires libgmp
 RUN apt-get update && \
-    apt-get install -y libgmp-dev
+    apt-get install -y --no-install-recommends apt-utils gcc libc6-dev libc-dev libssl-dev libgmp-dev && \
+    rm -rf /var/lib/apt/lists/*
+
+ADD . /code
 
-# download and install Viper
 WORKDIR /code
-RUN git clone https://github.com/ethereum/viper.git
-WORKDIR /code/viper
-RUN python setup.py install
+RUN python setup.py install && \
+    apt-get purge -y --auto-remove apt-utils gcc libc6-dev libc-dev libssl-dev

Makefile

@@ -25,3 +25,8 @@ docs:
 	$(MAKE) -C docs clean
 	$(MAKE) -C docs html
 	open docs/_build/html/index.html
+
+docker-build:
+	@docker build -t viper \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` .

README.md

@@ -1,7 +1,7 @@
-[![Join the chat at https://gitter.im/bethereum/viper](https://badges.gitter.im/ethereum/viper.svg)](https://gitter.im/ethereum/viper?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/ethereum/viper.svg?branch=master)](https://travis-ci.org/ethereum/viper)
-[![Documentation Status](https://readthedocs.org/projects/viper/badge/?version=latest)](http://viper.readthedocs.io/en/latest/?badge=latest)
-[![Coverage Status](https://coveralls.io/repos/github/ethereum/viper/badge.svg?branch=master)](https://coveralls.io/github/ethereum/viper?branch=master)
+[![Join the chat at https://gitter.im/bethereum/vyper](https://badges.gitter.im/ethereum/vyper.svg)](https://gitter.im/ethereum/vyper?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://travis-ci.org/ethereum/vyper.svg?branch=master)](https://travis-ci.org/ethereum/vyper)
+[![Documentation Status](https://readthedocs.org/projects/vyper/badge/?version=latest)](http://vyper.readthedocs.io/en/latest/?badge=latest)
+[![Coverage Status](https://coveralls.io/repos/github/ethereum/vyper/badge.svg?branch=master)](https://coveralls.io/github/ethereum/vyper?branch=master)
 
 # Principles and Goals
 
@@ -31,7 +31,7 @@ Viper does NOT strive to be a 100% replacement for everything that can be done i
 **Note: Viper is still alpha software, use with care**
 
 # Installation 
-See the [Viper documentation](https://viper.readthedocs.io/en/latest/installing-viper.html)
+See the [Viper documentation](https://vyper.readthedocs.io/en/latest/installing-viper.html)
 for build instructions.
 
 # Compiling a contract
@@ -59,5 +59,5 @@ For testing strategy, please see [Testing](no-link)
 # Contributing
 * See Issues tab, and feel free to submit your own issues 
 * Add PRs if you discover a solution to an existing issue
-* For further discussions and questions talk to us on [gitter](https://gitter.im/ethereum/viper)
-* For more information, see [Contributing](http://viper.readthedocs.io/en/latest/contributing.html)
+* For further discussions and questions talk to us on [gitter](https://gitter.im/ethereum/vyper)
+* For more information, see [Contributing](http://vyper.readthedocs.io/en/latest/contributing.html)

bin/viper

@@ -6,22 +6,30 @@ import viper
 
 from viper import compiler, optimizer
 from viper.parser.parser import parse_to_lll
+from viper.parser import parser_utils
+
 
 parser = argparse.ArgumentParser(description='Viper {0} programming language for Ethereum'.format(viper.__version__))
 parser.add_argument('input_file', help='Viper sourcecode to compile')
-parser.add_argument('-f', help='Format to print', choices=['abi', 'json', 'bytecode', 'ir'], default='bytecode', dest='format')
+parser.add_argument('-f', help='Format to print', choices=['abi', 'json', 'bytecode', 'bytecode_runtime', 'ir'], default='bytecode', dest='format')
+parser.add_argument('--show-gas-estimates', help='Show gas estimates in ir output mode.', action="store_true")
 
 args = parser.parse_args()
 
 if __name__ == '__main__':
 
     with open(args.input_file) as fh:
         code = fh.read()
+        if args.show_gas_estimates:
+            parser_utils.LLLnode.repr_show_gas = True
+
         if args.format == 'abi':
             print(compiler.mk_full_signature(code))
         elif args.format == 'json':
             print(json.dumps(compiler.mk_full_signature(code)))
         elif args.format == 'bytecode':
             print('0x' + compiler.compile(code).hex())
+        elif args.format == 'bytecode_runtime':
+            print('0x' + compiler.compile(code, bytecode_runtime=True).hex())
         elif args.format == 'ir':
             print(optimizer.optimize(parse_to_lll(code)))

docs/built-in-functions.rst

@@ -0,0 +1,230 @@
+.. index:: function, built-in;
+
+.. _built_in_functions:
+
+***********************
+Built in Functions
+***********************
+
+Viper contains a set amount of built in functions that would be timely and/or unachievable to write in Viper.
+
+.. _functions:
+
+Functions
+=========
+* **floor**
+::
+
+  def floor(a) -> b:
+    """
+    :param a: value to round down
+    :type a: either decimal or num
+
+    :output b: integer
+    """
+Rounds a decimal down to the nearest integer.
+
+* **decimal**
+::
+
+  def decimal(a) -> b:
+    """
+    :param a: value to turn into decimal
+    :type a: either decimal or num
+
+    :output b: decimal
+    """
+Turns a number into a decimal.
+
+* **as_unitless_number**
+::
+
+  def as_unitless_number(a) -> b:
+    """
+    :param a: value to remove units from
+    :type a: either decimal or num
+
+    :output b: either decimal or num
+    """
+Turns a ``num`` or ``decimal`` with units into one without units (used for assignment and math).
+
+* **as_num128**
+::
+
+  def as_num128(a) -> b:
+    """
+    :param a: value to turn into int128
+    :type a: either num, bytes32, num256, or bytes
+
+    :output b: num
+    """
+Turns input into a ``num`` (int128).
+
+* **as_num256**
+::
+
+  def as_num256(a) -> b:
+    """
+    :param a: value to turn into num256
+    :type a: either num_literal, num, bytes32, or address
+
+    :output b: num256
+    """
+Turns input into a ``num256`` (uint256).
+
+* **as_bytes32**
+::
+
+  def as_bytes32(a) -> b:
+    """
+    :param a: value to turn into bytes32
+    :type a: either num, num256, address
+
+    :output b: bytes32
+    """
+Turns input into a ``bytes32``.
+* **slice**
+::
+
+  def slice(a, start=b, length=c) -> d:
+    """
+    :param a: bytes to be sliced
+    :type a: either bytes or bytes32
+    :param b: start position of the slice
+    :type b: num
+    :param c: length of the slice
+    :type c: num
+
+    :output d: bytes
+    """
+Takes a list of bytes and copies, then returns a specified chunk.
+
+* **len**
+::
+
+  def len(a) -> b:
+    """
+    :param a: value to get the length of
+    :type a: bytes
+
+    :output b: num
+    """
+Returns the length of a given list of bytes.
+
+* **concat**
+::
+
+  def concat(a, b, ...) -> c:
+    """
+    :param a: value to combine
+    :type a: bytes
+    :param b: value to combine
+    :type b: bytes
+
+    :output b: bytes
+    """
+Takes 2 or more bytes arrays of type ``bytes32`` or ``bytes`` and combines them into one.
+
+* **keccak256 (sha3)**
+::
+
+  def keccak256(a) -> b:
+    """
+    :param a: value to hash
+    :type a: either str_literal, bytes, bytes32
+
+    :output b: bytes32
+    """
+Returns ``keccak_256`` (Ethereums sha3) hash of input.
+
+* **method_id**
+::
+
+  def method_id(a) -> b:
+    """
+    :param a: method declaration
+    :type a: str_literal
+
+    :output b: bytes
+    """
+
+Takes a function declaration and returns its method_id (used in data field to call it).
+
+* **ecrecover**
+::
+
+  def ecrecover(hash, v, r, s) -> b:
+    """
+    :param hash: a signed hash
+    :type hash: bytes32
+    :param v: 
+    :type v: num256
+    :param r: elliptic curve point
+    :type r: num256
+    :param s: elliptic curve point
+    :type s: num256
+
+    :output b: address
+    """
+
+Takes a signed hash and vrs and returns the public key of the signer.
+
+* **ecadd**
+::
+
+  def ecadd(a, b) -> sum:
+    """
+    :param a: pair to be added
+    :type a: num252[2]
+    :param b: pair to be added
+    :type b: num252[2]
+
+    :output sum: num256[2]
+    """
+
+Takes two elliptical curves and adds them together.
+
+* **ecmul**
+::
+
+  def ecmul(a, b) -> product:
+    """
+    :param a: pair to be multiplied
+    :type a: num252[2]
+    :param b: pair to be multiplied
+    :type b: num252[2]
+
+    :output product: num256[2]
+    """
+
+Takes two elliptical curves and multiplies them together.
+
+* **extract32**
+::
+
+  def extract32(a, b, type=c) -> d:
+    """
+    :param a: where 32 bytes are extracted from
+    :type a: bytes
+    :param b: start point of bytes to be extracted
+    :type b: num
+    :param c: type of output
+    :type c: either bytes32, num128, or address
+
+    :output d: either bytes32, num128, or address
+    """
+
+Takes a byte array and extracts 32 bytes from it.
+
+* **bytes_to_num**
+::
+
+  def bytes_to_num(a) -> b:
+    """
+    :param a: bytes to be transformed
+    :type a: bytes
+
+    :output d: num
+    """
+
+Transforms bytes to num.

docs/compiling-a-contract.rst

@@ -6,7 +6,7 @@ To compile a contract, use:
     viper yourFileName.v.py
 
 .. note:: 
-    Since .vy is not official a language supported by any syntax highlighters or linters,
+    Since .vy is not officially a language supported by any syntax highlighters or linters,
     it is recommended to name your Viper file ending with `.v.py` in order to have Python syntax highlighting.
 
 An `online compiler <https://viper.tools/>`_ is available as well, which lets you experiment with