Solidity models of L2 precompiled contracts: ArbSys and ArbTxRetryable

.github/workflows/docker.yml

@@ -8,18 +8,30 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
 
-      - name: GitHub Login
-        uses: azure/docker-login@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        id: buildx
         with:
-          login-server: docker.pkg.github.com
+          install: true
+
+      - name: DockerHub Login
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
+
+      - name: GitHub Container Registry Login
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set Docker Package and Version
-        env:
-          ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+        id: version
         run: |
           set +e
           _=$(echo "$GITHUB_REF" | grep "^refs/heads/")
@@ -41,20 +53,18 @@ jobs:
             PKG=etheno
           fi
           set -e
-          echo "::set-env name=PKG::$PKG"
-          echo "::set-env name=VER::$VER"
+          echo "::set-output name=PKG::$PKG"
+          echo "::set-output name=VER::$VER"
 
-      - name: Docker Build
-        run: docker build -t $PKG:$VER .
 
-      - name: DockerHub Login
-        uses: azure/docker-login@v1
+      - name: Docker build and push
+        uses: docker/build-push-action@v3
         with:
-          login-server: registry.hub.docker.com
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
-
-      - name: Docker Push
-        run: |
-          docker tag $PKG:$VER registry.hub.docker.com/trailofbits/$PKG:$VER
-          docker push registry.hub.docker.com/trailofbits/$PKG:$VER
+          push: true
+          target: final
+          platforms: |
+            linux/arm64/v8
+            linux/amd64
+          tags: |
+            trailofbits/${{ steps.version.outputs.PKG }}:${{ steps.version.outputs.VER }}
+            ghcr.io/${{ github.repository }}/${{ steps.version.outputs.PKG }}:${{ steps.version.outputs.VER }}

.github/workflows/pythonpublish.yml

@@ -5,23 +5,24 @@ name: Upload Python Package
 
 on:
   release:
-    types: [created]
+    types: [published]
 
 jobs:
   deploy:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: '3.x'
-    - name: Install dependencies
+    - name: Install and upgrade dependencies
       run: |
         python -m pip install --upgrade pip
         pip install setuptools wheel twine
+        pip install --upgrade setuptools wheel twine
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}

.gitignore

@@ -2,3 +2,10 @@
 *.pyc
 build
 dist
+venv/
+*egg*
+init.json
+tests/drizzle/node_modules/
+tests/drizzle/artifacts/
+tests/drizzle/yarn.lock
+tests/drizzle/cache/

CHANGELOG.md

@@ -2,8 +2,24 @@
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
-## [Unreleased](https://github.com/trailofbits/etheno/compare/v0.2.3...HEAD)
+## [Unreleased](https://github.com/trailofbits/etheno/compare/v0.3.0...HEAD)
 
+## 0.3.0 - 2022-07-08
+
+### Changed
+- We are now using `ganache` instead of `ganache-cli` for running Ganache
+- Using the latest Flask version
+- Python 3.7.x is now the lowest allowed version
+
+### Fixed
+- Fixed a bug that occurred when a `JSONRPCError` was being logged
+- Fixed a bug that occurred when using non-hex strings during Ganache initialization
+- Fixed a bug that prevented Ganache from being used from within a Docker container
+
+### Removed
+- Removed Manticore integration and all associated command-line parameters
+- Removed Echidna integration and all associated command-line parameters
+- Removed `examples/` folder since it is outdated and uses deprecated features
 ## 0.2.3 — 2019-06-27
 
 ### Added

Dockerfile

@@ -1,69 +1,85 @@
-FROM ubuntu:bionic
-MAINTAINER Evan Sultanik
-
-RUN DEBIAN_FRONTEND=noninteractive \
-    apt-get update && apt-get install -y --no-install-recommends \
+# syntax=docker/dockerfile:1.3
+FROM ubuntu:focal AS python-wheels
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    build-essential \
+    ca-certificates \
+    cmake \
     curl \
