Merge pull request #31 from ubiquity-os-marketplace/development

Merge development into main

.gitattributes

@@ -0,0 +1,2 @@
+dist/** linguist-generated
+bun.lockb linguist-generated

.github/workflows/update-configuration.yml

@@ -1,21 +1,21 @@
-name: Update Manifest and Commit Changes
+name: "Update Configuration and Build"
 
 on:
   workflow_dispatch:
   push:
 
 jobs:
   update-manifest:
-    name: "Update Manifest and Commit Changes"
+    name: "Update Configuration & Build"
     runs-on: ubuntu-latest
     permissions: write-all
 
     steps:
-      - name: Update Manifest and Commit Changes
-        uses: ubiquity-os/action-deploy-plugin@main
+      - uses: ubiquity-os/action-deploy-plugin@main
         with:
           treatAsEsm: false
           sourcemap: false
           pluginEntry: ${{ github.workspace }}/src/main.ts
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          APP_ID: ${{ secrets.APP_ID }}
+          APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}

.github/workflows/worker-deploy.yml

@@ -1,32 +1,38 @@
 name: Deploy Worker
 
 on:
-  push:
   workflow_dispatch:
+  workflow_run:
+    workflows: ["Update Configuration and Build"]
+    types:
+      - completed
+
+env:
+  APP_ID: ${{ secrets.APP_ID }}
+  APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
 
 jobs:
   deploy-to-cloudflare:
     runs-on: ubuntu-latest
     name: Automatic Cloudflare Deploy
     environment: ${{ github.ref == 'refs/heads/main' && 'main' || 'development' }}
+    permissions:
+      contents: write
 
     steps:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
           node-version: "20.10.0"
 
-      - name: Enable corepack
-        run: corepack enable
-
       - uses: actions/checkout@v4
 
       - name: Setup Bun
         uses: oven-sh/setup-bun@v2
 
       - name: Update wrangler.toml Name Field
         run: |
-          branch_name=$(echo '${{ github.event.ref }}' | sed 's#refs/heads/##' | sed 's#[^a-zA-Z0-9]#-#g')
+          branch_name=$(echo '${{ github.ref }}' | sed 's#refs/heads/##' | sed 's#[^a-zA-Z0-9]#-#g')
           # Extract base name from wrangler.toml
           base_name=$(grep '^name = ' wrangler.toml | sed 's/^name = "\(.*\)"$/\1/')
           # Concatenate branch name with base name
@@ -57,6 +63,46 @@ jobs:
           CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           KERNEL_PUBLIC_KEY: ${{ secrets.KERNEL_PUBLIC_KEY }}
 
+      - name: Update manifest.json worker url
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const fs = require('fs');
+            const path = require('path');
+
+            const manifestPath = path.resolve("${{ github.workspace }}", './manifest.json');
+            const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
+
+            manifest["homepage_url"] = "${{ steps.wrangler_deploy.outputs.deployment-url }}";
+
+            const updatedManifest = JSON.stringify(manifest, null, 2);
+            fs.writeFileSync(manifestPath, updatedManifest);
+            console.log('Updated manifest:', updatedManifest);
+
+      - name: Get GitHub App token
+        if: env.APP_ID != '' && env.APP_PRIVATE_KEY != ''
+        uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ env.APP_ID }}
+          private-key: ${{ env.APP_PRIVATE_KEY }}
+
+      - name: Format manifest.json using Prettier
+        shell: bash
+        run: |
+          bun add -DE prettier
+          bun prettier --write .
+
+      - name: Commit file
+        uses: swinton/[email protected]
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token || secrets.GITHUB_TOKEN }}
+        with:
+          files: |
+            manifest.json
+          commit-message: "chore: [skip ci] update manifest.json url"
+          ref: ${{ github.ref }}
+
       - name: Write Deployment URL to Summary
         run: |
           echo "### Deployment URL" >> $GITHUB_STEP_SUMMARY

.husky/commit-msg

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn commitlint --edit "$1"
+bun commitlint --edit "$1"

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn lint-staged
+bun lint-staged

README.md

@@ -9,13 +9,13 @@ Allows users to register their wallets to collect rewards.
 
 ## Getting Started
 
-1. Install the dependencies preferably using `yarn` or `bun`.
+1. Install the dependencies preferably using `bun`.
 2. Copy `.dev.vars.example` to `.dev.vars` and fill the variables
 3. Generate Supabase types by running
    ```shell
-   yarn prebuild
+   bun prebuild
    ```
-4. Run the project with `yarn wrangler`
+4. Run the project with `bun wrangler`
 
 ## Example configuration
 

manifest.json

@@ -6,13 +6,18 @@
   "commands": {
     "wallet": {
       "ubiquity:example": "/wallet ubq.eth",
-      "description": "Register your wallet address for payments.",
+      "description": "Register your wallet address for payments. Use '/wallet unset' to unlink your wallet.",
       "parameters": {
         "type": "object",
         "properties": {
           "walletAddress": {
             "description": "Ethereum address or Ethereum Name Service",
             "type": "string"
+          },
+          "unset": {
+            "description": "Unsets the wallet associated with a user",
+            "type": "boolean",
+            "default": false
           }
         }
       }
@@ -26,5 +31,6 @@
         "type": "boolean"
       }
     }
-  }
+  },
+  "homepage_url": "https://ubiquity-os-command-wallet-development.ubiquity.workers.dev"
 }

package.json

@@ -9,7 +9,7 @@
     "node": ">=20.10.0"
   },
   "scripts": {
-    "prebuild": "dotenv -- cross-env yarn supabase:generate:remote",
+    "prebuild": "dotenv -- cross-env bun supabase:generate:remote",
     "format": "run-p format:*",
     "format:lint": "eslint --fix .",
     "format:prettier": "prettier --write .",
@@ -34,7 +34,7 @@
     "@sinclair/typebox": "0.34.3",
     "@supabase/supabase-js": "2.43.5",
     "@ubiquity-dao/rpc-handler": "1.3.0",
-    "@ubiquity-os/plugin-sdk": "^1.1.0",
+    "@ubiquity-os/plugin-sdk": "^1.1.1",
     "@ubiquity-os/ubiquity-os-logger": "^1.3.2",
     "commander": "12.1.0",
     "dotenv": "16.4.5",
@@ -75,7 +75,7 @@
   },
   "lint-staged": {
     "*.ts": [
-      "yarn prettier --write",
+      "prettier --write",
       "eslint --fix"
     ],
     "src/**.{ts,json}": [