refactor(contracts): deploy only equity, bond, deposit

Clean the deploy scripts and Factory so only Equity, Bond and DepositToken
are deployed, removing the Loan, LoansPortfolio, BondFixedRate and
BondKpiLinkedRate deploy configurations, the Factory SecurityType entries
for them, their deploy fixtures and per-type deploy tests, and renumbering
the deployment workflow steps. The underlying Solidity facets are retained
and still exercised by the shared AssetMock mega-asset.

BBND-1882

Signed-off-by: Miguel_LZPF <miguel.carpena@io.builders>

Author: MiguelLZPF

.changeset/bbnd-1882-deploy-only-equity-bond-deposit.md

@@ -0,0 +1,5 @@
+---
+"@hashgraph/asset-tokenization-contracts": minor
+---
+
+Clean the deploy scripts and Factory so only Equity, Bond and DepositToken are deployed, removing the Loan, LoansPortfolio, BondFixedRate and BondKpiLinkedRate deploy configurations and the Factory `SecurityType` entries for them.

packages/ats/contracts/.betterer.results

@@ -267,8 +267,8 @@ exports[`ats contracts solhint`] = {
       [35, 4, 1, "gas-indexed-events: GC: [voteId] on Event [VotingCancelled] could be Indexed", "177600"],
       [40, 4, 1, "gas-indexed-events: GC: [voteId] on Event [VotingForceCancelled] could be Indexed", "177600"]
     ],
