Combined: S2 support + Raw OPRF

browser/index.html

@@ -4,6 +4,10 @@
 	<script src="browser-rpc/resources/snarkjs/snarkjs.min.js">
 	</script>
 	<script type="module">
+		// Load s2circuits as ES module and assign to window BEFORE attestor loads
+		import * as s2circuits from './browser-rpc/resources/stwo/s2circuits.js'
+		window.s2circuits = s2circuits
+
 		import * as ReclaimAttestorCore from './browser-rpc/resources/attestor-browser.min.mjs'
 		window.ReclaimAttestorCore = ReclaimAttestorCore
 		ReclaimAttestorCore.setupWindowRpc()

package.json

@@ -81,7 +81,7 @@
     "@peculiar/webcrypto": "^1.5.0",
     "@peculiar/x509": "^1.14.0",
     "@reclaimprotocol/tls": "github:reclaimprotocol/tls",
-    "@reclaimprotocol/zk-symmetric-crypto": "^5.0.4",
+    "@reclaimprotocol/zk-symmetric-crypto": "^5.0.9",
     "ajv": "^8.17.1",
     "bs58": "^6.0.0",
     "canonicalize": "^2.0.0",

proto/api.proto

@@ -62,6 +62,7 @@ enum ErrorCode {
 enum ZKProofEngine {
   ZK_ENGINE_SNARKJS = 0;
   ZK_ENGINE_GNARK = 1;
+  ZK_ENGINE_STWO = 2;
 }
 
 message ClaimContext {
@@ -212,6 +213,20 @@ message MessageReveal {
 	message MessageRevealZk {
 		repeated ZKProof proofs = 1;
 		repeated TOPRFProof toprfs = 2;
+		/** Markers for server-side OPRF computation (oprf-raw mode) */
+		repeated OPRFRawMarker oprfRawMarkers = 3;
+		/**
+		 * If an oprf-raw marker from the previous packet overshot into this packet,
+		 * this indicates how many bytes of plaintext from this packet should be
+		 * collected to complete the server-side OPRF computation.
+		 */
+		uint32 overshotOprfRawLength = 4;
+	}
+
+	/** Marker for server-side OPRF computation (oprf-raw mode). */
+	message OPRFRawMarker {
+		/** Location of the data to OPRF in the revealed plaintext */
+		DataSlice dataLocation = 1;
 	}
 
 	message ZKProof {

provider-schemas/http/parameters.yaml

@@ -156,6 +156,7 @@ properties:
           enum:
             - oprf
             - oprf-mpc
+            - oprf-raw
       additionalProperties: false
   paramValues:
     type: object

src/client/create-claim.ts

@@ -4,7 +4,7 @@ import { asciiToUint8Array } from '@reclaimprotocol/tls'
 import { makeRpcTlsTunnel } from '#src/client/tunnels/make-rpc-tls-tunnel.ts'
 import { getAttestorClientFromPool } from '#src/client/utils/attestor-pool.ts'
 import { DEFAULT_HTTPS_PORT, PROVIDER_CTX, TOPRF_DOMAIN_SEPARATOR } from '#src/config/index.ts'
-import { ClaimTunnelRequest, ZKProofEngine } from '#src/proto/api.ts'
+import { ClaimTunnelRequest } from '#src/proto/api.ts'
 import { providers } from '#src/providers/index.ts'
 import type {
 	CreateClaimOnAttestorOpts,
@@ -304,9 +304,7 @@ async function _createClaimOnAttestor<N extends ProviderName>(
 			owner: getAddress(),
 		},
 		transcript:transcript,
-		zkEngine: zkEngine === 'gnark'
-			? ZKProofEngine.ZK_ENGINE_GNARK
-			: ZKProofEngine.ZK_ENGINE_SNARKJS,
+		zkEngine: getEngineProto(zkEngine),
 		fixedServerIV: serverIV!,
 		fixedClientIV: clientIV!,
 	})
@@ -515,12 +513,13 @@ async function _createClaimOnAttestor<N extends ProviderName>(
 			revealedPackets.push(...packets.filter(p => p.sender === 'server'))
 		} else {
 			for(const {
-				block, redactedPlaintext, overshotToprfFromPrevBlock, toprfs
+				block, redactedPlaintext, overshotToprfFromPrevBlock, toprfs, oprfRawMarkers
 			} of serverPacketsToReveal) {
 				setRevealOfMessage(block.message, {
 					type: 'zk',
 					redactedPlaintext,
 					toprfs,
+					oprfRawMarkers,
 					overshotToprfFromPrevBlock
 				})
 				revealedPackets.push(

src/scripts/build-browser.sh

@@ -2,8 +2,15 @@ set -e
 cp -r node_modules/@reclaimprotocol/zk-symmetric-crypto/resources/ ./browser/resources
 cp node_modules/snarkjs/build/snarkjs.min.js ./browser/resources/snarkjs/snarkjs.min.js
 # remove r1cs files, we don't need them in prod
-rm -r ./browser/resources/snarkjs/*/*.r1cs
+rm -rf ./browser/resources/snarkjs/*/*.r1cs 2>/dev/null || true
 # remove gnark libs, they are only for nodejs
-rm -r ./browser/resources/gnark
+rm -rf ./browser/resources/gnark 2>/dev/null || true
+# ensure stwo resources exist (s2circuits.js + s2circuits_bg.wasm)
+if [ ! -f ./browser/resources/stwo/s2circuits.js ]; then
+    echo "Warning: stwo/s2circuits.js not found in resources"
+fi
+if [ ! -f ./browser/resources/stwo/s2circuits_bg.wasm ]; then
+    echo "Warning: stwo/s2circuits_bg.wasm not found in resources"
+fi
 npm run run:tsc -- src/scripts/build-browser.ts
 npm run run:tsc -- src/scripts/build-jsc.ts

src/scripts/build-browser.ts

@@ -17,6 +17,7 @@ const rslt = await esbuild.build({
 		'ip-cidr': '#src/scripts/fallbacks/empty.ts',
 		'snarkjs': '#src/scripts/fallbacks/snarkjs.ts',
 		're2': '#src/scripts/fallbacks/re2.ts',
+		'@reclaimprotocol/zk-symmetric-crypto/stwo': '#src/scripts/fallbacks/stwo.ts',
 	},
 	external: [
 		'dotenv',

src/scripts/build-jsc.ts

@@ -32,6 +32,7 @@ const rslt = await esbuild.build({
 		'ip-cidr': '#src/scripts/fallbacks/empty.ts',
 		'snarkjs': '#src/scripts/fallbacks/empty.ts',
 		're2': '#src/scripts/fallbacks/re2.ts',
+		'@reclaimprotocol/zk-symmetric-crypto/stwo': '#src/scripts/fallbacks/stwo.ts',
 	},
 	external: [
 		'dotenv',