Add FFI bindings for Espresso validation

Dockerfile

@@ -45,8 +45,8 @@ FROM wasm-base AS wasm-libs-builder
 	# clang / lld used by soft-float wasm
 RUN apt-get update && \
     apt-get install -y clang=1:14.0-55.7~deb12u1 lld=1:14.0-55.7~deb12u1 wabt
-    # pinned rust 1.80.1
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.80.1 --target x86_64-unknown-linux-gnu wasm32-unknown-unknown wasm32-wasi
+    # pinned rust 1.81.0
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.81.0 --target x86_64-unknown-linux-gnu wasm32-unknown-unknown wasm32-wasi
 COPY ./Makefile ./
 COPY arbitrator/Cargo.* arbitrator/
 COPY arbitrator/arbutil arbitrator/arbutil
@@ -73,6 +73,7 @@ COPY ./arbcompress ./arbcompress
 COPY ./arbos ./arbos
 COPY ./arbstate ./arbstate
 COPY ./espressocrypto ./espressocrypto
+COPY ./espressocryptowasm/ ./espressocryptowasm/
 COPY ./arbutil ./arbutil
 COPY ./gethhook ./gethhook
 COPY ./blsSignatures ./blsSignatures
@@ -96,7 +97,7 @@ COPY --from=contracts-builder workspace/contracts/node_modules/@offchainlabs/upg
 COPY --from=contracts-builder workspace/.make/ .make/
 RUN PATH="$PATH:/usr/local/go/bin" NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-wasm-bin
 
-FROM rust:1.80.1-slim-bookworm AS prover-header-builder
+FROM rust:1.81.0-slim-bookworm AS prover-header-builder
 WORKDIR /workspace
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -114,16 +115,18 @@ COPY arbitrator/jit arbitrator/jit
 COPY arbitrator/espresso-crypto-helper arbitrator/espresso-crypto-helper
 COPY arbitrator/stylus arbitrator/stylus
 COPY arbitrator/tools/wasmer arbitrator/tools/wasmer
+COPY espressocrypto espressocrypto
 COPY --from=brotli-wasm-export / target/
 COPY scripts/build-brotli.sh scripts/
 COPY brotli brotli
 RUN apt-get update && apt-get install -y cmake
 RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-prover-header
+RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-espresso-crypto-lib
 
 FROM scratch AS prover-header-export
 COPY --from=prover-header-builder /workspace/target/ /
 
-FROM rust:1.80.1-slim-bookworm AS prover-builder
+FROM rust:1.81.0-slim-bookworm AS prover-builder
 WORKDIR /workspace
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \

Makefile

@@ -45,7 +45,7 @@ precompiles = $(patsubst %,./solgen/generated/%.go, $(precompile_names))
 output_root=target
 output_latest=$(output_root)/machines/latest
 
-repo_dirs = arbos arbcompress arbnode arbutil arbstate cmd das precompiles solgen system_tests util validator wavmio
+repo_dirs = arbos arbcompress arbnode arbutil arbstate cmd das espressocrypto precompiles solgen system_tests util validator wavmio
 go_source.go = $(wildcard $(patsubst %,%/*.go, $(repo_dirs)) $(patsubst %,%/*/*.go, $(repo_dirs)))
 go_source.s  = $(wildcard $(patsubst %,%/*.s, $(repo_dirs)) $(patsubst %,%/*/*.s, $(repo_dirs)))
 go_source = $(go_source.go) $(go_source.s)
