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: add ERC1155Common, support launchpad/presale and adapt OZ v5. #26

Merged
merged 13 commits into from
Dec 29, 2024
Merged

feat: add ERC1155Common, support launchpad/presale and adapt OZ v5. #26

merged 13 commits into from
Dec 29, 2024

Conversation

huyhuynh3103
Copy link
Contributor

Description

  • Add ERC1155Common contract
  • Support template compatible with launchpad and presale
  • Adapt Openzeppelin V5.
  • Fix unit test on ci

Checklist

  • I have clearly commented on all the main functions following the NatSpec Format
  • The box that allows repo maintainers to update this PR is checked
  • I tested locally to make sure this feature/fix works

TuDo1403 and others added 13 commits September 29, 2024 17:46
@TuDo1403
BREAKING_CHANGE: adapt openzeppelin v5
b560d3a
@TuDo1403
refactor: use explicit import
839feec
@TuDo1403
chore: remove unused package
1252459
@TuDo1403
Merge pull request #18 from axieinfinity/implement-feature/adapt-oz-v…
ed6d969 
…5/use-oz-v5
@huyhuynh3103
Merge pull request #23 from axieinfinity/main
fa02f31 
Back merge to release
@huyhuynh3103
feat: resolve conflicts
e0ec6e8
@huyhuynh3103
feat: add sample presale contracts
5737e35
@huyhuynh3103
feat: rename sample contracts
abf4697
@huyhuynh3103
fix: unit test on ci
5939e68
@huyhuynh3103
Merge pull request #25 from axieinfinity/implement-feature/adapt-oz-v…
d7924bd 
…5/merge-with-release-0.2.0

feat: resolve conflicts caused by merging with release/v0.2.0 branch
@huyhuynh3103
Merge branch 'release/v0.2.0' into feature/adapt-oz-v5
37b6069
@huyhuynh3103
fix: remove underscore and useless _requireOwned
f5db390
@huyhuynh3103
Merge pull request #24 from axieinfinity/feature/adapt-oz-v5
c8d186c 
feat: Adapt OZ V5
@huyhuynh3103 huyhuynh3103 merged commit 2027c61 into main Dec 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TuDo1403 TuDo1403 TuDo1403 approved these changes

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

Successfully merging this pull request may close these issues.
2 participants
@huyhuynh3103 @TuDo1403