adapt to gif-interface v1.5.0-staging-j, fix solc to 0.8.2 and oz to 4.7

Author: matthiaszimmermann

README.md

@@ -57,10 +57,12 @@ cd gif-sandbox
 export SANDBOX=$PWD
 ```
 
-The next step is to build the Brownie docker image in the directory of the GIF sandbox repository.
+Build the Brownie docker image.
 
 ```bash
+cd docker
 docker build . -t brownie
+cd $SANDBOX
 ```
 
 ## Start a Local Ganache Chain

brownie-config.yaml

@@ -2,14 +2,14 @@
 compiler:
     evm_version: null
     solc:
-        version: null
+        version: 0.8.2
         optimizer:
             enabled: true
             runs: 200
         # https://eth-brownie.readthedocs.io/en/stable/compile.html#compiler-settings
         remappings:
-          - "@openzeppelin=OpenZeppelin/openzeppelin-contracts@4.6.0"
-          - "@gif-interface=etherisc/gif-interface@1.5.0-staging-i"
+          - "@openzeppelin=OpenZeppelin/openzeppelin-contracts@4.7.0"
+          - "@gif-interface=etherisc/gif-interface@1.5.0-staging-j"
     vyper:
         version: null
 
@@ -18,8 +18,8 @@ compiler:
 # to list the packages installed via the dependency list below
 dependencies:
     # github dependency format: <owner>/<repository>@<release>
-    - OpenZeppelin/openzeppelin-contracts@4.6.0
-    - etherisc/gif-interface@1.5.0-staging-i
+    - OpenZeppelin/openzeppelin-contracts@4.7.0
+    - etherisc/gif-interface@1.5.0-staging-j
 
 # exclude Ownable when calculating test coverage
 # https://eth-brownie.readthedocs.io/en/v1.10.3/config.html#exclude_paths

Dockerfile docker/DockerfileDockerfile renamed to docker/Dockerfile

@@ -2,7 +2,7 @@
 FROM python:3.7
 
 # Set up code directory
-RUN mkdir -p /usr/src/app
+RUN mkdir -p /usr/src/app/brownie-setup
 WORKDIR /usr/src/app
 
 # Install linux dependencies
@@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y npm
 RUN npm install --global ganache-cli
 
 # Install Brownie
+RUN echo force-brownie-upgrade-0
 RUN wget https://raw.githubusercontent.com/eth-brownie/brownie/master/requirements.txt
 
 RUN pip install -r requirements.txt
@@ -22,6 +23,16 @@ RUN pip install eth-brownie
 RUN pip install fastapi
 RUN pip install uvicorn
 
+# force installation of solc in docker image
+# solc version is defined in brownie-config.yaml
+WORKDIR /usr/src/app/brownie-setup
+RUN echo force-dependency-upgrade-0
+
+RUN brownie init -f
+COPY brownie-config.yaml /usr/src/app/brownie-setup
+COPY Dummy.sol /usr/src/app/brownie-setup/contracts
+RUN brownie compile --all
+
 EXPOSE 8000
 
 # Add some aliases

docker/Dummy.sol

@@ -0,0 +1,3 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.0;
+contract Dummy {}

docker/brownie-config.yaml

@@ -0,0 +1,16 @@
+# brownie default values made explicit
+compiler:
+    evm_version: null
+    solc:
+        version: 0.8.2
+        optimizer:
+            enabled: true
+            runs: 200
+        remappings:
+          - "@openzeppelin=OpenZeppelin/openzeppelin-contracts@4.7.0"
+    vyper:
+        version: null
+
+dependencies:
+    # github dependency format: <owner>/<repository>@<release>
+    - OpenZeppelin/openzeppelin-contracts@4.7.0