@@ -153,7 +153,18 @@ stylus_test_read-return-data_src  = $(call get_stylus_test_rust,read-return-data
 stylus_test_wasms = $(stylus_test_keccak_wasm) $(stylus_test_keccak-100_wasm) $(stylus_test_fallible_wasm) $(stylus_test_storage_wasm) $(stylus_test_multicall_wasm) $(stylus_test_log_wasm) $(stylus_test_create_wasm) $(stylus_test_math_wasm) $(stylus_test_sdk-storage_wasm) $(stylus_test_erc20_wasm) $(stylus_test_read-return-data_wasm) $(stylus_test_evm-data_wasm) $(stylus_test_bfs:.b=.wasm)
 stylus_benchmarks = $(wildcard $(stylus_dir)/*.toml $(stylus_dir)/src/*.rs) $(stylus_test_wasms)
 
+espresso_crypto_dir = ./espressocrypto/lib/espresso-crypto-helper
+espresso_crypto_files = $(wildcard $(espresso_crypto_dir)/*.toml $(espresso_crypto_dir)/src/*.rs)
+espresso_crypto_lib = $(output_root)/lib/libespresso_crypto_helper.a
+
 # user targets
+.PHONY: build-espresso-crypto-lib
+build-espresso-crypto-lib: $(espresso_crypto_lib)
+
+$(espresso_crypto_lib): $(DEP_PREDICATE) $(espresso_crypto_files)
+	mkdir -p `dirname $(espresso_crypto_lib)`
+	cargo build --release --manifest-path $(espresso_crypto_dir)/Cargo.toml
+	install $(espresso_crypto_dir)/target/release/libespresso_crypto_helper.a $@
 
 .PHONY: push
 push: lint test-go .make/fmt
@@ -169,7 +180,7 @@ build: $(patsubst %,$(output_root)/bin/%, nitro deploy relay daserver datool seq
 	@printf $(done)
 
 .PHONY: build-node-deps
-build-node-deps: $(go_source) build-prover-header build-prover-lib build-jit .make/solgen .make/cbrotli-lib
+build-node-deps: $(go_source) build-prover-header build-prover-lib build-jit .make/solgen .make/cbrotli-lib build-espresso-crypto-lib
 
 .PHONY: test-go-deps
 test-go-deps: \
@@ -286,7 +297,9 @@ clean:
 	@rm -rf contracts/build contracts/cache solgen/go/
 	@rm -f .make/*
 	rm -rf brotli/buildfiles
-	# Ensure lib64 is a symlink to lib
+	cargo clean --manifest-path $(espresso_crypto_dir)/Cargo.toml
+
+# Ensure lib64 is a symlink to lib
 	mkdir -p $(output_root)/lib
 	ln -s lib $(output_root)/lib64
 

arbitrator/jit/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 arbutil = { path = "../arbutil/" }
-espresso-crypto-helper = { path = "../espresso-crypto-helper/" }
+espresso-crypto-helper = { path = "../espresso-crypto-helper/"}
 brotli = { path = "../brotli/", features = ["wasmer_traits"] }
 caller-env = { path = "../caller-env/", features = ["wasmer_traits"] }
 prover = { path = "../prover/", default-features = false, features = ["native"] }

arbnode/batch_poster.go

@@ -593,6 +593,7 @@ func (b *BatchPoster) addEspressoBlockMerkleProof(
 		}
 		var newMsg arbostypes.L1IncomingMessage
 		jst.BlockMerkleJustification = &arbostypes.BlockMerkleJustification{BlockMerkleProof: &proof, BlockMerkleComm: nextHeader.BlockMerkleTreeRoot}
+
 		if arbos.IsEspressoSovereignMsg(msg.Message) {
 			// Passing an empty byte slice as payloadSignature because txs[0] already contains the payloadSignature here
 			newMsg, err = arbos.MessageFromEspressoSovereignTx(txs[0], jst, []byte{}, msg.Message.Header)

cmd/replay/main.go

@@ -33,7 +33,7 @@ import (
 	"github.com/offchainlabs/nitro/arbutil"
 	"github.com/offchainlabs/nitro/cmd/chaininfo"
 	"github.com/offchainlabs/nitro/das/dastree"
-	"github.com/offchainlabs/nitro/espressocrypto"
+	"github.com/offchainlabs/nitro/espressocryptowasm"
 	"github.com/offchainlabs/nitro/gethhook"
 	"github.com/offchainlabs/nitro/wavmio"
 )
@@ -322,14 +322,14 @@ func main() {
 			if err != nil {
 				panic("unable to serialize header")
 			}
-			espressocrypto.VerifyMerkleProof(
+			espressocryptowasm.VerifyMerkleProof(
 				jst.BlockMerkleJustification.BlockMerkleProof.Proof,
 				jsonHeader,
 				*jst.BlockMerkleJustification.BlockMerkleComm,
 				commitment,
 			)
 			if jst.Proof != nil {
-				espressocrypto.VerifyNamespace(chainConfig.ChainID.Uint64(), *jst.Proof, *jst.Header.PayloadCommitment, *jst.Header.NsTable, txs, *jst.VidCommon)
+				espressocryptowasm.VerifyNamespace(chainConfig.ChainID.Uint64(), *jst.Proof, *jst.Header.PayloadCommitment, *jst.Header.NsTable, txs, *jst.VidCommon)
 			}
 
 		}

espressocrypto/espressocrypto_common.go

@@ -32,26 +32,27 @@ func VerifyNamespace(
 	ns_table espressoTypes.NsTable,
 	txs []espressoTypes.Bytes,
 	common_data json.RawMessage,
-) {
+) bool {
 	// TODO: this code will likely no longer be used in the STF soon.
 	// G115: integer overflow conversion uint64 -> uint32 (gosec)
 	// #nosec G115
 	var txnComm = hashTxns(uint32(namespace), txs)
-	verifyNamespace(
+	res := verifyNamespace(
 		namespace,
 		proof,
 		[]byte(block_comm.String()),
 		ns_table.Bytes,
 		[]byte(txnComm),
 		common_data,
 	)
+	return res
 }
 
 func VerifyMerkleProof(
 	proof json.RawMessage,
 	header json.RawMessage,
 	blockComm espressoTypes.TaggedBase64,
 	circuit_comm_bytes espressoTypes.Commitment,
-) {
-	verifyMerkleProof(proof, header, []byte(blockComm.String()), circuit_comm_bytes[:])
+) bool {
+	return verifyMerkleProof(proof, header, []byte(blockComm.String()), circuit_comm_bytes[:])
 }