TwinStory

.github/workflows/studio.yml

@@ -0,0 +1,133 @@
+name: Studio CI
+
+on:
+    push:
+
+jobs:
+    buildAndTest:
+        name: 'Build & Test'
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                node-version: ['18'] # Add other versions if needed
+
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v3
+              with:
+                  fetch-depth: 0
+
+            - name: Configure AWS credentials
+              uses: aws-actions/configure-aws-credentials@v1
+              with:
+                  aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+                  aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+                  aws-region: us-east-1
+
+            - name: Install Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v4
+              with:
+                  node-version: ${{ matrix.node-version }}
+
+            - name: Restore Node.js dependencies
+              uses: actions/cache@v3
+              with:
+                  path: ./node_modules
+                  key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+                  restore-keys: |
+                      ${{ runner.os }}-node-
+
+            - name: Install Node.js dependencies
+              run: yarn install --frozen-lockfile
+
+            - name: Cache Node.js dependencies
+              uses: actions/cache/save@v3
+              if: always()
+              with:
+                  path: ./node_modules
+                  key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+
+            - name: Build Studio
+              run: yarn nx run studio:build --prod --skip-nx-cache
+
+    autodeploy:
+        name: 'Auto deploy'
+        runs-on: ubuntu-latest
+        if: "(github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main')"
+        needs: [buildAndTest]
+        outputs:
+            newTag: ${{ steps.version-bump.outputs.newTag }}
+        steps:
+            - name: 'Checkout source code'
+              uses: 'actions/checkout@v3'
+              with:
+                  ref: ${{ github.ref }}
+
+            - name: Install Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v4
+              with:
+                  node-version: ${{ matrix.node-version }}
+
+            - name: Configure AWS credentials
+              uses: aws-actions/configure-aws-credentials@v1
+              with:
+                  aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+                  aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+                  aws-region: eu-west-3
+
+            - name: Restore Node.js dependencies
+              uses: actions/cache@v3
+              with:
+                  path: ./node_modules
+                  key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+                  restore-keys: |
+                      ${{ runner.os }}-node-
+
+            - name: Set environment based on branch
+              run: |
+                  if [[ $GITHUB_REF == 'refs/heads/develop' ]]; then
+                    echo "S3_URL=s3://dev-studio.thx.network" >> $GITHUB_ENV
+                    echo "DISTRIBUTION=${{ secrets.CLOUDFRONT_DISTRIBUTION_STUDIO_DEV }}" >> $GITHUB_ENV
+                    echo "BUILD_MODE=dev" >> $GITHUB_ENV
+                  elif [[ $GITHUB_REF == 'refs/heads/main' ]]; then
+                    echo "S3_URL=s3://studio.thx.network" >> $GITHUB_ENV
+                    echo "DISTRIBUTION=${{ secrets.CLOUDFRONT_DISTRIBUTION_STUDIO_PROD }}" >> $GITHUB_ENV
+                    echo "BUILD_MODE=prod" >> $GITHUB_ENV
+                  fi
+
+            - name: Build Studio
+              run: NODE_ENV='production' yarn nx run studio:build --configuration=production --mode $BUILD_MODE --skip-nx-cache
+
+            - name: Deploy
+              run: aws s3 sync ./dist/apps/studio $S3_URL --delete
+
+            - name: Invalidate CloudFront cache
+              run: aws cloudfront create-invalidation --distribution-id $DISTRIBUTION --paths "/*"
+
+    discord:
+        name: Update Discord
+        runs-on: ubuntu-latest
+        needs: [autodeploy]
+        steps:
+            - name: 'Checkout source code'
+              uses: 'actions/checkout@v3'
+              with:
+                  ref: ${{ github.ref }}
+
+            - name: Set DISCORD_WEBHOOK based on branch
+              run: |
+                  if [[ $GITHUB_REF == 'refs/heads/develop' ]]; then
+                    echo "DISCORD_WEBHOOK=${{ secrets.DISCORD_WEBHOOK_DEV }}" >> $GITHUB_ENV
+                  elif [[ $GITHUB_REF == 'refs/heads/main' ]]; then
+                    echo "DISCORD_WEBHOOK=${{ secrets.DISCORD_WEBHOOK_PROD }}" >> $GITHUB_ENV
+                  fi
+
+            - name: Get version
+              run: echo "VERSION=$(git rev-parse HEAD)" >> $GITHUB_ENV
+
+            - name: Send message
+              env:
+                  DISCORD_WEBHOOK: ${{ env.DISCORD_WEBHOOK }}
+              uses: Ilshidur/action-discord@master
+              with:
+                  args: "${{ needs.autodeploy.result == 'success' && '✅' || '⛔' }} Released Studio `v${{ env.VERSION }}-app`"

.github/workflows/wallet.yml

