Switch Quest Chains from ethers to Viem for Contract Access

.gitignore

@@ -56,3 +56,4 @@ tsconfig.tsbuildinfo
 # Ceramic daemon
 ipfs
 packages/backend/uploads/
+*.key

.nvmrc

@@ -1 +1 @@
-lts/gallium
+lts/iron

.vscode/settings.json

@@ -1,5 +1,6 @@
-{
-    "githubPullRequests.ignoredPullRequestBranches": [
-        "develop"
-    ]
-}
+{
+    "githubPullRequests.ignoredPullRequestBranches": [
+        "develop"
+    ],
+    "typescript.tsdk": "node_modules/typescript/lib"
+}

.yarnrc.yml

@@ -0,0 +1,7 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.3.1.cjs
+
+progressBarStyle: simba
+
+preferInteractive: true

docker-compose.yml

@@ -24,7 +24,7 @@ services:
       HASURA_GRAPHQL_DEV_MODE: ${HASURA_GRAPHQL_DEV_MODE:-false}
 
   database:
-    image: postgres:12
+    image: postgres:16
     volumes:
       - database:/var/lib/postgresql/data
     ports:
@@ -39,6 +39,8 @@ services:
       context: .
       dockerfile: ./docker/backend/Dockerfile
       target: base
+      args:
+        CACHEBUST: ${CACHEBUST:-$(date +%s)}
     command: yarn backend:dev
     ports:
       - 4000:4000

docker/backend/Dockerfile

@@ -1,24 +1,32 @@
 FROM node:20-slim as base
 WORKDIR /usr/src/app
 
+# varying arg to prevent caching
+ARG CACHEBUST
+ARG DEBUG
+
 # Install dependencies not included in the slim image
 RUN apt-get update && \
     apt-get install -y --no-install-recommends g++ make python3 git openssl && \
     apt-get install -y --no-install-recommends --reinstall ca-certificates
 
