Skip to content

Jung/initial deploy#72

Open
prateekreddy wants to merge 330 commits into
masterfrom
jung/initial-deploy
Open

Jung/initial deploy#72
prateekreddy wants to merge 330 commits into
masterfrom
jung/initial-deploy

Conversation

@prateekreddy
Copy link
Copy Markdown
Member

No description provided.

Frenchkebab and others added 28 commits January 24, 2025 16:49
# Conflicts:
#	.gitignore
#	.openzeppelin/unknown-421614.json
#	.vscode/settings.json
#	addresses/42161.json
#	addresses/421614.json
#	contracts/GeneratorRegistry.sol
#	contracts/ProofMarketplace.sol
#	contracts/lib/Error.sol
#	contracts/verifierWrappers/plonk_vk_wrapper.sol
#	contracts/verifierWrappers/tee_verifier_wrapper.sol
#	contracts/verifierWrappers/transfer_verifier_wrapper.sol
#	contracts/verifierWrappers/xor2_verifier_wrapper.sol
#	contracts/verifierWrappers/zksync_verifier_wrapper.sol
#	errorSig.py
#	hardhat.config.ts
#	helpers/setup.ts
#	package-lock.json
#	scripts/deploy.ts
#	scripts/findErrorCode.ts
#	test/AttestationVerifierZK.ts
#	test/Generator.ts
#	test/ProofMarketPlaceBasic.ts
#	test/ProofMarketPlaceForAttestationZkVerifier.ts
@Frenchkebab Frenchkebab self-requested a review February 20, 2025 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants