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

update to support SafeERC20 #11

Merged
merged 4 commits into from
Jul 12, 2021
Merged

update to support SafeERC20 #11

merged 4 commits into from
Jul 12, 2021

Conversation

kamescg
Copy link

@kamescg kamescg commented Jun 28, 2021

Copy link

@asselstine asselstine left a comment

Choose a reason for hiding this comment

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

Is this a dupe of https://github.com/pooltogether/sushi-pooltogether/pull/17/files?

I'm a little confused as to what the history of PRs is

@PierrickGT
Copy link

PierrickGT commented Jul 8, 2021

Is this a dupe of https://github.com/pooltogether/sushi-pooltogether/pull/17/files?

I'm a little confused as to what the history of PRs is

@asselstine looks like it's the same first two commits yes.
This one should only be about adding SafeERC20 support to Sushi token.
I propose that we merge it first and then we will fix conflicts when we pull fixes/c4-audit in the other one.

@asselstine ok so in this one, I've approved the max amount in the constructor and in the other one, I'll add the function to re-approve.

@PierrickGT PierrickGT force-pushed the fix/112 branch 2 times, most recently from e54d56d to c31f9bd Compare July 8, 2021 13:55
@PierrickGT PierrickGT merged commit 6f87db9 into fixes/c4-audit Jul 12, 2021
@PierrickGT PierrickGT deleted the fix/112 branch July 12, 2021 15:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants