Skip to content

refactor: move user data encryption to bin threshold [skip-line-limit] #1420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ctrlc03 merged 2 commits into from
Mar 16, 2026
Merged

refactor: move user data encryption to bin threshold [skip-line-limit] #1420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90427b6
move user_data_encryption to bin/threshold
0xjei Mar 13, 2026
8b42c68
fix lint errors
0xjei Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions circuits/bin/recursive_aggregation/wrapper/threshold/Nargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ members = [
"pk_generation",
"pk_aggregation",
"share_decryption",
"decrypted_shares_aggregation",
"user_data_encryption"
"decrypted_shares_aggregation"
]
1 change: 1 addition & 0 deletions circuits/bin/threshold/Nargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
members = [
"pk_generation",
"pk_aggregation",
"user_data_encryption",
"user_data_encryption_ct0",
"user_data_encryption_ct1",
"share_decryption",
Expand Down
2 changes: 1 addition & 1 deletion ...threshold/user_data_encryption/Nargo.toml → ...threshold/user_data_encryption/Nargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ type = "bin"
authors = ["Gnosis Guild / Enclave"]

[dependencies]
lib = { path = "../../../../../lib" }
lib = { path = "../../../lib" }
bb_proof_verification = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" }
0 ...hreshold/user_data_encryption/src/main.nr → ...hreshold/user_data_encryption/src/main.nr
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/CRISP/packages/crisp-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"compile:circuits": "pnpm compile:crisp && pnpm compile:user_data_encryption_ct0 && pnpm compile:user_data_encryption_ct1 && pnpm compile:user_data_encryption && pnpm compile:fold",
"compile:user_data_encryption_ct0": "cd ../../../../circuits/bin/threshold/user_data_encryption_ct0 && nargo compile",
"compile:user_data_encryption_ct1": "cd ../../../../circuits/bin/threshold/user_data_encryption_ct1 && nargo compile",
"compile:user_data_encryption": "cd ../../../../circuits/bin/recursive_aggregation/wrapper/threshold/user_data_encryption && nargo compile",
"compile:user_data_encryption": "cd ../../../../circuits/bin/threshold/user_data_encryption && nargo compile",
"compile:crisp": "cd ../../circuits/bin/crisp && nargo compile",
"compile:fold": "cd ../../circuits/bin/fold && nargo compile",
"build:wasm": "pnpm -C ../crisp-zk-inputs build",
Expand Down
2 changes: 1 addition & 1 deletion examples/CRISP/packages/crisp-sdk/src/vote.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import crispCircuit from '../../../circuits/bin/crisp/target/crisp.json'
import foldCircuit from '../../../circuits/bin/fold/target/crisp_fold.json'
import userDataEncryptionCt0Circuit from '../../../../../circuits/bin/threshold/target/user_data_encryption_ct0.json'
import userDataEncryptionCt1Circuit from '../../../../../circuits/bin/threshold/target/user_data_encryption_ct1.json'
import userDataEncryptionCircuit from '../../../../../circuits/bin/recursive_aggregation/wrapper/threshold/target/user_data_encryption.json'
import userDataEncryptionCircuit from '../../../../../circuits/bin/threshold/target/user_data_encryption.json'
import { bytesToHex, encodeAbiParameters, parseAbiParameters, numberToHex, getAddress } from 'viem/utils'
import { Hex } from 'viem'

Expand Down
2 changes: 1 addition & 1 deletion examples/CRISP/scripts/compile_circuits.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if ! (cd "$ENCLAVE_CIRCUITS/bin/threshold/user_data_encryption_ct1" && nargo com
fi

echo "Compiling user_data_encryption..."
if ! (cd "$ENCLAVE_CIRCUITS/bin/recursive_aggregation/wrapper/threshold/user_data_encryption" && nargo compile); then
if ! (cd "$ENCLAVE_CIRCUITS/bin/threshold/user_data_encryption" && nargo compile); then
echo "Error: user_data_encryption compilation failed"
exit 1
fi
Expand Down
4 changes: 2 additions & 2 deletions packages/enclave-contracts/test/E3Lifecycle/E3Integration.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ describe("E3 Integration - Refund/Timeout Mechanism", function () {
const { mockCircuitVerifier } = await ignition.deploy(
MockCircuitVerifierModule,
);
const circuitVerifier = MockCircuitVerifierFactory.connect(
const _circuitVerifier = MockCircuitVerifierFactory.connect(
await mockCircuitVerifier.getAddress(),
owner,
);
Expand Down Expand Up @@ -415,7 +415,7 @@ describe("E3 Integration - Refund/Timeout Mechanism", function () {
bondingRegistry,
registry,
slashingManager: slashingManagerTyped,
circuitVerifier,
_circuitVerifier,
usdcToken,
enclToken,
e3Program,
Expand Down
2 changes: 1 addition & 1 deletion packages/enclave-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"compile:circuits": "pnpm compile:user_data_encryption_ct0 && pnpm compile:user_data_encryption_ct1 && pnpm compile:user_data_encryption",
"compile:user_data_encryption_ct0": "cd ../../circuits/bin/threshold/user_data_encryption_ct0 && nargo compile",
"compile:user_data_encryption_ct1": "cd ../../circuits/bin/threshold/user_data_encryption_ct1 && nargo compile",
"compile:user_data_encryption": "cd ../../circuits/bin/recursive_aggregation/wrapper/threshold/user_data_encryption && nargo compile",
"compile:user_data_encryption": "cd ../../circuits/bin/threshold/user_data_encryption && nargo compile",
"prebuild": "pnpm -C ../enclave-contracts build && pnpm -C ../../ wasm:build && pnpm compile:circuits",
"build": "tsup",
"dev": "tsup --watch",
Expand Down
2 changes: 1 addition & 1 deletion packages/enclave-sdk/src/crypto/user-data-encryption.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import { Barretenberg, UltraHonkBackend, type ProofData } from '@aztec/bb.js'
import userDataEncryptionCt0Circuit from '../../../../circuits/bin/threshold/target/user_data_encryption_ct0.json'
import userDataEncryptionCt1Circuit from '../../../../circuits/bin/threshold/target/user_data_encryption_ct1.json'
import userDataEncryptionCircuit from '../../../../circuits/bin/recursive_aggregation/wrapper/threshold/target/user_data_encryption.json'
import userDataEncryptionCircuit from '../../../../circuits/bin/threshold/target/user_data_encryption.json'
import { CompiledCircuit, Noir } from '@noir-lang/noir_js'
import { proofToFields } from '../utils'

Expand Down
Loading