Sip 366 implementation

markets/bfp-market/storage.dump.sol

@@ -119,7 +119,7 @@ library Account {
         AccountRBAC.Data rbac;
         uint64 lastInteraction;
         uint64 __slotAvailableForFutureUse;
-        uint128 __slot2AvailableForFutureUse;
+        uint128 currentDelegationIntentsEpoch;
         mapping(address => Collateral.Data) collaterals;
     }
     function load(uint128 id) internal pure returns (Data storage account) {
@@ -228,11 +228,13 @@ library Market {
         mapping(uint128 => MarketPoolInfo.Data) pools;
         DepositedCollateral[] depositedCollateral;
         mapping(address => uint256) maximumDepositableD18;
-        uint32 minDelegateTime;
+        uint32 __unusedLegacyStorageSlot;
+        uint32 undelegateCollateralDelay;
+        uint32 undelegateCollateralWindow;
+        uint32 delegateCollateralDelay;
+        uint32 delegateCollateralWindow;
         uint32 __reservedForLater1;
         uint64 __reservedForLater2;
-        uint64 __reservedForLater3;
-        uint64 __reservedForLater4;
         uint256 minLiquidityRatioD18;
     }
     struct DepositedCollateral {
@@ -280,7 +282,6 @@ library OracleManager {
 
 // @custom:artifact @synthetixio/main/contracts/storage/Pool.sol:Pool
 library Pool {
-    bytes32 private constant _CONFIG_SET_MARKET_MIN_DELEGATE_MAX = "setMarketMinDelegateTime_max";
     struct Data {
         uint128 id;
         string name;
@@ -388,7 +389,7 @@ library VaultEpoch {
         Distribution.Data accountsDebtDistribution;
         ScalableMapping.Data collateralAmounts;
         mapping(uint256 => int256) consolidatedDebtAmountsD18;
-        mapping(uint128 => uint64) lastDelegationTime;
+        mapping(uint128 => uint64) __unused_legacy_slot;
     }
 }
 

markets/bfp-market/test/integration/modules/OrderModule.test.ts

@@ -37,13 +37,15 @@ import {
 import { ethers } from 'ethers';
 import { calcFillPrice } from '../../calculations';
 import { shuffle } from 'lodash';
+import { delegateCollateral } from '@synthetixio/main/test/common';
 
 describe('OrderModule', () => {
   const bs = bootstrap(genBootstrap());
   const {
     systems,
     restore,
     provider,
+    owner,
     keeper,
     collateralsWithoutSusd,
     markets,
@@ -1372,7 +1374,7 @@ describe('OrderModule', () => {
     });
 
     it('should accurately account for utilization when holding for a long time', async () => {
-      const { BfpMarketProxy, Core } = systems();
+      const { BfpMarketProxy } = systems();
 
       const { collateral, collateralDepositAmount, trader, marketId, market } = await depositMargin(
         bs,
@@ -1402,7 +1404,10 @@ describe('OrderModule', () => {
       const { stakedAmount, staker, stakerAccountId, collateral: stakedCollateral, id } = pool();
       // Unstake 50% of the delegated amount on the core side, this should lead to a increased utilization rate.
       const newDelegated = wei(stakedAmount).mul(0.5).toBN();
-      await Core.connect(staker()).delegateCollateral(
+      await delegateCollateral(
+        systems,
+        owner(),
+        staker(),
         stakerAccountId,
         id,
         stakedCollateral().address,

markets/bfp-market/test/integration/modules/PerpMarketFactoryModule.utilisation.test.ts

@@ -23,6 +23,7 @@ import {
   withExplicitEvmMine,
 } from '../../helpers';
 import { calcUtilization, calcUtilizationRate } from '../../calculations';
+import { delegateCollateral } from '@synthetixio/main/test/common';
 
 describe('PerpMarketFactoryModule Utilization', () => {
   const bs = bootstrap(genBootstrap());
@@ -152,7 +153,10 @@ describe('PerpMarketFactoryModule Utilization', () => {
         stakedCollateral().address
       );
       const stakedCollateralAddress = stakedCollateral().address;
-      await Core.connect(staker()).delegateCollateral(
+      await delegateCollateral(
+        systems,
+        owner(),
+        staker(),
         stakerAccountId,
         poolId,
         stakedCollateralAddress,
@@ -222,7 +226,10 @@ describe('PerpMarketFactoryModule Utilization', () => {
         stakedCollateral().address
       );
       const stakedCollateralAddress = stakedCollateral().address;
-      await Core.connect(staker()).delegateCollateral(
+      await delegateCollateral(
+        systems,
+        owner(),
+        staker(),
         stakerAccountId,
         poolId,
         stakedCollateralAddress,
@@ -377,7 +384,7 @@ describe('PerpMarketFactoryModule Utilization', () => {
   });
   describe('getUtilizationDigest', async () => {
     it('should return utilization data', async () => {
-      const { BfpMarketProxy, Core } = systems();
+      const { BfpMarketProxy } = systems();
       const market = genOneOf(markets());
 
       const { marketId, trader, collateral, collateralDepositAmount } = await depositMargin(
@@ -412,16 +419,15 @@ describe('PerpMarketFactoryModule Utilization', () => {
       await fastForwardBySec(provider(), genNumber(1, SECONDS_ONE_DAY));
       // Decrease amount of staked collateral on the core side.
       const stakedCollateralAddress = stakedCollateral().address;
-      await withExplicitEvmMine(
-        () =>
-          Core.connect(staker()).delegateCollateral(
-            stakerAccountId,
-            poolId,
-            stakedCollateralAddress,
-            wei(stakedAmount).mul(0.9).toBN(),
-            bn(1)
-          ),
-        provider()
+      await delegateCollateral(
+        systems,
+        owner(),
+        staker(),
+        stakerAccountId,
+        poolId,
+        stakedCollateralAddress,
+        wei(stakedAmount).mul(0.9).toBN(),
+        bn(1)
       );
 
       const utilizationDigest2 = await BfpMarketProxy.getUtilizationDigest(marketId);

markets/legacy-market/package.json

@@ -20,6 +20,7 @@
     "@synthetixio/common-config": "workspace:*",
     "@synthetixio/core-utils": "workspace:*",
     "@synthetixio/docgen": "workspace:*",
+    "@synthetixio/main": "workspace:*",
     "@synthetixio/wei": "^2.74.4",
     "ethers": "^5.7.2",
     "hardhat": "^2.19.5",

markets/legacy-market/test/integration/LegacyMarket.iosiroInfiniteMoney.ts

@@ -6,6 +6,7 @@ import { wei } from '@synthetixio/wei';
 import { snapshotCheckpoint } from '../utils';
 import { fastForward } from '@synthetixio/core-utils/utils/hardhat/rpc';
 import assertRevert from '@synthetixio/core-utils/utils/assertions/assert-revert';
+import { delegateCollateral } from '@synthetixio/main/test/common';
 
 async function getImpersonatedSigner(
   provider: ethers.providers.JsonRpcProvider,
@@ -274,15 +275,18 @@ describe('LegacyMarket (iosiro)', function () {
       await v3System
         .connect(whaleAccount)
         .deposit(whaleAccountId, collateralType, whaleDelegationAmount);
-      await v3System
-        .connect(whaleAccount)
-        .delegateCollateral(
-          whaleAccountId,
-          otherPoolId,
-          collateralType,
-          whaleDelegationAmount,
-          wei(1).toBN()
-        );
+      await delegateCollateral(
+        () => ({
+          Core: v3System,
+        }),
+        owner,
+        whaleAccount,
+        whaleAccountId,
+        otherPoolId,
+        collateralType,
+        whaleDelegationAmount,
+        wei(1).toBN()
+      );
       await v3System
         .connect(whaleAccount)
         .mintUsd(whaleAccountId, otherPoolId, collateralType, wei(3333).toBN());
@@ -325,9 +329,18 @@ describe('LegacyMarket (iosiro)', function () {
         const amountToWithdraw = accountCollateralDetails.totalDeposited;
 
         await fastForward(605000, cannonProvider);
-        await v3System
-          .connect(attacker)
-          .delegateCollateral(accountID, poolId, collateralType, 0, wei(1).toBN());
+        await delegateCollateral(
+          () => ({
+            Core: v3System,
+          }),
+          owner,
+          attacker,
+          accountID,
+          poolId,
+          collateralType,
+          wei(0).toBN(),
+          wei(1).toBN()
+        );
         await v3System.connect(attacker).withdraw(accountID, collateralType, amountToWithdraw);
         // attacker restakes in v2
         await snxV2.connect(attacker).issueMaxSynths();

markets/legacy-market/test/integration/LegacyMarket.ts

@@ -11,6 +11,7 @@ import { LegacyMarket } from '../../typechain-types/contracts/LegacyMarket';
 import Wei, { wei } from '@synthetixio/wei';
 import assertEvent from '@synthetixio/core-utils/utils/assertions/assert-event';
 import { snapshotCheckpoint } from '../utils';
+import { delegateCollateral } from '@synthetixio/main/test/common';
 
 async function getImpersonatedSigner(
   provider: ethers.providers.JsonRpcProvider,
@@ -347,15 +348,17 @@ describe('LegacyMarket', function () {
         await v3System.connect(owner).deposit(accountId, snxToken.address, delegateAmount);
 
         // invest in the pool
-        await v3System
-          .connect(owner)
-          .delegateCollateral(
-            accountId,
-            await v3System.getPreferredPool(),
-            snxToken.address,
-            delegateAmount,
-            ethers.utils.parseEther('1')
-          );
+        await delegateCollateral(
+          () => ({
+            Core: v3System,
+          }),
+          owner,
+          accountId,
+          await v3System.getPreferredPool(),
+          snxToken.address,
+          delegateAmount,
+          ethers.utils.parseEther('1')
+        );
 
         // sanity
         assertBn.equal(

markets/perps-market/storage.dump.sol

@@ -118,7 +118,7 @@ library Account {
         AccountRBAC.Data rbac;
         uint64 lastInteraction;
         uint64 __slotAvailableForFutureUse;
-        uint128 __slot2AvailableForFutureUse;
+        uint128 currentDelegationIntentsEpoch;
         mapping(address => Collateral.Data) collaterals;
     }
     function load(uint128 id) internal pure returns (Data storage account) {
@@ -227,11 +227,13 @@ library Market {
         mapping(uint128 => MarketPoolInfo.Data) pools;
         DepositedCollateral[] depositedCollateral;
         mapping(address => uint256) maximumDepositableD18;
-        uint32 minDelegateTime;
+        uint32 __unusedLegacyStorageSlot;
+        uint32 undelegateCollateralDelay;
+        uint32 undelegateCollateralWindow;
+        uint32 delegateCollateralDelay;
+        uint32 delegateCollateralWindow;
         uint32 __reservedForLater1;
         uint64 __reservedForLater2;
-        uint64 __reservedForLater3;
-        uint64 __reservedForLater4;
         uint256 minLiquidityRatioD18;
     }
     struct DepositedCollateral {
@@ -279,7 +281,6 @@ library OracleManager {
 
 // @custom:artifact @synthetixio/main/contracts/storage/Pool.sol:Pool
 library Pool {
-    bytes32 private constant _CONFIG_SET_MARKET_MIN_DELEGATE_MAX = "setMarketMinDelegateTime_max";
     struct Data {
         uint128 id;
         string name;
@@ -387,7 +388,7 @@ library VaultEpoch {
         Distribution.Data accountsDebtDistribution;
         ScalableMapping.Data collateralAmounts;
         mapping(uint256 => int256) consolidatedDebtAmountsD18;
-        mapping(uint128 => uint64) lastDelegationTime;
+        mapping(uint128 => uint64) __unused_legacy_slot;
     }
 }
 

markets/perps-market/test/integration/Insolvent.test.ts

@@ -4,6 +4,7 @@ import Wei, { wei } from '@synthetixio/wei';
 import { ethers } from 'ethers';
 import { fastForwardTo, getTime } from '@synthetixio/core-utils/utils/hardhat/rpc';
 import assertBn from '@synthetixio/core-utils/utils/assertions/assert-bignumber';
+import { delegateCollateral } from '@synthetixio/main/test/common';
 
 const _SECONDS_IN_DAY = 24 * 60 * 60;
 
@@ -18,7 +19,7 @@ const interestRateParams = {
 };
 
 describe('Position - interest rates', () => {
-  const { systems, perpsMarkets, superMarketId, provider, trader1, keeper, staker } =
+  const { systems, perpsMarkets, superMarketId, provider, owner, trader1, keeper, staker } =
     bootstrapMarkets({
       interestRateParams: {
         lowUtilGradient: interestRateParams.lowUtilGradient.toBN(),
@@ -83,15 +84,16 @@ describe('Position - interest rates', () => {
       systems().CollateralMock.address
     );
     // very low amount to make market insolvent
-    await systems()
-      .Core.connect(staker())
-      .delegateCollateral(
-        1,
-        1,
-        systems().CollateralMock.address,
-        wei(currentCollateralAmount).mul(wei(0.1)).toBN(),
-        ethers.utils.parseEther('1')
-      );
+    await delegateCollateral(
+      systems,
+      owner(),
+      staker(),
+      1,
+      1,
+      systems().CollateralMock.address,
+      wei(currentCollateralAmount).mul(wei(0.1)).toBN(),
+      ethers.utils.parseEther('1')
+    );
   });
 
   // trader 1