1545 compose db

.github/workflows/ci.yml

@@ -7,22 +7,52 @@ on:
     branches: [main]
 
 jobs:
+  # ceramic-config:
+  #   runs-on: ubuntu-latest
+
+  #   steps:
+  #     - name: Ceramic Config
+  #       run: |
+  #         echo ${GITHUB_WORKSPACE}
+  #         echo "List files in GITHUB_WORKSPACE"
+  #         ls ${GITHUB_WORKSPACE}
+  #         echo "Pwd"
+  #         pwd
+  #         echo '{"anchor": {"auth-method": "did"}, "http-api": {"cors-allowed-origins": [".*"], "admin-dids": ["did:key:z6MkgUzNYV8J1yw43wj9K2CbhTZoN25uZ6TJ3Gi4cYVpZyDb"]}, "ipfs": {"mode": "bundled", "disable-peer-data-sync": false}, "logger": {"log-level": 2, "log-to-files": false}, "metrics": {"metrics-exporter-enabled": false}, "network": {"name": "testnet-clay"}, "node": {}, "state-store": {"mode": "fs", "local-directory": "/home/root/.ceramic/statestore/"}, "indexing": {"db": "sqlite:///home/root/.ceramic/indexing.sqlite", "allow-queries-before-historical-sync": true, "disable-composedb": false, "enable-historical-sync": false}}' > ${GITHUB_WORKSPACE}/daemon.config.json
+
+  # debug:
+  #   runs-on: ubuntu-latest
+
+  #   steps:
+  #     - name: Debug
+  #       run: |
+  #         echo ${GITHUB_WORKSPACE}
+  #         echo "List files in GITHUB_WORKSPACE"
+  #         ls ${GITHUB_WORKSPACE}
+  #         echo "Pwd"
+  #         cat ${GITHUB_WORKSPACE}/daemon.config.json
+
   build:
+    # needs: [ceramic-config]
     runs-on: ubuntu-latest
 
     # Run a local ceramic nod to test against
     services:
       ceramic:
-        image: ceramicnetwork/js-ceramic:2.20.0
+        image: ceramicnetwork/js-ceramic:3.2.0
         ports:
           - 7007:7007
 
+        # volumes:
+        #   # TODO: use GITHUB_WORKSPACE var here ..
+        #   - /home/runner/work/passport/passport/daemon.config.json:/root/.ceramic/daemon.config.json
+
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 18
+      - name: Use Node.js 20
         uses: actions/setup-node@v3
         with:
-          node-version: 18.18
+          node-version: 20.8.1
           cache: "yarn"
       - name: Install Packages
         run: yarn install
@@ -36,15 +66,17 @@ jobs:
         run: yarn build
       - name: Run Ceramic Integration Tests
         run: yarn test:ceramic-integration
+        env:
+          CERAMIC_CLIENT_URL: ${{secrets.CERAMIC_CLIENT_URL}}
 
   check-provider-bitmap:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 18
+      - name: Use Node.js 20
         uses: actions/setup-node@v3
         with:
-          node-version: 18.18
+          node-version: 20.8
           cache: "yarn"
       - name: Install Packages
         run: yarn install

.github/workflows/iam-cd-review.yml

@@ -12,10 +12,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       # run tests
-      - name: Use Node.js 18
+      - name: Use Node.js 20
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20.8
           cache: "yarn"
       - name: Install Packages
         run: yarn install

.github/workflows/iam-promote-production.yml

@@ -16,10 +16,10 @@ jobs:
         with:
           ref: ${{ github.event.inputs.commit }}
       # run tests
-      - name: Use Node.js 16
+      - name: Use Node.js 20
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20.8
           cache: "yarn"
       - name: Install Packages
         run: yarn install
@@ -67,10 +67,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 18
+      - name: Use Node.js 20
         uses: actions/setup-node@v3
         with:
-          node-version: 18.18
+          node-version: 20.8
           cache: "yarn"
       - name: Install Packages
         run: yarn install

.github/workflows/iam-promote-staging.yml

@@ -16,10 +16,10 @@ jobs:
         with:
           ref: ${{ github.event.inputs.commit }}
       # run tests
-      - name: Use Node.js 18
+      - name: Use Node.js 20
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20.8
           cache: "yarn"
       - name: Install Packages
         run: yarn install
@@ -67,10 +67,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 18
+      - name: Use Node.js 20
         uses: actions/setup-node@v3
         with:
-          node-version: 18.18
+          node-version: 20.8
           cache: "yarn"
       - name: Install Packages
         run: yarn install

.gitignore

@@ -22,4 +22,6 @@ lerna-debug.log*
 *.ntvs*
 *.njsproj
 *.sln
