updated makefiles with latest solc

lsd-ucsc · May 17, 2023 · 69720de · 69720de
1 parent be259ac
commit 69720de
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 74 deletions.
diff --git a/Makefile b/Makefile
@@ -1,16 +1,24 @@
-NODEENV_CONFIG := ./utils/nodeenv.ini
-NODEENV_REQ    := ./utils/nodeenv-requirements.txt
 MODULES        := \
 	PubSub \
 	tests
+SOLC_VERSION   := v0.8.20
+MKFILE_PATH    := $(abspath $(lastword $(MAKEFILE_LIST)))
+CURRENT_DIR    := $(dir $(MKFILE_PATH))
+SOLC_BIN       := $(CURRENT_DIR)/build/solc-static-linux
 
 
-all: build/nodeenv.state $(MODULES)
+all: $(SOLC_BIN) $(MODULES)
 
 
-build/nodeenv.state: $(NODEENV_CONFIG) $(NODEENV_REQ)
-	nodeenv --config=$(NODEENV_CONFIG) --requirements=$(NODEENV_REQ) build/nodeenv
-	touch $@
+$(SOLC_BIN):
+	mkdir -p $(dir $(SOLC_BIN)) && \
+	curl -fsSL -o $(SOLC_BIN) \
+		https://github.com/ethereum/solidity/releases/download/$(SOLC_VERSION)/solc-static-linux \
+		&& \
+	chmod +x $(SOLC_BIN)
+
+
+solc_bin: $(SOLC_BIN)
 
 
 $(MODULES):
@@ -22,7 +30,7 @@ $(addprefix clean_,$(MODULES)):
 
 
 clean: $(addprefix clean_,$(MODULES))
-	rm -rf build/nodeenv build/nodeenv.state
+	rm -rf $(SOLC_BIN)
 
 
-.PHONY: all clean $(MODULES) $(addprefix clean_,$(MODULES))
+.PHONY: all clean solc_bin $(MODULES) $(addprefix clean_,$(MODULES))
diff --git a/PubSub/Makefile b/PubSub/Makefile
@@ -3,61 +3,61 @@ CONTRACTS   := \
 	EventManager \
 	PubSubService
 
+MKFILE_PATH  := $(abspath $(lastword $(MAKEFILE_LIST)))
+CURRENT_DIR  := $(dir $(MKFILE_PATH))
+ROOT_DIR     := $(CURRENT_DIR)/..
+BUILD_DIR    := $(ROOT_DIR)/build
+
+SOLC_BIN     := $(BUILD_DIR)/solc-static-linux
+OPTIMIZE_RUN := 200
+SOLC_FLAGS   := --optimize --optimize-runs $(OPTIMIZE_RUN) \
+				--revert-strings strip \
+				--via-ir \
+				--overwrite \
+				--base-path $(ROOT_DIR) \
+				--output-dir $(BUILD_DIR)/$(MODULE_NAME)/all/
+
 CHECKSUM_BIN := openssl sha256
 
 
