Bug/bbnd 1340 adjusted at

.changeset/all-banks-battle.md

@@ -0,0 +1,5 @@
+---
+"@hashgraph/asset-tokenization-contracts": minor
+---
+
+kpi linked interest rate coupons now use the kpi latest facet instead of the kpi oracle

.changeset/scripts-refactoring-cli-standardization.md

@@ -0,0 +1,29 @@
+---
+"@hashgraph/asset-tokenization-contracts": patch
+---
+
+refactor(scripts): standardize CLI entry points and improve infrastructure
+
+**CLI Standardization:**
+
+- Unified CLI entry points to match workflow names (deploySystemWithNewBlr, deploySystemWithExistingBlr, upgradeConfigurations, upgradeTupProxies)
+- Created shared validation utilities in `cli/shared/` module eliminating ~100+ lines of duplicated code
+- Standardized environment variable parsing and address validation across all CLI files
+
+**Infrastructure Improvements:**
+
+- Resolved circular import issues in logging module
+- Exposed tools layer API through main scripts entry point
+- Consolidated validation utilities for better code reuse
+
+**Performance Fix:**
+
+- Fixed parallel test performance regression (8+ min → 2 min)
+- Restored dynamic imports in blrConfigurations.ts to prevent eager typechain loading
+- Added troubleshooting documentation for future reference
+
+**Documentation:**
+
+- Enhanced JSDoc documentation across infrastructure operations
+- Added troubleshooting section for parallel test performance issues
+- Updated README with CLI shared utilities documentation

apps/ats/web/CHANGELOG.md

@@ -1,11 +1,5 @@
 # @hashgraph/asset-tokenization-dapp
 
-## 4.0.1
-
-### Patch Changes
-
-- @hashgraph/asset-tokenization-sdk@4.0.1
-
 ## 4.0.0
 
 ### Major Changes