@@ -0,0 +1,133 @@
+name: Wallet CI
+
+on:
+    push:
+
+jobs:
+    buildAndTest:
+        name: 'Build & Test'
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                node-version: ['18'] # Add other versions if needed
+
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v3
+              with:
+                  fetch-depth: 0
+
+            - name: Configure AWS credentials
+              uses: aws-actions/configure-aws-credentials@v1
+              with:
+                  aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+                  aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+                  aws-region: us-east-1
+
+            - name: Install Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v4
+              with:
+                  node-version: ${{ matrix.node-version }}
+
+            - name: Restore Node.js dependencies
+              uses: actions/cache@v3
+              with:
+                  path: ./node_modules
+                  key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+                  restore-keys: |
+                      ${{ runner.os }}-node-
+
+            - name: Install Node.js dependencies
+              run: yarn install --frozen-lockfile
+
+            - name: Cache Node.js dependencies
+              uses: actions/cache/save@v3
+              if: always()
+              with:
+                  path: ./node_modules
+                  key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+
+            - name: Build Wallet
+              run: yarn nx run wallet:build --prod --skip-nx-cache
+
+    autodeploy:
+        name: 'Auto deploy'
+        runs-on: ubuntu-latest
+        if: "(github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main')"
+        needs: [buildAndTest]
+        outputs:
+            newTag: ${{ steps.version-bump.outputs.newTag }}
+        steps:
+            - name: 'Checkout source code'
+              uses: 'actions/checkout@v3'
+              with:
+                  ref: ${{ github.ref }}
+
+            - name: Install Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v4
+              with:
+                  node-version: ${{ matrix.node-version }}
+
+            - name: Configure AWS credentials
+              uses: aws-actions/configure-aws-credentials@v1
+              with:
+                  aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+                  aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+                  aws-region: eu-west-3
+
+            - name: Restore Node.js dependencies
+              uses: actions/cache@v3
+              with:
+                  path: ./node_modules
+                  key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+                  restore-keys: |
+                      ${{ runner.os }}-node-
+
+            - name: Set environment based on branch
+              run: |
+                  if [[ $GITHUB_REF == 'refs/heads/develop' ]]; then
+                    echo "S3_URL=s3://dev-wallet.thx.network" >> $GITHUB_ENV
+                    echo "DISTRIBUTION=${{ secrets.CLOUDFRONT_DISTRIBUTION_WALLET_DEV }}" >> $GITHUB_ENV
+                    echo "BUILD_MODE=dev" >> $GITHUB_ENV
+                  elif [[ $GITHUB_REF == 'refs/heads/main' ]]; then
+                    echo "S3_URL=s3://wallet.thx.network" >> $GITHUB_ENV
+                    echo "DISTRIBUTION=${{ secrets.CLOUDFRONT_DISTRIBUTION_WALLET_PROD }}" >> $GITHUB_ENV
+                    echo "BUILD_MODE=prod" >> $GITHUB_ENV
+                  fi
+
+            - name: Build Wallet
+              run: NODE_ENV='production' yarn nx run wallet:build --configuration=production --mode $BUILD_MODE --skip-nx-cache
+
+            - name: Deploy
+              run: aws s3 sync ./dist/apps/wallet $S3_URL --delete
+
+            - name: Invalidate CloudFront cache
+              run: aws cloudfront create-invalidation --distribution-id $DISTRIBUTION --paths "/*"
+
+    discord:
+        name: Update Discord
+        runs-on: ubuntu-latest
+        needs: [autodeploy]
+        steps:
+            - name: 'Checkout source code'
+              uses: 'actions/checkout@v3'
+              with:
+                  ref: ${{ github.ref }}
+
+            - name: Set DISCORD_WEBHOOK based on branch
+              run: |
+                  if [[ $GITHUB_REF == 'refs/heads/develop' ]]; then
+                    echo "DISCORD_WEBHOOK=${{ secrets.DISCORD_WEBHOOK_DEV }}" >> $GITHUB_ENV
+                  elif [[ $GITHUB_REF == 'refs/heads/main' ]]; then
+                    echo "DISCORD_WEBHOOK=${{ secrets.DISCORD_WEBHOOK_PROD }}" >> $GITHUB_ENV
+                  fi
+
+            - name: Get version
+              run: echo "VERSION=$(git rev-parse HEAD)" >> $GITHUB_ENV
+
+            - name: Send message
+              env:
+                  DISCORD_WEBHOOK: ${{ env.DISCORD_WEBHOOK }}
+              uses: Ilshidur/action-discord@master
+              with:
+                  args: "${{ needs.autodeploy.result == 'success' && '✅' || '⛔' }} Released Wallet `v${{ env.VERSION }}-app`"

.gitignore

@@ -43,6 +43,10 @@ Thumbs.db
 !.env.example
 !apps/app/.env.prod
 !apps/app/.env.dev