-# Install dependencies for dev and prod
-COPY package.json .
-COPY lerna.json .
-COPY yarn.lock .
-COPY schema.graphql .
-COPY tsconfig.base.json .
+COPY package.json ./
+COPY lerna.json ./
+COPY yarn.lock ./
+COPY schema.graphql ./
+COPY tsconfig.base.json ./
 COPY packages/backend/*.json ./packages/backend/
 COPY packages/utils/*.json ./packages/utils/
 COPY packages/discord-bot/*.json ./packages/discord-bot/
 
-RUN yarn install --pure-lockfile
+RUN corepack enable
+RUN yarn set version berry
+RUN yarn config set nodeLinker node-modules
+RUN yarn install # --immutable
+
+# RUN set -x && echo $CACHEBUST && ls -la
 
-# Dev environment doesn't run this stage or beyond
+# Dev environment doesn't run beyond here
 FROM base as build
 
 # Copy source files
@@ -41,7 +49,10 @@ ENV THE_GRAPH_API_TOKEN $THE_GRAPH_API_TOKEN
 RUN yarn backend:build
 
 # Delete devDependencies
-RUN yarn install --pure-lockfile --production --ignore-scripts --prefer-offline
+RUN corepack enable
+RUN yarn set version berry
+RUN yarn install # --immutable
+# RUN yarn install --pure-lockfile --production --ignore-scripts --prefer-offline
 
 # Create completely new stage including only necessary files
 FROM node:20-slim as app

docker/frontend/Dockerfile

@@ -26,7 +26,9 @@ COPY packages/web/graphql ./packages/web/graphql/
 COPY packages/utils/*.json ./packages/utils/
 COPY packages/design-system/*.json ./packages/design-system/
 
-RUN yarn install --pure-lockfile
+RUN corepack enable
+RUN yarn set version berry
+RUN yarn install # --immutable
 
 FROM base AS build
 

hasura/clear-xp.mjs

@@ -1,7 +1,5 @@
 #!/usr/bin/env node
 
-import fetch from 'node-fetch'
-
 /* eslint-disable no-console */
 
 const TARGET_GRAPHQL_URL = (

hasura/seed-db.mjs

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
 import Bottleneck from 'bottleneck';
-import fetch from 'node-fetch';
 
 /* eslint-disable no-console */
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@metafam/the-game",
   "version": "0.2.0",
-  "license": "GPL-3.0",
+  "license": "GPL-2.0",
   "type": "module",
   "engines": {
     "node": ">=20"
@@ -15,6 +15,7 @@
     "docker:stop": "docker-compose down",
     "docker:clean": "docker-compose down -v",
     "docker:dev": "DOCKER_BUILDKIT=1 docker compose up --build",
+    "docker:debug": "docker compose --progress=plain up --build",
     "build": "lerna run --concurrency 1 --stream build",
     "web:dev": "lerna run dev --parallel --scope @metafam/web --include-dependencies",
     "web:build": "lerna run build --scope @metafam/web --include-dependencies --stream",
@@ -29,7 +30,7 @@
     "test": "lerna run test --parallel --",
     "test:full": "yarn lint && yarn typecheck && yarn test",
     "clean": "lerna clean",
-    "clean:libndist": "CMD='rm -rf node_modules/ packages/*/node_modules/ packages/*/dist/ packages/web/.next/' && echo \"$CMD\" && eval $CMD",
+    "clean:libndist": "CMD='rm -rf node_modules/ packages/*/node_modules/ packages/*/dist/ packages/web/.next/' && echo \"$CMD\" && sh -c \"eval $CMD\"",
     "clean:autogen": "find -type d -name autogen -exec rm -rfv '{}' \\; || true",
     "clean:full": "yarn clean:libndist && yarn clean:autogen",
     "format": "prettier --write \"{*,**/*}.{ts,tsx,js,jsx,json,yml,yaml,md}\"",
@@ -43,35 +44,29 @@
     "web": "yarn --cwd packages/web/",
     "ds": "yarn --cwd packages/design-system/",
     "release": "standard-version",
-    "composedb:create-composite": "composedb composite:create packages/utils/schema/user-profile.graphql -o packages/utils/schema/user-profile-composite.json",
-    "composedb:create-definition": "composedb composite:compile packages/utils/schema/user-profile-composite.json packages/utils/schema/user-profile-definition.json",
-    "composedb:graphql-generate": "composedb composite:compile packages/utils/schema/user-profile-composite.json packages/utils/src/graphql/composeDBDefinition.ts",
-    "composedb:graphql-server": "composedb graphql:server --graphiql packages/utils/schema/user-profile-definition.json"
+    "composedb:create-composite": "composedb composite:create packages/utils/schema/user-profile.graphql --output packages/utils/schema/user-profile-composite.json",
+    "composedb:create-definition": "composedb composite:compile packages/utils/schema/user-profile-composite.json packages/utils/schema/user-profile-definition.json --ceramic-url=https://ceramic.metagame.wtf",
+    "composedb:graphql-generate": "composedb composite:compile packages/utils/schema/user-profile-composite.json packages/utils/src/graphql/composeDBDefinition.ts --ceramic-url=https://ceramic.metagame.wtf",
+    "composedb:graphql-server": "composedb graphql:server --graphiql packages/utils/schema/user-profile-definition.json --ceramic-url=https://ceramic.metagame.wtf"
   },
   "workspaces": [
     "packages/*"
   ],
+  "dependencies": {
+    "dag-jose": "^4.0.0",
+    "tslib": "^2.4.0",
+    "uuid": "8.3.2"
+  },
   "devDependencies": {
-    "@apollo/rover": "^0.18.0",
-    "@composedb/cli": "^0.4.4",
-    "@graphql-codegen/add": "^5.0.0",
-    "@graphql-codegen/cli": "^5.0.0",
-    "@graphql-codegen/introspection": "^4.0.0",
-    "@graphql-codegen/typescript": "^4.0.1",
-    "@graphql-codegen/typescript-graphql-request": "^5.0.0",
-    "@graphql-codegen/typescript-operations": "^4.0.1",
-    "@graphql-codegen/typescript-react-apollo": "^3.3.7",
-    "@graphql-codegen/typescript-resolvers": "^4.0.1",
-    "@graphql-codegen/typescript-urql": "^4.0.0",
+    "@apollo/rover": "^0.23.0",
+    "@composedb/cli": "^0.7.1",
     "@types/jest": "^29.2.1",
     "@types/node": "^20.8.6",
-    "@types/node-fetch": "^2.6.2",
     "@types/react": "^18.0.21",
     "@types/react-dom": "^18.0.6",
     "@types/uuid": "8.3.4",
     "@typescript-eslint/eslint-plugin": "5.45.0",
     "@typescript-eslint/parser": "^6.6.0",
-    "caniuse-lite": "^1.0.30001383",
     "concurrently": "7.0.0",
     "env-cmd": "10.1.0",
     "eslint": "^8.39.0",
@@ -97,10 +92,7 @@
     "wait-on": "6.0.1"
   },
   "resolutions": {
-    "@ceramicnetwork/common": "2.31.1",
-    "did-resolver": "4.1.0",
-    "dids": "4.0.4",
-    "graphql": "16.5.0",
+    "graphql": "16.9.0",
     "multihashes": "4.0.3",
     "node-gyp": "10.0.1",
     "better-sqlite3": "9.4.5",
@@ -110,10 +102,5 @@
     "defaults",
     "not IE 11"
   ],
-  "dependencies": {
-    "dag-jose": "^4.0.0",
-    "tslib": "^2.4.0",
-    "uuid": "8.3.2"
-  },
-  "packageManager": "[email protected]"
+  "packageManager": "[email protected]"
 }

