chore: cleanup make deps to be OS aware (#534)

use backticks

Fix for weird git error

Go away git

.dockerignore

@@ -0,0 +1 @@
+/cache

.github/workflows/check-compilation.yml

@@ -12,19 +12,6 @@ jobs:
       - name: Build and validate
         if: github.event_name == 'push'
         run: |
-          sudo apt-get update
-          sudo apt-get install -y make curl git software-properties-common jq
-          sudo add-apt-repository -y ppa:longsleep/golang-backports
-          sudo apt-get update
-          sudo apt-get install -y golang-1.22
-          sudo update-alternatives --install /usr/local/bin/go go /usr/lib/go-1.22/bin/go 1
-          mkdir ~/.go
-          export GOPATH=~/.go
-          export PATH=$PATH:~/.go/bin
-          go install github.com/ethereum/go-ethereum/cmd/abigen@v1.14.0
-          curl -L https://foundry.paradigm.xyz | bash
-          export PATH=$PATH:/home/runner/.config/.foundry/bin
-          source ~/.bashrc
-          foundryup
-          make bindings
+          make docker
+          docker run -v `pwd`:/build -w /build --rm -i eigenlayer-contracts:latest bash -c "make gha"
           if [ ! -z "$(git status --porcelain)" ]; then git diff; git status; exit 1; fi

Dockerfile

@@ -0,0 +1,13 @@
+FROM ubuntu:22.04
+
+RUN apt-get update \
+    && apt-get install -y make curl git software-properties-common jq \
+    && add-apt-repository -y ppa:longsleep/golang-backports \
+    && add-apt-repository -y ppa:ethereum/ethereum \
+    && apt-get update \
+    && apt-get install -y golang-1.22 ethereum \
+    && curl -L https://foundry.paradigm.xyz | bash \
+    && /root/.foundry/bin/foundryup
+
+RUN cp -R /root/.foundry/bin/* /usr/local/bin/
+

Makefile

@@ -1,19 +1,46 @@
 
+CONTAINER_NAME = eigenlayer-contracts
+
 .PHONY: install-hooks
 install-hooks:
-	cp scripts/pre-commit.sh .git/hooks/pre-commit
+	cp bin/pre-commit.sh .git/hooks/pre-commit
 
-.PHONY: deps
-deps: install-hooks
-	brew install libusb
-	go install github.com/ethereum/go-ethereum/cmd/abigen@latest
-	curl -L https://foundry.paradigm.xyz | bash
+.PHONY: install-deps
+install-deps:
+	./bin/install-deps.sh
 	foundryup
 
+.PHONY: deps
+deps: install-hooks install-deps
+
 .PHONY: compile
 compile:
 	forge b
 
 .PHONY: bindings
 bindings: compile
-	./scripts/compile-bindings.sh
+	./bin/compile-bindings.sh
+
+.PHONY: all
+all: compile bindings
+
+gha:
+	git config --global --add safe.directory "*"
+	forge install
+	forge b
+	./bin/compile-bindings.sh
+
+docker:
+	docker build --progress=plain -t ${CONTAINER_NAME}:latest .
+
+compile-in-docker:
+	docker run -v $(PWD):/build -w /build --rm -it ${CONTAINER_NAME}:latest bash -c "make compile"
+
+bindings-in-docker:
+	docker run -v $(PWD):/build -w /build --rm -it ${CONTAINER_NAME}:latest bash -c "make bindings"
+
+all-in-docker:
+	docker run -v $(PWD):/build -w /build --rm -it ${CONTAINER_NAME}:latest bash -c "make all"
+
+gha-docker:
+	docker run -v $(PWD):/build -w /build --rm -i ${CONTAINER_NAME}:latest bash -c "make gha"

README.md

@@ -20,19 +20,6 @@ The main branches we use are:
 
 ## Documentation
 
-### Setup
-
-To set up this repo for the first time, run:
-
-```bash
-make deps
-```
-
-This will:
-* Install the pre-commit hook
-* Install foundry and its tools
-* Install abigen
-
 ### Basics
 
 To get a basic understanding of EigenLayer, check out [You Could've Invented EigenLayer](https://www.blog.eigenlayer.xyz/ycie/). Note that some of the document's content describes features that do not exist yet (like the Slasher). To understand more about how restakers and operators interact with EigenLayer, check out these guides:
@@ -54,10 +41,21 @@ foundryup
 
 forge build
 forge test
+```
 
-make bindings
+### Contributor Setup
+
+To set up this repo for the first time, run:
+
+```bash
+make deps
 ```
 
+This will:
+* Install the pre-commit hook
+* Install foundry and its tools
+* Install abigen
+
 ### Running Fork Tests
 
 We have a few fork tests against ETH mainnet. Passing these requires the environment variable `RPC_MAINNET` to be set. See `.env.example` for an example. Once you've set up your environment, `forge test` should show these fork tests passing.

scripts/compile-bindings.sh → bin/compile-bindings.sh

@@ -20,7 +20,15 @@ function create_binding {
         --bin=$binding_out_dir/tmp.bin \
         --abi=$binding_out_dir/tmp.abi \
         --pkg="${contract_name}" \
-        --out=$BINDING_DIR/$contract_name/binding.go
+        --out=$BINDING_DIR/$contract_name/binding.go \
+        > /dev/null 2>&1
+
+    if [[ $? == "1" ]];
+    then
+        echo "Failed to generate binding for $contract_json_path"
+    fi
+    rm $binding_out_dir/tmp.abi
+    rm $binding_out_dir/tmp.bin
 }
 
 contracts=$(find src/contracts -type f -name "*.sol" )

bin/install-deps.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+OS=$(uname -s | tr '[:upper:]' '[:lower:]')
+
+if [[ "$OS" == "linux" ]]; then
+    sudo apt-get update
+    sudo apt-get install -y make curl git software-properties-common jq
+    sudo add-apt-repository -y ppa:ethereum/ethereum
+    sudo apt-get update
+    sudo apt-get install abigen
+    curl -L https://foundry.paradigm.xyz | bash
+elif [[ "$OS" == "darwin" ]]; then
+    brew tap ethereum/ethereum
+    brew install libusb ethereum
+    curl -L https://foundry.paradigm.xyz | bash
+else
+    echo "Unsupported OS: $OS"
+    exit 1
+fi