Skip to content

note encrypt/decrypt - #253

Merged
akileshtangella merged 1 commit into
maspfrom
akilesh/note-encryption
Feb 16, 2023
Merged

akileshtangella merged 1 commit into
maspfrom
akilesh/note-encryption

Conversation

@akileshtangella

Copy link
Copy Markdown
Contributor

No description provided.

@akileshtangella
akileshtangella merged commit 6a391b8 into masp Feb 16, 2023
@akileshtangella
akileshtangella deleted the akilesh/note-encryption branch February 16, 2023 21:41
akileshtangella added a commit that referenced this pull request Apr 27, 2023
* transaction circuit (#230)

* circuit updates

* record.circom

* nullifier.circom

* key.circom

* transaction.circom

* add fee work

* circuit is compiling

* registry contract updates

* registry handler updates

* update masp contracts to support nft

* combine wrapAndDepositErc20 and depositErc20 into one flow

* deposit erc721 in one flow

* update public input strcuts

* masp key class

* verifier contracts

* interface verifier

* contracts compiling

* masp vanchor tree

* restart masp classes

* solidity fixtures

* update masp ts types

* updates add zkopru babyjubjub update masp class

* just alpha stuff left on masp class

* yarn build works

* delete debyg log

* tokens package.json

* masp snarkjs tx circuit is passing

* bit shifting inside key.circom

* run prettier

* start integrating reward stuff

* compiling reward circuit with correct masp record structure

* reward snarkjs test working

* change record structure and swap circuit progress

* swap circuit progress

* swap circuit complete

* ups

* update record with inner partial commitment

* snarkjs working for all 3 circuits

* remove it.only

* swap verifier

* prettier

* make registry test pass

* ci

* create 2 utils ci

* registry test fix

* regenerate wasm

* dvc

* skip aave test

* get classes building after merge main

* Update MASP Circuits (#252)

* update tx/reward circuits with new record structure

* updated swap circuit

* update swap circuit

* snark js tests passing for all masp circuits

* ci should work

* ups

* note encrypt/decrypt (#253)

* batch update system  (#277)

* redo tx circuit (#309)

* downgrading verifiers and updating fixtures accordingly (#322)

Co-authored-by: semaraugusto <semaraugusto@dcc.ufmg.br>

* fix yarn build

* .gitignore

* remove unused imports

* typechain-types

* remove typechain-types

* try fix ci

* try fix ci

* verifiers wrong from merge

---------

Co-authored-by: semaraugusto <semaraugusto@dcc.ufmg.br>
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.

1 participant