Sprint 3 (#96)

Signed-off-by: Mario Francia <mario@io.builders>
Signed-off-by: jaime-iobermudez <jaime.bermudez@io.builders>
Signed-off-by: Manuel Campo <manuel.campo@io.builders>
Signed-off-by: Manu Fernandez <manuel@io.builders>
Signed-off-by: Miguel_LZPF <miguel.carpena@io.builders>
Co-authored-by: jaime-iobermudez <jaime.bermudez@io.builders>
Co-authored-by: manuel-campo-iobuilders <139767014+manuel-campo-iobuilders@users.noreply.github.com>
Co-authored-by: Manu Fernández <110894694+ManuIOB@users.noreply.github.com>
Co-authored-by: Miguel_LZPF <miguel.carpena@io.builders>

Author: 5 people

.gitignore

@@ -133,3 +133,5 @@ dist
 .pnp.*
 
 package-lock.json
+
+asset-tokenization-studio.iml

README.md

@@ -114,8 +114,8 @@ These variables are only required if you are integrating Hedera Wallet Connect f
 
     REACT_APP_MIRROR_NODE="https://testnet.mirrornode.hedera.com/api/v1/"
     REACT_APP_RPC_NODE="https://testnet.hashio.io/api"
-    REACT_APP_RPC_RESOLVER="0.0.3532144"
-    REACT_APP_RPC_FACTORY="0.0.3532205"
+    REACT_APP_RPC_RESOLVER="0.0.5038989"
+    REACT_APP_RPC_FACTORY="0.0.5039041"
 
     REACT_APP_PROJECT_ID="your_project_id_from_walletconnect"
     REACT_APP_DAPP_NAME="Asset Tokenization Studio"

contracts/contracts/layer_1/accessControl/AccessControlStorageWrapper.sol

@@ -290,6 +290,26 @@ abstract contract AccessControlStorageWrapper is
                 _remove(roleDataStorage, _roles[index], _account);
             }
         }
+        for (uint256 index2 = 0; index2 < _roles.length; index2++) {
+            if (_actives[index2]) {
+                if (!_has(roleDataStorage, _roles[index2], _account))
+                    revert ApplyRoleContradiction(
+                        _roles,
+                        _actives,
+                        _roles[index2]
+                    );
+                continue;
+            } else {
+                if (_has(roleDataStorage, _roles[index2], _account))
+                    revert ApplyRoleContradiction(
+                        _roles,
+                        _actives,
+                        _roles[index2]
+                    );
+                continue;
+            }
+        }
+
         success_ = true;
     }
 

contracts/contracts/layer_1/constants/roles.sol

@@ -236,3 +236,6 @@ bytes32 constant _SNAPSHOT_ROLE = 0x3fbb44760c0954eea3f6cb9f1f210568f5ae959dcbbe
 
 // keccak256('security.token.standard.role.locker');
 bytes32 constant _LOCKER_ROLE = 0xd8aa8c6f92fe8ac3f3c0f88216e25f7c08b3a6c374b4452a04d200c29786ce88;
+
+// keccak256('security.token.standard.role.bondManager');
+bytes32 constant _BOND_MANAGER_ROLE = 0x8e99f55d84328dd46dd7790df91f368b44ea448d246199c88b97896b3f83f65d;

contracts/contracts/layer_1/interfaces/accessControl/IAccessControlStorageWrapper.sol

@@ -240,4 +240,13 @@ interface IAccessControlStorageWrapper {
         uint256 rolesLength,
         uint256 activesLength
     );
+
+    /**
+     * @dev Emitted when the there is a contradiction in the roles to apply, the same role must be granted and revoked
+     *
+     * @param roles This list of roles
+     * @param actives grant or revoke roles
+     * @param role the role for which there is a contradiction
+     */
+    error ApplyRoleContradiction(bytes32[] roles, bool[] actives, bytes32 role);
 }

contracts/contracts/layer_2/bond/Bond.sol

@@ -208,7 +208,10 @@ pragma solidity 0.8.18;
 
 import {IBond} from '../interfaces/bond/IBond.sol';
 import {COUPON_CORPORATE_ACTION_TYPE} from '../constants/values.sol';
-import {_CORPORATE_ACTION_ROLE} from '../../layer_1/constants/roles.sol';
+import {
+    _CORPORATE_ACTION_ROLE,
+    _BOND_MANAGER_ROLE
+} from '../../layer_1/constants/roles.sol';
 import {BondStorageWrapper} from './BondStorageWrapper.sol';
 import {
     IStaticFunctionSelectors
@@ -270,6 +273,30 @@ abstract contract Bond is IBond, IStaticFunctionSelectors, BondStorageWrapper {
         );
     }
 
