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.

Sign up for GitHub

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

Adapt new delegator #5

Merged
merged 1 commit into from
Dec 27, 2024
Merged

Adapt new delegator #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/core
Open in desktop
Submodule core updated 274 files
108 changes: 70 additions & 38 deletions test/DefaultCollateralMigrator.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,19 @@ import {OptInService} from "@symbioticfi/core/src/contracts/service/OptInService
import {Vault} from "@symbioticfi/core/src/contracts/vault/Vault.sol";
import {NetworkRestakeDelegator} from "@symbioticfi/core/src/contracts/delegator/NetworkRestakeDelegator.sol";
import {FullRestakeDelegator} from "@symbioticfi/core/src/contracts/delegator/FullRestakeDelegator.sol";
import {OperatorSpecificDelegator} from "@symbioticfi/core/src/contracts/delegator/OperatorSpecificDelegator.sol";
import {OperatorNetworkSpecificDelegator} from
"@symbioticfi/core/src/contracts/delegator/OperatorNetworkSpecificDelegator.sol";
import {Slasher} from "@symbioticfi/core/src/contracts/slasher/Slasher.sol";
import {VetoSlasher} from "@symbioticfi/core/src/contracts/slasher/VetoSlasher.sol";

import {Token} from "@symbioticfi/core/test/mocks/Token.sol";
import {FeeOnTransferToken} from "@symbioticfi/core/test/mocks/FeeOnTransferToken.sol";
import {VaultConfigurator, IVaultConfigurator} from "@symbioticfi/core/src/contracts/VaultConfigurator.sol";
import {IVault} from "@symbioticfi/core/src/interfaces/IVaultConfigurator.sol";
import {VaultConfigurator} from "@symbioticfi/core/src/contracts/VaultConfigurator.sol";
import {IVaultConfigurator} from "@symbioticfi/core/src/interfaces/IVaultConfigurator.sol";
import {INetworkRestakeDelegator} from "@symbioticfi/core/src/interfaces/delegator/INetworkRestakeDelegator.sol";
import {IBaseDelegator} from "@symbioticfi/core/src/interfaces/delegator/IBaseDelegator.sol";
import {IVault} from "@symbioticfi/core/src/interfaces/vault/IVault.sol";

import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";