-*.sw?
+*.sw?
+
+schemas/.env.yarn

.prettierrc.js

@@ -1,10 +1,10 @@
 module.exports = {
   overrides: [
     {
-      files: ['**/*.js', '**/*.ts', '**/*.tsx'],
+      files: ["**/*.js", "**/*.ts", "**/*.tsx"],
       options: {
         bracketSpacing: true,
-        trailingComma: 'es5',
+        trailingComma: "es5",
         tabWidth: 2,
         printWidth: 120,
         singleQuote: false,

app/__tests__/context/ceramicContext.test.tsx

@@ -6,29 +6,21 @@ import {
   CeramicContextState,
   cleanPassport,
 } from "../../context/ceramicContext";
-import { CeramicDatabase, PassportDatabase } from "@gitcoin/passport-database-client";
+import { ComposeDatabase, PassportDatabase } from "@gitcoin/passport-database-client";
 import {
   googleStampFixture,
   discordStampFixture,
   brightidStampFixture,
 } from "../../__test-fixtures__/databaseStorageFixtures";
 import { Passport } from "@gitcoin/passport-types";
-import {
-  DatastoreConnectionContext,
-  DatastoreConnectionContextProvider,
-} from "../../context/datastoreConnectionContext";
+import { DatastoreConnectionContext } from "../../context/datastoreConnectionContext";
+import { DID } from "dids";
 
 const viewerConnection = {
   status: "connected",
   selfID: "did:3:abc",
 };
 
-jest.mock("@self.id/framework", () => {
-  return {
-    useViewerConnection: () => [viewerConnection],
-  };
-});
-
 jest.mock("@didtools/cacao", () => ({
   Cacao: {
     fromBlockBytes: jest.fn(),
@@ -93,14 +85,26 @@ const ceramicDbMocks = {
   addStamps: dbAddStampsMock,
   deleteStamp: dbDeleteStampMock,
   deleteStamps: dbDeleteStampsMock,
+  patchStamps: jest.fn(),
   did: "test-user-did",
 };
 
+jest.mock("@gitcoin/passport-database-client", () => {
+  return {
+    ComposeDatabase: jest.fn().mockImplementation(() => ceramicDbMocks),
+    PassportDatabase: jest.fn().mockImplementation(() => passportDbMocks),
+  };
+});
+
 const mockComponent = () => (
   <DatastoreConnectionContext.Provider
     value={{
       dbAccessToken: "token",
       dbAccessTokenStatus: "idle",
+      did: {
+        id: "did:3:abc",
+        parent: "did:3:abc",
+      } as unknown as DID,
       connect: async () => {},
       disconnect: async () => {},
     }}
@@ -124,7 +128,7 @@ const mockComponent = () => (
 
 describe("CeramicContextProvider syncs stamp state with ceramic", () => {
   beforeEach(() => {
-    (CeramicDatabase as jest.Mock).mockImplementation(() => ceramicDbMocks);
+    (ComposeDatabase as jest.Mock).mockImplementation(() => ceramicDbMocks);
   });
 
   it("should return passport and stamps after successful fetch", async () => {
@@ -210,7 +214,7 @@ describe("CeramicContextProvider syncs stamp state with ceramic", () => {
           }),
       };
     });
-    (CeramicDatabase as jest.Mock).mockImplementationOnce(() => {
+    (ComposeDatabase as jest.Mock).mockImplementationOnce(() => {
       return {
         ...ceramicDbMocks,
         getPassport: jest.fn().mockImplementation(async () => {
@@ -235,7 +239,7 @@ describe("CeramicContextProvider syncs stamp state with ceramic", () => {
       console.log = jest.fn();
 
       const addStampsMock = jest.fn();
-      const setStampMock = jest.fn().mockRejectedValue(new Error("Error"));
+      const addStampMock = jest.fn().mockRejectedValue(new Error("Error"));
       (PassportDatabase as jest.Mock).mockImplementationOnce(() => {
         return {
           ...passportDbMocks,
@@ -257,10 +261,9 @@ describe("CeramicContextProvider syncs stamp state with ceramic", () => {
               status: "Success",
             };
           }),
-          setStamps: setStampMock,
         };
       });
-      (CeramicDatabase as jest.Mock).mockImplementationOnce(() => {
+      (ComposeDatabase as jest.Mock).mockImplementationOnce(() => {
         return {
           ...ceramicDbMocks,
           getPassport: jest.fn().mockImplementation(async () => {
@@ -272,15 +275,15 @@ describe("CeramicContextProvider syncs stamp state with ceramic", () => {
               status: "Success",
             };
           }),
-          setStamps: setStampMock,
+          addStamps: addStampMock,
         };
       });
       render(mockComponent());
 
       await waitFor(() => fireEvent.click(screen.getByText("handleAddStamps")));
       await waitFor(() => {
         expect(addStampsMock).toHaveBeenCalled();
-        expect(setStampMock).toHaveBeenCalledWith(stamps);
+        expect(addStampMock).toHaveBeenCalledWith(stamps);
         expect(console.log).toHaveBeenCalledWith("error setting ceramic stamps", new Error("Error"));
       });
     } finally {
@@ -291,8 +294,7 @@ describe("CeramicContextProvider syncs stamp state with ceramic", () => {
     const oldConsoleLog = console.log;
     try {
       console.log = jest.fn();
-      const deleteStampsMock = jest.fn();
-      const setStampMock = jest.fn().mockRejectedValue(new Error("Error"));
+      const deleteStampsMock = jest.fn().mockRejectedValue("Error");
       (PassportDatabase as jest.Mock).mockImplementationOnce(() => {
         return {
           ...passportDbMocks,
@@ -316,27 +318,18 @@ describe("CeramicContextProvider syncs stamp state with ceramic", () => {
           }),
         };
       });
-      (CeramicDatabase as jest.Mock).mockImplementationOnce(() => {
+      (ComposeDatabase as jest.Mock).mockImplementationOnce(() => {
         return {
           ...ceramicDbMocks,
-          getPassport: jest.fn().mockImplementation(async () => {
-            return {
-              passport: {
-                stamps: [],
-              },
-              errorDetails: {},
-              status: "Success",
-            };
-          }),
-          setStamps: setStampMock,
+          deleteStamps: deleteStampsMock,
         };
       });
       render(mockComponent());
 
       await waitFor(() => fireEvent.click(screen.getByText("handleDeleteStamps")));
       await waitFor(() => {
         expect(deleteStampsMock).toHaveBeenCalled();
-        expect(setStampMock).toHaveBeenCalledWith([]);
+        expect(deleteStampsMock).toHaveBeenCalledWith(stamps.map((stamp) => stamp.provider));
       });
     } finally {
       console.log = oldConsoleLog;
@@ -345,7 +338,6 @@ describe("CeramicContextProvider syncs stamp state with ceramic", () => {
 
   it("should patch stamps in database and delete + add stamps in ceramic", async () => {
     const added = stampPatches.filter(({ credential }) => credential);
-    const deletedProviders = stampPatches.filter(({ credential }) => !credential).map(({ provider }) => provider);
 
     const patchStampsMock = jest.fn();
     (PassportDatabase as jest.Mock).mockImplementationOnce(() => {
@@ -375,10 +367,9 @@ describe("CeramicContextProvider syncs stamp state with ceramic", () => {
     const setStampMock = jest.fn();
     const deleteStampsMock = jest.fn();
 
-    (CeramicDatabase as jest.Mock).mockImplementationOnce(() => {
+    (ComposeDatabase as jest.Mock).mockImplementationOnce(() => {
       return {
         ...ceramicDbMocks,
-        setStamps: setStampMock,
         deleteStampIDs: deleteStampsMock,
       };
     });
@@ -388,8 +379,6 @@ describe("CeramicContextProvider syncs stamp state with ceramic", () => {
     await waitFor(() => fireEvent.click(screen.getByText("handlePatchStamps")));
     await waitFor(() => {
       expect(patchStampsMock).toHaveBeenCalledWith(stampPatches);
-      expect(deleteStampsMock).toHaveBeenCalledWith(deletedProviders);
-      expect(setStampMock).toHaveBeenCalledWith(added);
     });
   });
 
@@ -398,7 +387,7 @@ describe("CeramicContextProvider syncs stamp state with ceramic", () => {
     try {
       console.log = jest.fn();
 
-      const patchStampsMock = jest.fn();
+      const patchStampsMock = jest.fn().mockRejectedValue(new Error("Error"));
       (PassportDatabase as jest.Mock).mockImplementationOnce(() => {
         return {
           ...passportDbMocks,
@@ -426,11 +415,12 @@ describe("CeramicContextProvider syncs stamp state with ceramic", () => {
       const setStampMock = jest.fn().mockRejectedValue(new Error("Error"));
       const deleteStampsMock = jest.fn();
 
-      (CeramicDatabase as jest.Mock).mockImplementationOnce(() => {
+      (ComposeDatabase as jest.Mock).mockImplementationOnce(() => {
         return {
           ...ceramicDbMocks,
           setStamps: setStampMock,
           deleteStampIDs: deleteStampsMock,
+          patchStamps: patchStampsMock,
         };
       });