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

Jump to bottom

refactor(protocol): add proofWindowMultiplier #14263

Closed
wants to merge 75 commits into from
Closed

refactor(protocol): add proofWindowMultiplier #14263

wants to merge 75 commits into from

Conversation

dantaik
Copy link
Contributor

@dantaik dantaik commented Jul 24, 2023

No description provided.

adaki2004 and others added 30 commits July 6, 2023 16:57
@adaki2004
Adjust current bridge api to an nft bridge version
109e22e
@adaki2004
PoC ERC721 birdge implementation
2873d37
@adaki2004
fix harhdat compile issue with event name
c848356
@adaki2004 @github-actions
Add auto-generated contract documentation
223c45d
@dong77
ignore nft_bridge in docs for now
a5b61dd
@dong77
Update .gitignore
9e0c21a
@dantaik @dong77
refactor(protocol): move ERC20 related code to its own folder (#14129)
607ce65 
Co-authored-by: Daniel Wang <dong77@gmail.com>
@adaki2004
NFTVault + bridged erc721 support
7a57741
@adaki2004
Move folders
b8fc41d
@adaki2004
remove interface inheritance
36f7675
@adaki2004
Added erc1155 support to NFTVault
d4560ef
@adaki2004
Adding unit tests
6d1c7b5
@adaki2004
PR findings addressed (not all unit tests adjusted)
0fe45f8
@adaki2004
Adjusted unit tests
57e9933
@adaki2004
Rename receiveERC20 to receiveToken
361f55f
@adaki2004
Tests for erc1155 vault functionalities
4cf82dc
@adaki2004
Added tests for erc721 vault
bd581e3
@adaki2004
Addressed review items
1670624
@dantaik @dong77 @adaki2004
refactor(protocol): try to refactor Dani's vault code (#14155)
166d7b4 
Co-authored-by: Daniel Wang <dong77@gmail.com>
Co-authored-by: D <51912515+adaki2004@users.noreply.github.com>
@adaki2004
Improvements
b12fe08
@adaki2004
linting
72ee162
@dantaik @dong77
refactor(protocol): improve NFT vaults (#14161)
2f39fde 
Co-authored-by: Daniel Wang <dong77@gmail.com>
@dantaik @dong77
refactor(protocol): improve NFT vaults (#14166)
dfb944f 
Co-authored-by: Daniel Wang <dong77@gmail.com>
@adaki2004
feat(protocol): Multiple token with one txn (#14168)
a72f570
@adaki2004
remove debug print
bfc9d8c
@adaki2004
Main changes: added msgReleased check, decode to erc20, adjusted erc1155
0cf07ec
@adaki2004
Mint when released the bridged token back
39949bd
@dantaik @dong77 @adaki2004
refactor(protocol): add quite a few TODOs for Dani (#14172)
249fb7d 
Co-authored-by: Daniel Wang <dong77@gmail.com>
Co-authored-by: adaki2004 <keszeydani@gmail.com>
@adaki2004
Rename confusing variable
30c580f
@adaki2004
Updated files for deployment
49feae1
davidtaikocha
davidtaikocha previously approved these changes Jul 24, 2023
View reviewed changes
adaki2004
adaki2004 previously approved these changes Jul 24, 2023
View reviewed changes
@dantaik dantaik changed the base branch from alpha-4 to improve_nft_vaults_10 July 24, 2023 21:31
Base automatically changed from improve_nft_vaults_10 to alpha-4 July 24, 2023 21:32
@dantaik dantaik mentioned this pull request Jul 24, 2023
Merged
@dong77
merge
595db7d
@dong77
Revert "merge"
792323e 
This reverts commit 595db7d, reversing
changes made to 20ea06c.
@dantaik dantaik marked this pull request as draft July 24, 2023 22:01
@dantaik dantaik closed this Jul 24, 2023
@dantaik dantaik deleted the config_proof_window branch September 25, 2023 11:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidtaikocha davidtaikocha davidtaikocha left review comments

@adaki2004 adaki2004 adaki2004 left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dantaik @adaki2004 @davidtaikocha @dong77