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

3.4.0 Upgrade Spell #1133

Closed
wants to merge 30 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
bd383e6
new file for proposal validator, test proposal.
pmckelvy1 Apr 28, 2024
9d45768
pickup proposal from file.
pmckelvy1 Apr 28, 2024
9d0e8ab
use param id to ingest file, check against proposed id.
pmckelvy1 Apr 28, 2024
389c357
cleanup
pmckelvy1 Apr 29, 2024
1908407
cleanup.
pmckelvy1 Apr 29, 2024
29330f7
scrape a whale.
pmckelvy1 Apr 29, 2024
2799fd2
saving scraped data.
pmckelvy1 Apr 29, 2024
3485472
add refresh-whales script.
pmckelvy1 Apr 30, 2024
9e81967
use whale config instead of constants.
pmckelvy1 Apr 30, 2024
5249579
import fs.
pmckelvy1 Apr 30, 2024
7851d41
save whales by address.
pmckelvy1 Apr 30, 2024
1984254
add rtoken whales, cleanup refresh script.
pmckelvy1 Apr 30, 2024
cb66951
refreshed whales.
pmckelvy1 May 1, 2024
85d783e
add 3.4.0 checks, still testing just 3.3.0
pmckelvy1 May 1, 2024
b250d4c
apply 3.4.0 updates, add sample 3.4.0 proposal for eusd.
pmckelvy1 May 1, 2024
fa70b0a
validations into separate task.
pmckelvy1 May 1, 2024
602ee1d
cleanup.
pmckelvy1 May 1, 2024
6f5063c
support forked network whales.
pmckelvy1 May 1, 2024
f8c5b39
implement upgrade spell + serialize to disk
tbrent May 2, 2024
8890b64
success with eUSD
tbrent May 2, 2024
1081daf
support base whale collection.
pmckelvy1 May 2, 2024
72097a6
support convex vaults.
pmckelvy1 May 2, 2024
1e74c01
Merge branch 'proposal-validator' into 3.4.0-proposals
tbrent May 2, 2024
659d09e
intermediate rebalance progress
tbrent May 2, 2024
d408c02
add calculation of true auction midpoint
tbrent May 2, 2024
a6892da
lint clean
tbrent May 2, 2024
cf75bcc
fix morpho tests
tbrent May 2, 2024
99272d5
Merge branch 'proposal-validator' into 3.4.0-proposals
tbrent May 2, 2024
888a0ed
Merge branch '3.4.0' into 3.4.0-proposals
tbrent May 3, 2024
610738d
start testing upgrade on all RTokens
tbrent May 3, 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
4 changes: 2 additions & 2 deletions common/configuration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export interface ITokens {
Re7WETH?: string
}

export type ITokensKeys = Array<keyof ITokens>;
export type ITokensKeys = Array<keyof ITokens>

export interface IFeeds {
stETHETH?: string
Expand Down Expand Up @@ -218,7 +218,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = {
wstETH: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
rETH: '0xae78736Cd615f374D3085123A210448E74Fc6393',
cUSDCv3: '0xc3d688B66703497DAA19211EEdff47f25384cdc3',
wcUSDCv3: '0xfBD1a538f5707C0D67a16ca4e3Fc711B80BD931A',
wcUSDCv3: '0x27F2f159Fe990Ba83D57f39Fd69661764BEbf37a',
ONDO: '0xfAbA6f8e4a5E8Ab82F62fe7C39859FA577269BE3',
sFRAX: '0xA663B02CF0a4b149d2aD41910CB81e23e1c41c32',
sDAI: '0x83f20f44975d03b1b09e64809b757c47f942beea',
Expand Down
2 changes: 2 additions & 0 deletions common/constants.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { utils, BigNumber } from 'ethers'

export const ZERO_BYTES = '0x0000000000000000000000000000000000000000000000000000000000000000'

export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
export const ONE_ADDRESS = '0x0000000000000000000000000000000000000001'

Expand Down
9 changes: 9 additions & 0 deletions contracts/interfaces/IBasketHandler.sol
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,15 @@ interface IBasketHandler is IComponent {
}

interface TestIBasketHandler is IBasketHandler {
function getPrimeBasket()
external
view
returns (
IERC20[] memory erc20s,
bytes32[] memory targetNames,
uint192[] memory targetAmts
);

function lastCollateralized() external view returns (uint48);

function warmupPeriod() external view returns (uint48);
Expand Down
9 changes: 9 additions & 0 deletions contracts/interfaces/IDeployer.sol
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,13 @@ interface TestIDeployer is IDeployer {
function gnosis() external view returns (IGnosis);

function rsrAsset() external view returns (IAsset);

function implementations()
external
view
returns (
IMain,
Components memory,
TradePlugins memory
);
}
12 changes: 12 additions & 0 deletions contracts/interfaces/ISpell.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// SPDX-License-Identifier: BlueOak-1.0.0
pragma solidity 0.8.19;

import "@openzeppelin/contracts/governance/IGovernor.sol";
import "./IRToken.sol";

interface ISpell {
// Cast once-per-sender
/// @param rToken The RToken to upgrade
/// @param governor The corresponding Governor Alexios for the RToken
function cast(IRToken rToken, IGovernor governor) external;
}
Loading
Loading