Merge branch 'main' into zero-shares

auxiliary/ERC4626ToAssetsRatioOracle/package.json

@@ -29,7 +29,7 @@
     "@synthetixio/docgen": "workspace:*",
     "@synthetixio/main": "workspace:*",
     "@synthetixio/wei": "^2.74.4",
-    "@usecannon/cli": "2.13.6",
+    "@usecannon/cli": "2.15.2",
     "ethers": "^5.7.2",
     "hardhat": "^2.19.5",
     "solidity-docgen": "^0.6.0-beta.36"

auxiliary/RewardsDistributor/package.json

@@ -21,7 +21,7 @@
     "forge-coverage": "forge coverage --report lcov"
   },
   "devDependencies": {
-    "@usecannon/cli": "2.13.6",
+    "@usecannon/cli": "2.15.2",
     "forge-std": "github:foundry-rs/forge-std#master"
   },
   "depcheck": {

auxiliary/RewardsDistributorExternal/package.json

@@ -21,7 +21,7 @@
     "forge-coverage": "forge coverage --report lcov"
   },
   "devDependencies": {
-    "@usecannon/cli": "2.13.6",
+    "@usecannon/cli": "2.15.2",
     "forge-std": "github:foundry-rs/forge-std#master"
   },
   "depcheck": {

auxiliary/WstEthToStEthRatioOracle/package.json

@@ -29,7 +29,7 @@
     "@synthetixio/docgen": "workspace:*",
     "@synthetixio/main": "workspace:*",
     "@synthetixio/wei": "^2.74.4",
-    "@usecannon/cli": "2.13.6",
+    "@usecannon/cli": "2.15.2",
     "ethers": "^5.7.2",
     "hardhat": "^2.19.5",
     "solidity-docgen": "^0.6.0-beta.36"

markets/bfp-market/cannonfile.test.toml

@@ -68,6 +68,10 @@ args = []
 artifact = "contracts/modules/SettlementHookModule.sol:SettlementHookModule"
 args = []
 
+[contract.SplitAccountConfigurationModule]
+artifact = "contracts/modules/SplitAccountConfigurationModule.sol:SplitAccountConfigurationModule"
+args = []
+
 # --- Distributor contract --- #
 
 [contract.PerpRewardDistributor]
@@ -104,6 +108,7 @@ contracts = [
     "LiquidationModule",
     "PerpRewardDistributorFactoryModule",
     "SettlementHookModule",
+    "SplitAccountConfigurationModule",
     "__TestHelperModule",
 ]
 

markets/bfp-market/cannonfile.toml

@@ -64,6 +64,10 @@ args = []
 artifact = "contracts/modules/SettlementHookModule.sol:SettlementHookModule"
 args = []
 
+[contract.SplitAccountConfigurationModule]
+artifact = "contracts/modules/SplitAccountConfigurationModule.sol:SplitAccountConfigurationModule"
+args = []
+
 # --- Distributor contract --- #
 
 [contract.PerpRewardDistributor]
@@ -94,6 +98,7 @@ contracts = [
     "LiquidationModule",
     "PerpRewardDistributorFactoryModule",
     "SettlementHookModule",
+    "SplitAccountConfigurationModule",
 ]
 
 # --- Proxy post deployment --- #

markets/bfp-market/contracts/interfaces/ISplitAccountConfigurationModule.sol

@@ -0,0 +1,30 @@
+//SPDX-License-Identifier: MIT
+pragma solidity >=0.8.11 <0.9.0;
+
+import {SettlementHookConfiguration} from "../storage/SettlementHookConfiguration.sol";
+
+interface ISplitAccountConfigurationModule {
+    // --- Events --- //
+
+    /// @notice Emitted when split account whitelist is configured.
+    /// @param from Address of configurer
+    /// @param hooks Number of addresses configured
+    event SplitAccountConfigured(address indexed from, uint256 hooks);
+
+    // --- Mutations --- //
+
+    /// @notice Configures a list of addresses to be whitelisted for splitAccount.
+    /// @param addresses An array of addresses to whitelist
+    function setEndorsedSplitAccounts(address[] memory addresses) external;
+
+    // --- Views --- //
+
+    /// @notice Returns addresses allowed to split account.
+    /// @return addresses list of addresses
+    function getEndorsedSplitAccounts() external view returns (address[] memory addresses);
+
+    /// @notice Returns whether the specified hook is whitelisted.
+    /// @param addr Address of hook to assert
+    /// @return isEndoresedForSplitAccount True if whitelisted, false otherwise
+    function isEndorsedForSplitAccount(address addr) external view returns (bool);
+}

markets/bfp-market/contracts/modules/PerpAccountModule.sol

@@ -17,6 +17,7 @@ import {Margin} from "../storage/Margin.sol";
 import {AddressRegistry} from "../storage/AddressRegistry.sol";
 import {PerpMarketConfiguration} from "../storage/PerpMarketConfiguration.sol";
 import {SettlementHookConfiguration} from "../storage/SettlementHookConfiguration.sol";
+import {SplitAccountConfiguration} from "../storage/SplitAccountConfiguration.sol";
 
 /* solhint-disable meta-transactions/no-msg-sender */
 
@@ -229,6 +230,9 @@ contract PerpAccountModule is IPerpAccountModule {
         Position.Data storage toPosition = market.positions[toId];
         Position.Data storage fromPosition = market.positions[fromId];
 
+        if (SplitAccountConfiguration.load().whitelisted[msg.sender] != true) {
+            revert ErrorUtil.Unauthorized(msg.sender);
+        }
         // Cannot split more than what's available.
         if (proportion > DecimalMath.UNIT) {
             revert ErrorUtil.AccountSplitProportionTooLarge();

markets/bfp-market/contracts/modules/SplitAccountConfigurationModule.sol

@@ -0,0 +1,66 @@
+//SPDX-License-Identifier: MIT
+pragma solidity >=0.8.11 <0.9.0;
+
+import {IERC165} from "@synthetixio/core-contracts/contracts/interfaces/IERC165.sol";
+import {OwnableStorage} from "@synthetixio/core-contracts/contracts/ownership/OwnableStorage.sol";
+import {ERC165Helper} from "@synthetixio/core-contracts/contracts/utils/ERC165Helper.sol";
+import {ERC2771Context} from "@synthetixio/core-contracts/contracts/utils/ERC2771Context.sol";
+import {ISplitAccountConfigurationModule} from "../interfaces/ISplitAccountConfigurationModule.sol";
+import {SplitAccountConfiguration} from "../storage/SplitAccountConfiguration.sol";
+import {ErrorUtil} from "../utils/ErrorUtil.sol";
+
+contract SplitAccountConfigurationModule is ISplitAccountConfigurationModule {
+    // --- Mutations --- //
+
+    /**
+     * @inheritdoc ISplitAccountConfigurationModule
+     */
+    function setEndorsedSplitAccounts(address[] memory addresses) external {
+        OwnableStorage.onlyOwner();
+
+        SplitAccountConfiguration.GlobalData storage config = SplitAccountConfiguration.load();
+        uint256 existingAddresses = config.whitelistedAddresses.length;
+        for (uint256 i = 0; i < existingAddresses; ) {
+            delete config.whitelisted[config.whitelistedAddresses[i]];
+            unchecked {
+                ++i;
+            }
+        }
+        delete config.whitelistedAddresses;
+
+        uint256 addressesLength = addresses.length;
+        address currentAddress;
+        for (uint256 i = 0; i < addressesLength; ) {
+            currentAddress = addresses[i];
+            if (currentAddress == address(0)) {
+                revert ErrorUtil.ZeroAddress();
+            }
+
+            config.whitelisted[currentAddress] = true;
+            unchecked {
+                ++i;
+            }
+        }
+        config.whitelistedAddresses = addresses;
+
+        emit SplitAccountConfigured(ERC2771Context._msgSender(), addressesLength);
+    }
+
+    // --- Views --- //
+
+    /**
+     * @inheritdoc ISplitAccountConfigurationModule
+     */
+    function getEndorsedSplitAccounts() external view returns (address[] memory addresses) {
+        SplitAccountConfiguration.GlobalData storage config = SplitAccountConfiguration.load();
+        return config.whitelistedAddresses;
+    }
+
+    /**
+     * @inheritdoc ISplitAccountConfigurationModule
+     */
+    function isEndorsedForSplitAccount(address addr) external view returns (bool) {
+        SplitAccountConfiguration.GlobalData storage config = SplitAccountConfiguration.load();
+        return config.whitelisted[addr];
+    }
+}

markets/bfp-market/contracts/storage/Position.sol

@@ -141,7 +141,10 @@ library Position {
         uint256 minimumCredit = market.getMinimumCredit(marketConfig, oraclePrice, addresses);
         int256 delegatedCollateralValueUsd = market.getDelegatedCollateralValueUsd(addresses);
 
-        if (delegatedCollateralValueUsd < minimumCredit.toInt()) {
+        if (
+            delegatedCollateralValueUsd + market.depositedCollateral[addresses.sUsd].toInt() <
+            minimumCredit.toInt()
+        ) {
             revert ErrorUtil.InsufficientLiquidity();
         }
     }

markets/bfp-market/contracts/storage/SplitAccountConfiguration.sol

@@ -0,0 +1,25 @@
+//SPDX-License-Identifier: MIT
+pragma solidity >=0.8.11 <0.9.0;
+
+library SplitAccountConfiguration {
+    // --- Constants --- //
+
+    bytes32 private constant GLOBAL_DATA_SLOT_NAME =
+        keccak256(abi.encode("io.synthetix.bfp-market.SplitAccountConfiguration"));
+
+    // --- Storage --- //
+
+    struct GlobalData {
+        /// {address => isEnabled}.
+        mapping(address => bool) whitelisted;
+        /// Array of whitelisted addresses (use whitelisted mapping).
+        address[] whitelistedAddresses;
+    }
+
+    function load() internal pure returns (SplitAccountConfiguration.GlobalData storage d) {
+        bytes32 s = GLOBAL_DATA_SLOT_NAME;
+        assembly {
+            d.slot := s
+        }
+    }
+}

markets/bfp-market/contracts/utils/ErrorUtil.sol

@@ -101,6 +101,9 @@ library ErrorUtil {
     /// @notice Thrown when an invalid Core as passed was specified.
     error InvalidCoreAddress(address synthetixCore);
 
+    /// @notice Thrown when an account is not authorized to perform an action.
+    error Unauthorized(address caller);
+
     /// @notice Thrown when a specified hook is not whitelisted, or does not match spec, or otherwise.
     error InvalidHook(address hook);
 

markets/bfp-market/package.json

@@ -32,7 +32,7 @@
     "@synthetixio/wei": "^2.74.4",
     "@types/lodash": "^4.14.199",
     "@types/mocha-each": "2.0.1",
-    "@usecannon/cli": "2.13.6",
+    "@usecannon/cli": "2.15.2",
     "ethers": "^5.7.2",
     "hardhat": "^2.19.5",
     "lodash": "^4.17.21",

markets/bfp-market/storage.dump.sol

@@ -950,6 +950,21 @@ library SettlementHookConfiguration {
     }
 }
 
+// @custom:artifact contracts/storage/SplitAccountConfiguration.sol:SplitAccountConfiguration
+library SplitAccountConfiguration {
+    bytes32 private constant GLOBAL_DATA_SLOT_NAME = keccak256(abi.encode("io.synthetix.bfp-market.SplitAccountConfiguration"));
+    struct GlobalData {
+        mapping(address => bool) whitelisted;
+        address[] whitelistedAddresses;
+    }
+    function load() internal pure returns (SplitAccountConfiguration.GlobalData storage d) {
+        bytes32 s = GLOBAL_DATA_SLOT_NAME;
+        assembly {
+            d.slot := s
+        }
+    }
+}
+
 // @custom:artifact contracts/utils/Flags.sol:Flags
 library Flags {
     bytes32 public constant CREATE_ACCOUNT = "createAccount";