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

Feat/collateral swap 2 #369

Open
wants to merge 86 commits into
base: main
Choose a base branch
from
Open

Feat/collateral swap 2 #369

wants to merge 86 commits into from

Conversation

GopherJ
Copy link
Contributor

@GopherJ GopherJ commented Apr 13, 2023

Security Checklist

  • 1. Re-Entrancy
  • 2. Arithmetic Over/Under Flows
  • 3. Unexpected Ether
  • 4. Delegatecall
  • 5. Default Visibilities
  • 6. Entropy Illusion
  • 7. External Contract Referencing
  • 8. Short Address/Parameter Attack (off chain)
  • 9. Unchecked CALL Return Values
  • 10. Race Conditions / Front Running
  • 11. Denial Of Service (DOS)
  • 12. Block Timestamp Manipulation
  • 13. Constructors with Care
  • 14. Uninitialized Storage Pointers
  • 15. Floating Points and Precision
  • 16. Tx.Origin Authentication
  • 17. Address.isContract Re-Entrancy via Constructor

⚠️ NOTES ⚠️

Make sure to think about each of these exploits in this PR.

GopherJ added 6 commits April 12, 2023 21:48
@GopherJ
feat: support non-listed nft
dd9f1ca 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: remove collateral swap approve process & add eth support & calc…
9fdcc53 
…ulate the exact price after fee

Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
fix: seperate listingPrice & supplyAmount
3d77ba1 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
chore: add more comments
e68ccf1 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: add missing supplyAmount check
c1a2738 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
fix: looksrare & blur adapter recipient
b0f62df 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ GopherJ requested a review from a team as a code owner April 13, 2023 09:03
@GopherJ GopherJ force-pushed the feat/collateral-swap-2 branch from 314318d to b0f62df Compare April 13, 2023 09:06
GopherJ and others added 19 commits April 13, 2023 16:42
@GopherJ
fix: collateral swap test cases
6332ca3 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
chore: use safeTransfer instead
89f5bce
@GopherJ
feat: add missing tests
d77d03a 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
fix: lint
f974534 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
Merge branch 'main' into feat/collateral-swap-2
555f4c0
@GopherJ
Merge remote-tracking branch 'origin/main' into feat/collateral-swap-2
3d4243e
@GopherJ
Feat/collateral swap 2 - borrow any (#373)
7f6f5a6 
* fix: build

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* chore: cleanup

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* feat: resolve some TODOs

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* feat: pass swapAdapter, swapPayload

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* fix: stack too deep

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* fix: lint

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* fix: buy tests

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* fix: accept bid tests

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* chore: remove unused params

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* chore: remove unused swapProvider

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* fix: typo

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* fix: typo & check srcToken

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* chore: emit missing event

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* fix: basic borrow and swap

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* feat: add missing buy tests

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* fix: lint

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* feat: support non-listed token with underlying asset address function

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

---------

Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
Feat/collateral swap 2 - ptoken (#380)
a6e6a8d 
* fix: build

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* chore: cleanup

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* feat: resolve some TODOs

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* feat: pass swapAdapter, swapPayload

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* fix: stack too deep

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* fix: lint

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* fix: buy tests

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* fix: accept bid tests

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* chore: remove unused params

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* chore: remove unused swapProvider

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* fix: typo

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* fix: typo & check srcToken

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* chore: emit missing event

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* fix: basic borrow and swap

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* feat: add missing buy tests

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* fix: lint

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* feat: support non-listed token with underlying asset address function

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

* feat: ptoken support for collateral swap

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

---------

Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
Merge branch 'main' into feat/collateral-swap-2
3a44155
@GopherJ
feat: make collateralswap only works with ptoken
5feb7ba 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
chore: add seaport v14 config
18dd06e 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: consistent naming
250a773 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: better naming
0526092 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
fix: ptoken tests
3567955 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
fix: ptoken tests
0fe791a 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
fix: bid ptoken tests
2d02b7b 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
fix: bid ptoken tests
cdcf693 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: remove duplicated timelock code
7063359 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
chore: update ci to use make
6f6b4b7 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ GopherJ requested a review from a team as a code owner April 23, 2023 09:24
GopherJ added 6 commits July 6, 2023 22:36
@GopherJ
chore: add more comments
e399c19 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: remove ethLeft from vars
7d4c681 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: remove duplicated code
7705a25 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: remove duplicated code
d145853 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: remove msg.value check
5a41a31 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: remove redundant check
635eac6 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ GopherJ force-pushed the feat/collateral-swap-2 branch from 78a9ef9 to b54d38d Compare July 7, 2023 00:33
@GopherJ
fix: tests
d4c99c1 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ GopherJ force-pushed the feat/collateral-swap-2 branch from b54d38d to d4c99c1 Compare July 7, 2023 00:39
GopherJ added 21 commits July 7, 2023 09:11
@GopherJ
feat: limit marketplace offer to be same collection
86de1ec 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
fix: typo
f3c9768 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: remove one if else
83db9a9 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: batch supply
81cf9e5 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
fix: typo
9b07cd5 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: simplify
d4c6c6c 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: resolve comments
2adfe1c 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: add batchAcceptOpenseaBid
71e189b 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: cache requiredItemType
d78fa85 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: batch collateralize
f35ec00 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: improve gas
1d3cbbe 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
feat: improve gas
65c800b 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
fix: typo
fe27530 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
chore: update lockfile
238acdb 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
fix: unused lib
c7cfb0f 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
fix: remove redundant check
92bb4d6 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
fix: remove transferToken
9506a4e 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
chore: revert husky
33766a0 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
fix: remove 1 mstore
f7adee4 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
fix: remove typos
153652c 
Signed-off-by: GopherJ <alex_cj96@foxmail.com>
@GopherJ
Merge branch 'main' into feat/collateral-swap-2
add9a62
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@billyz9611 billyz9611 billyz9611 left review comments

@zhoujia6139 zhoujia6139 zhoujia6139 left review comments

At least 1 approving review is required to merge this pull request.

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
@GopherJ @zhoujia6139 @billyz9611 @woshihahaha