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: BlastYield contract #103

Merged

0xhiroshi merged 39 commits into master from feat/BlastYield

Jul 9, 2024

Contributor

stonehengeLR commented Jun 30, 2024

No description provided.

stonehengeLR added 3 commits

June 30, 2024 19:35


          feat: BlastYield contract

b93db9e


          fix: Compilier error


          fix: Compilier error

f9fcf92

stonehengeLR changed the title ~~feat: BlastYield contract~~ feat(wip): BlastYield contract

stonehengeLR added 5 commits

July 2, 2024 18:17


          test: BlastYield Tests

2edb97e


          test: BlastYield Test Fixes

edbe35f


          fix: Prettier and Mocks

fe415c3


          fix: Increase node version for github actions

b7e2d0d


          fix: Increase node version for github actions

d1c8d3f

stonehengeLR changed the title ~~feat(wip): BlastYield contract~~ feat: BlastYield contract

stonehengeLR added 2 commits

July 4, 2024 07:32


          fix: Update Access Control to OwnableTwoSteps

9ca51b7


          feat: Private function to allow both access control and ownable two s…

6f67949

…teps

0xhiroshi reviewed

View reviewed changes

contracts/BlastYield.sol Outdated Show resolved Hide resolved


          fix: Remove virtual from _claim

e9cb33e

0xhiroshi reviewed

View reviewed changes

contracts/BlastYield.sol Outdated Show resolved Hide resolved

0xhiroshi reviewed

View reviewed changes

contracts/BlastYield.sol Outdated Show resolved Hide resolved

0xhiroshi reviewed

View reviewed changes

package.json Outdated Show resolved Hide resolved

0xhiroshi reviewed

View reviewed changes

test/foundry/BlastYield.t.sol Outdated Show resolved Hide resolved

0xhiroshi reviewed

View reviewed changes

test/foundry/BlastYield.t.sol Outdated Show resolved Hide resolved

0xhiroshi reviewed

View reviewed changes

test/foundry/BlastYield.t.sol Outdated Show resolved Hide resolved

0xhiroshi reviewed

View reviewed changes

test/mock/MockBlastERC20.sol Outdated Show resolved Hide resolved

0xhiroshi reviewed

View reviewed changes

test/mock/MockBlastWETH.sol Outdated Show resolved Hide resolved

0xhiroshi reviewed

View reviewed changes

test/mock/MockBlastYield.sol Outdated Show resolved Hide resolved

stonehengeLR added 7 commits

July 4, 2024 17:09


          fix: Rename _owner to _governor

cc82877


          fix: Fix _claim notice

e7dcbeb


          fix: Pass mockPoints


          fix: Remove operator role

88ee19b


          fix: Mock naming

ce33daf


          fix: Get modifier from TestHelpers

591cf53


          chore: Update solmate to openzeppelin

0ba5d3a


          fix: Remove event

06cebd1

0xhiroshi reviewed

View reviewed changes

test/foundry/BlastERC20RebasingYield.t.sol Outdated Show resolved Hide resolved


          fix: Remove empty line

70b57dd

0xhiroshi reviewed

View reviewed changes

test/foundry/BlastNativeYield.t.sol Outdated Show resolved Hide resolved

0xhiroshi reviewed

View reviewed changes

test/foundry/BlastPoints.t.sol Outdated Show resolved Hide resolved

0xhiroshi reviewed

View reviewed changes

test/foundry/BlastPoints.t.sol Outdated Show resolved Hide resolved

0xhiroshi reviewed

View reviewed changes

test/foundry/BlastNativeYield.t.sol Outdated Show resolved Hide resolved

stonehengeLR added 7 commits

July 5, 2024 19:41


          fix: YieldMode GasMode fix

f80299b


          fix: Fix blast points notice

96c81ec


          fix: Refix YieldMode GasMode

ed78762


          fix: Test names

bc6d3e8


          fix: Improve notices

3d7fac2


          fix: Fix native yield and points tests

666c866


          fix: YieldMode GasMode naming BlastNativeYield_Test

c01c63d

0xhiroshi reviewed

View reviewed changes

test/foundry/BlastPoints.t.sol Outdated Show resolved Hide resolved

0xhiroshi reviewed

View reviewed changes

test/foundry/BlastNativeYield.t.sol Outdated Show resolved Hide resolved

stonehengeLR added 4 commits

July 6, 2024 07:51


          fix: Unused variables and imports

68bb39c


          fix: Remove variable alias

1d6537f


          fix: Another unused import

0729c1a


          fix: Remove variable alias

jpopxfile reviewed

View reviewed changes

contracts/BlastERC20RebasingYield.sol

+                      WETH = _weth;
+                      USDB = _usdb;
+                      IERC20Rebasing(_weth).configure(YieldMode.CLAIMABLE);

jpopxfile Jul 6, 2024

Just to confirm, for all weth and usdb holding contracts, the yield mode will always be claimable, never automatic?

Collaborator

0xhiroshi Jul 6, 2024

I think it's fine to leave it as the default and if we want to change it we can do it after - we've never had any contracts with a claim mode that's not CLAIMABLE

jpopxfile reviewed

View reviewed changes

contracts/BlastERC20RebasingYield.sol Show resolved Hide resolved

stonehengeLR added 5 commits

July 6, 2024 08:35


          fix: Fix _claim notice

602487e


          fix: Fix _claim notice

534d053


          fix: Renaming

39e688a


          fix: Notice length

763c63d


          fix: Whitespace formatting

3cfa074

0xhiroshi approved these changes

View reviewed changes

0xhiroshi merged commit 6fae336 into master

2 checks passed

0xhiroshi deleted the feat/BlastYield branch

July 9, 2024 12:46

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet