Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions brownie/world_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
aero_helper = load_contract('aerodrome_slipstream_sugar_helper', AERODROME_SUGAR_HELPER_BASE)
amo_pool = load_contract('aerodrome_slipstream_pool', AERODROME_WETH_OETHB_POOL_BASE)
curve_pool = load_contract('curve_pool_base', CURVE_POOL_BASE)
base_curve_amo_strat = load_contract('ousd_curve_amo_strat', OETHB_CURVE_AMO_STRATEGY)

aerodrome_voter = load_contract('aerodrome_voter', AERO_VOTER_BASE)

Expand Down
11 changes: 6 additions & 5 deletions contracts/deploy/base/049_permissioned_rebase_module.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ module.exports = deployOnBase(

const cOETHBaseVaultProxy = await ethers.getContract("OETHBaseVaultProxy");

await deployWithConfirmation("PermissionedRebaseModule", [
safeAddress,
addresses.permissionedRebaseRelayer,
[cOETHBaseVaultProxy.address],
]);
await deployWithConfirmation(
"PermissionedRebaseModule",
[safeAddress, addresses.talosRelayer, [cOETHBaseVaultProxy.address]],
undefined,
true
);
const cPermissionedRebaseModule = await ethers.getContract(
"PermissionedRebaseModule"
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const addresses = require("../../utils/addresses");

module.exports = deployOnBase(
{
deployName: "049_vault_permissioned_rebase",
deployName: "050_vault_permissioned_rebase",
},
async ({ ethers }) => {
// 1. Deploy new OETHBaseVault implementation
Expand Down Expand Up @@ -32,7 +32,7 @@ module.exports = deployOnBase(
{
contract: cOETHbVault,
signature: "setOperatorAddr(address)",
args: [addresses.multichainStrategist],
args: [addresses.talosRelayer],
},
],
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = deploymentWithGovernanceProposal(

await deployWithConfirmation("PermissionedRebaseModule", [
safeAddress,
addresses.permissionedRebaseRelayer,
addresses.talosRelayer,
[cVaultProxy.address, cOETHVaultProxy.address],
]);
const cPermissionedRebaseModule = await ethers.getContract(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,29 @@ const { deploymentWithGovernanceProposal } = require("../../utils/deploy");

module.exports = deploymentWithGovernanceProposal(
{
deployName: "193_vault_permissioned_rebase",
deployName: "194_vault_permissioned_rebase",
forceDeploy: false,
reduceQueueTime: true,
deployerIsProposer: false,
proposalId: "",
proposalId:
"9948092462276445509780797495205471799644905864792185620552351889756709358003",
},
async ({ deployWithConfirmation }) => {
// 1. Deploy new OUSD Vault implementation
const dOUSDVault = await deployWithConfirmation("OUSDVault", [
addresses.mainnet.USDC,
]);
const dOUSDVault = await deployWithConfirmation(
"OUSDVault",
[addresses.mainnet.USDC],
undefined,
true
);

// 2. Deploy new OETH Vault implementation
const dOETHVault = await deployWithConfirmation("OETHVault", [
addresses.mainnet.WETH,
]);
const dOETHVault = await deployWithConfirmation(
"OETHVault",
[addresses.mainnet.WETH],
undefined,
true
);

const cVaultProxy = await ethers.getContract("VaultProxy");
const cOUSDVault = await ethers.getContractAt(
Expand All @@ -43,7 +50,7 @@ module.exports = deploymentWithGovernanceProposal(
{
contract: cOUSDVault,
signature: "setOperatorAddr(address)",
args: [addresses.multichainStrategist],
args: [addresses.talosRelayer],
},
{
contract: cOETHVaultProxy,
Expand All @@ -53,7 +60,7 @@ module.exports = deploymentWithGovernanceProposal(
{
contract: cOETHVault,
signature: "setOperatorAddr(address)",
args: [addresses.multichainStrategist],
args: [addresses.talosRelayer],
},
],
};
Expand Down
2 changes: 1 addition & 1 deletion contracts/deploy/sonic/028_permissioned_rebase_module.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = deployOnSonic(

await deployWithConfirmation("PermissionedRebaseModule", [
safeAddress,
addresses.permissionedRebaseRelayer,
addresses.talosRelayer,
[cOSonicVaultProxy.address],
]);
const cPermissionedRebaseModule = await ethers.getContract(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const addresses = require("../../utils/addresses");

module.exports = deployOnSonic(
{
deployName: "028_vault_permissioned_rebase",
deployName: "029_vault_permissioned_rebase",
},
async ({ ethers }) => {
// 1. Deploy new OSVault implementation
Expand Down Expand Up @@ -32,7 +32,7 @@ module.exports = deployOnSonic(
{
contract: cOSonicVault,
signature: "setOperatorAddr(address)",
args: [addresses.sonic.guardian],
args: [addresses.talosRelayer],
},
],
};
Expand Down
3 changes: 2 additions & 1 deletion contracts/deployments/base/.migrations.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,6 @@
"046_crosschain_upgrade_remote": 1772750064,
"047_merkl_pb_bribes_module": 1773930124,
"048_oethb_hydrex_amo": 1778063838,
"049_permissioned_rebase_module": 1778095983
"049_permissioned_rebase_module": 1778095983,
"050_vault_permissioned_rebase": 1778496613
}
261 changes: 136 additions & 125 deletions contracts/deployments/base/OETHBaseVault.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"version": "1.0",
"chainId": "8453",
"createdAt": 1778496613,
"meta": {
"name": "Transaction Batch",
"description": "",
"txBuilderVersion": "1.16.1",
"createdFromSafeAddress": "0x92A19381444A001d62cE67BaFF066fA1111d7202",
"createdFromOwnerAddress": ""
},
"transactions": [
{
"to": "0xf817cb3092179083c48c014688D98B72fB61464f",
"value": "0",
"data": null,
"contractMethod": {
"inputs": [
{
"type": "address[]",
"name": "targets"
},
{
"type": "uint256[]",
"name": "values"
},
{
"type": "bytes[]",
"name": "payloads"
},
{
"type": "bytes32",
"name": "predecessor"
},
{
"type": "bytes32",
"name": "salt"
}
],
"name": "executeBatch",
"payable": true
},
"contractInputsValues": {
"targets": "[\"0x98a0CbeF61bD2D21435f433bE4CD42B56B38CC93\",\"0x98a0CbeF61bD2D21435f433bE4CD42B56B38CC93\"]",
"values": "[\"0\",\"0\"]",
"payloads": "[\"0x3659cfe6000000000000000000000000fdbe6a80e1d22ff652cbff44fead2e52287393e8\",\"0x9e4285520000000000000000000000000abcda6fa7d500cf69b0ea5de9a607cd9941221c\"]",
"predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
"salt": "0x0bd702311b1c2059690ab3de76df60f5a16fea5d0904e96a749666ef2d98e866"
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"version": "1.0",
"chainId": "8453",
"createdAt": 1778496613,
"meta": {
"name": "Transaction Batch",
"description": "",
"txBuilderVersion": "1.16.1",
"createdFromSafeAddress": "0x92A19381444A001d62cE67BaFF066fA1111d7202",
"createdFromOwnerAddress": ""
},
"transactions": [
{
"to": "0xf817cb3092179083c48c014688D98B72fB61464f",
"value": "0",
"data": null,
"contractMethod": {
"inputs": [
{
"type": "address[]",
"name": "targets"
},
{
"type": "uint256[]",
"name": "values"
},
{
"type": "bytes[]",
"name": "payloads"
},
{
"type": "bytes32",
"name": "predecessor"
},
{
"type": "bytes32",
"name": "salt"
},
{
"type": "uint256",
"name": "delay"
}
],
"name": "scheduleBatch",
"payable": false
},
"contractInputsValues": {
"targets": "[\"0x98a0CbeF61bD2D21435f433bE4CD42B56B38CC93\",\"0x98a0CbeF61bD2D21435f433bE4CD42B56B38CC93\"]",
"values": "[\"0\",\"0\"]",
"payloads": "[\"0x3659cfe6000000000000000000000000fdbe6a80e1d22ff652cbff44fead2e52287393e8\",\"0x9e4285520000000000000000000000000abcda6fa7d500cf69b0ea5de9a607cd9941221c\"]",
"predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
"salt": "0x0bd702311b1c2059690ab3de76df60f5a16fea5d0904e96a749666ef2d98e866",
"delay": "172800"
}
}
]
}
Loading
Loading