fix: rebase with develop

Signed-off-by: Axel Loupias <[email protected]>

Author: Axel-IoBuilders

packages/ats/contracts/contracts/layer_0/beneficiaries/BeneficiariesStorageWrapper.sol

@@ -206,7 +206,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.18;
 
-import {PauseStorageWrapper} from '../core/pause/PauseStorageWrapper.sol';
+import {
+    TotalBalancesStorageWrapper
+} from '../totalBalances/totalBalancesStorageWrapper.sol';
 import {
     _BENEFICIARIES_STORAGE_POSITION,
     _BENEFICIARIES_DATA_STORAGE_POSITION
@@ -215,7 +217,7 @@ import {
     IBeneficiaries
 } from '../../layer_2/interfaces/beneficiaries/IBeneficiaries.sol';
 
-abstract contract BeneficiariesStorageWrapper is PauseStorageWrapper {
+abstract contract BeneficiariesStorageWrapper is TotalBalancesStorageWrapper {
     struct BeneficiariesDataStorage {
         mapping(address => bytes) beneficiaryData;
     }

packages/ats/contracts/contracts/layer_2/beneficiaries/BeneficiariesFacet.sol

@@ -230,7 +230,7 @@ contract BeneficiariesFacet is Beneficiaries, IStaticFunctionSelectors {
         returns (bytes4[] memory staticFunctionSelectors_)
     {
         uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](7);
+        staticFunctionSelectors_ = new bytes4[](8);
         staticFunctionSelectors_[selectorIndex++] = this
             .initialize_Beneficiaries
             .selector;

…tsTimeTravel/BeneficiariesTimeTravel.sol …eTravel/BeneficiariesFacetTimeTravel.solpackages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/BeneficiariesTimeTravel.sol renamed to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/BeneficiariesFacetTimeTravel.sol packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/BeneficiariesTimeTravel.sol renamed to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/BeneficiariesFacetTimeTravel.sol

@@ -206,13 +206,18 @@
 // SPDX-License-Identifier: BSD-3-Clause-Attribution
 pragma solidity 0.8.18;
 
-import {Beneficiaries} from '../../../layer_2/beneficiaries/Beneficiaries.sol';
+import {
+    BeneficiariesFacet
+} from '../../../layer_2/beneficiaries/BeneficiariesFacet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract BeneficiariesTimeTravel is Beneficiaries, TimeTravelStorageWrapper {
+contract BeneficiariesFacetTimeTravel is
+    BeneficiariesFacet,
+    TimeTravelStorageWrapper
+{
     function _blockTimestamp()
         internal
         view

packages/ats/contracts/scripts/deploy.ts

@@ -327,8 +327,8 @@ import {
     TimeTravel__factory,
     ProxyAdmin__factory,
     TransparentUpgradeableProxy__factory,
-    Beneficiaries__factory,
-    BeneficiariesTimeTravel__factory,
+    BeneficiariesFacetTimeTravel__factory,
+    BeneficiariesFacet__factory,
 } from '@typechain'
 
 export let environment = Environment.empty()
@@ -393,7 +393,6 @@ export async function deployAtsFullInfrastructure({
                 signer,
             })
         await registerDeployedContractBusinessLogics(registerCommand)
-
         // * Create configurations for all Securities (EquityUSA, BondUSA)
         console.log(MESSAGES.businessLogicResolver.info.creatingConfigurations)
         const createCommand =
@@ -891,8 +890,8 @@ export async function deployAtsContracts({
         }),
         beneficiaries: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new Beneficiaries__factory(),
-                new BeneficiariesTimeTravel__factory()
+                new BeneficiariesFacet__factory(),
+                new BeneficiariesFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed