Initial (still only trivial) integration of Risc0.

.gitmodules

@@ -271,3 +271,9 @@
 [submodule "liboqs"]
 	path = lib-protocol/liboqs
 	url = https://github.com/open-quantum-safe/liboqs.git
+[submodule "risc0"]
+	path = eth-sender/risc0
+	url = https://github.com/risc0/risc0.git
+[submodule "risc0-ethereum"]
+	path = eth-sender/risc0-ethereum
+	url = https://github.com/risc0/risc0-ethereum.git

env/output.mk

@@ -175,8 +175,10 @@ $(output)/%/librust.a: $$(specific) $$(folder)/Cargo.toml $(output)/rustup-targe
 	@# or if using rustc: rustc --version --verbose | sed -e '/^host: /!d;s///'
 
 	@# https://github.com/buildroot/buildroot/commit/4b2be770b8a853a7dd97b5788d837f0d84923fa1
-	cd $(folder) && RUST_BACKTRACE=1 $(rust):$(dir $(word 1,$(cc))) \
-	    $(ccrs)_CC='$(cc) $(more/$(arch)) $(qflags)' $(ccrs)_AR='$(ar/$(arch))' \
+	cd $(folder) && ENV_RUST=$(notdir $(folder)) RUST_BACKTRACE=1 $(rust):$(dir $(word 1,$(cc))) \
+	    $(ccrs)_CC='$(cc) $(more/$(arch))' $(ccrs)_CFLAGS='$(qflags)' \
+	    $(ccrs)_CXX='$(cxx) $(more/$(arch))' $(ccrs)_CXXFLAGS='$(qflags) $(xflags)' \
+	    $(ccrs)_AR='$(ar/$(arch))' \
 	    PKG_CONFIG_ALLOW_CROSS=1 PKG_CONFIG="$(CURDIR)/env/pkg-config.sh" ENV_ARCH="$(arch)" \
 	    CARGO_HOME='$(call path,$(CURDIR)/$(output)/cargo)' CARGO_INCREMENTAL=0 \
 	    __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS=nightly CARGO_TARGET_APPLIES_TO_HOST=false \
@@ -185,7 +187,7 @@ $(output)/%/librust.a: $$(specific) $$(folder)/Cargo.toml $(output)/rustup-targe
 	    cargo +$(rustc) build --verbose --lib --release --features "$(features/$(folder))" \
 	        --target $(triple/$(arch)) -Z target-applies-to-host \
 	        --target-dir $(call path,$(CURDIR)/$(output)/$(arch)/$(folder))
-	cp -f $(output)/$(arch)/$(folder)/$(triple/$(arch))/release/deps/lib$(subst -,_,$(notdir $(folder))).a $@
+	cp -f $(output)/$(arch)/$(folder)/$(triple/$(arch))/release/lib$(subst -,_,$(notdir $(folder))).a $@
 
 .PHONY: clean
 clean:

env/rustc-wrapper

@@ -4,10 +4,12 @@ set -e
 # XXX: this only exists due to this Cargo bug :(
 # https://github.com/rust-lang/cargo/issues/8140
 
+# XXX: well, I also mix in the project name now?
+
 file=
 for arg in "$@"; do
     if [[ ${arg} == ${CARGO_HOME}/* && -z ${file} ]]; then
-        file=${arg##${CARGO_HOME}}
+        file=${ENV_RUST}/${arg##${CARGO_HOME}/}
     fi
 done
 

eth-sender/makefile

@@ -36,6 +36,11 @@ cflags += -I$(pwd)/source
 checks/$(pwd)/source/main.cpp += -bugprone-unchecked-optional-access
 
 $(call include,lib/target.mk)
+
+linked += $(pwd)/riscy/librust.a
+cflags += -I$(pwd)/riscy
+$(call depend,$(pwd)/riscy/librust.a,$(pwd)/riscy/riscy.rs)
+
 include env/output.mk
 
 $(output)/%/cj$(exe): $(patsubst %,$(output)/$$*/%,$(object) $(linked))