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.

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

Remove duplicate code to make contract fit #145

Closed
wants to merge 56 commits into from

Conversation

iainnash
Copy link
Collaborator

@iainnash iainnash commented Aug 2, 2023

No description provided.

@iainnash iainnash changed the base branch from zora-rewards to main September 14, 2023 21:41
@@ -1,7 +1,7 @@
[profile.default]
solc_version = '0.8.17'
optimizer = true
optimizer_runs = 300
optimizer_runs = 500
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

@@ -51,7 +51,11 @@
},
"dependencies": {
"@dotenv/cli": "^2.2.2",
<<<<<<< HEAD
"@zoralabs/protocol-rewards": "^1.0.1",
=======
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

broken rebase

_emitSaleEvents(msgSender, msgSender, quantity, pricePerToken, firstMintedTokenId, comment);

return firstMintedTokenId;
<<<<<<< HEAD
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

broken rebase :(

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was trying to get this diff better, didn't work, ignore for now

@@ -452,7 +452,7 @@ contract ERC721Drop is
onlyPublicSaleActive
returns (uint256)
{
return _handlePurchase(msg.sender, quantity, "");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we remove this _handlePurchase function?

@iainnash iainnash closed this Sep 21, 2023
@iainnash
Copy link
Collaborator Author

Moving to a new diff.

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.

3 participants