refactor(contracts): follow compact-contracts contracts file structure and upgrade to 0.28.0

.github/actions/setup/action.yml

@@ -10,6 +10,10 @@ inputs:
 runs:
   using: "composite"
   steps:
+    - name: Checkout submodules
+      shell: bash
+      run: git submodule update --init --recursive
+
     - name: Cache turbo build setup
       uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
       with:
@@ -31,7 +35,7 @@ runs:
       if: ${{ inputs.skip-compact != 'true' }}
       uses: midnightntwrk/setup-compact-action@4130145456ad3f45934788dd4a65647eb283e658
       with:
-        compact-version: "0.26.0"
+        compact-version: "0.28.0"
 
     - name: Verify Compact Compiler Installation
       if: ${{ inputs.skip-compact != 'true' }}
@@ -44,6 +48,34 @@ runs:
         echo "✅ Compact CLI is available"
         compact --version || true
 
+    - name: Enable Corepack for Yarn
+      shell: bash
+      run: corepack enable
+
+    - name: Build compact-tools submodule
+      shell: bash
+      run: |
+        echo "📦 Building compact-tools submodule..."
+        cd compact-tools
+        yarn install --immutable
+        yarn build
+        echo "✅ compact-tools built successfully"
+
+    - name: Validate compact-tools artifacts
+      shell: bash
+      run: |
+        REQUIRED_FILES=(
+          "compact-tools/packages/cli/dist/runCompiler.js"
+          "compact-tools/packages/cli/dist/runBuilder.js"
+        )
+        for file in "${REQUIRED_FILES[@]}"; do
+          if [ ! -f "$file" ]; then
+            echo "::error::❌ Missing required file: $file"
+            exit 1
+          fi
+        done
+        echo "✅ compact-tools artifacts validated"
+
     - name: Install dependencies
       shell: bash
       run: pnpm install --frozen-lockfile --prefer-offline

.github/workflows/apps.yml

@@ -27,7 +27,8 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
-          fetch-depth: 2 # Recommended by turbo team
+          fetch-depth: 1
+          submodules: recursive
 
       - name: Setup Environment
         uses: ./.github/actions/setup

.github/workflows/checks.yml

@@ -27,6 +27,7 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           fetch-depth: 0
+          submodules: recursive
 
       - name: Setup Environment
         uses: ./.github/actions/setup

.github/workflows/contracts.yml

@@ -24,6 +24,7 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           fetch-depth: 2 # Recommended by turbo team
+          submodules: recursive
 
       - name: Setup Environment
         uses: ./.github/actions/setup

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "compact-tools"]
+	path = compact-tools
+	url = https://github.com/OpenZeppelin/compact-tools
+	branch = main

.npmrc

@@ -7,5 +7,5 @@ registry=https://registry.npmjs.org/
 # Token to auth yourself (make sure the env‐var matches below)
 # //npm.pkg.github.com/:_authToken=${GITHUB_TOKEN}
 
-# Always send auth on every request to GitHub’s registry
+# Always send auth on every request to GitHub's registry
 # //npm.pkg.github.com/:always-auth=true

README.md

