Skip to content
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

ZK-382: Implement deposit for token shortlist #97

Closed
wants to merge 7 commits into from
Closed

ZK-382: Implement deposit for token shortlist #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
33a4a93
ZK-382: Implement deposit for shortlist of tokens
kroist Jan 22, 2025
4685ee4
linter
kroist Jan 22, 2025
7b4ad40
makefile generate
kroist Jan 22, 2025
fb8e781
upd
kroist Jan 24, 2025
b50410d
upd
kroist Jan 24, 2025
d51e18d
upd
kroist Jan 24, 2025
723990b
lint
kroist Jan 24, 2025
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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ target/
.DS_Store
.vscode/
contracts/*Key.sol
contracts/*Verifier.sol
contracts/*Verifier*.sol
contracts/Poseidon2T8Assembly.sol
**/*output.log
*.txt
Expand Down
63 changes: 52 additions & 11 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ sha3 = { version = "0.10" }
shellexpand = { version = "3.1.0" }
# https://github.com/Cardinal-Cryptography/zkOS-circuits/tree/7743b2f084d80685041c1b16718e6388226e9631
shielder-circuits = { git = "ssh://git@github.com/Cardinal-Cryptography/zkOS-circuits", rev = "7743b2f" }
# https://github.com/Cardinal-Cryptography/zkOS-circuits/tree/4f413a87dac5ceb7cf7581691e1b799c2914cdcc
shielder-circuits-v0_1_0 = { package = "shielder-circuits", git = "ssh://git@github.com/Cardinal-Cryptography/zkOS-circuits", rev = "4f413a8" }
fbielejec marked this conversation as resolved.
Show resolved Hide resolved
testcontainers = { version = "0.19.0" }
thiserror = { version = "2.0.9" }
tokio = { version = "1.38.0" }
Expand Down
15 changes: 14 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ else
PRIVATE_KEY=$(PRIVATE_KEY) OWNER_ADDRESS=$(OWNER_ADDRESS) forge script DeployShielderScript --broadcast --rpc-url $(NETWORK) --sender $(shell cast wallet address $(PRIVATE_KEY))
endif

.PHONY: deploy-contracts-and-migrate
deploy-contracts-and-migrate: # Deploy solidity contracts
deploy-contracts-and-migrate:
NETWORK=$(NETWORK) PRIVATE_KEY=$(PRIVATE_KEY) OWNER_ADDRESS=$(OWNER_ADDRESS) ./scripts/deploy-all-migrations.sh

.PHONY: generate-poseidon-contracts
generate-poseidon-contracts: # Generate Poseidon contract
generate-poseidon-contracts:
Expand All @@ -69,9 +74,17 @@ generate-verifier-contracts:
cargo run --release --bin halo2_solidity_verifier_generator
$(MAKE) format-contracts


.PHONY: generate-verifier-contracts-v0_1_0
generate-verifier-contracts-v0_1_0: # Generate relation verifier contracts for v0_1_0 contract
generate-verifier-contracts-v0_1_0:
cd crates/halo2-verifier
cargo run --release --bin halo2_solidity_verifier_generator_v0_1_0
fbielejec marked this conversation as resolved.
Show resolved Hide resolved
$(MAKE) format-contracts

.PHONY: generate-contracts
generate-contracts: # Generate poseidon & relation verifier contracts
generate-contracts: generate-poseidon-contracts generate-verifier-contracts
generate-contracts: generate-poseidon-contracts generate-verifier-contracts generate-verifier-contracts-v0_1_0

.PHONY: measure-gas
measure-gas: # measure shielder gas usage
Expand Down
Loading