feat: split and ci

Signed-off-by: Mario Francia <mario@io.builders>

Author: themariofrancia

.github/workflows/all.publish.yml

@@ -1,9 +1,10 @@
 name: Publishing
 
+
 on:
   release:
-    types:
-      - published
+    types: [published]
+
 
 permissions:
   contents: read
@@ -12,6 +13,8 @@ jobs:
   publish:
     name: Publish NPM Packages
     runs-on: ubuntu-latest
+    env:
+      NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
     steps:
       - name: Harden Runner
@@ -27,32 +30,19 @@ jobs:
         with:
           node-version: 20.x
 
-      - name: Create file .npmrc
-        run: |
-          touch .npmrc
-          echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> .npmrc
-          cp .npmrc ./packages/ats/contracts/.npmrc
-          cp .npmrc ./packages/ats/sdk/.npmrc
-
       - name: Install dependencies
         run: npm ci
 
       # --- ATS publishing ---
       - name: Publish ats/contracts
         if: contains(github.ref_name, 'ats')
-        run: npm run ats:contracts:publish --access=public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npm run ats:contracts:publish
 
       - name: Publish ats/sdk
         if: contains(github.ref_name, 'ats')
-        run: npm run ats:sdk:publish --access=public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npm run ats:sdk:publish
 
       # --- Mass Payout publishing ---
       - name: Publish mass-payout
         if: contains(github.ref_name, 'mp')
-        run: npm run mass-payout:publish --access=public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npm run mass-payout:publish

.gitignore

@@ -117,6 +117,7 @@ dist
 
 # Stores VSCode versions used for testing VSCode extensions
 .vscode-test
+.github/
 
 # Mac files
 .DS_Store

apps/ats/web/package.json

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

package-lock.json

@@ -227,46 +227,47 @@ export const CONTRACT_NAMES = [
     'Factory',
     'BusinessLogicResolver',
     'AccessControlFacet',
-    'Cap',
-    'ControlList',
+    'CapFacet',
+    'ControlListFacet',
     'PauseFacet',
-    'ERC20',
-    'ERC20Permit',
-    'ERC20Votes',
+    'ERC20Facet',
+    'ERC20PermitFacet',
+    'ERC1410ScheduledTasksFacet',
+    'ERC20Votes', //TODO
     'ERC1410ReadFacet',
     'ERC1410ManagementFacet',
     'ERC1410TokenHolderFacet',
-    'ERC1594',
-    'ERC1643',
-    'ERC1644',
+    'ERC1594Facet',
+    'ERC1643Facet',
+    'ERC1644Facet',
     'DiamondFacet',
-    'EquityUSA',
-    'BondUSA',
-    'BondUSARead',
-    'ScheduledSnapshots',
-    'ScheduledBalanceAdjustments',
-    'ScheduledTasks',
-    'Snapshots',
-    'CorporateActions',
-    'TransferAndLock',
-    'Lock',
-    'AdjustBalances',
-    'ProtectedPartitions',
+    'EquityUSAFacet',
+    'BondUSAFacet',
+    'BondUSARead', //TODO
+    'ScheduledSnapshotsFacet',
+    'ScheduledBalanceAdjustmentsFacet',
+    'ScheduledTasksFacet',
+    'SnapshotsFacet',
+    'CorporateActionsFacet',
+    'TransferAndLockFacet',
+    'LockFacet',
+    'AdjustBalancesFacet',
+    'ProtectedPartitionsFacet',
     'HoldReadFacet',
     'HoldTokenHolderFacet',
     'HoldManagementFacet',
     'TimeTravel',
-    'Kyc',
-    'SsiManagement',
+    'KycFacet',
+    'SsiManagementFacet',
     'ClearingHoldCreationFacet',
     'ClearingRedeemFacet',
     'ClearingTransferFacet',
     'ClearingReadFacet',
     'ClearingActionsFacet',
-    'ExternalPauseManagement',
-    'ExternalControlListManagement',
-    'ExternalKycListManagement',
-    'ERC3643',
+    'ExternalPauseManagementFacet',
+    'ExternalControlListManagementFacet',
+    'ExternalKycListManagementFacet',
+    'ERC3643Facet',
     'FreezeFacet',
     'ERC3643ManagementFacet',
     'ERC3643ReadFacet',

packages/ats/contracts/Configuration.ts

@@ -271,9 +271,9 @@ The Asset Tokenization Studio uses a modular diamond pattern architecture where
 - `ERC1410ManagementFacet`: Token partition management and administrative functions
 - `ERC1410ReadFacet`: Read-only token state queries
 - `ERC1410TokenHolderFacet`: Token holder operations (transfers, approvals)
-- `ERC20`: Basic ERC20 compatibility layer
-- `ERC1594`: Security token issuance and redemption
-- `ERC1644`: Controller operations for forced transfers
+- `ERC20Facet`: Basic ERC20 compatibility layer
+- `ERC1594Facet`: Security token issuance and redemption
+- `ERC1644Facet`: Controller operations for forced transfers
 
 **ERC3643 (T-REX) Compliance Facets:**
 

packages/ats/contracts/README.md

@@ -206,17 +206,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.18;
 
-import {
-    IStaticFunctionSelectors
-} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
-import {_ERC1594_RESOLVER_KEY} from '../../constants/resolverKeys.sol';
 import {_ISSUER_ROLE, _AGENT_ROLE} from '../../constants/roles.sol';
 import {IERC1594} from '../../interfaces/ERC1400/IERC1594.sol';
 import {Common} from '../../common/Common.sol';
 import {_DEFAULT_PARTITION} from '../../../layer_0/constants/values.sol';
-import {Common} from '../../common/Common.sol';
 
-contract ERC1594 is IERC1594, IStaticFunctionSelectors, Common {
+abstract contract ERC1594 is IERC1594, Common {
     // solhint-disable-next-line func-name-mixedcase
     function initialize_ERC1594()
         external
@@ -447,51 +442,4 @@ contract ERC1594 is IERC1594, IStaticFunctionSelectors, Common {
             );
         return (status, statusCode, reason);
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _ERC1594_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        staticFunctionSelectors_ = new bytes4[](9);
-        uint256 selectorsIndex;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .initialize_ERC1594
-            .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .transferWithData
-            .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .transferFromWithData
-            .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.isIssuable.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.issue.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.redeem.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.redeemFrom.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.canTransfer.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .canTransferFrom
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IERC1594).interfaceId;
-    }
 }