apps/ats/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hashgraph/asset-tokenization-dapp",
-  "version": "4.0.1",
+  "version": "4.0.0",
   "license": "Apache-2.0",
   "scripts": {
     "build": "tsc && vite build",

packages/ats/contracts/CHANGELOG.md

@@ -1,32 +1,5 @@
 # @hashgraph/asset-tokenization-contracts
 
-## 4.0.1
-
-### Patch Changes
-
-- 171b22b: Fix all lint issues in contracts package.
-- d1552c7: refactor(scripts): standardize CLI entry points and improve infrastructure
-
-  **CLI Standardization:**
-  - Unified CLI entry points to match workflow names (deploySystemWithNewBlr, deploySystemWithExistingBlr, upgradeConfigurations, upgradeTupProxies)
-  - Created shared validation utilities in `cli/shared/` module eliminating ~100+ lines of duplicated code
-  - Standardized environment variable parsing and address validation across all CLI files
-
-  **Infrastructure Improvements:**
-  - Resolved circular import issues in logging module
-  - Exposed tools layer API through main scripts entry point
-  - Consolidated validation utilities for better code reuse
-
-  **Performance Fix:**
-  - Fixed parallel test performance regression (8+ min → 2 min)
-  - Restored dynamic imports in blrConfigurations.ts to prevent eager typechain loading
-  - Added troubleshooting documentation for future reference
-
-  **Documentation:**
-  - Enhanced JSDoc documentation across infrastructure operations
-  - Added troubleshooting section for parallel test performance issues
-  - Updated README with CLI shared utilities documentation
-
 ## 4.0.0
 
 ### Major Changes

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

@@ -11,7 +11,7 @@ import { TRexIFixedRate as IFixedRate } from "./IFixedRate.sol";
 import { TRexIKpiLinkedRate as IKpiLinkedRate } from "./IKpiLinkedRate.sol";
 // prettier-ignore
 // solhint-disable-next-line max-line-length
-import {TRexISustainabilityPerformanceTargetRate as ISustainabilityPerformanceTargetRate} from "./ISustainabilityPerformanceTargetRate.sol";
+import {TRexISustainabilityPerformanceTargetRate as ISustainabilityPerformanceTargetRate} from './ISustainabilityPerformanceTargetRate.sol';
 
 interface TRexIFactory {
     enum SecurityType {
@@ -61,7 +61,6 @@ interface TRexIFactory {
         FactoryRegulationData factoryRegulationData;
         IKpiLinkedRate.InterestRate interestRate;
         IKpiLinkedRate.ImpactData impactData;
-        address kpiOracle;
     }
 
     struct BondSustainabilityPerformanceTargetRateData {

packages/ats/contracts/contracts/factory/ERC3643/interfaces/IKpiLinkedRate.sol

@@ -22,25 +22,16 @@ interface TRexIKpiLinkedRate {
 
     event InterestRateUpdated(address indexed operator, InterestRate newInterestRate);
     event ImpactDataUpdated(address indexed operator, ImpactData newImpactData);
-    event KpiOracleUpdated(address indexed operator, address kpiOracle);
 
     error WrongInterestRateValues(InterestRate interestRate);
     error WrongImpactDataValues(ImpactData impactData);
-    error KpiOracleCalledFailed();
 
     // solhint-disable-next-line func-name-mixedcase
-    function initialize_KpiLinkedRate(
-        InterestRate calldata _interestRate,
-        ImpactData calldata _impactData,
-        address kpiOracle
-    ) external;
+    function initialize_KpiLinkedRate(InterestRate calldata _interestRate, ImpactData calldata _impactData) external;
 
     function setInterestRate(InterestRate calldata _newInterestRate) external;
     function setImpactData(ImpactData calldata _newImpactData) external;
-    function setKpiOracle(address _kpiOracle) external;
 
     function getInterestRate() external view returns (InterestRate memory interestRate_);
-
     function getImpactData() external view returns (ImpactData memory impactData_);
-    function getKpiOracle() external view returns (address kpiOracle_);
 }

packages/ats/contracts/contracts/factory/Factory.sol

@@ -166,8 +166,7 @@ contract Factory is IFactory, Common {
 
         IKpiLinkedRate(bondAddress_).initialize_KpiLinkedRate(
             _bondKpiLinkedRateData.interestRate,
-            _bondKpiLinkedRateData.impactData,
-            _bondKpiLinkedRateData.kpiOracle
+            _bondKpiLinkedRateData.impactData
         );
 
         emit BondKpiLinkedRateDeployed(_msgSender(), bondAddress_, _bondKpiLinkedRateData);

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

@@ -66,7 +66,6 @@ interface IFactory {
         FactoryRegulationData factoryRegulationData;
         IKpiLinkedRate.InterestRate interestRate;
         IKpiLinkedRate.ImpactData impactData;
-        address kpiOracle;
     }
 
     struct BondSustainabilityPerformanceTargetRateData {

packages/ats/contracts/contracts/layer_0/ERC1400/ERC1410/ERC1410StandardStorageWrapper.sol

@@ -27,15 +27,15 @@ abstract contract ERC1410StandardStorageWrapper is ERC1410OperatorStorageWrapper
             // burn | redeem
             _updateAccountSnapshot(from, partition);
             _updateTotalSupplySnapshot(partition);
-            if (amount > 0 && _balanceOfAdjusted(from) == amount) removeFrom = true;
+            if (amount > 0 && _balanceOfAdjustedAt(from, _blockTimestamp()) == amount) removeFrom = true;
         }
         // transfer
         else {
             _updateAccountSnapshot(from, partition);
             _updateAccountSnapshot(to, partition);
             // _balanceOf instead of _balanceOfAdjusted because we are comparing it to 0
             if (amount > 0 && _balanceOf(to) == 0) addTo = true;
-            if (amount > 0 && _balanceOfAdjusted(from) == amount) removeFrom = true;
+            if (amount > 0 && _balanceOfAdjustedAt(from, _blockTimestamp()) == amount) removeFrom = true;
         }
 
         if (addTo && removeFrom) {
@@ -154,36 +154,24 @@ abstract contract ERC1410StandardStorageWrapper is ERC1410OperatorStorageWrapper
         erc1410Storage.totalSupplyByPartition[_partition] += _value;
     }
 
-    function _totalSupplyAdjusted() internal view override returns (uint256) {
-        return _totalSupplyAdjustedAt(_blockTimestamp());
-    }
-
     function _totalSupplyAdjustedAt(uint256 _timestamp) internal view override returns (uint256) {
         (uint256 pendingABAF, ) = _getPendingScheduledBalanceAdjustmentsAt(_timestamp);
         return _totalSupply() * pendingABAF;
     }
 
-    function _totalSupplyByPartitionAdjusted(bytes32 _partition) internal view override returns (uint256) {
-        uint256 factor = _calculateFactor(_getAbafAdjusted(), _getLabafByPartition(_partition));
+    function _totalSupplyByPartitionAdjustedAt(
+        bytes32 _partition,
+        uint256 _timestamp
+    ) internal view override returns (uint256) {
+        uint256 factor = _calculateFactor(_getAbafAdjustedAt(_timestamp), _getLabafByPartition(_partition));
         return _totalSupplyByPartition(_partition) * factor;
     }
 
-    function _balanceOfAdjusted(address _tokenHolder) internal view override returns (uint256) {
-        return _balanceOfAdjustedAt(_tokenHolder, _blockTimestamp());
-    }
-
     function _balanceOfAdjustedAt(address _tokenHolder, uint256 _timestamp) internal view override returns (uint256) {
         uint256 factor = _calculateFactor(_getAbafAdjustedAt(_timestamp), _getLabafByUser(_tokenHolder));
         return _balanceOf(_tokenHolder) * factor;
     }
 
-    function _balanceOfByPartitionAdjusted(
-        bytes32 _partition,
-        address _tokenHolder
-    ) internal view override returns (uint256) {
-        return _balanceOfByPartitionAdjustedAt(_partition, _tokenHolder, _blockTimestamp());
-    }
-
     function _balanceOfByPartitionAdjustedAt(
         bytes32 _partition,
         address _tokenHolder,
@@ -196,10 +184,6 @@ abstract contract ERC1410StandardStorageWrapper is ERC1410OperatorStorageWrapper
         return _balanceOfByPartition(_partition, _tokenHolder) * factor;
     }
 
-    function _getTotalBalance(address _tokenHolder) internal view virtual override returns (uint256) {
-        return super._getTotalBalance(_tokenHolder) + _balanceOfAdjustedAt(_tokenHolder, _blockTimestamp());
-    }
-
     function _getTotalBalanceForAdjustedAt(
         address _tokenHolder,
         uint256 _timestamp
@@ -209,13 +193,14 @@ abstract contract ERC1410StandardStorageWrapper is ERC1410OperatorStorageWrapper
             _balanceOfAdjustedAt(_tokenHolder, _timestamp);
     }
 
-    function _getTotalBalanceForByPartitionAdjusted(
+    function _getTotalBalanceForByPartitionAdjustedAt(
         bytes32 _partition,
-        address _tokenHolder
+        address _tokenHolder,
+        uint256 _timestamp
     ) internal view virtual override returns (uint256) {
         return
-            super._getTotalBalanceForByPartitionAdjusted(_partition, _tokenHolder) +
-            _balanceOfByPartitionAdjustedAt(_partition, _tokenHolder, _blockTimestamp());
+            super._getTotalBalanceForByPartitionAdjustedAt(_partition, _tokenHolder, _timestamp) +
+            _balanceOfByPartitionAdjustedAt(_partition, _tokenHolder, _timestamp);
     }
 
     function _validateParams(bytes32 _partition, uint256 _value) internal pure override {

packages/ats/contracts/contracts/layer_0/ERC1400/ERC1594/ERC1594StorageWrapper.sol

@@ -370,7 +370,7 @@ abstract contract ERC1594StorageWrapper is IERC1594StorageWrapper, CapStorageWra
         bytes32 _partition
     ) private view returns (bool isAbleToTransfer, bytes1 statusCode, bytes32 reasonCode, bytes memory details) {
         if (_checkAllowance) {
-            uint256 currentAllowance = _allowanceAdjusted(_from, _msgSender());
+            uint256 currentAllowance = _allowanceAdjustedAt(_from, _msgSender(), _blockTimestamp());
             if (currentAllowance < _value) {
                 return (
                     false,
@@ -387,7 +387,7 @@ abstract contract ERC1594StorageWrapper is IERC1594StorageWrapper, CapStorageWra
         }
 
         // Balance check - check partition-specific balance
-        uint256 currentPartitionBalance = _balanceOfByPartitionAdjusted(_partition, _from);
+        uint256 currentPartitionBalance = _balanceOfByPartitionAdjustedAt(_partition, _from, _blockTimestamp());
         if (currentPartitionBalance < _value) {
             return (
                 false,

packages/ats/contracts/contracts/layer_0/ERC1400/ERC20/ERC20StorageWrapper1.sol

@@ -32,14 +32,6 @@ abstract contract ERC20StorageWrapper1 is ERC1410BasicStorageWrapperRead {
         _erc20Storage().decimals += decimals;
     }
 
-    function _decimalsAdjusted() internal view override returns (uint8) {
-        return _decimalsAdjustedAt(_blockTimestamp());
-    }
-
-    function _allowanceAdjusted(address _owner, address _spender) internal view override returns (uint256) {
-        return _allowanceAdjustedAt(_owner, _spender, _blockTimestamp());
-    }
-
     function _allowance(address _owner, address _spender) internal view override returns (uint256) {
         return _erc20Storage().allowed[_owner][_spender];
     }
@@ -57,10 +49,6 @@ abstract contract ERC20StorageWrapper1 is ERC1410BasicStorageWrapperRead {
         return _allowance(_owner, _spender) * factor;
     }
 
-    function _getERC20MetadataAdjusted() internal view override returns (IERC20.ERC20Metadata memory erc20Metadata_) {
-        erc20Metadata_ = _getERC20MetadataAdjustedAt(_blockTimestamp());
-    }
-
     function _getERC20MetadataAdjustedAt(
         uint256 _timestamp
     ) internal view override returns (IERC20.ERC20Metadata memory erc20Metadata_) {

packages/ats/contracts/contracts/layer_0/ERC1400/ERC20Votes/ERC20VotesStorageWrapper.sol

@@ -94,10 +94,7 @@ abstract contract ERC20VotesStorageWrapper is ERC1594StorageWrapper {
 
         _takeAbafCheckpoint();
 
-        uint256 delegatorBalance = _balanceOfAdjustedAt(delegator, _blockTimestamp()) +
-            _getLockedAmountForAdjustedAt(delegator, _blockTimestamp()) +
-            _getHeldAmountForAdjusted(delegator) +
-            _getClearedAmountForAdjusted(delegator);
+        uint256 delegatorBalance = _getTotalBalanceForAdjustedAt(delegator, _blockTimestamp());
 
         _erc20VotesStorage().delegates[delegator] = delegatee;
 
@@ -179,20 +176,20 @@ abstract contract ERC20VotesStorageWrapper is ERC1594StorageWrapper {
     }
 
     function _getVotes(address account) internal view virtual override returns (uint256) {
-        return _getVotesAdjusted(_clock(), _erc20VotesStorage().checkpoints[account]);
+        return _getVotesAdjustedAt(_clock(), _erc20VotesStorage().checkpoints[account]);
     }
 
     function _getPastVotes(address account, uint256 timepoint) internal view virtual override returns (uint256) {
         require(timepoint < _clock(), "ERC20Votes: future lookup");
-        return _getVotesAdjusted(timepoint, _erc20VotesStorage().checkpoints[account]);
+        return _getVotesAdjustedAt(timepoint, _erc20VotesStorage().checkpoints[account]);
     }
 
     function _getPastTotalSupply(uint256 timepoint) internal view virtual override returns (uint256) {
         require(timepoint < _clock(), "ERC20Votes: future lookup");
-        return _getVotesAdjusted(timepoint, _erc20VotesStorage().totalSupplyCheckpoints);
+        return _getVotesAdjustedAt(timepoint, _erc20VotesStorage().totalSupplyCheckpoints);
     }
 
-    function _getVotesAdjusted(
+    function _getVotesAdjustedAt(
         uint256 timepoint,
         CheckpointsLib.Checkpoint[] storage ckpts
     ) internal view override returns (uint256) {