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

Merge development into main
ubiquity-os-marketplace · Nov 17, 2024 · df6a521 · df6a521
2 parents 6057481 + d9d29aa
commit df6a521
Show file tree

Hide file tree

Showing 68 changed files with 3,464 additions and 12,077 deletions.
diff --git a/.env.example b/.env.example
@@ -1,8 +1,35 @@
+# Token used to use when calling GitHub API
 GITHUB_TOKEN="<token>"
+
+# Key for OpenAI usage
 OPENAI_API_KEY="<api_key>"
-# treasury fee applied to the final permits, ex: 100 = 100%, 0.1 = 0.1%
+
+# Supabase URL
+SUPABASE_URL=""
+
+# Supabase key
+SUPABASE_KEY=""
+
+# X25519 private key
+X25519_PRIVATE_KEY=""
+
+# NFT minter private key
+NFT_MINTER_PRIVATE_KEY=""
+
+# NFT contract address
+NFT_CONTRACT_ADDRESS=""
+
+# Treasury fee applied to the final permits, ex: 100 = 100%, 0.1 = 0.1%
 PERMIT_FEE_RATE=""
-# github account associated with EVM treasury address allowed to claim permit fees, ex: "ubiquity-os-treasury"
+
+# GitHub account associated with EVM treasury address allowed to claim permit fees, ex: "ubiquity-os-treasury"
 PERMIT_TREASURY_GITHUB_USERNAME=""
-# comma separated list of token addresses which should not incur any fees, ex: "0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d, 0x4ECaBa5870353805a9F068101A40E0f32ed605C6"
+
+# Comma-separated list of token addresses which should not incur any fees, ex: "0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d, 0x4ECaBa5870353805a9F068101A40E0f32ed605C6"
 PERMIT_ERC20_TOKENS_NO_FEE_WHITELIST=""
+
+# Optional kernel public key
+KERNEL_PUBLIC_KEY=""
+
+# Logger level, default is INFO
+LOG_LEVEL=""
diff --git a/.github/workflows/compute.yml b/.github/workflows/compute.yml
@@ -23,9 +23,11 @@ jobs:
     name: Rewards
     runs-on: ubuntu-latest
     permissions: write-all
+    environment: ${{ github.ref == 'refs/heads/main' && 'main' || 'development' }}
 
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      PLUGIN_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
       X25519_PRIVATE_KEY: ${{ secrets.X25519_PRIVATE_KEY }}
       SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
@@ -35,6 +37,7 @@ jobs:
       PERMIT_FEE_RATE: ${{ secrets.PERMIT_FEE_RATE }}
       PERMIT_TREASURY_GITHUB_USERNAME: ${{ secrets.PERMIT_TREASURY_GITHUB_USERNAME }}
       PERMIT_ERC20_TOKENS_NO_FEE_WHITELIST: ${{ secrets.PERMIT_ERC20_TOKENS_NO_FEE_WHITELIST }}
+      KERNEL_PUBLIC_KEY: ${{ secrets.KERNEL_PUBLIC_KEY }}
 
     steps:
       # Note: the checkout could potentially be avoided by calling the workflow on the repo/branch directly.

diff --git a/.github/workflows/jest-testing.yml b/.github/workflows/jest-testing.yml
@@ -32,8 +32,11 @@ jobs:
         with:
           fetch-depth: 0
 
+      - uses: oven-sh/setup-bun@v2
+
       - name: Jest With Coverage
-        run: yarn install --immutable --immutable-cache --check-cache && yarn test
+        # we install with bun but test with Jest because bun doesn't support network mocking yet
+        run: bun install && yarn test
 
       - name: Add Jest Report to Summary
         if: always()

diff --git a/.github/workflows/knip.yml b/.github/workflows/knip.yml
@@ -15,8 +15,11 @@ jobs:
         with:
           node-version: 20.10.0
 
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+
       - name: Install toolchain
-        run: yarn install
+        run: bun install
 
       - name: Store PR number
         run: echo ${{ github.event.number }} > pr-number.txt

