Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into sparrowDom/nativeSt…
Browse files Browse the repository at this point in the history 
…aking
  • Loading branch information
@naddison36
naddison36 committed May 29, 2024
2 parents 9295fe7 + e6396db commit 8748170
Show file tree
Hide file tree
Showing 11 changed files with 1,294 additions and 147 deletions.
30 changes: 30 additions & 0 deletions contracts/contracts/interfaces/ITimelockController.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,34 @@ interface ITimelockController {
function revokeRole(bytes32 role, address account) external;

function renounceRole(bytes32 role, address account) external;

function hasRole(bytes32 role, address account)
external
view
returns (bool);

function executeBatch(
address[] calldata targets,
uint256[] calldata values,
bytes[] calldata payloads,
bytes32 predecessor,
bytes32 salt
) external payable;

function scheduleBatch(
address[] calldata targets,
uint256[] calldata values,
bytes[] calldata payloads,
bytes32 predecessor,
bytes32 salt,
uint256 delay
) external;

function hashOperationBatch(
address[] calldata targets,
uint256[] calldata values,
bytes[] calldata payloads,
bytes32 predecessor,
bytes32 salt
) external;
}
3 changes: 2 additions & 1 deletion contracts/deploy/mainnet/095_ogn_buyback.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ module.exports = deploymentWithGovernanceProposal(
// forceSkip: true,
// onlyOnFork: true, // this is only executed in forked environment
reduceQueueTime: true, // just to solve the issue of later active proposals failing
proposalId: "",
proposalId:
"100113649362054951243432198289201251397604714208907424900419345506009716510012",
},
async ({ ethers }) => {
const cOETHBuybackProxy = await ethers.getContract("OETHBuybackProxy");
Expand Down
1 change: 1 addition & 0 deletions contracts/deployments/mainnet/.migrations.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,6 @@
"092_woeth_ccip_zapper": 1714111493,
"093_disable_frxeth_strategies": 1714495720,
"094_add_multisig_to_timelock": 1715176032,
"095_ogn_buyback": 1716026320,
"096_vault_admin_upgrade": 1715943467
}
96 changes: 48 additions & 48 deletions contracts/deployments/mainnet/OETHBuyback.json
View file

Large diffs are not rendered by default.

98 changes: 49 additions & 49 deletions contracts/deployments/mainnet/OUSDBuyback.json
View file

Large diffs are not rendered by default.

656 changes: 656 additions & 0 deletions contracts/deployments/mainnet/solcInputs/09f58b6dcf9cf4ead266452e592de39c.json
View file

Large diffs are not rendered by default.

365 changes: 365 additions & 0 deletions contracts/deployments/mainnet/solcInputs/232e8e0204d2e4a7ef16f42f2d1e8c8e.json
View file

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions contracts/storageLayout/mainnet/OETHBuyback.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,88 +46,88 @@
"offset": 0,
"slot": "102",
"type": "t_address",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:31"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:31"
},
{
"label": "__deprecated_ousd",
"offset": 0,
"slot": "103",
"type": "t_address",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:34"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:34"
},
{
"label": "__deprecated_ogv",
"offset": 0,
"slot": "104",
"type": "t_address",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:36"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:36"
},
{
"label": "__deprecated_usdt",
"offset": 0,
"slot": "105",
"type": "t_address",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:38"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:38"
},
{
"label": "__deprecated_weth9",
"offset": 0,
"slot": "106",
"type": "t_address",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:40"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:40"
},
{
"label": "rewardsSource",
"offset": 0,
"slot": "107",
"type": "t_address",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:43"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:43"
},
{
"label": "treasuryManager",
"offset": 0,
"slot": "108",
"type": "t_address",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:46"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:46"
},
{
"label": "__deprecated_treasuryBps",
"offset": 0,
"slot": "109",
"type": "t_uint256",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:49"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:49"
},
{
"label": "balanceForOGV",
"label": "balanceForOGN",
"offset": 0,
"slot": "110",
"type": "t_uint256",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:57"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:57"
},
{
"label": "balanceForCVX",
"offset": 0,
"slot": "111",
"type": "t_uint256",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:60"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:60"
},
{
"label": "cvxShareBps",
"offset": 0,
"slot": "112",
"type": "t_uint256",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:63"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:63"
}
],
"types": {
Expand Down
46 changes: 23 additions & 23 deletions contracts/storageLayout/mainnet/OUSDBuyback.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,88 +46,88 @@
"offset": 0,
"slot": "102",
"type": "t_address",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:31"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:31"
},
{
"label": "__deprecated_ousd",
"offset": 0,
"slot": "103",
"type": "t_address",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:34"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:34"
},
{
"label": "__deprecated_ogv",
"offset": 0,
"slot": "104",
"type": "t_address",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:36"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:36"
},
{
"label": "__deprecated_usdt",
"offset": 0,
"slot": "105",
"type": "t_address",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:38"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:38"
},
{
"label": "__deprecated_weth9",
"offset": 0,
"slot": "106",
"type": "t_address",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:40"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:40"
},
{
"label": "rewardsSource",
"offset": 0,
"slot": "107",
"type": "t_address",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:43"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:43"
},
{
"label": "treasuryManager",
"offset": 0,
"slot": "108",
"type": "t_address",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:46"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:46"
},
{
"label": "__deprecated_treasuryBps",
"offset": 0,
"slot": "109",
"type": "t_uint256",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:49"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:49"
},
{
"label": "balanceForOGV",
"label": "balanceForOGN",
"offset": 0,
"slot": "110",
"type": "t_uint256",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:57"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:57"
},
{
"label": "balanceForCVX",
"offset": 0,
"slot": "111",
"type": "t_uint256",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:60"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:60"
},
{
"label": "cvxShareBps",
"offset": 0,
"slot": "112",
"type": "t_uint256",
"contract": "BaseBuyback",
"src": "contracts/buyback/BaseBuyback.sol:63"
"contract": "AbstractBuyback",
"src": "contracts/buyback/AbstractBuyback.sol:63"
}
],
"types": {
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/strategies/ousd-metapool-balanced-pool.fork-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ describe("ForkTest: Convex 3pool/OUSD Meta Strategy - Balanced Metapool", functi
const currentBalance = await ousd.connect(anna).balanceOf(anna.address);

// Now try to redeem the amount
const redeemAmount = ousdUnits("29900");
const redeemAmount = ousdUnits("29980");
await vault.connect(anna).redeem(redeemAmount, 0);

// User balance should be down by 30k
Expand Down
Loading

0 comments on commit 8748170

Please sign in to comment.