packages/backend/codegen.ts

@@ -8,17 +8,18 @@ const config = {
   generates: {
     'src/handlers/remote-schemas/autogen/types.ts': {
       schema: 'src/handlers/remote-schemas/typeDefs.ts',
-      plugins: [
-        'typescript',
-        'typescript-resolvers',
-        { add: { content: '/* eslint-disable */' } },
-      ],
-      config: {
-        noSchemaStitching: true,
-        avoidOptionals: true,
-        maybeValue:
-          'T extends PromiseLike<infer U> ? Promise<U | null> : T | null | undefined',
-      },
+
+      // plugins: [
+      //   'typescript',
+      //   'typescript-resolvers',
+      //   { add: { content: '/* eslint-disable */' } },
+      // ],
+      // config: {
+      //   noSchemaStitching: true,
+      //   avoidOptionals: true,
+      //   maybeValue:
+      //     'T extends PromiseLike<infer U> ? Promise<U | null> : T | null | undefined',
+      // },
     },
     'src/lib/autogen/hasura-sdk.ts': {
       schema: '../../schema.graphql',

packages/backend/package.json

@@ -4,53 +4,60 @@
   "version": "0.2.0",
   "description": "",
   "author": "MetaFam",
-  "license": "ISC",
+  "contributors": [
+    "δυς <[email protected]> (https://trwb.live)"
+  ],
+  "license": "GPL-2.0",
   "type": "module",
   "main": "dist/index.js",
   "scripts": {
     "start": "node --trace-warnings dist/index.js",
     "build": "yarn generate && tsc -b",
-    "dev": "tsc --build && concurrently 'tsc --watch --preserveWatchOutput' nodemon",
+    "dev": "nodemon",
     "typecheck": "tsc --noEmit --pretty",
     "precommit": "yarn typecheck",
     "generate": "graphql-code-generator --debug && yarn fix:daohaus-types",
-    "fix:daohaus-types": "export OUT=src/lib/autogen/daohaus-sdk.ts && awk '!/MolochVersion = .molochVersion/' $OUT > $OUT.filtered && mv $OUT.filtered $OUT",
+    "fix:daohaus-types": "bash -c 'export OUT=src/lib/autogen/daohaus-sdk.ts && awk \"!/MolochVersion = .molochVersion/\" $OUT > $OUT.filtered && mv $OUT.filtered $OUT'",
     "fix:lint": "eslint --fix",
     "test": "jest --passWithNoTests"
   },
   "dependencies": {
-    "@ceramicnetwork/stream-caip10-link": "^2.26.1",
-    "@composedb/client": "^0.4.4",
-    "@graphql-tools/schema": "8.3.2",
-    "@metafam/discord-bot": "0.1.0",
-    "@metafam/utils": "1.0.1",
+    "@ceramicnetwork/http-client": "^5.16.0",
+    "@ceramicnetwork/stream-caip10-link": "^5.15.0",
+    "@composedb/client": "^0.7.1",
+    "@datamodels/identity-accounts-crypto": "^0.2.0",
+    "@datamodels/identity-profile-basic": "^0.2.0",
+    "@graphql-tools/schema": "^10.0.4",
+    "@metafam/discord-bot": "workspace:*",
+    "@metafam/utils": "workspace:*",
     "bluebird": "3.7.2",
     "bottleneck": "^2.19.5",
     "cors": "2.8.5",
-    "discord.js": "13.6.0",
+    "discord.js": "^14.15.3",
     "dotenv": "16.0.0",
-    "ethers": "5.7.2",
-    "express": "^4.18.2",
+    "ethers": "^6.13.1",
+    "express": "^4.19.2",
     "express-graphql": "0.12.0",
-    "graphql": "16.5.0",
-    "graphql-request": "4.0.0",
-    "graphql-tag": "2.12.6",
+    "graphql": "16.9.0",
+    "graphql-request": "^7.1.0",
+    "graphql-tag": "^2.12.6",
     "showdown": "^2.1.0",
     "uuid": "8.3.2"
   },
   "devDependencies": {
+    "@composedb/types": "^0.7.1",
     "@types/bluebird": "3.5.36",
     "@types/body-parser": "1.19.2",
     "@types/cors": "2.8.12",
+    "@types/create-hash": "^1.2.6",
+    "@types/express": "^4.17.21",
+    "@types/node": "^20.14.10",
     "@types/showdown": "^2.0.0",
-    "@types/uuid": "8.3.0",
+    "@types/uuid": "^10.0.0",
     "nock": "13.2.4",
-    "nodemon": "^2.0.20",
-    "ts-node": "^10.9.1"
-  },
-  "resolutions": {
-    "better-sqlite3": "9.4.5",
-    "node-gyp": "10.0.1"
+    "nodemon": "^3.1.4",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.5.3"
   },
   "nodemonConfig": {
     "exec": "node --inspect=0.0.0.0:4322 --loader ts-node/esm src/index.ts",

packages/backend/src/handlers/actions/composeDB/linkProfileNode/handler.ts

@@ -41,12 +41,12 @@ export default async (req: Request, res: Response): Promise<void> => {
     });
     const modelInstanceDoc = await composeDBClient.context.loadDoc(nodeId);
 
+    if (!modelInstanceDoc) throw new Error(`Model instance not found: "${nodeId}".`);
+
     const { controller } = modelInstanceDoc.metadata;
 
-    // There is probably a better way to do this...
-    const controllerEthAddress = controller.substring(
-      controller.lastIndexOf(':') + 1,
-    );
+    const controllerEthAddress = controller.replace(/.*:/g, '');
+
     // controller is something like did:pkh:eip155:1:0x4c81e51aa103490838fd9db1d859a5fcd8276324
     // make sure this is a mainnet address!
     if (

packages/backend/src/handlers/actions/player/syncBalances.ts

@@ -65,9 +65,7 @@ const setBalances = async ({
         uniqueDrops[executionDate] ??= {};
         uniqueDrops[executionDate][to] ??= 0;
         if (tokenAddress === guildTokenAddress) {
-          uniqueDrops[executionDate][to] += Number(
-            ethers.utils.formatEther(value),
-          );
+          uniqueDrops[executionDate][to] += Number(ethers.formatEther(value));
         }
       });
     });

packages/backend/src/handlers/actions/quests/createQuest/permissions.ts

@@ -2,7 +2,7 @@ import { Constants, numbers } from '@metafam/utils';
 
 import { getERC20Contract, polygonProvider } from '../../../../lib/ethereum.js';
 
-const { BN, amountToDecimal } = numbers;
+const { amountToDecimal } = numbers;
 
 /**
  * As a first iteration, we only allow people to create quests if they hold more that 100 pSEED tokens
@@ -17,13 +17,13 @@ export async function isAllowedToCreateQuest(
   );
   const pSEEDBalance = await pSEEDContract.balanceOf(playerAddress);
   const pSEEDDecimals = await pSEEDContract.decimals();
-  const minimumPooledSeedBalance = new BN(Constants.PSEED_FOR_QUEST);
+  const minimumPooledSeedBalance = BigInt(Constants.PSEED_FOR_QUEST);
   const pSEEDBalanceInDecimal = amountToDecimal(
     pSEEDBalance.toString(),
     pSEEDDecimals,
   );
 
-  const allowed = new BN(pSEEDBalanceInDecimal).gte(minimumPooledSeedBalance);
+  const allowed = BigInt(pSEEDBalanceInDecimal) >= minimumPooledSeedBalance;
 
   return allowed;
 }

packages/backend/src/handlers/auth-webhook/handler.ts

@@ -33,7 +33,7 @@ export const authHandler = async (
     }
     const claim = await did.verifyToken(
       token,
-      mainnetProvider as unknown as ethers.providers.Web3Provider,
+      mainnetProvider as unknown as ethers.BrowserProvider,
     );
     if (!claim) {
       throw new Error('Invalid token');