-    "contracts/factory/IFactory.sol:1165606848": [
-      [115, 4, 1, "gas-struct-packing: GC: For [ EquityDetailsData ] struct, packing seems inefficient. Try rearranging to achieve 32bytes slots", "177622"]
+    "contracts/factory/IFactory.sol:1789107471": [
+      [121, 4, 1, "gas-struct-packing: GC: For [ EquityDetailsData ] struct, packing seems inefficient. Try rearranging to achieve 32bytes slots", "177622"]
     ],
     "contracts/infrastructure/diamond/IDiamondCutManager.sol:1721314983": [
       [72, 4, 1, "gas-indexed-events: GC: [version] on Event [DiamondBatchConfigurationCanceled] could be Indexed", "177600"]

packages/ats/contracts/contracts/factory/IFactory.sol

@@ -12,26 +12,32 @@ bytes32 constant RESOLVER_KEY_FACTORY = 0x9fc26269cc1cb994e66f269ed6b58a5bb0c344
 /**
  * @title Factory Interface
  * @author Asset Tokenization Studio Team
- * @notice Interface for deploying tokenised securities (equity, bonds, loans)
+ * @notice Interface for deploying tokenised securities (equity, bonds, deposit tokens)
  *         through a centralised factory that configures resolver proxies,
  *         business-logic resolvers, and role-based access control.
  */
 interface IFactory {
     /**
      * @notice Distinguishes the security variant being deployed.
-     * @dev Used internally to select the correct initialisation path in the factory.
+     * @dev Used internally to select the correct initialisation path in the factory. The
+     *      ordinal of each variant is persisted on-chain in `ERC20StorageWrapper.securityType`,
+     *      so members MUST NOT be reordered or removed — doing so would reinterpret or invalidate
+     *      the stored value of already-deployed tokens. `BondFixedRate`, `BondKpiLinkedRate` and
+     *      `Loan` are no longer deployable through the factory (BBND-1882) but are retained here
+     *      to keep their ordinals stable for tokens deployed before that change.
      */
     enum SecurityType {
         /// @notice A bond whose coupon rate floats against an external index.
         BondVariableRate,
         /// @notice An equity instrument (shares).
         Equity,
-        /// @notice A bond with a fixed coupon rate.
+        /// @notice A bond with a fixed coupon rate (retained for ordinal stability; not deployable).
         BondFixedRate,
-        /// @notice A bond whose coupon is tied to KPI performance metrics.
+        /// @notice A bond whose coupon is tied to KPI performance metrics (retained; not deployable).
         BondKpiLinkedRate,
-        /// @notice A loan instrument.
+        /// @notice A loan instrument (retained for ordinal stability; not deployable).
         Loan,
+        /// @notice A minimal cash-style deposit token.
         DepositToken
     }
 
@@ -140,7 +146,7 @@ interface IFactory {
     /**
      * @notice Input data describing a bond's economic parameters.
      * @dev    Replaces the removed `IBondRead.BondDetailsData` type. Consumed by the Factory
-     *         during `deployBond`, `deployBondFixedRate`, and `deployBondKpiLinkedRate`.
+     *         during `deployBond`.
      * @param currency               ISO 4217 currency code encoded as `bytes3`.
      * @param nominalValue           Face value of one unit of the bond (raw integer).
      * @param nominalValueDecimals   Number of decimals applied to `nominalValue`.

packages/ats/contracts/contracts/test/mocks/MockFactory.sol

@@ -2,20 +2,9 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import { Factory } from "../../factory/Factory.sol";
-import { IFactory, FactoryRegulationData } from "../../factory/IFactory.sol";
-import { IInterestRate } from "../../facets/interestRate/IInterestRate.sol";
-import { IInitializer } from "../../facets/initializer/IInitializer.sol";
-import { IAccessControl } from "../../facets/accessControl/IAccessControl.sol";
+import { IFactory } from "../../factory/IFactory.sol";
 import { DEFAULT_ADMIN_ROLE } from "../../constants/roles.sol";
-import { FACTORY_OPERATIONAL_STATUS } from "../../constants/values.sol";
-import { IKpis } from "../../facets/kpis/IKpis.sol";
-import { IFixedRate } from "../../facets/fixedRate/IFixedRate.sol";
-import { IKpiLinkedRate } from "../../facets/kpiLinkedRate/IKpiLinkedRate.sol";
-import { InterestRateStorageWrapper } from "../../domain/asset/InterestRateStorageWrapper.sol";
-import { EvmAccessors } from "../../infrastructure/utils/EvmAccessors.sol";
-import { _checkUnexpectedError } from "../../infrastructure/utils/UnexpectedError.sol";
 import { IEvmAccessorsFacet } from "../testAccessors/IEvmAccessorsFacet.sol";
-import { IDiamondCutManager } from "../../infrastructure/diamond/IDiamondCutManager.sol";
 import { IMockDiamondCut } from "./MockDiamondCut.sol";
 import { ResolverProxy } from "../../infrastructure/proxy/ResolverProxy.sol";
 import { IResolverProxy } from "../../infrastructure/proxy/IResolverProxy.sol";
@@ -32,83 +21,6 @@ import { IBusinessLogicResolver } from "../../infrastructure/diamond/IBusinessLo
  * @author Asset Tokenization Studio Team
  */
 interface IMockFactory is IFactory {
-    /**
-     * @notice Full configuration for deploying a KPI-linked-rate bond.
-     * @param bondData              Base bond configuration.
-     * @param factoryRegulationData Regulatory classification applied at deployment.
-     * @param interestRate          Initial KPI-linked interest-rate parameters.
-     * @param impactData            KPI impact metrics used to compute the variable coupon.
-     */
-    struct BondKpiLinkedRateData {
-        BondData bondData;
-        FactoryRegulationData factoryRegulationData;
-        IKpiLinkedRate.InterestRate interestRate;
-        IKpiLinkedRate.ImpactData impactData;
-    }
-
-    /**
-     * @notice Full configuration for deploying a fixed-rate bond.
-     * @param bondData              Base bond configuration.
-     * @param factoryRegulationData Regulatory classification applied at deployment.
-     * @param fixedRateData         Fixed coupon rate and day-count convention parameters.
-     */
-    struct BondFixedRateData {
-        BondData bondData;
-        FactoryRegulationData factoryRegulationData;
-        IFixedRate.FixedRateData fixedRateData;
-    }
-
-    /**
-     * @notice Emitted when a new fixed-rate bond is deployed.
-     * @param deployer Address that initiated the deployment.
-     * @param bondAddress Address of the newly deployed bond proxy.
-     * @param bondFixedRateData Full fixed-rate bond configuration.
-     */
-    event BondFixedRateDeployed(address indexed deployer, address bondAddress, BondFixedRateData bondFixedRateData);
-
-    /**
-     * @notice Emitted when a new KPI-linked-rate bond is deployed.
-     * @param deployer Address that initiated the deployment.
-     * @param bondAddress Address of the newly deployed bond proxy.
-     * @param bondKpiLinkedRateData Full KPI-linked-rate bond configuration.
-     */
-    event BondKpiLinkedRateDeployed(
-        address indexed deployer,
-        address bondAddress,
-        BondKpiLinkedRateData bondKpiLinkedRateData
-    );
-
-    /// @notice Thrown when the supplied interest-rate parameters violate ordering invariants
-    ///         (e.g. `minRate > baseRate` or `baseRate > maxRate`).
-    error WrongInterestRateValues(IKpiLinkedRate.InterestRate interestRate);
-
-    /// @notice Thrown when the supplied KPI impact-data parameters violate ordering invariants
-    ///         (e.g. `maxDeviationFloor >= baseLine` or `baseLine >= maxDeviationCap`).
-    error WrongImpactDataValues(IKpiLinkedRate.ImpactData impactData);
-
-    /**
-     * @notice Deploys and initialises a fixed-rate bond security proxy.
-     * @dev Validates resolver, admin RBAC, regulation data and bond dates. Initialises
-     *      bond-specific and fixed-rate facets, marks the proxy operational, renounces this
-     *      factory's temporary admin role and emits `BondFixedRateDeployed`.
-     * @param _bondFixedRateData Fixed-rate bond deployment, regulation and rate data.
-     * @return bondAddress_ Address of the deployed fixed-rate bond proxy.
-     */
-    function deployBondFixedRate(BondFixedRateData calldata _bondFixedRateData) external returns (address bondAddress_);
-
-    /**
-     * @notice Deploys and initialises a KPI-linked-rate bond security proxy.
-     * @dev Validates resolver, admin RBAC, regulation data, bond dates, interest-rate
-     *      and impact data. Initialises bond-specific and KPI facets, marks the proxy
-     *      operational, renounces this factory's temporary admin role and emits
-     *      `BondKpiLinkedRateDeployed`.
-     * @param _bondKpiLinkedRateData KPI-linked-rate bond deployment, regulation, rate and impact data.
-     * @return bondAddress_ Address of the deployed KPI-linked-rate bond proxy.
-     */
-    function deployBondKpiLinkedRate(
-        BondKpiLinkedRateData calldata _bondKpiLinkedRateData
-    ) external returns (address bondAddress_);
-
     /// @notice Deploy a test-only asset diamond against the AssetMock configuration.
     /// @dev Mirrors `Factory._deploySecurityProxy` but force-readies every facet via
     ///      `MockDiamondCut.forceFacetsReady` instead of running per-facet initialisers.
@@ -125,102 +37,12 @@ interface IMockFactory is IFactory {
  */
 abstract contract MockFactory is Factory, IMockFactory {
     /// @notice Resolver configuration ID that registers the full IAsset facet union.
-    /// @dev All 7 asset-class facet sets (equity, bond, bondFixedRate, bondKpiLinkedRate,
-    ///      loan, loansPortfolio, depositToken) with DiamondFacet swapped for MockDiamondCut
-    ///      and EvmAccessorsFacet appended. Created by the TypeScript-side
+    /// @dev All asset-class facet sets (equity, bond, depositToken) with DiamondFacet swapped
+    ///      for MockDiamondCut and EvmAccessorsFacet appended. Created by the TypeScript-side
     ///      `createAssetMockConfiguration` at infrastructure deploy time.
     ///      Value: 0x000000000000000000000000000000000000000000000000000000000000000a
     bytes32 private constant _ASSET_MOCK_CONFIG_ID = 0x000000000000000000000000000000000000000000000000000000000000000a;
 
-    /**
-     * @notice Guarantees KPI-linked interest rate data is valid before deployment.
-     * @dev Delegates to `_checkInterestRate`, which reverts for invalid interest-rate data.
-     * @param _newInterestRate KPI-linked interest rate configuration to validate.
-     */
-    modifier onlyValidInterestRate(IKpiLinkedRate.InterestRate calldata _newInterestRate) {
-        _checkInterestRate(_newInterestRate);
-        _;
-    }
-
-    /**
-     * @notice Guarantees KPI impact data is valid before deployment.
-     * @dev Delegates to `_checkImpactData`, which reverts for invalid impact data.
-     * @param _newImpactData KPI impact configuration to validate.
-     */
-    modifier onlyValidImpactData(IKpiLinkedRate.ImpactData calldata _newImpactData) {
-        _checkImpactData(_newImpactData);
-        _;
-    }
-
-    /**
-     * @notice Deploys and initialises a fixed-rate bond security proxy.
-     * @dev Validates resolver, admin RBAC, regulation data and bond dates. Initialises
-     *      bond-specific and fixed-rate facets, marks the proxy operational, renounces this
-     *      factory's temporary admin role and emits `BondFixedRateDeployed`.
-     * @param _bondFixedRateData Fixed-rate bond deployment, regulation and rate data.
-     * @return bondAddress_ Address of the deployed fixed-rate bond proxy.
-     */
-    function deployBondFixedRate(
-        BondFixedRateData calldata _bondFixedRateData
-    )
-        external
-        onlyValidResolver(_bondFixedRateData.bondData.security.resolver)
-        onlyValidAdmins(_bondFixedRateData.bondData.security.rbacs)
-        onlyValidRegulation(
-            _bondFixedRateData.factoryRegulationData.regulationType,
-            _bondFixedRateData.factoryRegulationData.regulationSubType
-        )
-        onlyValidBondDates(
-            _bondFixedRateData.bondData.bondDetails.startingDate,
-            _bondFixedRateData.bondData.bondDetails.maturityDate
-        )
-        returns (address bondAddress_)
-    {
-        bondAddress_ = _deployBond(_bondFixedRateData.bondData, SecurityType.BondFixedRate);
-        IFixedRate(bondAddress_).initializeFixedRate(_bondFixedRateData.fixedRateData);
-        IInterestRate(bondAddress_).initializeInterestRateType(IInterestRate.RateType.FIXED);
-        (bool isOperational_, ) = IInitializer(bondAddress_).setOperationalStatus();
-        _checkUnexpectedError(!isOperational_, FACTORY_OPERATIONAL_STATUS);
-        IAccessControl(bondAddress_).renounceRole(DEFAULT_ADMIN_ROLE);
-        emit BondFixedRateDeployed(EvmAccessors.getMsgSender(), bondAddress_, _bondFixedRateData);
-    }
-
-    /**
-     * @notice Deploys and initialises a KPI-linked-rate bond security proxy.
-     * @dev Validates resolver, admin RBAC, regulation data, KPI rate data, impact data
-     *      and bond dates. Initialises bond-specific and KPI-linked facets, marks the proxy
-     *      operational, renounces this factory's temporary admin role and emits
-     *      `BondKpiLinkedRateDeployed`.
-     * @param _bondKpiLinkedRateData KPI-linked bond deployment, regulation and rate data.
-     * @return bondAddress_ Address of the deployed KPI-linked-rate bond proxy.
-     */
-    function deployBondKpiLinkedRate(
-        BondKpiLinkedRateData calldata _bondKpiLinkedRateData
-    )
-        external
-        onlyValidResolver(_bondKpiLinkedRateData.bondData.security.resolver)
-        onlyValidAdmins(_bondKpiLinkedRateData.bondData.security.rbacs)
-        onlyValidRegulation(
-            _bondKpiLinkedRateData.factoryRegulationData.regulationType,
-            _bondKpiLinkedRateData.factoryRegulationData.regulationSubType
-        )
-        onlyValidInterestRate(_bondKpiLinkedRateData.interestRate)
-        onlyValidImpactData(_bondKpiLinkedRateData.impactData)
-        onlyValidBondDates(
-            _bondKpiLinkedRateData.bondData.bondDetails.startingDate,
-            _bondKpiLinkedRateData.bondData.bondDetails.maturityDate
-        )
-        returns (address bondAddress_)
-    {
-        bondAddress_ = _deployBondKpiLinkedRate(_bondKpiLinkedRateData);
-        (bool isOperational_, ) = IInitializer(bondAddress_).setOperationalStatus();
-        _checkUnexpectedError(!isOperational_, FACTORY_OPERATIONAL_STATUS);
-        IAccessControl(bondAddress_).renounceRole(DEFAULT_ADMIN_ROLE);
-        _emitBondKpiLinkedRateDeployed(bondAddress_, _bondKpiLinkedRateData);
-    }
-
-    // ── Test-only: deploy a diamond proxy against AssetMock config ──────────
-
     /// @inheritdoc IMockFactory
     function deployAssetMock(IBusinessLogicResolver resolver_) external returns (address assetAddress_) {
         // 1. Build RBAC: seed the caller as temporary DEFAULT_ADMIN_ROLE holder
@@ -281,52 +103,4 @@ abstract contract MockFactory is Factory, IMockFactory {
         securityAddress_ = super._deployDepositToken(_securityData, _securityType);
         IEvmAccessorsFacet(securityAddress_).initializeEvmAccessors();
     }
-
-    /**
-     * @notice Deploys and initialises the KPI-linked-rate bond facet set.
-     * @dev Builds on `_deployBond`, then initialises KPI-linked rate metadata, rate type and
-     *      KPI tracking. Operational status and admin renouncement remain caller concerns.
-     * @param _data KPI-linked bond deployment data.
-     * @return bondAddress_ Address of the deployed KPI-linked-rate bond proxy.
-     */
-    function _deployBondKpiLinkedRate(BondKpiLinkedRateData calldata _data) internal returns (address bondAddress_) {
-        bondAddress_ = _deployBond(_data.bondData, SecurityType.BondKpiLinkedRate);
-        IKpiLinkedRate(bondAddress_).initializeKpiLinkedRate(_data.interestRate, _data.impactData);
-        IInterestRate(bondAddress_).initializeInterestRateType(IInterestRate.RateType.KPI_LINKED);
-        IKpis(bondAddress_).initializeKpis();
-    }
-
-    /**
-     * @notice Emits the KPI-linked-rate bond deployment event.
-     * @dev Uses `EvmAccessors.getMsgSender()` so the emitted deployer follows the project's
-     *      message-sender abstraction.
-     * @param _bondAddress Address of the deployed KPI-linked-rate bond proxy.
-     * @param _bondKpiLinkedRateData KPI-linked bond deployment data emitted for indexing.
-     */
-    function _emitBondKpiLinkedRateDeployed(
-        address _bondAddress,
-        BondKpiLinkedRateData calldata _bondKpiLinkedRateData
-    ) private {
-        emit BondKpiLinkedRateDeployed(EvmAccessors.getMsgSender(), _bondAddress, _bondKpiLinkedRateData);
-    }
-
-    /**
-     * @notice Asserts that KPI-linked interest rate data is valid.
-     * @dev Forwards to `InterestRateStorageWrapper.requireValidInterestRate`, which reverts for
-     *      invalid interest-rate data.
-     * @param _newInterestRate KPI-linked interest rate configuration to validate.
-     */
-    function _checkInterestRate(IKpiLinkedRate.InterestRate calldata _newInterestRate) private pure {
-        InterestRateStorageWrapper.requireValidInterestRate(_newInterestRate);
-    }
-
-    /**
-     * @notice Asserts that KPI impact data is valid.
-     * @dev Forwards to `InterestRateStorageWrapper.requireValidImpactData`, which reverts for
-     *      invalid impact data.
-     * @param _newImpactData KPI impact configuration to validate.
-     */
-    function _checkImpactData(IKpiLinkedRate.ImpactData calldata _newImpactData) private pure {
-        InterestRateStorageWrapper.requireValidImpactData(_newImpactData);
-    }
 }

packages/ats/contracts/contracts/test/mocks/MockFactoryFacet.sol

@@ -25,8 +25,6 @@ contract MockFactoryFacet is MockFactory, IStaticFunctionSelectors {
         return
             Bytes4Builder.build(
                 this.getAppliedRegulationData.selector,
-                this.deployBondKpiLinkedRate.selector,
-                this.deployBondFixedRate.selector,
                 this.deployBond.selector,
                 this.deployEquity.selector,
                 this.deployDepositToken.selector,

packages/ats/contracts/scripts/cli/deploySystemWithNewBlr.ts

@@ -43,7 +43,7 @@ async function main() {
   info(`📡 Network: ${network}`);
   info(`📦 PartialBatchDeploy: ${partialBatchDeploy ? "enabled" : "disabled"}`);
   info(`📊 Batch Size: ${batchSize}`);
-  if (deployOnlyBondConfig) info(`⚡ Mode: Bond-only (Equity, Bond variants, Loan, LoansPortfolio skipped)`);
+  if (deployOnlyBondConfig) info(`⚡ Mode: Bond-only (Equity and Deposit Token skipped)`);
   if (parallelFacetDeployment)
     info(`⚡ Parallel facet deployment: concurrency=${concurrency} (retries off, checkpoint skipped)`);
   info("---");