chore: merge develop

README.md

@@ -3,6 +3,7 @@
 ## Intro to monorepo
 
 The monorepo consists of three main parts:
+
 * [Contracts](packages/contracts)
 * [Dapp](packages/dapp)
 * [Subgraphs](packages/subgraphs)
@@ -18,10 +19,10 @@ pnpm lint
 
 ## Deployed contracts and EAS schemas
 
-### EESCore deployed contracts:
+### EESCore deployed contracts
 
 * Mainnet: TODO
-* Base: TODO
+* Base: [0x6BbcC7D0E661a4f5441F74Dc0Ab324ac4327D940](https://basescan.org/address/0x6bbcc7d0e661a4f5441f74dc0ab324ac4327d940)
 * Sepolia: [0x306aa8b6640A4Ef12919Ed97b5d85c006DD68796](https://sepolia.etherscan.io/address/0x306aa8b6640A4Ef12919Ed97b5d85c006DD68796)
 * Base Sepolia: [0x63F610a03Caa82ca32386BDb6F447a93d4D6F6e7](https://sepolia.basescan.org/address/0x63F610a03Caa82ca32386BDb6F447a93d4D6F6e7)
 

packages/contracts/scripts/deployCore.ts

@@ -13,7 +13,7 @@ const networkToSchemaUid = {
   mainnet: 'not-yet-deployed',
   sepolia: '0x28bb35c3774b2963e8703dccbe93a3d1620ddf91ee3eee4678cdb8fb8e1a8bbb',
   local: '0x28bb35c3774b2963e8703dccbe93a3d1620ddf91ee3eee4678cdb8fb8e1a8bbb',
-  base: 'not-yet-deployed',
+  base: '0xc15bb007fcd98a5a99c0fd98286fba2f62f997de62c11ea24dfd30d274eef99f',
   baseSepolia:
     '0xc15bb007fcd98a5a99c0fd98286fba2f62f997de62c11ea24dfd30d274eef99f',
 };
@@ -44,12 +44,12 @@ async function main() {
   );
   await deployment.waitForDeployment();
 
+  console.log('EESCore deployed to: ', await deployment.getAddress());
   if (hre.network.name !== 'local') {
     await run('verify:verify', {
       address: await deployment.getAddress(),
     });
   }
-  console.log('EESCore deployed to: ', await deployment.getAddress());
 }
 
 main().catch((error) => {

packages/dapp/.env.example

@@ -1,7 +1,12 @@
-# GraphQL API endpoints
-NEXT_PUBLIC_EES_BASE_GRAPHQL_ENDPOINT=
-NEXT_PUBLIC_EES_BASE_SEPOLIA_GRAPHQL_ENDPOINT=
-NEXT_PUBLIC_EES_SEPOLIA_GRAPHQL_ENDPOINT=
+# GraphQL API endpoints (Alchemy + The Graph Network)
+# Alchemy
+EES_BASE_GRAPHQL_ENDPOINT_ALCHEMY=
+EES_BASE_SEPOLIA_GRAPHQL_ENDPOINT_ALCHEMY=
+EES_SEPOLIA_GRAPHQL_ENDPOINT_ALCHEMY=
+# Graph network
+EES_BASE_GRAPHQL_ENDPOINT_GRAPH_NETWORK=
+EES_BASE_SEPOLIA_GRAPHQL_ENDPOINT_GRAPH_NETWORK=
+EES_SEPOLIA_GRAPHQL_ENDPOINT_GRAPH_NETWORK=
 
 # Coinbase API Secrets
 COINBASE_API_KEY_NAME=
@@ -14,3 +19,11 @@ NEXT_PUBLIC_APP_ENV=
 NEXT_PUBLIC_BASE_ENDPOINT=
 NEXT_PUBLIC_BASE_SEPOLIA_ENDPOINT=
 NEXT_PUBLIC_SEPOLIA_ENDPOINT=
+
+# Airstack
+AIRSTACK_API_URL=
+AIRSTACK_API_KEY=
+
+# Next.js Vercel
+# Should be only set for local development, on Vercel it will be set automatically
+NEXT_PUBLIC_VERCEL_PROJECT_PRODUCTION_URL=

packages/dapp/codegen.ts

@@ -2,22 +2,38 @@ import type { CodegenConfig } from '@graphql-codegen/cli';
 
 const config: CodegenConfig = {
   generates: {
-    './src/__generated__/eas/': {
-      documents: './src/lib/graphql/eas/**/*.graphql',
-      schema: 'https://base.easscan.org/graphql',
+    // './src/__generated__/eas/': {
+    //   documents: './src/lib/graphql/eas/**/*.graphql',
+    //   schema: 'https://base.easscan.org/graphql',
+    //   preset: 'client',
+    //   plugins: [],
+    //   presetConfig: {
+    //     gqlTagName: 'gqlEAS',
+    //   },
+    // },
+    './src/__generated__/ees/': {
+      documents: './src/lib/graphql/ees/**/*.graphql',
+      config: {
+        documentMode: 'string',
+      },
+      schema:
+        'https://subgraph.satsuma-prod.com/9c8dcc2edf3c/martins-team--780110/ees-sepolia/api',
       preset: 'client',
       plugins: [],
       presetConfig: {
-        gqlTagName: 'gqlEAS',
+        gqlTagName: 'gqlEES',
       },
     },
-    './src/__generated__/ees/': {
-      documents: './src/lib/graphql/ees/**/*.graphql',
-      schema: 'http://0.0.0.0:8000/subgraphs/name/ees',
+    './src/__generated__/airstack/': {
+      documents: './src/lib/graphql/airstack/**/*.graphql',
+      config: {
+        documentMode: 'string',
+      },
+      schema: 'https://api.airstack.xyz/graphql',
       preset: 'client',
       plugins: [],
       presetConfig: {
-        gqlTagName: 'gqlEES',
+        gqlTagName: 'gqlAirstack',
       },
     },
   },

packages/dapp/next.config.js

@@ -1,5 +1,10 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
+  logging: {
+    fetches: {
+      fullUrl: true,
+    },
+  },
   images: {
     remotePatterns: [
       {

packages/dapp/package.json

@@ -27,17 +27,20 @@
     "@rainbow-me/rainbowkit": "^2.1.2",
     "@tanstack/react-query": "5.40.0",
     "@tanstack/react-query-devtools": "^5.40.0",
+    "@vercel/analytics": "^1.3.1",
+    "@vercel/speed-insights": "^1.0.11",
     "@wagmi/core": "^2.10.5",
+    "blo": "^1.2.0",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "cmdk": "^1.0.0",
     "framer-motion": "^11.2.10",
     "jsonwebtoken": "^9.0.2",
     "lucide-react": "^0.381.0",
-    "next": "14.2.3",
+    "next": "14.3.0-canary.87",
     "next-themes": "^0.3.0",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0",
     "react-inlinesvg": "^4.1.3",
     "react-share": "^5.1.0",
     "react-use": "^17.5.0",