-all:    $(addprefix ../build/$(MODULE_NAME)/,$(addsuffix .abi,$(CONTRACTS))) \
-		$(addprefix ../build/$(MODULE_NAME)/,$(addsuffix .bin,$(CONTRACTS))) \
-		$(addprefix ../build/$(MODULE_NAME)/,checksums.txt)
+all: $(CONTRACTS) checksums
 
 
-../build/nodeenv.state:
-	$(MAKE) -C .. build/nodeenv.state
+$(SOLC_BIN):
+	$(MAKE) -C .. solc_bin
 
 
-../build/$(MODULE_NAME)/%.bin: %.sol ../build/nodeenv.state
+$(BUILD_DIR)/$(MODULE_NAME)/%.bin: %.sol $(SOLC_BIN)
 	( \
-		. ../build/nodeenv/bin/activate && \
-		solcjs  --optimize --optimize-runs 200 \
-				--bin \
-				--include-path node_modules/ --base-path .. \
-				--output-dir ../build/$(MODULE_NAME)/ \
-				$< && \
-		mv  ../build/$(MODULE_NAME)/$(MODULE_NAME)_$(basename $<)_sol_$(basename $<).bin \
-			../build/$(MODULE_NAME)/$(basename $<).bin && \
-		rm  -f ../build/$(MODULE_NAME)/*_sol_*.bin \
+		$(SOLC_BIN) --bin $(SOLC_FLAGS) $< && \
+		cp  $(BUILD_DIR)/$(MODULE_NAME)/all/$(basename $<).bin \
+			$(BUILD_DIR)/$(MODULE_NAME)/$(basename $<).bin \
 	)
 
 
-../build/$(MODULE_NAME)/%.abi: %.sol ../build/nodeenv.state
+$(BUILD_DIR)/$(MODULE_NAME)/%.abi: %.sol $(SOLC_BIN)
 	( \
-		. ../build/nodeenv/bin/activate && \
-		solcjs  --optimize --optimize-runs 200 \
-				--abi \
-				--include-path node_modules/ --base-path .. \
-				--output-dir ../build/$(MODULE_NAME)/ \
-				$< && \
-		mv  ../build/$(MODULE_NAME)/$(MODULE_NAME)_$(basename $<)_sol_$(basename $<).abi \
-			../build/$(MODULE_NAME)/$(basename $<).abi && \
-		rm  -f ../build/$(MODULE_NAME)/*_sol_*.abi \
+		$(SOLC_BIN) --abi $(SOLC_FLAGS) $< && \
+		cp  $(BUILD_DIR)/$(MODULE_NAME)/all/$(basename $<).abi \
+			$(BUILD_DIR)/$(MODULE_NAME)/$(basename $<).abi \
 	)
 
 
-../build/$(MODULE_NAME)/checksums.txt:  $(addprefix ../build/$(MODULE_NAME)/,$(addsuffix .abi,$(CONTRACTS))) \
-										$(addprefix ../build/$(MODULE_NAME)/,$(addsuffix .bin,$(CONTRACTS)))
+$(CONTRACTS): %: $(BUILD_DIR)/$(MODULE_NAME)/%.abi $(BUILD_DIR)/$(MODULE_NAME)/%.bin
+
+
+$(BUILD_DIR)/$(MODULE_NAME)/checksums.txt: $(CONTRACTS)
 	( \
-		cd ../build/$(MODULE_NAME); \
+		cd $(BUILD_DIR)/$(MODULE_NAME); \
 		$(CHECKSUM_BIN) $(addsuffix .abi,$(CONTRACTS)) $(addsuffix .bin,$(CONTRACTS)) > checksums.txt; \
 	)
 
 
-checksums: ../build/$(MODULE_NAME)/checksums.txt
+checksums: $(BUILD_DIR)/$(MODULE_NAME)/checksums.txt
 
 
 clean:
-	rm -f   $(addprefix ../build/$(MODULE_NAME)/,$(addsuffix .abi,$(CONTRACTS))) \
-			$(addprefix ../build/$(MODULE_NAME)/,$(addsuffix .bin,$(CONTRACTS))) \
-			$(addprefix ../build/$(MODULE_NAME)/,checksums.txt)
+	rm -rf $(BUILD_DIR)/$(MODULE_NAME)/
 
 
-.PHONY: all clean checksums
+.PHONY: all clean checksums $(CONTRACTS)
diff --git a/tests/Makefile b/tests/Makefile
@@ -3,61 +3,61 @@ CONTRACTS   := \
 	HelloWorldPublisher \
 	HelloWorldSubscriber
 
+MKFILE_PATH  := $(abspath $(lastword $(MAKEFILE_LIST)))
+CURRENT_DIR  := $(dir $(MKFILE_PATH))
+ROOT_DIR     := $(CURRENT_DIR)/..
+BUILD_DIR    := $(ROOT_DIR)/build
+
+SOLC_BIN     := $(BUILD_DIR)/solc-static-linux
+OPTIMIZE_RUN := 200
+SOLC_FLAGS   := --optimize --optimize-runs $(OPTIMIZE_RUN) \
+				--revert-strings strip \
+				--via-ir \
+				--overwrite \
+				--base-path $(ROOT_DIR) \
+				--output-dir $(BUILD_DIR)/$(MODULE_NAME)/all/
+
 CHECKSUM_BIN := openssl sha256
 
 
-all:    $(addprefix ../build/$(MODULE_NAME)/,$(addsuffix .abi,$(CONTRACTS))) \
-		$(addprefix ../build/$(MODULE_NAME)/,$(addsuffix .bin,$(CONTRACTS))) \
-		$(addprefix ../build/$(MODULE_NAME)/,checksums.txt)
+all: $(CONTRACTS) checksums
 
 
-../build/nodeenv.state:
-	$(MAKE) -C .. build/nodeenv.state
+$(SOLC_BIN):
+	$(MAKE) -C .. solc_bin
 
 
-../build/$(MODULE_NAME)/%.bin: %.sol ../build/nodeenv.state
+$(BUILD_DIR)/$(MODULE_NAME)/%.bin: %.sol $(SOLC_BIN)
 	( \
-		. ../build/nodeenv/bin/activate && \
-		solcjs  --optimize --optimize-runs 200 \
-				--bin \
-				--include-path node_modules/ --base-path .. \
-				--output-dir ../build/$(MODULE_NAME)/ \
-				$< && \
-		mv  ../build/$(MODULE_NAME)/$(MODULE_NAME)_$(basename $<)_sol_$(basename $<).bin \
-			../build/$(MODULE_NAME)/$(basename $<).bin && \
-		rm  -f ../build/$(MODULE_NAME)/*_sol_*.bin \
+		$(SOLC_BIN) --bin $(SOLC_FLAGS) $< && \
+		cp  $(BUILD_DIR)/$(MODULE_NAME)/all/$(basename $<).bin \
+			$(BUILD_DIR)/$(MODULE_NAME)/$(basename $<).bin \
 	)
 
 
-../build/$(MODULE_NAME)/%.abi: %.sol ../build/nodeenv.state
+$(BUILD_DIR)/$(MODULE_NAME)/%.abi: %.sol $(SOLC_BIN)
 	( \
-		. ../build/nodeenv/bin/activate && \
-		solcjs  --optimize --optimize-runs 200 \
-				--abi \
-				--include-path node_modules/ --base-path .. \
-				--output-dir ../build/$(MODULE_NAME)/ \
-				$< && \
-		mv  ../build/$(MODULE_NAME)/$(MODULE_NAME)_$(basename $<)_sol_$(basename $<).abi \
-			../build/$(MODULE_NAME)/$(basename $<).abi && \
-		rm  -f ../build/$(MODULE_NAME)/*_sol_*.abi \
+		$(SOLC_BIN) --abi $(SOLC_FLAGS) $< && \
+		cp  $(BUILD_DIR)/$(MODULE_NAME)/all/$(basename $<).abi \
+			$(BUILD_DIR)/$(MODULE_NAME)/$(basename $<).abi \
 	)
 
 
-../build/$(MODULE_NAME)/checksums.txt:  $(addprefix ../build/$(MODULE_NAME)/,$(addsuffix .abi,$(CONTRACTS))) \
-										$(addprefix ../build/$(MODULE_NAME)/,$(addsuffix .bin,$(CONTRACTS)))
+$(CONTRACTS): %: $(BUILD_DIR)/$(MODULE_NAME)/%.abi $(BUILD_DIR)/$(MODULE_NAME)/%.bin
+
+
+$(BUILD_DIR)/$(MODULE_NAME)/checksums.txt: $(CONTRACTS)
 	( \
-		cd ../build/$(MODULE_NAME); \
+		cd $(BUILD_DIR)/$(MODULE_NAME); \
 		$(CHECKSUM_BIN) $(addsuffix .abi,$(CONTRACTS)) $(addsuffix .bin,$(CONTRACTS)) > checksums.txt; \
 	)
 
 
-checksums: ../build/$(MODULE_NAME)/checksums.txt
+checksums: $(BUILD_DIR)/$(MODULE_NAME)/checksums.txt
 
 
 clean:
-	rm -f   $(addprefix ../build/$(MODULE_NAME)/,$(addsuffix .abi,$(CONTRACTS))) \
-			$(addprefix ../build/$(MODULE_NAME)/,$(addsuffix .bin,$(CONTRACTS))) \
-			$(addprefix ../build/$(MODULE_NAME)/,checksums.txt)
+	rm -rf $(BUILD_DIR)/$(MODULE_NAME)/
 
 
-.PHONY: all clean checksums
+.PHONY: all clean checksums $(CONTRACTS)