+    /**
+     * @dev Updates the maturity date of the bond.
+     * @param _newMaturityDate The new maturity date to be set.
+     */
+    function updateMaturityDate(
+        uint256 _newMaturityDate
+    )
+        external
+        virtual
+        override
+        onlyUnpaused
+        onlyRole(_BOND_MANAGER_ROLE)
+        onlyAfterCurrentMaturityDate(_newMaturityDate)
+        returns (bool success_)
+    {
+        emit MaturityDateUpdated(
+            address(this),
+            _newMaturityDate,
+            _getMaturityDate()
+        );
+        success_ = _setMaturityDate(_newMaturityDate);
+        return success_;
+    }
+
     function getCouponDetails()
         external
         view

contracts/contracts/layer_2/bond/BondStorageWrapper.sol

@@ -225,6 +225,17 @@ abstract contract BondStorageWrapper is CorporateActionsStorageWrapperSecurity {
         bool initialized;
     }
 
+    /**
+     * @dev Modifier to ensure that the function is called only after the current maturity date.
+     * @param _maturityDate The maturity date to be checked against the current maturity date.
+     * Reverts with `BondMaturityDateWrong` if the provided maturity date is less than or equal
+     * to the current maturity date.
+     */
+    modifier onlyAfterCurrentMaturityDate(uint256 _maturityDate) {
+        if (_maturityDate <= _getMaturityDate()) revert BondMaturityDateWrong();
+        _;
+    }
+
     function _storeBondDetails(
         IBond.BondDetailsData memory _bondDetails
     ) internal returns (bool) {
@@ -294,6 +305,18 @@ abstract contract BondStorageWrapper is CorporateActionsStorageWrapperSecurity {
         );
     }
 
+    /**
+     * @dev Internal function to set the maturity date of the bond.
+     * @param _maturityDate The new maturity date to be set.
+     * @return success_ True if the maturity date was set successfully.
+     */
+    function _setMaturityDate(
+        uint256 _maturityDate
+    ) internal returns (bool success_) {
+        _bondStorage().bondDetail.maturityDate = _maturityDate;
+        return true;
+    }
+
     function _getBondDetails()
         internal
         view
@@ -310,6 +333,10 @@ abstract contract BondStorageWrapper is CorporateActionsStorageWrapperSecurity {
         couponDetails_ = _bondStorage().couponDetail;
     }
 
+    function _getMaturityDate() internal view returns (uint256 maturityDate_) {
+        return _bondStorage().bondDetail.maturityDate;
+    }
+
     function _getCoupon(
         uint256 _couponID
     )

contracts/contracts/layer_2/corporateActions/CorporateActionsStorageWrapperSecurity.sol

@@ -222,6 +222,7 @@ import {
     ICorporateActionsStorageWrapperSecurity
 } from '../interfaces/corporateActions/ICorporateActionsStorageWrapperSecurity.sol';
 import {IEquity} from '../interfaces/equity/IEquity.sol';
+import {IBond} from '../interfaces/bond/IBond.sol';
 import {
     ScheduledSnapshotsStorageWrapper
 } from '../scheduledSnapshots/ScheduledSnapshotsStorageWrapper.sol';
@@ -305,19 +306,19 @@ abstract contract CorporateActionsStorageWrapperSecurity is
             revert CouponCreationFailed();
         }
 
-        uint256 recordDate = abi.decode(_data, (uint256));
+        IBond.Coupon memory newCoupon = abi.decode(_data, (IBond.Coupon));
 
-        _addScheduledSnapshot(recordDate, abi.encode(_actionId));
+        _addScheduledSnapshot(newCoupon.recordDate, abi.encode(_actionId));
     }
 
     function _onScheduledSnapshotTriggered(
         uint256 snapShotID,
         bytes memory data
     ) internal virtual override {
-        bytes32 actionId;
-        if (data.length > 0) actionId = abi.decode(data, (bytes32));
-
-        _addSnapshotToAction(actionId, snapShotID);
+        if (data.length > 0) {
+            bytes32 actionId = abi.decode(data, (bytes32));
+            _addSnapshotToAction(actionId, snapShotID);
+        }
     }
 
     function _addSnapshotToAction(

contracts/contracts/layer_2/interfaces/bond/IBond.sol

@@ -248,6 +248,10 @@ interface IBond {
         Coupon calldata _newCoupon
     ) external returns (bool success_, uint256 couponID_);
 
+    function updateMaturityDate(
+        uint256 _maturityDate
+    ) external returns (bool success_);
+
     function getCouponDetails()
         external
         view

contracts/contracts/layer_2/interfaces/bond/IBondStorageWrapper.sol

@@ -216,7 +216,14 @@ interface IBondStorageWrapper {
         uint256 rate
     );
 
+    event MaturityDateUpdated(
+        address indexed bondId,
+        uint256 indexed maturityDate,
+        uint256 indexed previousMaturityDate
+    );
+
     error CouponCreationFailed();
     error CouponFirstDateWrong();
     error CouponFrequencyWrong();
+    error BondMaturityDateWrong();
 }