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

Frax.mainh #232

Open
wants to merge 51 commits into
base: FortisFortuna-patch-FraxUnifiedFarm_ERC20_V2
Choose a base branch
from

Conversation

Hawthorne001
Copy link

No description provided.

FortisFortuna and others added 30 commits January 6, 2023 17:28
…ce#189)

* prep for crosschain frxETH

* minor fix

* compile fix

* frxETH ferry stuff

* periodic update
* Travis (FraxFinance#172)

* farm

* compiling

* farm 2

* remove unneeded error

* segregate changes into V2 for all files altered from original, revert pragma updates on otherwise unchanged files

* comment removed

* corrected testing errors

* move get receiver stake

* resolved errors

* info

* allowance logic

* allowanace & approval logic

* adds comments & some logic fixes from testing

* include comments for allowance, make isApproved external & remove msg.sender from that

* convert functions from public to external where feasible to reduce bytecode

* file matching

* file sync

* file sync

* file sync

* file sync

* file sync

* enhanced foundry compiler settings

* alter a getter

* alter a getter

* missed fixes from testing

* missed fixes from testing

* moved getReceiverLockedStake back inside the main if checks for receiver - causes it to fail instead of create a new locked stake

Co-authored-by: Travis Moore <[email protected]>
Didn't check whether the receiver address is a contract or not, causing it to fail for instances of transfer to EOA.
Remove unnecessary `{` before the lock transferring checks from line 760.
Change the event emit value to match the name of the value for the event emitted during `_stakeLocked` function. It's emitting the number of stakes the user has instead of the new locked stake index. Added ` - 1` to the value being emitted to get it to match with the name of the parameter for the event.
* Travis (FraxFinance#172)

* farm

* compiling

* farm 2

* remove unneeded error

* segregate changes into V2 for all files altered from original, revert pragma updates on otherwise unchanged files

* comment removed

* corrected testing errors

* move get receiver stake

* resolved errors

* info

* allowance logic

* allowanace & approval logic

* adds comments & some logic fixes from testing

* include comments for allowance, make isApproved external & remove msg.sender from that

* convert functions from public to external where feasible to reduce bytecode

* file matching

* file sync

* file sync

* file sync

* file sync

* file sync

* enhanced foundry compiler settings

* alter a getter

* alter a getter

* missed fixes from testing

* missed fixes from testing

* moved getReceiverLockedStake back inside the main if checks for receiver - causes it to fail instead of create a new locked stake

* bug fixes

* remove ending timestamp alteration

* changed ILockReceiverV2 back to ILockReceiver since that was original & messes up the selector

* overwrote incorrect line

---------

Co-authored-by: Travis Moore <[email protected]>
* Travis (FraxFinance#172)

* farm

* compiling

* farm 2

* remove unneeded error

* segregate changes into V2 for all files altered from original, revert pragma updates on otherwise unchanged files

* comment removed

* corrected testing errors

* move get receiver stake

* resolved errors

* info

* allowance logic

* allowanace & approval logic

* adds comments & some logic fixes from testing

* include comments for allowance, make isApproved external & remove msg.sender from that

* convert functions from public to external where feasible to reduce bytecode

* file matching

* file sync

* file sync

* file sync

* file sync

* file sync

* enhanced foundry compiler settings

* alter a getter

* alter a getter

* missed fixes from testing

* missed fixes from testing

* moved getReceiverLockedStake back inside the main if checks for receiver - causes it to fail instead of create a new locked stake

* bug fixes

* remove ending timestamp alteration

* changed ILockReceiverV2 back to ILockReceiver since that was original & messes up the selector

* overwrote incorrect line

* add familial middleman gauge type

* create familial gauge for redistributing rewards across transferrable & non-transferrable gauges as a signle votable gauge, based on each child gauges total combined weight

* remove gauge set up from constructor

* change var names & make getters to match with farm required abis

* change var names & make getters to match with farm required abis

* convert vars to internal to reduce execution gas costs, expose through specified getters

* return transfer tests to previous state

---------

Co-authored-by: Travis Moore <[email protected]>
Periodic update. New farms, BAMM, FraxferryV2 WIPs
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