Merge branch 'master' of https://github.com/vyperlang/vyper into fix/…

…bytestring_compare_type

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,7 +6,7 @@
 
 ### Commit message
 
-Commit message for the final, squashed PR. (Optional, but reviewers will appreciate it! Please see [our commit message style guide](../../blob/master/docs/style-guide.rst#best-practices-1) for what we would ideally like to see in a commit message.)
+Commit message for the final, squashed PR. (Optional, but reviewers will appreciate it! Please see [our commit message style guide](../../master/docs/style-guide.rst#best-practices-1) for what we would ideally like to see in a commit message.)
 
 ### Description for the changelog
 

.github/workflows/build.yml

@@ -1,15 +1,16 @@
-name: Artifacts
+name: Build artifacts
 
 on:
   workflow_dispatch:
     inputs:
       tag:
         default: ''
   push:
-    tags:
-      - '*'
     branches:
       - master
+  pull_request:
+  release:
+    types: [published]  # releases and pre-releases (release candidates)
 
 defaults:
   run:
@@ -20,47 +21,50 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-20.04, macos-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
             # grab the commit passed in via `tag`, if any
             ref: ${{ github.event.inputs.tag }}
             # need to fetch unshallow so that setuptools_scm can infer the version
             fetch-depth: 0
 
       - name: Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
+          cache: "pip"
 
       - name: Generate Binary
         run: >-
-          pip install . &&
+          pip install --no-binary pycryptodome --no-binary cbor2 . &&
           pip install pyinstaller &&
           make freeze
 
+
       - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: dist/vyper.*
 
   windows-build:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
             # grab the commit passed in via `tag`, if any
             ref: ${{ github.event.inputs.tag }}
             # need to fetch unshallow so that setuptools_scm can infer the version
             fetch-depth: 0
 
       - name: Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
+          cache: "pip"
 
       - name: Generate Binary
         run: >-
@@ -69,6 +73,43 @@ jobs:
           ./make.cmd freeze
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: dist/vyper.*
+
+  publish-release-assets:
+    needs: [windows-build, unix-build]
+    if: ${{ github.event_name == 'release' }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/download-artifact@v3
+        with:
+          path: artifacts/
+
+      - name: Upload assets
+        # fun - artifacts are downloaded into "artifact/".
+        working-directory: artifacts/artifact
+        run: |
+          set -Eeuxo pipefail
+          for BIN_NAME in $(ls)
+          do
+            curl -L \
+              --no-progress-meter \
+              -X POST \
+              -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}"\
+              -H "Content-Type: application/octet-stream" \
+              "https://uploads.github.com/repos/${{ github.repository }}/releases/${{ github.event.release.id }}/assets?name=${BIN_NAME/+/%2B}" \
+              --data-binary "@${BIN_NAME}"
+          done
+
+  # check build success for pull requests
+  build-success:
+    if: always()
+    runs-on: ubuntu-latest
+    needs: [windows-build, unix-build]
+    steps:
+      - name: check that all builds succeeded
+        if: ${{ contains(needs.*.result, 'failure') }}
+        run: exit 1

.github/workflows/era-tester.yml

@@ -0,0 +1,117 @@
+name: Era compiler tester
+
+# run the matter labs compiler test to integrate their test cases
+# this is intended as a diagnostic / spot check to check that we
+# haven't seriously broken the compiler. but, it is not intended as
+# a requirement for merging since we may make changes to our IR
+# which break the downstream backend (at which point, downstream needs
+# to update, which we do not want to be blocked on).
+
+on: [push, pull_request]
+
+concurrency:
+  # cancel older, in-progress jobs from the same PR, same workflow.
+  # use run_id if the job is triggered by a push to ensure
+  # push-triggered jobs to not get canceled.
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  era-compiler-tester:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Get latest commit hash
+      run: |
+        echo "ERA_HASH=$( curl -u "u:${{ github.token }}" https://api.github.com/repos/matter-labs/era-compiler-tester/git/ref/heads/main | jq .object.sha | tr -d '"' )" >> $GITHUB_ENV
+        echo "ERA_VYPER_HASH=$( curl -u "u:${{ github.token }}" https://api.github.com/repos/matter-labs/era-compiler-vyper/git/ref/heads/main | jq .object.sha | tr -d '"' )" >> $GITHUB_ENV
+
+    - name: Checkout
+      uses: actions/checkout@v1
+
+    - name: Rust setup
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: nightly-2022-11-03
+
+    - name: Set up Python ${{ matrix.python-version[0] }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version[0] }}
+        cache: "pip"
+
+    - name: Get cache
+      id: get-cache
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cargo/bin/
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+          **/target
+          **/target-llvm
+          **/compiler_tester
+          **/llvm
+          **/era-compiler-tester
+        key: ${{ runner.os }}-${{ env.ERA_HASH }}-${{ env.ERA_VYPER_HASH }}
+
+    - name: Initialize repository and install dependencies
+      if: steps.get-cache.outputs.cache-hit != 'true'
+      run: |
+        git clone --depth 1 https://github.com/matter-labs/era-compiler-tester.git
+        cd era-compiler-tester
+        sed -i 's/ssh:\/\/git@/https:\/\//g' .gitmodules
+        git submodule init
+        git submodule update
+        sudo apt install cmake ninja-build clang-13 lld-13 parallel pkg-config lld
+        cargo install compiler-llvm-builder
+        zkevm-llvm clone && zkevm-llvm build
+        cargo build --release
+
+    - name: Save cache
+      uses: actions/cache/save@v3
+      if: steps.get-cache.outputs.cache-hit != 'true'
+      with:
+        path: |
+          ~/.cargo/bin/
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+          **/target
+          **/target-llvm
+          **/compiler_tester
+          **/llvm
+          **/era-compiler-tester
+        key: ${{ runner.os }}-${{ env.ERA_HASH }}-${{ env.ERA_VYPER_HASH }}
+
+    - name: Build Vyper
+      run: |
+        set -Eeuxo pipefail
+        pip install .
+        echo "VYPER_VERSION=$(vyper --version | cut -f1 -d'+')" >> $GITHUB_ENV
+
+    - name: Install Vyper
+      run: |
+        mkdir era-compiler-tester/vyper-bin
+        cp $(which vyper) era-compiler-tester/vyper-bin/vyper-${{ env.VYPER_VERSION }}
+
+    - name: Run tester (fast)
+      # Run era tester with no LLVM optimizations
+      continue-on-error: true
+      if: ${{ github.ref != 'refs/heads/master' }}
+      run: |
+        cd era-compiler-tester
+        cargo run --release --bin compiler-tester -- --path=tests/vyper/ --mode="M0B0 ${{ env.VYPER_VERSION }}"
+
+    - name: Run tester (slow)
+      # Run era tester across the LLVM optimization matrix
+      continue-on-error: true
+      if: ${{ github.ref == 'refs/heads/master' }}
+      run: |
+        cd era-compiler-tester
+        cargo run --release --bin compiler-tester -- --path=tests/vyper/ --mode="M*B* ${{ env.VYPER_VERSION }}"
+
+    - name: Mark as success
+      run: |
+        exit 0

.github/workflows/ghcr.yml

@@ -0,0 +1,75 @@
+name: Deploy docker image to ghcr
+
+# Deploy docker image to ghcr on pushes to master and all releases/tags.
+# Note releases to docker hub are managed separately in another process
+# (github sends webhooks to docker hub which triggers the build there).
+# This workflow is an alternative form of retention for docker images
+# which also allows us to tag and retain every single commit to master.
+
+on:
+  push:
+    branches:
+      - master
+  release:
+    types: [released]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  deploy-ghcr:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+            # need to fetch unshallow so that setuptools_scm can infer the version
+            fetch-depth: 0
+
+      - uses: actions/setup-python@v4
+        name: Install python
+        with:
+          python-version: "3.11"
+          cache: "pip"
+
+      - name: Generate vyper/version.py
+        run: |
+          pip install .
+          echo "VYPER_VERSION=$(PYTHONPATH=. python vyper/cli/vyper_compile.py --version)" >> "$GITHUB_ENV"
+
+      - name: generate tag suffix
+        if: ${{ github.event_name != 'release' }}
+        run: echo "VERSION_SUFFIX=-dev" >> "$GITHUB_ENV"
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=ref,event=tag
+            type=raw,value=${{ env.VYPER_VERSION }}${{ env.VERSION_SUFFIX }}
+            type=raw,value=dev,enable=${{ github.ref == 'refs/heads/master' }}
+            type=raw,value=latest,enable=${{ github.event_name == 'release' }}
+
+
+      - name: Login to ghcr.io
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/publish.yml

@@ -1,11 +1,11 @@
-# This workflows will upload a Python Package using Twine when a release is created
+# This workflow will upload a Python Package using Twine when a release is created
 # For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
 
-name: Publish
+name: Publish to PyPI
 
 on:
   release:
-    types: [released]
+    types: [published]  # releases and pre-releases (release candidates)
 
 jobs:
 
@@ -16,9 +16,9 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
-        python-version: '3.x'
+        python-version: "3.11"
 
     - name: Install dependencies
       run: |