From 6519868d025db09bce3ab9346a6f48a54c34ee43 Mon Sep 17 00:00:00 2001
From: Victor Fusco <victor@cartesi.io>
Date: Sat, 29 Apr 2023 19:04:36 -0300
Subject: [PATCH] Add machine-solidity-step v0.8.0

---
 .gitmodules   |  3 +++
 Makefile      | 10 +++++++---
 README.md     |  1 +
 solidity-step |  1 +
 4 files changed, 12 insertions(+), 3 deletions(-)
 create mode 160000 solidity-step

diff --git a/.gitmodules b/.gitmodules
index adcbdce..6a54340 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "toolchain"]
 	path = toolchain
 	url = ../image-toolchain.git
+[submodule "solidity-step"]
+	path = solidity-step
+	url = ../machine-solidity-step.git
diff --git a/Makefile b/Makefile
index 3e583b8..ae61e55 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ UPPER = $(shell echo '$1' | tr '[:lower:]' '[:upper:]')
 
 all:
 	@echo "Usage: make [option]\n"
-	@echo "Options: emulator, rom, tests, fs, kernel or toolchain.\n"
+	@echo "Options: emulator, rom, tests, fs, kernel, toolchain and solidity-step.\n"
 	@echo "eg.: make emulator"
 
 clean: $(SRCCLEAN)
@@ -58,7 +58,7 @@ $(BUILDDIR) $(IMAGES_INSTALL_PATH):
 	mkdir -p $@
 
 submodules:
-	git submodule update --init --recursive emulator fs kernel toolchain rom tests
+	git submodule update --init --recursive emulator fs kernel toolchain rom tests solidity-step
 
 emulator:
 	$(MAKE) -C $@ downloads
@@ -131,6 +131,10 @@ fs kernel:
 toolchain:
 	$(MAKE) -C $@ TOOLCHAIN_TAG=$(TOOLCHAIN_TAG)
 
+solidity-step:
+	cd solidity-step && yarn install
+	$(MAKE) -C $@ generate build
+
 create-symlinks:
 	@ln -svf ../../rom/build/$(ROM_TO_IMAGES) emulator/src/rom.bin
 	@ln -svf ../../fs/$(FS_TO_IMAGES) emulator/src/rootfs.ext2
@@ -146,4 +150,4 @@ install: $(IMAGES_INSTALL_PATH)
 	cd $(IMAGES_INSTALL_PATH) && ln -s $(ROM_TO_IMAGES) rom.bin
 	cd $(IMAGES_INSTALL_PATH) && ln -s $(FS_TO_IMAGES) rootfs.ext2
 
-.PHONY: all submodules clean fs kernel toolchain fs-env kernel-env toolchain-env $(SRCDIRS) $(SRCCLEAN)
+.PHONY: all submodules clean fs kernel toolchain solidity-step fs-env kernel-env toolchain-env $(SRCDIRS) $(SRCCLEAN)
diff --git a/README.md b/README.md
index 2eccfd9..f1bdbfe 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,7 @@ The following options are available to initialize and build the software artifac
 - **tests**: builds the tests binaries (requires toolchain)
 - **fs**: builds the rootfs.ext2 image (requires toolchain)
 - **kernel**: builds the kernel image (requires toolchain)
+- **solidity-step**: builds the machine solidity step (requires toolchain v0.11.0)
 
 If you want to test the emulator you use:
 
diff --git a/solidity-step b/solidity-step
new file mode 160000
index 0000000..53ba326
--- /dev/null
+++ b/solidity-step
@@ -0,0 +1 @@
+Subproject commit 53ba326d73843d1d197aec190db1bcf8d4f8dd01