+    python3-dev \
+    python3-pip \
+    python3-setuptools
+
+# Needed for rusty-rlp wheel
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV PATH="/root/.cargo/bin:${PATH}"
+
+RUN --mount=type=bind,target=/etheno \
+    cd /etheno && \
+    pip3 install --no-cache-dir --upgrade pip setuptools && \
+    pip3 wheel --no-cache-dir -w /wheels \
+    https://github.com/cburgdorf/rusty-rlp/archive/refs/tags/0.1.15.tar.gz \
+    .
+
+
+FROM ubuntu:focal AS ganache
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    build-essential \
     ca-certificates \
+    curl \
+    gnupg \
+    lsb-release
+RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends nodejs
+RUN npm install --omit=dev --location=global --prefix /opt/node ganache truffle
+
+
+FROM ubuntu:focal AS final
+LABEL org.opencontainers.image.authors="Evan Sultanik"
+
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     bash-completion \
-    sudo \
+    ca-certificates \
+    curl \
+    gpg-agent \
+    libudev-dev \
+    locales \
     python3 \
-    libpython3-dev \
     python3-pip \
-    python3-setuptools \
-    git \
-    build-essential \
     software-properties-common \
-    locales-all locales \
-    libudev-dev \
-    gpg-agent \
-&& apt-get clean \
+    sudo \
 && rm -rf /var/lib/apt/lists/*
 
-RUN DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:ethereum/ethereum && \
+# NOTE: solc was removed from the below command since the echidna integration is being removed
+# If the solc option is added back, --platform linux-amd64 needs to be added to the `docker build` command for M1 machines
+RUN add-apt-repository -y ppa:ethereum/ethereum && \
     apt-get update && apt-get install -y --no-install-recommends \
-    solc \
     ethereum \
-&& apt-get clean \
 && rm -rf /var/lib/apt/lists/*
 
-RUN curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash - && sudo apt-get install -y --no-install-recommends nodejs && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-RUN npm install --production -g ganache-cli truffle && npm --force cache clean
-
-# BEGIN Install Echidna
-
-COPY --from=trailofbits/echidna:latest /root/.local/bin/echidna-test /usr/local/bin/echidna-test
-
-RUN update-locale LANG=en_US.UTF-8 && locale-gen en_US.UTF-8
-ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
+RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash && \
+    apt-get install -y --no-install-recommends nodejs \
+&& rm -rf /var/lib/apt/lists/*
 
-# END Install Echidna
+COPY --from=ganache /opt/node /usr/local/
 
-RUN useradd -m etheno
-RUN usermod -aG sudo etheno
-USER etheno
-WORKDIR /home/etheno
-USER root
-WORKDIR /root
+# BEGIN Install Etheno
+RUN --mount=type=bind,target=/mnt/etheno \
+    --mount=type=bind,target=/mnt/wheels,source=/wheels,from=python-wheels \
+    cd /mnt/etheno && \
+    pip3 install --no-cache-dir --upgrade pip setuptools && \
+    pip3 install --no-cache-dir --no-index --find-links /mnt/wheels .
 
-# Install Parity
-RUN curl https://get.parity.io -L | bash
+RUN useradd -m -G sudo etheno
 
 # Allow passwordless sudo for etheno
 RUN echo 'etheno ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
 
 USER etheno
-ENV HOME=/home/etheno PATH=$PATH:/home/etheno/.local/bin
-WORKDIR /home/etheno
+ENV HOME=/home/etheno
 
-COPY --chown=etheno:etheno LICENSE setup.py etheno/
-COPY --chown=etheno:etheno etheno/*.py etheno/etheno/
-RUN cd etheno && \
-    pip3 install --no-cache-dir --user '.[manticore]' && \
-    cd .. && \
-    rm -rf etheno
-
-COPY --chown=etheno:etheno examples examples/
+# Use the DOCKER env variable to set hostname accordingly
+ENV DOCKER=1
+WORKDIR /home/etheno
 
+# TODO: Need to copy tests and models 
 CMD ["/bin/bash"]