packages/ats/contracts/contracts/layer_1/ERC1400/ERC1594/ERC1594.sol

@@ -206,21 +206,21 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.18;
 
-import {_ERC3643_MANAGEMENT_RESOLVER_KEY} from '../constants/resolverKeys.sol';
-import {IERC3643Management} from '../interfaces/ERC3643/IERC3643Management.sol';
 import {
     IStaticFunctionSelectors
-} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
-import {ERC3643Management} from './ERC3643Management.sol';
+} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {_ERC1594_RESOLVER_KEY} from '../../constants/resolverKeys.sol';
+import {IERC1594} from '../../interfaces/ERC1400/IERC1594.sol';
+import {ERC1594} from './ERC1594.sol';
 
-contract ERC3643ManagementFacet is IStaticFunctionSelectors, ERC3643Management {
+contract ERC1594Facet is ERC1594, IStaticFunctionSelectors {
     function getStaticResolverKey()
         external
         pure
         override
         returns (bytes32 staticResolverKey_)
     {
-        staticResolverKey_ = _ERC3643_MANAGEMENT_RESOLVER_KEY;
+        staticResolverKey_ = _ERC1594_RESOLVER_KEY;
     }
 
     function getStaticFunctionSelectors()
@@ -232,21 +232,21 @@ contract ERC3643ManagementFacet is IStaticFunctionSelectors, ERC3643Management {
         staticFunctionSelectors_ = new bytes4[](9);
         uint256 selectorsIndex;
         staticFunctionSelectors_[selectorsIndex++] = this
-            .initialize_ERC3643
+            .initialize_ERC1594
             .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.setName.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.setSymbol.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.setOnchainID.selector;
         staticFunctionSelectors_[selectorsIndex++] = this
-            .setIdentityRegistry
+            .transferWithData
             .selector;
         staticFunctionSelectors_[selectorsIndex++] = this
-            .setCompliance
+            .transferFromWithData
             .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.addAgent.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.removeAgent.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.isIssuable.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.issue.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.redeem.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.redeemFrom.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.canTransfer.selector;
         staticFunctionSelectors_[selectorsIndex++] = this
-            .recoveryAddress
+            .canTransferFrom
             .selector;
     }
 
@@ -258,7 +258,6 @@ contract ERC3643ManagementFacet is IStaticFunctionSelectors, ERC3643Management {
     {
         staticInterfaceIds_ = new bytes4[](1);
         uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IERC3643Management)
-            .interfaceId;
+        staticInterfaceIds_[selectorsIndex++] = type(IERC1594).interfaceId;
     }
 }

…ntracts/layer_1/ERC3643/ERC3643Facet.sol …layer_1/ERC1400/ERC1594/ERC1594Facet.solpackages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Facet.sol renamed to packages/ats/contracts/contracts/layer_1/ERC1400/ERC1594/ERC1594Facet.sol packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Facet.sol renamed to packages/ats/contracts/contracts/layer_1/ERC1400/ERC1594/ERC1594Facet.sol

@@ -210,12 +210,8 @@ import {IERC1643} from '../../interfaces/ERC1400/IERC1643.sol';
 import {_DOCUMENTER_ROLE} from '../../constants/roles.sol';
 import {_ERC1643_STORAGE_POSITION} from '../../constants/storagePositions.sol';
 import {Common} from '../../common/Common.sol';
-import {
-    IStaticFunctionSelectors
-} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
-import {_ERC1643_RESOLVER_KEY} from '../../constants/resolverKeys.sol';
 
-contract ERC1643 is IERC1643, IStaticFunctionSelectors, Common {
+abstract contract ERC1643 is IERC1643, Common {
     struct Document {
         bytes32 docHash; // Hash of the document
         uint256 lastModified; // Timestamp at which document details was last modified
@@ -326,44 +322,6 @@ contract ERC1643 is IERC1643, IStaticFunctionSelectors, Common {
         return _erc1643Storage().docNames;
     }
 
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _ERC1643_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        staticFunctionSelectors_ = new bytes4[](4);
-        uint256 selectorsIndex;
-        staticFunctionSelectors_[selectorsIndex++] = this.getDocument.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.setDocument.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .removeDocument
-            .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .getAllDocuments
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IERC1643).interfaceId;
-    }
-
     function _erc1643Storage()
         internal
         pure