Skip to content

Commit 6c9226b

Browse files
committed
fix: minor fixes in migration script
1 parent 6c12a06 commit 6c9226b

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

contracts/migration/MarketConfigurator.sol

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ import {IContractsRegisterLegacy} from
1313
import {ACL} from "@gearbox-protocol/governance/contracts/market/ACL.sol";
1414
import {ContractsRegister} from "@gearbox-protocol/governance/contracts/market/ContractsRegister.sol";
1515

16+
contract LossPolicy {
17+
uint256 public constant version = 3_10;
18+
}
19+
1620
/// @dev Extremely dumbed-down version of `MarketConfiguratorLegacy` that is just enough to let compressors work
1721
contract MarketConfigurator {
1822
string public name;
@@ -22,8 +26,8 @@ contract MarketConfigurator {
2226

2327
constructor(string memory name_, address acl_, address contractsRegister_, address treasury_) {
2428
name = name_;
25-
acl = acl_;
26-
contractsRegister = address(new ContractsRegister(address(new ACL())));
29+
acl = address(new ACL());
30+
contractsRegister = address(new ContractsRegister(acl));
2731
treasury = treasury_;
2832

2933
address[] memory pools = IContractsRegisterLegacy(contractsRegister_).getPools();
@@ -38,7 +42,7 @@ contract MarketConfigurator {
3842

3943
address priceOracle = _priceOracle(creditManagers[0]);
4044
// NOTE: v3.0.x contracts don't have loss policies set so we don't bother with them here
41-
address lossPolicy = address(1);
45+
address lossPolicy = address(new LossPolicy());
4246

4347
ContractsRegister(contractsRegister).registerMarket(pool, priceOracle, lossPolicy);
4448
for (uint256 j; j < numCreditManagers; ++j) {
@@ -58,8 +62,4 @@ contract MarketConfigurator {
5862
function _priceOracle(address creditManager) internal view returns (address) {
5963
return ICreditManagerV3(creditManager).priceOracle();
6064
}
61-
62-
function _lossLiquidator(address creditManager) internal view returns (address) {
63-
return ICreditFacadeV3(ICreditManagerV3(creditManager).creditFacade()).lossLiquidator();
64-
}
6565
}

script/Migrate.s.sol

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ contract MigrateScript is Script {
6161
AddressProvider addressProvider = new AddressProvider();
6262
console.log("new address provider:", address(addressProvider));
6363

64-
addressProvider.transferOwnership(Ownable(acl).owner());
65-
6664
// NOTE: just some fake address
6765
addressProvider.setAddress({
6866
key: AP_MARKET_CONFIGURATOR_FACTORY.fromSmallString(),
@@ -117,6 +115,9 @@ contract MigrateScript is Script {
117115
address creditAccountCompressor = address(new CreditAccountCompressor(address(addressProvider)));
118116
addressProvider.setAddress(creditAccountCompressor, true);
119117

118+
// NOTE: configurator must later accept ownership over new address provider
119+
addressProvider.transferOwnership(Ownable(acl).owner());
120+
120121
string memory obj1 = "address_provider";
121122
vm.serializeAddress(obj1, "addressProvider", address(addressProvider));
122123

0 commit comments

Comments
 (0)