feat: merge upstream/main and resolve conflicts

Integrate upstream changes (MockToken, token::Client transfer, updated
test snapshots) while preserving subscription pausing with duration
limits, auto-resume, and the refund mechanism.

Author: Caleb Peterson

.eslintrc.json

@@ -1,8 +1,5 @@
 {
-  "extends": [
-    "expo",
-    "plugin:@typescript-eslint/recommended"
-  ],
+  "extends": ["expo", "plugin:@typescript-eslint/recommended"],
   "plugins": ["@typescript-eslint", "prettier"],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {

.github/BRANCH_PROTECTION.md

@@ -3,16 +3,19 @@
 To enforce the CI/CD pipeline quality gates, configure branch protection rules in your GitHub repository:
 
 ## Settings Location
+
 Go to: Repository Settings → Branches → Add rule
 
 ## Required Settings for `main` branch:
 
 ### Branch name pattern
+
 ```
 main
 ```
 
 ### ✅ Required checks (enable ALL):
+
 - [ ] **typescript-lint** - ESLint and Prettier checks
 - [ ] **typescript-typecheck** - TypeScript type validation
 - [ ] **typescript-tests** - Jest test suite
@@ -23,6 +26,7 @@ main
 - [ ] **rust-build** - Rust contract compilation
 
 ### Additional protections:
+
 - [x] Require pull request before merging
 - [x] Require at least 1 approval (recommended)
 - [x] Dismiss stale reviews
@@ -31,13 +35,15 @@ main
 - [x] Do not allow bypassing the above settings
 
 ## Settings Location for `dev` branch (optional):
+
 Similar settings, but you may allow force pushes for rapid development.
 
 ---
 
 ## Verification
 
 After setting up, verify by:
+
 1. Creating a test PR
 2. Intentionally break a lint rule
 3. Verify the PR cannot be merged until fixed

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,7 @@
 ## Pull Request Checklist
 
 ### Quality Gates (All must pass before merge)
+
 - [ ] **Lint**: Code passes ESLint and Prettier checks
 - [ ] **Type Check**: TypeScript compilation succeeds
 - [ ] **Tests**: All tests pass
@@ -11,12 +12,14 @@
 - [ ] **Rust Build**: Smart contracts compile successfully
 
 ### Additional Requirements
+
 - [ ] New code has appropriate TypeScript types
 - [ ] No hardcoded secrets or credentials
 - [ ] New features have corresponding tests
 - [ ] Documentation updated if needed
 
 ### Reviewers
+
 - At least 1 approval required for merge
 - All CI checks must be green
 

.github/workflows/ci.yml

@@ -11,6 +11,28 @@ env:
   RUST_VERSION: '1.77'
 
 jobs:
+  commitlint:
+    name: Conventional Commit Check
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm ci --legacy-peer-deps
+
+      - name: Validate PR commits
+        run: npx commitlint --from ${{ github.event.pull_request.base.sha }} --to ${{ github.sha }} --verbose
+
   # ─────────────────────────────────────────────────────────
   # TypeScript / React Native Checks
   # ─────────────────────────────────────────────────────────
@@ -111,7 +133,7 @@ jobs:
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@master
         with:
-          version: ${{ env.RUST_VERSION }}
+          toolchain: ${{ env.RUST_VERSION }}
           components: rustfmt
 
       - name: Check Rust formatting
@@ -127,7 +149,7 @@ jobs:
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@master
         with:
-          version: ${{ env.RUST_VERSION }}
+          toolchain: ${{ env.RUST_VERSION }}
           components: clippy
 
       - name: Cache Rust dependencies
@@ -149,7 +171,7 @@ jobs:
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@master
         with:
-          version: ${{ env.RUST_VERSION }}
+          toolchain: ${{ env.RUST_VERSION }}
 
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@v2
@@ -170,7 +192,7 @@ jobs:
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@master
         with:
-          version: ${{ env.RUST_VERSION }}
+          toolchain: ${{ env.RUST_VERSION }}
 
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@v2
@@ -188,7 +210,18 @@ jobs:
     name: Merge Protection Check
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request'
-    needs: [typescript-lint, typescript-typecheck, typescript-tests, typescript-build, rust-format, rust-clippy, rust-tests, rust-build]
+    needs:
+      [
+        commitlint,
+        typescript-lint,
+        typescript-typecheck,
+        typescript-tests,
+        typescript-build,
+        rust-format,
+        rust-clippy,
+        rust-tests,
+        rust-build,
+      ]
     steps:
       - name: All checks passed
         run: echo "All quality gates passed!"
@@ -200,10 +233,25 @@ jobs:
     name: CI Complete
     runs-on: ubuntu-latest
     if: always()
-    needs: [typescript-lint, typescript-typecheck, typescript-tests, typescript-build, rust-format, rust-clippy, rust-tests, rust-build]
+    needs:
+      [
+        commitlint,
+        typescript-lint,
+        typescript-typecheck,
+        typescript-tests,
+        typescript-build,
+        rust-format,
+        rust-clippy,
+        rust-tests,
+        rust-build,
+      ]
     steps:
       - name: Check for failures
         run: |
+          if [ "${{ github.event_name }}" = "pull_request" ] && [ "${{ needs.commitlint.result }}" != "success" ]; then
+            echo "Conventional commit check failed"
+            exit 1
+          fi
           if [ "${{ needs.typescript-lint.result }}" != "success" ] || \
              [ "${{ needs.typescript-typecheck.result }}" != "success" ] || \
              [ "${{ needs.typescript-tests.result }}" != "success" ] || \

.github/workflows/release.yml

@@ -0,0 +1,43 @@
+name: Release
+
+on:
+  workflow_run:
+    workflows: ['CI/CD Pipeline']
+    types: [completed]
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
+jobs:
+  release:
+    name: semantic-release
+    if: |
+      (github.event_name == 'workflow_run' &&
+      github.event.workflow_run.conclusion == 'success' &&
+      github.event.workflow_run.head_branch == 'main') ||
+      github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          registry-url: https://registry.npmjs.org
+          cache: npm
+
+      - name: Install dependencies
+        run: npm ci --legacy-peer-deps
+
+      - name: Run semantic-release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npx semantic-release

.husky/pre-commit

@@ -0,0 +1 @@
+npx lint-staged

.prettierignore

@@ -18,3 +18,8 @@ builds/
 coverage/
 # TypeChain output (generated; do not reformat to avoid churn)
 src/contracts/types/
+# Rust build artifacts (local/generated)
+contracts/target/
+# Backup/fixed package snapshots
+package-fixed.json
+package.json.backup

.releaserc

@@ -0,0 +1,50 @@
+{
+  "branches": [
+    "main"
+  ],
+  "tagFormat": "v${version}",
+  "plugins": [
+    [
+      "@semantic-release/commit-analyzer",
+      {
+        "preset": "conventionalcommits"
+      }
+    ],
+    [
+      "@semantic-release/release-notes-generator",
+      {
+        "preset": "conventionalcommits"
+      }
+    ],
+    [
+      "@semantic-release/changelog",
+      {
+        "changelogFile": "CHANGELOG.md"
+      }
+    ],
+    [
+      "@semantic-release/npm",
+      {
+        "npmPublish": true
+      }
+    ],
+    [
+      "@semantic-release/github",
+      {
+        "successComment": false,
+        "failComment": false
+      }
+    ],
+    [
+      "@semantic-release/git",
+      {
+        "assets": [
+          "CHANGELOG.md",
+          "package.json",
+          "package-lock.json"
+        ],
+        "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+      }
+    ]
+  ]
+}