+!apps/studio/.env.prod
+!apps/studio/.env.dev
+!apps/wallet/.env.prod
+!apps/wallet/.env.dev
 
 certs/*
 

apps/api/package.json

@@ -10,7 +10,7 @@
         "jochemvn <[email protected]>"
     ],
     "license": "AGPL-3.0",
-    "version": "1.53.28",
+    "version": "1.53.52",
     "scripts": {
         "migrate": "yarn run migrate:db && yarn run migrate:post-migrate",
         "migrate:post-migrate": "node post-migrate.js",

apps/api/scripts/script.ts

@@ -12,8 +12,8 @@ import db from '@thxnetwork/api/util/database';
 // import main from './src/preview';
 // import main from './src/metamask';
 // import main from './src/lottery';
-import main from './src/web3';
-// import main from './src/safe';
+// import main from './src/web3';
+import main from './src/safe';
 
 db.connect(process.env.MONGODB_URI_PROD);
 

apps/api/scripts/src/qr.ts

@@ -0,0 +1,38 @@
+import { QRCodeEntry, RewardNFT } from '@thxnetwork/api/models';
+import PoolService from '@thxnetwork/api/services/PoolService';
+import { PromiseParser } from '@thxnetwork/api/util';
+
+export default async function main() {
+    const chunkSize = 1000;
+
+    let skip = 0;
+    let entries = [];
+    console.log('start while', entries.length);
+    while (true) {
+        entries = await QRCodeEntry.find().skip(skip).limit(chunkSize).exec();
+        if (!entries.length) break;
+
+        const operations = await PromiseParser.parse(
+            entries.map(async (entry) => {
+                const reward = await RewardNFT.findById(entry.rewardId);
+                const pool = await PoolService.getById(reward.poolId);
+                const owner = await PoolService.findOwner(pool);
+                return {
+                    updateOne: {
+                        filter: { _id: entry._id },
+                        update: {
+                            $set: {
+                                accountId: owner._id,
+                            },
+                        },
+                    },
+                };
+            }),
+        );
+
+        console.log(operations.length);
+        await QRCodeEntry.bulkWrite(operations);
+
+        skip += chunkSize;
+    }
+}

apps/api/scripts/src/safe.ts

@@ -1,15 +1,28 @@
-import { RewardCoin, Wallet } from '@thxnetwork/api/models';
-import RewardCoinService from '@thxnetwork/api/services/RewardCoinService';
+import { Wallet } from '@thxnetwork/api/models';
+import SafeService from '@thxnetwork/api/services/SafeService';
+import { PromiseParser } from '@thxnetwork/api/util';
+import { WalletVariant } from '@thxnetwork/common/enums';
 
 export default async function main() {
-    // const reward = await RewardCoin.findById('669126e1110e00291909e0e3'); // Polygon Reward
-    // const reward = await RewardCoin.findById('66952d939a90f7280b2d3164'); // Linea Reward
-    const reward = await RewardCoin.findById('6698033a03bf2db6c9a940f1'); // Linea Reward
-    const wallet = await Wallet.findById('669805738c683b6c4c506e97');
-    const service = new RewardCoinService();
-
-    await service.createPayment({
-        reward,
-        wallet,
-    });
+    const query = {
+        variant: WalletVariant.Safe,
+        owners: { $exists: false },
+        poolId: { $exists: true },
+    };
+    const walletsCount = await Wallet.countDocuments(query);
+    console.log(`Updating ${walletsCount} wallets...`);
+
+    const wallet = await Wallet.find(query);
+    const chunkSize = 25;
+
+    for (let i = 0; i < wallet.length; i += chunkSize) {
+        await PromiseParser.parse(
+            wallet.slice(i, i + chunkSize).map(async (w) => {
+                const safe = await SafeService.getSafe(w);
+                const owners = await safe.getOwners();
+
+                await w.updateOne({ owners });
+            }),
+        );
+    }
 }

apps/api/src/app/config/secrets.ts

@@ -65,6 +65,7 @@ export const WALLET_URL = process.env.WALLET_URL || '';
 export const DASHBOARD_URL = process.env.DASHBOARD_URL || '';
 export const WIDGET_URL = process.env.WIDGET_URL || '';
 export const PUBLIC_URL = process.env.PUBLIC_URL || '';
+export const STUDIO_URL = process.env.STUDIO_URL || '';
 
 export const HARDHAT_RPC = process.env.HARDHAT_RPC || '';
 export const POLYGON_RPC = process.env.POLYGON_RPC || 'https://rpc.ankr.com/polygon';

apps/api/src/app/controllers/account/wallet/list.controller.ts

@@ -1,6 +1,6 @@
+import WalletService from '@thxnetwork/api/services/WalletService';
 import { Request, Response } from 'express';
 import { query } from 'express-validator';
-import WalletService from '@thxnetwork/api/services/WalletService';
 
 const validation = [query('chainId').optional().isNumeric()];