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

Add Launch Auction Price Oracle with reduced half life #70

Merged
merged 25 commits into from
Aug 14, 2024
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
7dd9033
Add parameterized auction half life
stevieraykatz Jul 21, 2024
6b37b28
Merge branch 'main' into launch-auction
stevieraykatz Aug 5, 2024
facd077
Revert to prod exp. price auction
stevieraykatz Aug 5, 2024
0e056b4
Add Launch Auction pricing contract
stevieraykatz Aug 5, 2024
edea68f
Fix tests, get ready for review
stevieraykatz Aug 5, 2024
0a6684a
Cleanup return to avoid overshadowing
stevieraykatz Aug 5, 2024
4774c14
Fix pragma
stevieraykatz Aug 5, 2024
6fb4de2
rename to avoid overshadowing
stevieraykatz Aug 5, 2024
a2f7087
Rename constant
stevieraykatz Aug 5, 2024
17a5a48
Add unit tests
stevieraykatz Aug 7, 2024
0f0589f
Lint
stevieraykatz Aug 7, 2024
d4534f7
Fix comments in test
stevieraykatz Aug 7, 2024
9f22d48
Fix tests per PR
stevieraykatz Aug 8, 2024
ea08a84
Add comment for base prices
stevieraykatz Aug 8, 2024
61c873e
lint
stevieraykatz Aug 8, 2024
1563df6
Change halflife to 1.5 hours, allow auction duration to be specified …
stevieraykatz Aug 9, 2024
f5826c9
Fix typo in natspec
stevieraykatz Aug 9, 2024
71394e9
Switch to Error from require
stevieraykatz Aug 9, 2024
74310cb
Add test for new error message
stevieraykatz Aug 9, 2024
1e46dc1
Fix unit conversion issue in bitshift operation
stevieraykatz Aug 11, 2024
01ac27f
Add launch auction integration tests
stevieraykatz Aug 12, 2024
e9b954d
reorder setup to mimic expected ordering
stevieraykatz Aug 12, 2024
eba4cfa
lint
stevieraykatz Aug 12, 2024
ac267c2
Update src/L2/LaunchAuctionPriceOracle.sol
stevieraykatz Aug 13, 2024
11936e7
Fix some comments, cleanup tests
stevieraykatz Aug 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into launch-auction
  • Loading branch information
stevieraykatz committed Aug 5, 2024
commit 6b37b28c77b0d41f8dc65a6be0609b8264419366
4 changes: 2 additions & 2 deletions test/IntegrationTest.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ contract IntegrationTest is Test {
rentPrices[4] = 31_709_791;
rentPrices[5] = 3_170_979; //3,170,979.1983764587 = 1e14 / (365 * 24 * 3600)

exponentialPremiumPriceOracle = new ExponentialPremiumPriceOracle(rentPrices, 1e18, 21, 1 days);
baseRegistrar = new BaseRegistrar(registry, owner, BASE_ETH_NODE);
exponentialPremiumPriceOracle = new ExponentialPremiumPriceOracle(rentPrices, 1e18, 21);
baseRegistrar = new BaseRegistrar(registry, owner, BASE_ETH_NODE, "", "");

_establishNamespaces();

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.