Merge pull request #1157 from dm3-org/lukso-poc

Lukso poc

Author: karladler

.github/workflows/deploy.yml

@@ -65,6 +65,7 @@ jobs:
                   echo "ENCRYPTION_PUBLIC_KEY=${{ secrets.ENCRYPTION_PUBLIC_KEY }}" >> ./.env
                   echo "ENCRYPTION_PRIVATE_KEY=${{ secrets.ENCRYPTION_PRIVATE_KEY }}" >> ./.env
                   echo "RPC=${{ secrets.RPC }}" >> ./.env
+                  echo "LUKSO_RPC=${{ secrets.LUKSO_RPC }}" >> ./.env
                   echo "URL=${{ vars.HOST_DOMAIN }}" >> ./.env
                   echo "CERT_MAIL=${{ vars.CERT_MAIL }}" >> ./.env
                   echo "DATABASE_URL=${{ secrets.DATABASE_URL }}" >> ./.env

docker/DockerfileBuild

@@ -2,7 +2,7 @@ FROM --platform=linux/amd64 node:22-alpine3.18 as build
 WORKDIR /build
 COPY . .
 # we need coreutils for proper ls command
-RUN apk add --update coreutils python3 make g++ curl bash gawk jq\
+RUN apk add --update coreutils python3 make g++ curl bash gawk jq git\
    && rm -rf /var/cache/apk/*
 
 ## Build libraries

docker/docker-compose.yml

@@ -31,6 +31,7 @@ services:
             ENCRYPTION_PRIVATE_KEY: ${ENCRYPTION_PRIVATE_KEY}
             DISABLE_SESSION_CHECK: ${DISABLE_SESSION_CHECK}
             RPC: ${RPC}
+            LUKSO_RPC: ${LUKSO_RPC}
             PORT: 8081
             LOG_LEVEL: 'debug'
             DATABASE_URL: ${DATABASE_URL}
@@ -58,6 +59,7 @@ services:
             ENCRYPTION_PUBLIC_KEY: ${ENCRYPTION_PUBLIC_KEY}
             ENCRYPTION_PRIVATE_KEY: ${ENCRYPTION_PRIVATE_KEY}
             RPC: ${RPC}
+            LUKSO_RPC: ${LUKSO_RPC}
             PORT: 8083
             LOG_LEVEL: 'debug'
         volumes:
@@ -88,6 +90,7 @@ services:
             DATABASE_URL: postgresql://postgres:example@offchain-resolver-db:5432
             PORT: 8082
             RPC: ${RPC}
+            LUKSO_RPC: ${LUKSO_RPC}
             RESOLVER_SUPPORTED_ADDR_ENS_SUBDOMAINS: ${RESOLVER_SUPPORTED_ADDR_ENS_SUBDOMAINS}
             RESOLVER_SUPPORTED_NAME_ENS_SUBDOMAINS: ${RESOLVER_SUPPORTED_NAME_ENS_SUBDOMAINS}
             LOG_LEVEL: 'debug'

docker/resolutions.json

@@ -10,6 +10,7 @@
     "@dm3-org/dm3-lib-shared": "file:/library_archives/lib-shared.tgz",
     "@dm3-org/dm3-lib-storage": "file:/library_archives/lib-storage.tgz",
     "@dm3-org/dm3-lib-test-helper": "file:/library_archives/lib-test-helper.tgz",
+    "@dm3-org/dm3-lib-smart-account": "file:/library_archives/lib-smart-account.tgz",
     "@dm3-org/dm3-messenger-widget": "file:/library_archives/messenger-widget.tgz"
   }
 }

package.json

@@ -13,11 +13,13 @@
             "packages/lib/storage",
             "packages/lib/delivery-api",
             "packages/lib/test-helper",
+            "packages/lib/smart-account",
             "packages/lib/offchain-resolver-api",
             "packages/backend",
             "packages/integration-tests",
             "packages/offchain-resolver",
             "packages/messenger-widget",
+            "packages/js-sdk",
             "packages/messenger-demo",
             "packages/next-messenger-demo",
             "packages/messenger-web",

packages/backend/src/index.ts

@@ -5,6 +5,7 @@ import {
     getServerSecret,
     logError,
     logRequest,
+    getLuksoProvider,
 } from '@dm3-org/dm3-lib-server-side';
 import { logInfo } from '@dm3-org/dm3-lib-shared';
 import bodyParser from 'body-parser';
@@ -30,14 +31,15 @@ app.use(bodyParser.json());
 (async () => {
     const db = await getDatabase();
     const web3Provider = await getCachedWebProvider(process.env);
+    const luksoProvider = await getLuksoProvider(process.env);
     const serverSecret = getServerSecret(process.env);
 
     app.use(logRequest);
 
     app.get('/hello', (req, res) => {
         return res.status(200).send('Hello DM3');
     });
-    app.use('/profile', Profile(db, web3Provider, serverSecret));
+    app.use('/profile', Profile(db, web3Provider, luksoProvider, serverSecret));
     app.use('/storage', Storage(db, web3Provider, serverSecret));
     app.use('/auth', Authenticate(db, serverSecret, web3Provider));
     app.use(logError);

packages/backend/src/profile/profile.test.ts

@@ -29,10 +29,11 @@ const setUpApp = async (
     db: IBackendDatabase,
     web3Provider: ethers.providers.JsonRpcProvider,
     serverSecret: string = 'my-secret',
+    luksoProvider: ethers.providers.JsonRpcProvider = {} as ethers.providers.JsonRpcProvider,
 ) => {
     app.use(bodyParser.json());
     const server = http.createServer(app);
-    app.use(profile(db, web3Provider, serverSecret));
+    app.use(profile(db, web3Provider, luksoProvider, serverSecret));
 };
 
 const createDbMock = async () => {

packages/backend/src/profile/profile.ts

@@ -1,5 +1,9 @@
 import { generateAuthJWT } from '@dm3-org/dm3-lib-server-side';
-import { getUserProfile } from '@dm3-org/dm3-lib-profile';
+import {
+    getUserProfile,
+    ProfileValidator,
+    SignedUserProfile,
+} from '@dm3-org/dm3-lib-profile';
 
 import {
     checkUserProfile,
@@ -14,6 +18,7 @@ import { IBackendDatabase } from '../persistence/getDatabase';
 export default (
     db: IBackendDatabase,
     web3Provider: ethers.providers.JsonRpcProvider,
+    luksoProvider: ethers.providers.JsonRpcProvider,
     serverSecret: string,
 ) => {
     const router = express.Router();
@@ -60,6 +65,7 @@ export default (
             if (
                 !(await checkUserProfile(
                     web3Provider,
+                    luksoProvider,
                     req.body, // as SignedUserProfile,
                     normalizeEnsName(ensName),
                 ))

packages/backend/src/profile/submitUserProfile.ts

@@ -3,6 +3,7 @@ import {
     Authenticate,
     errorHandler,
     getCachedWebProvider,
+    getLuksoProvider,
     getServerSecret,
     logError,
     logRequest,
@@ -22,13 +23,13 @@ import { startCleanUpPendingMessagesJob } from './cleanup/cleanUpPendingMessages
 import { getDeliveryServiceProperties } from './config/getDeliveryServiceProperties';
 import Delivery from './delivery';
 import { onConnection } from './messaging';
+import Metrics from './metrics';
 import Notifications from './notifications';
 import { IDatabase, getDatabase } from './persistence/getDatabase';
 import { Profile } from './profile/profile';
 import RpcProxy from './rpc/rpc-proxy';
-import { WebSocketManager } from './ws/WebSocketManager';
 import { socketAuth } from './socketAuth';
-import Metrics from './metrics';
+import { WebSocketManager } from './ws/WebSocketManager';
 
 const app = express();
 app.use(express.json({ limit: '50mb' }));
@@ -96,6 +97,7 @@ app.use(bodyParser.json());
     // load environment
     const deliveryServiceProperties = getDeliveryServiceProperties();
     const web3Provider = await getCachedWebProvider(process.env);
+    const luksoProvider = await getLuksoProvider(process.env);
 
     const db = getDbWithAddressResolvedGetAccount(
         await getDatabase(),
@@ -142,7 +144,7 @@ app.use(bodyParser.json());
 
     app.use('/metrics', Metrics(db, deliveryServiceProperties));
     app.use('/auth', Authenticate(db, serverSecret, web3Provider));
-    app.use('/profile', Profile(db, web3Provider, serverSecret));
+    app.use('/profile', Profile(db, web3Provider, luksoProvider, serverSecret));
     app.use('/delivery', Delivery(web3Provider, db, serverSecret));
     app.use(
         '/notifications',