@@ -1,9 +1,9 @@
-# Midnight DApps
+# Midnight Apps 
 
 [![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://opensource.org/licenses/MIT)
 [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/OpenZeppelin/midnight-apps/badge)](https://api.securityscorecards.dev/projects/github.com/OpenZeppelin/midnight-apps)
 
-A collection of starter dapps on the Midnight Network
+A collection of sample (starter) apps on the Midnight Network
 
 ## Overview
 This monorepo contains experimental sample projects built on top of the Midnight Network using Compact. It includes contract, utility, and application code.
@@ -33,35 +33,51 @@ compact --version
 ```
 
 ### Setup
-1. **Clone the Repository**:
+1. **Clone the Repository with Submodules**:
    ```bash
-   git clone <repository-url>
-   cd openzeppelin-midnight-apps
+   git clone --recurse-submodules <repository-url>
+   cd midnight-apps
    ```
 
-2. **Install Dependencies**:
+   If you already cloned without submodules, initialize them:
+   ```bash
+   git submodule update --init --recursive
+   ```
+
+2. **Build the compact-tools Submodule**:
+   ```bash
+cd compact-tools && yarn install && yarn build && cd -
+   ```
+   This builds the CLI tools (`compact-compiler`, `compact-builder`) required by the contracts.
+
+3. **Build the compact-contracts Submodule**:
+   ```bash
+   cd compact-contracts && yarn install && SKIP_ZK=true yarn compact && cd -
+   ```
+   This compiles the OpenZeppelin Compact contracts library.
+
+4. **Install Main Project Dependencies**:
    ```bash
    pnpm install
    ```
-   - This installs all workspace dependencies and runs the `prepare` script, which sets up Husky and builds `@openzeppelin/midnight-apps-compact`.
+   This installs all workspace dependencies and runs the `prepare` script, which sets up Husky.
 
-3. **Workspace Structure**:
-   - `contracts/*`: Compact Smart contract projects (e.g., `@openzeppelin/midnight-apps-access-contract`).
-   - `packages/*`: Utility packages (e.g., `@openzeppelin/midnight-apps-compact`).
-   - `apps/*`: Frontend applications (e.g., `@openzeppelin/midnight-apps-lunarswap-ui`).
+5. **Workspace Structure**:
+   - `compact-tools/`: Git submodule - CLI tools for compiling Compact contracts.
+   - `compact-contracts/`: Git submodule - OpenZeppelin Compact contracts library.
+   - `contracts/`: Compact smart contract projects for this repo.
+   - `packages/`: Utility packages (e.g., `@openzeppelin/midnight-apps-logger`).
+   - `apps/`: Frontend applications (e.g., `@openzeppelin/midnight-apps-lunarswap-ui`).
 
    See `pnpm-workspace.yaml` for the full list.
 
-4. **Build Contracts Packages**:
+6. **Build Contracts Packages**:
    ```bash
-   # Navigate to each contract package and run build
-   cd contracts/access && pnpm build 
-   cd ../math && pnpm build
-   cd ../structs && pnpm build
+   pnpm build:contracts
    ```
    - **Note**: Running `pnpm build:contracts`, `pnpm compact`, or `pnpm compact:fast` from the root may cause repetitive output due to Turbo's logging behavior. It's recommended to compile contracts individually from within each package directory.
    - **Feature Request**: A logging output mode flag is being requested to fix Turbo animation log flooding. See [GitHub Issue #1188](https://github.com/midnightntwrk/compactc/issues/1188) for more details.
-   
+
 ### Tasks with Turbo
 Turbo manages tasks across the monorepo, defined in `turbo.json`. Key tasks:
 
@@ -81,7 +97,7 @@ Turbo manages tasks across the monorepo, defined in `turbo.json`. Key tasks:
   - **`build:apps`**
     - Builds apps projects.
     - Run: `pnpm build:apps`.
-    
+
 - **`test`**:
   - Runs tests with Vitest.
   - Run: `pnpm test`.

apps/lunarswap-ui/package.json

@@ -13,9 +13,9 @@
   },
   "dependencies": {
     "@hookform/resolvers": "^5.1.1",
-    "@midnight-ntwrk/dapp-connector-api": "^3.0.0",
-    "@midnight-ntwrk/ledger": "^4.0.0",
-    "@midnight-ntwrk/wallet-api": "^3.0.0",
+    "@midnight-ntwrk/dapp-connector-api": "4.0.0",
+    "@midnight-ntwrk/ledger-v7": "7.0.0",
+    "@midnight-ntwrk/wallet-api": "5.0.0",
     "@openzeppelin/midnight-apps-logger": "workspace:^",
     "@radix-ui/react-accordion": "^1.2.11",
     "@radix-ui/react-alert-dialog": "^1.1.14",