Skip to content

feat: ERC-7858 and some optimize#61

Merged
MASDXI merged 61 commits into
mainfrom
develop/masdxi
Jul 28, 2025
Merged

feat: ERC-7858 and some optimize#61
MASDXI merged 61 commits into
mainfrom
develop/masdxi

Conversation

@MASDXI

@MASDXI MASDXI commented Jan 12, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

focus on NFT and refactor the sorted list to way more efficient

@MASDXI MASDXI self-assigned this Jan 12, 2025
@MASDXI
refactor: lightweight sorted list
1c3a9a3 
Signed-off-by: MASDXI <sirawitt42@gmail.com>
@MASDXI MASDXI changed the title follow: ERC-7858 feat: ERC-7858 and some optimize Jan 13, 2025
MASDXI added 21 commits January 13, 2025 13:05
@MASDXI
test: finish test fo sorted list
ed9475a 
Signed-off-by: MASDXI <sirawitt42@gmail.com>
@MASDXI
more clean up
f8c2147 
Signed-off-by: MASDXI <sirawitt42@gmail.com>
@MASDXI
refactor: remove unused function in ERC721EXP
2c16f4d 
Signed-off-by: MASDXI <sirawitt42@gmail.com>
@MASDXI
Merge branch 'main' into develop/masdxi
229c6a7
@MASDXI
Merge branch 'main' into develop/masdxi
c9bbde4
@MASDXI
refactor: remove unused file
719d3a3 
Signed-off-by: MASDXI <sirawitt42@gmail.com>
@MASDXI
feat: update ERC721EXP contracts
4074523 
Signed-off-by: MASDXI <sirawitt42@gmail.com>
@MASDXI
prettier code
6c25951 
Signed-off-by: MASDXI <sirawitt42@gmail.com>
@MASDXI
chore: change path
29302af 
Signed-off-by: MASDXI <sirawitt42@gmail.com>
@MASDXI
chore: adding interfaces ERC-7858Epoch
61b9c75 
Signed-off-by: MASDXI <sirawitt42@gmail.com>
@MASDXI
refactor: adding ERC721Epoch abstract
5e36db4 
Signed-off-by: MASDXI <sirawitt42@gmail.com>
@MASDXI
refactor: ERC721Epoch
42cb5d2 
Signed-off-by: MASDXI <sirawitt42@gmail.com>
@MASDXI
Merge branch 'main' into develop/masdxi
0a11af0
@MASDXI
refactor: 💡 ERC20NearestExpiry func name and ERC721Epoch
dfa8282
@MASDXI
chore: 🤖 generate copyright/license header
d113b75
@MASDXI
chore: 🤖 merge from main to develop/masdxi
e62e8c1
@MASDXI
Merge branch 'main' into develop/masdxi
03e87f4
@MASDXI
docs: ✏️ adding funding section to README.md
5a70919
@MASDXI
Merge branch 'main' into develop/masdxi
4da6a51
@MASDXI
fix: 🐛 missing args in insert
431003e
@MASDXI
refactor: 💡 adding logic to ERC721EXPEpochBase
fe08f3a
@MASDXI

MASDXI commented Feb 20, 2025

Copy link
Copy Markdown
Member Author

@ADISAKBOONMARK @parametprame check this then i will develop a test for it.

@ADISAKBOONMARK

ADISAKBOONMARK commented Feb 21, 2025

Copy link
Copy Markdown
Collaborator

@ADISAKBOONMARK @parametprame check this then i will develop a test for it.

I will check it today.

@MASDXI
refactor: 💡 adding logic to ERC721EpochBase
13d5eac 
adding logic to the functio that inheritance form the IERC7858
MASDXI and others added 18 commits February 25, 2025 15:53
@MASDXI
refactor: 💡 change function name in ERC-7858 interface
914d534
@MASDXI
refactor: 💡 handle burn and re-mint
4944ab0
@MASDXI
refactor: 💡 handling token timestamp check
8f6e096
@MASDXI
fix: 🐛 logic error compare start and end
9ea61e2
@MASDXI
fix: 🐛 startTime and endTime should revert if id not exist
998257e
@MASDXI
test: 💍 template test ERC7858 base
8cc98b8
@MASDXI
test: 💍 update testing for ERC7858
8531b83
@MASDXI
test: 💍 update test case for ERC7858
f0c1d68
@MASDXI
test: 💍 use expectBalance var instead of inscope function
6ffd7e4
@MASDXI
chore: 🤖 remove unused files
3db8610
@MASDXI
refactor: 💡 implementing missing function from interface
76a819b
@MASDXI
refactor: 💡 add transfer logic to ERC7858
96bca9f
@MASDXI
refactor: 💡 change files name and init test for erc7858 epoch
6516a06
@MASDXI
test: 💍 adding test case to erc7858 and fix nonexistence token
b1cb4aa
@parametprame
fix: 🐛 remove duplicate function with same business logic
e515d2a
@MASDXI
refactor: 💡 refactor isEpochExpired testcase
9325b32
@MASDXI
test: 💍 adding testcase to erc7858
8e9d2b8
@MASDXI
test: 💍 adding testcase to erc7858
5a7ce18
@MASDXI

MASDXI commented Mar 3, 2025

Copy link
Copy Markdown
Member Author

almost done

ADISAKBOONMARK
ADISAKBOONMARK reviewed Mar 5, 2025
View reviewed changes
Comment thread contracts/utils/datastructures/SortedList.sol Outdated
Comment thread contracts/utils/datastructures/SortedList.sol
Comment thread contracts/utils/datastructures/SortedList.sol
Comment thread contracts/utils/datastructures/SortedList.sol Outdated
Comment thread contracts/utils/datastructures/SortedList.sol Outdated
Comment thread contracts/tokens/ERC721/interfaces/IERC7858.sol
Comment thread contracts/tokens/ERC721/ERC721B.sol
Comment thread contracts/tokens/ERC721/ERC721T.sol
Comment thread contracts/tokens/ERC721/extensions/ERC721BLSW.sol
Comment thread contracts/tokens/ERC721/extensions/ERC721TLSW.sol
@MASDXI

MASDXI commented Mar 5, 2025 •
edited
Loading

Copy link
Copy Markdown
Member Author

I found some bug on ERC-7858Epoch when calling unexpiredBalanceOf and unexpiredBalanceOfAtEpoch scenario to reproduce the token endTime equal to the current pointer (timestamp/blockheight) it runs out of gas

@parametprame @ADISAKBOONMARK

ADISAKBOONMARK
ADISAKBOONMARK reviewed Mar 28, 2025
View reviewed changes
Comment thread mocks/contracts/utils/MockSortedList.sol
@MASDXI
refactor: handle shrink element and add some missing test
d56df9a 
Signed-off-by: MASDXI <sirawitt42@gmail.com>
@MASDXI MASDXI merged commit 30f5bcc into main Jul 28, 2025
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ADISAKBOONMARK ADISAKBOONMARK ADISAKBOONMARK left review comments

@parametprame parametprame parametprame approved these changes

Assignees

@MASDXI MASDXI

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@MASDXI @ADISAKBOONMARK @parametprame