Merge pull request #82 from aragon/main

Backport the artifact build changes to release-1.1

Author: jjavieralv

Makefile

@@ -10,14 +10,21 @@ FORGE_ZKSYNC:=forge-zksync
 
 ##
 
+ACCENT := \e[33m
+LIGHTER := \e[37m
+NORMAL := \e[0m
+COLUMN_START := 20
+
 .PHONY: help
-help: ## Display the current message
-	@echo "Available targets:"
+help: ## Show the main recipes
+	@echo -e "Available recipes:\n"
 	@cat Makefile | while IFS= read -r line; do \
-	   if [[ "$$line" == "##" ]]; then \
+		if [[ "$$line" == "##" ]]; then \
 			echo "" ; \
-		elif [[ "$$line" =~ ^([^:]+):(.*)##\ (.*)$$ ]]; then \
-			echo -e " - make $${BASH_REMATCH[1]} \t\t$${BASH_REMATCH[3]}" ; \
+		elif [[ "$$line" =~ ^##\ (.*)$$ ]]; then \
+			printf "\n$${BASH_REMATCH[1]}\n\n" ; \
+		elif [[ "$$line" =~ ^([^:#]+):(.*)##\ (.*)$$ ]]; then \
+			printf "  make $(ACCENT)%-*s$(LIGHTER) %s$(NORMAL)\n" $(COLUMN_START) "$${BASH_REMATCH[1]}" "$${BASH_REMATCH[3]}" ; \
 		fi ; \
 	done
 

npm-artifacts/prepare-abi.sh

@@ -11,7 +11,7 @@ TARGET_ABI_FILE="./src/abi.ts"
 # Move into contracts package and install dependencies
 cd $CONTRACTS_FOLDER
 
-yarn --ignore-scripts && yarn build
+yarn install --ignore-scripts && yarn build
 
 # Move back to artifacts package
 cd - > /dev/null
@@ -32,7 +32,7 @@ do
       SRC_FILE_PATH=${SRC_FILE_PATH%"ZkSync.json"}.json
     fi
 
-    ABI=$(node -e "console.log(JSON.stringify(JSON.parse(fs.readFileSync(\"$SRC_FILE_PATH\").toString()).abi))")
+    ABI=$(node -p "JSON.stringify(JSON.parse(fs.readFileSync(\"$SRC_FILE_PATH\").toString()).abi)")
 
     echo "const ${CONTRACT_NAME}ABI = $ABI as const;" >> $TARGET_ABI_FILE
     echo "export {${CONTRACT_NAME}ABI};" >> $TARGET_ABI_FILE

package.json

@@ -39,7 +39,7 @@
   "devDependencies": {
     "@openzeppelin/openzeppelin-foundry-upgrades": "github:openzeppelin/openzeppelin-foundry-upgrades",
     "dotenv-cli": "^7.4.2",
-    "forge-std": "github:foundry-rs/forge-std#v1.9.4",
+    "forge-std": "github:foundry-rs/forge-std#v1.12.0",
     "lodash.startcase": "^4.4.0",
     "prettier": "^2.8.8",
     "prettier-plugin-solidity": "^1.1.3",
@@ -53,7 +53,7 @@
     "@aragon/osx": "^1.4.0",
     "@aragon/osx-commons-configs": "^0.8.0",
     "@aragon/osx-commons-contracts": "^1.4.0",
-    "@ensdomains/ens-contracts": "^1.1.4",
+    "@ensdomains/ens-contracts": "0.0.11",
     "@openzeppelin/contracts": "^4.9.6",
     "@openzeppelin/contracts-upgradeable": "^4.9.6"
   }