Allow cairo1BinDir with dockerized plugin

.circleci/config.yml

@@ -151,6 +151,7 @@ commands:
                       for key in $(jq -r 'keys[]' config.json); do
                           echo $key=$(jq -r .[\""$key"\"] config.json) >> $BASH_ENV
                       done
+                      cat $BASH_ENV
             - run:
                   name: "Fetch Devnet version"
                   command: echo "$STARKNET_DEVNET" > /tmp/devnet-version

.gitignore

@@ -5,4 +5,4 @@ starknet-hardhat-example-link
 cache
 .vscode
 my-venv
-cairo-compiler
+cairo/

config.json

@@ -1,6 +1,6 @@
 {
     "CAIRO_LANG": "0.11.2",
     "STARKNET_DEVNET": "0.6.0",
-    "CAIRO_COMPILER": "v2.1.0",
+    "CAIRO_COMPILER": "2.1.0",
     "SCARB_VERSION": "0.4.0"
 }

package.json

@@ -43,7 +43,8 @@
         "form-data": "^4.0.0",
         "glob": "^10.0.0",
         "shelljs": "^0.8.5",
-        "starknet": "~5.19.3"
+        "starknet": "~5.19.3",
+        "tar-fs": "^3.0.4"
     },
     "peerDependencies": {
         "hardhat": "^2.14.0"
@@ -55,6 +56,7 @@
         "@types/mocha": "^10.0.0",
         "@types/node": "^18.0.0",
         "@types/shelljs": "^0.8.11",
+        "@types/tar-fs": "^2.0.1",
         "@typescript-eslint/eslint-plugin": "^5.8.1",
         "@typescript-eslint/parser": "^5.8.1",
         "chai": "^4.3.7",

scripts/setup-compiler.sh

@@ -2,9 +2,7 @@
 
 set -eu
 
-
-CAIRO_COMPILER_TARGET_TAG=$(jq -r .CAIRO_COMPILER config.json)
-
+CAIRO_COMPILER_TARGET_TAG=$CAIRO_COMPILER
 echo "Installing cairo compiler $CAIRO_COMPILER_TARGET_TAG"
 
 CAIRO_COMPILER_ASSET_NAME="release-x86_64-unknown-linux-musl.tar.gz"
@@ -13,21 +11,20 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
     CAIRO_COMPILER_ASSET_NAME="release-aarch64-apple-darwin.tar"
 fi
 
-COMPILER_BINARY_URL="https://github.com/starkware-libs/cairo/releases/download/$CAIRO_COMPILER_TARGET_TAG/$CAIRO_COMPILER_ASSET_NAME"
-
-if [ -z "${CAIRO_1_COMPILER_DIR+x}" ]; then
-    # Setup cairo1 compiler
-    echo $COMPILER_BINARY_URL
-    mkdir -p cairo-compiler/target/release
-    curl --location -O --request GET "$COMPILER_BINARY_URL"
-    # Unzip asset and move to correct target
-    tar -zxvf $CAIRO_COMPILER_ASSET_NAME -C cairo-compiler --strip-components=1
-    mv cairo-compiler/bin/* cairo-compiler/target/release/
-    mv cairo-compiler/corelib cairo-compiler/target/corelib
-    # Remove empty directory and asset
-    rm -rf $CAIRO_COMPILER_ASSET_NAME cairo-compiler/bin
-    export CAIRO_1_COMPILER_DIR="$(readlink -f  "cairo-compiler/target/release")"
-fi
+# Download compiler asset
+COMPILER_BINARY_URL="https://github.com/starkware-libs/cairo/releases/download/v$CAIRO_COMPILER_TARGET_TAG/$CAIRO_COMPILER_ASSET_NAME"
+echo "Downloading $COMPILER_BINARY_URL"
+curl --location -O "$COMPILER_BINARY_URL"
 
-$CAIRO_1_COMPILER_DIR/starknet-compile --version
+# Unpack and remove archive
+tar -zxvf "$CAIRO_COMPILER_ASSET_NAME"
+rm -rf "$CAIRO_COMPILER_ASSET_NAME"
+
+# For verification and future use
+# Using absolute path to make it usable everywhere
+export CAIRO_1_COMPILER_DIR=$(readlink -f "cairo/bin")
 
+# Verify
+echo "Verifying compiler binaries"
+$CAIRO_1_COMPILER_DIR/starknet-compile --version
+$CAIRO_1_COMPILER_DIR/starknet-sierra-compile --version