From 11f587163c1753d1b9f9c9ca7097c4fdff355f2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20L=C3=B3pez?= <emilio.lopez@trailofbits.com>
Date: Tue, 1 Nov 2022 12:42:38 -0300
Subject: [PATCH 1/4] Try building with an older rust toolchain

---
 .github/workflows/docker.yml | 2 +-
 Dockerfile                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 1c36215..ce9dd7b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,7 +1,7 @@
 name: Publish Docker
 on:
   push:
-    branches: [master]
+    branches: [master, docker-build]
     tags:
       - '*'
 jobs:
diff --git a/Dockerfile b/Dockerfile
index fd85957..829024b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
     python3-setuptools
 
 # Needed for rusty-rlp wheel
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.62.1
 ENV PATH="/root/.cargo/bin:${PATH}"
 
 RUN --mount=type=bind,target=/etheno \

From c2d9bfe85919ac30747dc3e8b3e1199084a18a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20L=C3=B3pez?= <emilio.lopez@trailofbits.com>
Date: Tue, 1 Nov 2022 13:08:25 -0300
Subject: [PATCH 2/4] Drop rusty-rlp

---
 Dockerfile | 5 -----
 setup.py   | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 829024b..04c306e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,15 +9,10 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
     python3-pip \
     python3-setuptools
 
-# Needed for rusty-rlp wheel
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.62.1
-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 \
     .
 
 
diff --git a/setup.py b/setup.py
index 8de1799..6ebccbc 100644
--- a/setup.py
+++ b/setup.py
@@ -24,10 +24,6 @@
         "eth-rlp<0.3.0",
         "setuptools",
     ],
-    # rusty-rlp==0.1.15 has to be downloaded as a tarball
-    dependency_links=[
-        "https://github.com/cburgdorf/rusty-rlp/archive/refs/tags/0.1.15.tar.gz"
-    ],
     entry_points={"console_scripts": ["etheno = etheno.__main__:main"]},
     classifiers=[
         "Development Status :: 4 - Beta",

From ecf46b259540a6f37d1d5989040a63c0b4e3d8b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20L=C3=B3pez?= <emilio.lopez@trailofbits.com>
Date: Tue, 1 Nov 2022 14:24:38 -0300
Subject: [PATCH 3/4] Drop test branch from workflow

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ce9dd7b..1c36215 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,7 +1,7 @@
 name: Publish Docker
 on:
   push:
-    branches: [master, docker-build]
+    branches: [master]
     tags:
       - '*'
 jobs:

From b8771e885f886fe4d0d1d77ec68d795b3c6ee538 Mon Sep 17 00:00:00 2001
From: anishnaik <anish.r.naik@gmail.com>
Date: Tue, 1 Nov 2022 13:42:09 -0400
Subject: [PATCH 4/4] updated release material

---
 CHANGELOG.md | 9 +++++++--
 setup.py     | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8367053..ac488e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,14 @@
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
-## [Unreleased](https://github.com/trailofbits/etheno/compare/v0.3.0...HEAD)
+## [Unreleased](https://github.com/trailofbits/etheno/compare/v0.3.2...HEAD)
 
-## 0.3.0 - 2022-07-08
+## 0.3.2 - 2022-11-01
+
+### Fixed
+- Dropped `rusty-rlp` dependency so that ARM Docker builds work as expected during QEMU emulation
+
+## 0.3.1 - 2022-11-01
 
 ### Changed
 - We are now using `ganache` instead of `ganache-cli` for running Ganache
diff --git a/setup.py b/setup.py
index 6ebccbc..ee245c4 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
     description="Etheno is a JSON RPC multiplexer, differential fuzzer, and test framework integration tool.",
     url="https://github.com/trailofbits/etheno",
     author="Trail of Bits",
-    version="0.3.1",
+    version="0.3.2",
     packages=find_packages(),
     python_requires=">=3.7",
     install_requires=[