diff --git a/.github/workflows/update-configuration.yml b/.github/workflows/update-configuration.yml
@@ -12,6 +12,9 @@ jobs:
 
     steps:
       - uses: ubiquity-os/action-deploy-plugin@main
+        with:
+          treatAsEsm: true
+          sourcemap: false
         env:
           APP_ID: ${{ secrets.APP_ID }}
           APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ static/dist
 junit.xml
 coverage
 test-dashboard.md
+*.private.env.json
diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn commitlint --edit "$1"
+bun commitlint --edit "$1"
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn lint-staged
+bun lint-staged
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,17 +2,16 @@
 
 ## [1.5.1](https://github.com/ubiquity-os-marketplace/text-conversation-rewards/compare/v1.5.0...v1.5.1) (2024-10-12)
 
-
 ### Bug Fixes
 
-* add log message for closed pull requests ([d640681](https://github.com/ubiquity-os-marketplace/text-conversation-rewards/commit/d640681cbcbbf5961e61c4f41eec8b82d963444d))
-* add logging for payload truncation ([bf0f4c5](https://github.com/ubiquity-os-marketplace/text-conversation-rewards/commit/bf0f4c5f6aaa8714baf8e4653f36f275f695374f))
-* added custom configuration and related tests ([2fc8136](https://github.com/ubiquity-os-marketplace/text-conversation-rewards/commit/2fc8136813c94553cc1631d50b87901831405484))
-* downgrade ethers to 5.7.2 and update web3 helper ([c5e8e3c](https://github.com/ubiquity-os-marketplace/text-conversation-rewards/commit/c5e8e3c0877bd21e80d745bdae557d28c74bd7f4))
-* enhance error logging for missing multiplier cases ([a8cab80](https://github.com/ubiquity-os-marketplace/text-conversation-rewards/commit/a8cab808e30cd1e156e795de22a63a386c39c591))
-* enhance error logging for missing multiplier cases ([72d0d47](https://github.com/ubiquity-os-marketplace/text-conversation-rewards/commit/72d0d4711eec68f7880e95762ccb5a853cf2299a))
-* remove redundant console log in run.ts ([7851b75](https://github.com/ubiquity-os-marketplace/text-conversation-rewards/commit/7851b7524822c42b62e1c67dca4a00bcbe9d7f4f))
-* upgrade permit generation package ([5300022](https://github.com/ubiquity-os-marketplace/text-conversation-rewards/commit/5300022f2b45d0d1b5c48b2d0db46014a5643bf5))
+- add log message for closed pull requests ([d640681](https://github.com/ubiquity-os-marketplace/text-conversation-rewards/commit/d640681cbcbbf5961e61c4f41eec8b82d963444d))
+- add logging for payload truncation ([bf0f4c5](https://github.com/ubiquity-os-marketplace/text-conversation-rewards/commit/bf0f4c5f6aaa8714baf8e4653f36f275f695374f))
+- added custom configuration and related tests ([2fc8136](https://github.com/ubiquity-os-marketplace/text-conversation-rewards/commit/2fc8136813c94553cc1631d50b87901831405484))
+- downgrade ethers to 5.7.2 and update web3 helper ([c5e8e3c](https://github.com/ubiquity-os-marketplace/text-conversation-rewards/commit/c5e8e3c0877bd21e80d745bdae557d28c74bd7f4))
+- enhance error logging for missing multiplier cases ([a8cab80](https://github.com/ubiquity-os-marketplace/text-conversation-rewards/commit/a8cab808e30cd1e156e795de22a63a386c39c591))
+- enhance error logging for missing multiplier cases ([72d0d47](https://github.com/ubiquity-os-marketplace/text-conversation-rewards/commit/72d0d4711eec68f7880e95762ccb5a853cf2299a))
+- remove redundant console log in run.ts ([7851b75](https://github.com/ubiquity-os-marketplace/text-conversation-rewards/commit/7851b7524822c42b62e1c67dca4a00bcbe9d7f4f))
+- upgrade permit generation package ([5300022](https://github.com/ubiquity-os-marketplace/text-conversation-rewards/commit/5300022f2b45d0d1b5c48b2d0db46014a5643bf5))
 
 ## [1.5.0](https://github.com/ubiquity-os-marketplace/conversation-rewards/compare/v1.4.0...v1.5.0) (2024-09-30)
 

diff --git a/README.md b/README.md
@@ -1,12 +1,5 @@
 # `@ubiquity-os/text-conversation-rewards`
 
-As of 28 February: test driven development to aggregate all necessary information based on a URL to an issue.
-
-- pass in closed as complete issue URL and receive all the timeline events and activities of all humans who helped close the issue as complete.
-- most importantly: this can inherit bot authentication and link pull requests to issues in private repositories.
-
-Be sure to review all `*.test.*` files for implementation details.
-
 ## Data structure
 
 ```json
@@ -354,8 +347,8 @@ Partner private key (`evmPrivateEncrypted` config param in `conversation-rewards
 
 Here `GITHUB_OWNER_ID` can be:
 
-1. Github organization id (if ubiquity-os is used within an organization)
-2. Github user id (if ubiquity-os is simply installed in a user's repository)
+1. GitHub organization id (if ubiquity-os is used within an organization)
+2. GitHub user id (if ubiquity-os is simply installed in a user's repository)
 
 Format `PRIVATE_KEY:GITHUB_OWNER_ID` restricts in which particular organization (or user related repositories)
 this private key can be used. It can be set either in the organization wide config either in the repository wide one.

diff --git a/bun.lockb b/bun.lockb
diff --git a/dist/33.index.js b/dist/33.index.js
@@ -1,6 +1,6 @@
-exports.id = 33;
-exports.ids = [33];
-exports.modules = {
+export const id = 33;
+export const ids = [33];
+export const modules = {
 
 /***/ 57666:
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
@@ -28,7 +28,6 @@ module.exports = globalThis.DOMException
 /***/ 42033:
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
 
-"use strict";
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
@@ -147,4 +146,3 @@ async function fileFromPath(path, filenameOrOptions, options) {
 /***/ })
 
 };
-;
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/package.json b/dist/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -16,7 +16,7 @@ export default tsEslint.config({
     parserOptions: {
       projectService: {
         defaultProject: "tsconfig.json",
-        allowDefaultProject: ["*.mjs"],
+        allowDefaultProject: ["eslint.config.mjs"],
       },
       tsconfigRootDir: import.meta.dirname,
     },

diff --git a/jest.config.ts b/jest.config.ts
@@ -2,7 +2,12 @@ import type { Config } from "jest";
 
 const cfg: Config = {
   transform: {
-    "^.+\\.tsx?$": "babel-jest",
+    "^.+\\.tsx?$": [
+      "ts-jest",
+      {
+        useESM: true,
+      },
+    ],
   },
   moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
   coveragePathIgnorePatterns: ["node_modules", "mocks"],
@@ -12,6 +17,11 @@ const cfg: Config = {
   coverageDirectory: "coverage",
   testTimeout: 20000,
   roots: ["<rootDir>", "tests"],
+  extensionsToTreatAsEsm: [".ts"],
+  moduleNameMapper: {
+    "^(\\.{1,2}/.*)\\.js$": "$1",
+  },
+  setupFilesAfterEnv: ["dotenv/config"],
 };
 
 export default cfg;
diff --git a/knip.ts b/knip.ts
@@ -5,7 +5,7 @@ const config: KnipConfig = {
   project: ["src/**/*.ts"],
   ignore: ["src/data-collection/examples/*.ts", "src/configuration/common-config-type.ts", "dist/**"],
   ignoreExportsUsedInFile: true,
-  ignoreDependencies: ["ts-node", "msw", "@mswjs/data"],
+  ignoreDependencies: ["ts-node", "msw", "@mswjs/data", "@octokit/plugin-paginate-graphql"],
   jest: {
     config: ["jest.config.ts"],
     entry: ["src/**/*.test.ts"],