Expand Down Expand Up @@ -85,8 +89,10 @@ contract DefaultCollateralMigratorTest is Test {
operatorMetadataService = new MetadataService(address(operatorRegistry));
networkMetadataService = new MetadataService(address(networkRegistry));
networkMiddlewareService = new NetworkMiddlewareService(address(networkRegistry));
operatorVaultOptInService = new OptInService(address(operatorRegistry), address(vaultFactory));
operatorNetworkOptInService = new OptInService(address(operatorRegistry), address(networkRegistry));
operatorVaultOptInService =
new OptInService(address(operatorRegistry), address(vaultFactory), "OperatorVaultOptInService");
operatorNetworkOptInService =
new OptInService(address(operatorRegistry), address(networkRegistry), "OperatorNetworkOptInService");

address vaultImpl =
address(new Vault(address(delegatorFactory), address(slasherFactory), address(vaultFactory)));
Expand Down Expand Up @@ -116,6 +122,32 @@ contract DefaultCollateralMigratorTest is Test {
);
delegatorFactory.whitelist(fullRestakeDelegatorImpl);

address operatorSpecificDelegatorImpl = address(
new OperatorSpecificDelegator(
address(operatorRegistry),
address(networkRegistry),
address(vaultFactory),
address(operatorVaultOptInService),
address(operatorNetworkOptInService),
address(delegatorFactory),
delegatorFactory.totalTypes()
)
);
delegatorFactory.whitelist(operatorSpecificDelegatorImpl);

address operatorNetworkSpecificDelegatorImpl = address(
new OperatorNetworkSpecificDelegator(
address(operatorRegistry),
address(networkRegistry),
address(vaultFactory),
address(operatorVaultOptInService),
address(operatorNetworkOptInService),
address(delegatorFactory),
delegatorFactory.totalTypes()
)
);
delegatorFactory.whitelist(operatorNetworkSpecificDelegatorImpl);

address slasherImpl = address(
new Slasher(
address(vaultFactory),
Expand Down Expand Up @@ -172,21 +204,21 @@ contract DefaultCollateralMigratorTest is Test {
IVaultConfigurator.InitParams({
version: vaultFactory.lastVersion(),
owner: alice,
vaultParams: IVault.InitParams({
collateral: address(feeOnTransferCollateral.asset()),
delegator: address(0),
slasher: address(0),
burner: address(0xdEaD),
epochDuration: epochDuration,
depositWhitelist: false,
isDepositLimit: false,
depositLimit: 0,
defaultAdminRoleHolder: alice,
depositWhitelistSetRoleHolder: alice,
depositorWhitelistRoleHolder: alice,
isDepositLimitSetRoleHolder: alice,
depositLimitSetRoleHolder: alice
}),
vaultParams: abi.encode(
IVault.InitParams({
collateral: address(feeOnTransferCollateral.asset()),
burner: address(0xdEaD),
epochDuration: epochDuration,
depositWhitelist: false,
isDepositLimit: false,
depositLimit: 0,
defaultAdminRoleHolder: alice,
depositWhitelistSetRoleHolder: alice,
depositorWhitelistRoleHolder: alice,
isDepositLimitSetRoleHolder: alice,
depositLimitSetRoleHolder: alice
})
),
delegatorIndex: 0,
delegatorParams: abi.encode(
INetworkRestakeDelegator.InitParams({
Expand Down Expand Up @@ -222,7 +254,7 @@ contract DefaultCollateralMigratorTest is Test {
uint256 balanceBeforeAssetVault = IERC20(collateral.asset()).balanceOf(address(vault));
uint256 balanceBeforeAssetMigrator = IERC20(collateral.asset()).balanceOf(address(defaultCollateralMigrator));

assertEq(vault.balanceOf(address(this)), 0);
assertEq(vault.slashableBalanceOf(address(this)), 0);

collateral.approve(address(defaultCollateralMigrator), amount);
defaultCollateralMigrator.migrate(address(collateral), address(vault), address(this), amount);
Expand All @@ -236,7 +268,7 @@ contract DefaultCollateralMigratorTest is Test {
IERC20(collateral.asset()).balanceOf(address(defaultCollateralMigrator)) - balanceBeforeAssetMigrator, 0
);

assertEq(vault.balanceOf(address(this)), amount);
assertEq(vault.slashableBalanceOf(address(this)), amount);
assertEq(
IERC20(collateral.asset()).allowance(address(defaultCollateralMigrator), address(vault)), type(uint256).max
);
Expand All @@ -255,7 +287,7 @@ contract DefaultCollateralMigratorTest is Test {
uint256 balanceBeforeAssetMigrator =
IERC20(feeOnTransferCollateral.asset()).balanceOf(address(defaultCollateralMigrator));

assertEq(vaultFeeOnTransfer.balanceOf(address(this)), 0);
assertEq(vaultFeeOnTransfer.slashableBalanceOf(address(this)), 0);

feeOnTransferCollateral.approve(address(defaultCollateralMigrator), amount);
defaultCollateralMigrator.migrate(
Expand All @@ -278,7 +310,7 @@ contract DefaultCollateralMigratorTest is Test {
0
);

assertEq(vaultFeeOnTransfer.balanceOf(address(this)), amount - 2);
assertEq(vaultFeeOnTransfer.slashableBalanceOf(address(this)), amount - 2);
assertEq(
IERC20(feeOnTransferCollateral.asset()).allowance(
address(defaultCollateralMigrator), address(vaultFeeOnTransfer)
Expand All @@ -298,21 +330,21 @@ contract DefaultCollateralMigratorTest is Test {
IVaultConfigurator.InitParams({
version: vaultFactory.lastVersion(),
owner: alice,
vaultParams: IVault.InitParams({
collateral: address(collateral.asset()),
delegator: address(0),
slasher: address(0),
burner: address(0xdEaD),
epochDuration: epochDuration,
depositWhitelist: false,
isDepositLimit: false,
depositLimit: 0,
defaultAdminRoleHolder: alice,
depositWhitelistSetRoleHolder: alice,
depositorWhitelistRoleHolder: alice,
isDepositLimitSetRoleHolder: alice,
depositLimitSetRoleHolder: alice
}),
vaultParams: abi.encode(
IVault.InitParams({
collateral: address(collateral.asset()),
burner: address(0xdEaD),
epochDuration: epochDuration,
depositWhitelist: false,
isDepositLimit: false,
depositLimit: 0,
defaultAdminRoleHolder: alice,
depositWhitelistSetRoleHolder: alice,
depositorWhitelistRoleHolder: alice,
isDepositLimitSetRoleHolder: alice,
depositLimitSetRoleHolder: alice
})
),
delegatorIndex: 0,
delegatorParams: abi.encode(
INetworkRestakeDelegator.InitParams({
Expand Down
Loading