@ozdao/prometheus-framework 0.2.132 → 0.2.134

package/src/modules/wallet/views/store/wallet.store.js

@@ -2,6 +2,8 @@ import axios from 'axios';
 import { reactive } from 'vue';
 import { BigNumber } from 'bignumber.js';
 
+import { setError } from "@pf/src/modules/globals/store/globals";
+
 const API_CRYPTO_PATH = '/api/crypto';
 const WDT_SUPPLY = 20_000_000;
 
@@ -13,46 +15,161 @@ const state = reactive({
   share: '0',
   account: null,
   web3: null,
+  depositInfo: null,
+  depositRequestIsActive: false,
+  websocket: null,
+  config: null,
+  chosenNetwork: null,
 });
 
+const timer = reactive({ remaining: 0, interval: null });
+
 const actions = {
-  listRewards: () => $axios
-    .get(`${API_CRYPTO_PATH}/rewards`)
-    .then((r) => {
+  loadConfig: async () => {
+    await $axios
+      .get(`${API_CRYPTO_PATH}/deposit/config`)
+      .then((r) => {
+        state.config = r.data;
+        state.chosenNetwork = {
+          name: `polygon-WDT`,
+          value: {
+            token: state.config.polygon.tokens.WDT,
+            network: 'polygon'
+          }
+        }
+      })
+      .catch((e) => console.error(e));
+  },
+
+  connectWebSocket: () => {
+    state.websocket = new WebSocket(process.env.WSS_URL);
+
+    state.websocket.onmessage = (event) => {
+      const message = JSON.parse(event.data);
+
+      if (message.id === state.depositInfo.id) {
+        const confirmations = state.depositInfo.confirmations;
+
+        state.depositInfo = message;
+        state.depositInfo.confirmations = confirmations;
+      }
+
+      if (message.hash === state.depositInfo.tx.hash) {
+        state.depositInfo.confirmations = message.confirmations;
+      }
+    };
+
+    state.websocket.onerror = (err) => console.error(err);
+  },
+
+  disconnectWebSocket: () => {
+    if (state.websocket) {
+      state.websocket.close();
+      state.websocket = null;
+    }
+  },
+
+  listRewards: async () => {
+    try {
+      const r = await $axios.get(`${API_CRYPTO_PATH}/rewards`);
+
       state.rewards = r.data;
       state.tokenBalance = r.data
         .reduce((acc, v) => acc.plus(v.amount), new BigNumber('0'))
         .toString();
+        
       state.share = new BigNumber(state.tokenBalance)
         .div(WDT_SUPPLY)
         .multipliedBy(100)
         .toFormat(6);
-    })
-    .catch((e) => console.error(e)),
-
-  collectRewards: () => $axios
-    .post(`${API_CRYPTO_PATH}/collect`, { recipient: state.account })
-    .then(() => actions.listRewards())
-    .catch((e) => console.error(e)),
-
-  disconnectWallet: () => window.ethereum
-    .request({ method: "wallet_revokePermissions", params: [{ "eth_accounts": {} }] })
-    .then(() => { state.account = null; })
-    .catch((e) => console.error(e)),
-
-  connectWallet: () => state.web3.eth
-    .requestAccounts()
-    .then((accounts) => { state.account = accounts[0] })
-    .catch((e) => console.error(e)),
-
-  tryReconnectWallet: () => state.web3.eth
-    .getAccounts()
-    .then((a) => {
+    } catch (e) {
+      console.error(e);
+    }
+  },
+
+  collectRewards: async () => {
+    try {
+      await $axios.post(`${API_CRYPTO_PATH}/collect`, { recipient: state.account });
+      await actions.listRewards();
+    } catch (e) {
+      console.error(e);
+    }
+  },
+
+  disconnectWallet: async () => {
+    try {
+      await window.ethereum.request({ method: "wallet_revokePermissions", params: [{ "eth_accounts": {} }] });
+      state.account = null;
+    } catch (e) {
+      console.error(e);
+    }
+  },
+
+  connectWallet: async () => {
+    try {
+      const accounts = await state.web3.eth.requestAccounts();
+      state.account = accounts[0];
+    } catch (e) {
+      console.error(e);
+    }
+  },
+
+  tryReconnectWallet: async () => {
+    try {
+      const a = await state.web3.eth.getAccounts();
       if (a.length > 0) {
-        return actions.connectWallet();
+        await actions.connectWallet();
       }
-    })
-    .catch((e) => console.error(e)),
+    } catch (e) {
+      console.error(e);
+    }
+  },
+
+  requestCryptoDeposit: async (amount) => {
+    state.depositRequestIsActive = true;
+
+    await $axios
+      .post(`${API_CRYPTO_PATH}/deposit`, {
+        network: state.chosenNetwork.value.network,
+        amount: new BigNumber(amount).shiftedBy(8).toString(),
+        token: state.chosenNetwork.value.token
+      })
+      .then((r) => {
+        state.depositInfo = r.data;
+
+        const createTimestamp = new Date(r.data.createdAt).getTime();
+        const dead = createTimestamp + state.config[state.chosenNetwork.value.network].waitingTime;
+        timer.remaining = Math.floor((dead - Date.now()) / 1000);
+
+        timer.interval = setInterval(
+          () => {
+            timer.remaining -= 1;
+
+            if (timer.remaining === 0) {
+              clearInterval(timer.interval);
+            }
+          },
+          1000
+        );
+      })
+      .catch((e) => console.error(e));
+
+    state.depositRequestIsActive = false;
+
+    actions.connectWebSocket();
+  },
+
+  stopTimer: () => {
+    clearInterval(timer.interval);
+  },
+
+  cancelDeposit: async () => {
+    await $axios
+      .post(`${API_CRYPTO_PATH}/deposit/cancel`, { id: state.depositInfo.id })
+      .then(() => actions.stopTimer())
+      .then(() => actions.disconnectWebSocket())
+      .catch((e) => console.error(e));
+  }
 };
 
-export { state, actions };
+export { state, actions, timer };

package/src/modules/wallet/wallet.server.js

@@ -8,7 +8,7 @@ const RoutesRewards = require('./controllers/routes/rewards.routes.js');
 const FactoryPayments = require('./controllers/factories/payments.factory.js');
 
 // Initialization function for setting up the module within the application
-function initializePayments(app, db, wdmClient, origins, publicPath) {
+function initializePayments(app, db, wss, wdmClient, origins, publicPath) {
   // Setup models in the database object
   db.wallet = ModelWallet(db);
   db.payment = ModelPayment(db);
@@ -17,7 +17,7 @@ function initializePayments(app, db, wdmClient, origins, publicPath) {
   // Setup routes if the app object is provided
   if (app) {
     RoutesPayments(app, db, origins, publicPath)
-    RoutesRewards(app, db, wdmClient, origins)
+    RoutesRewards(app, db, wss, wdmClient, origins)
   }
 }
 

package/src/modules/wallet/components/blocks/CryptoDeposite.vue

@@ -1,55 +0,0 @@
-<template>
-  <h2 class="mn-b-small t-center t-bold">{{ t('depositeWithCrypto') }}</h2>
-
-  <div class="bg-grey radius-big mn-t-semi mn-b-semi flex flex-justify-between">
-    <Field
-      :placeholder="t('enterAmount')"
-      class="pd-medium radius-small"
-    />
-
-    <div class="uppercase flex flex-justify-center flex-items-center mn-r-semi t-semi">
-      POLY USDT
-    </div>
-  </div>
-
-  <h3 class="t-semi">You will receieve: 0 WDT</h3>
-
-  <button
-    class="uppercase w-100 bg-main t-black pd-thin radius-medium t-center br-solid br-2px br-black-transp-10 mn-t-small"
-    @click="switchMenu(3)"
-  >
-    {{ t('pay') }}
-  </button>
-
-  <button
-    class="uppercase w-100 bg-main t-black pd-thin radius-medium t-center br-solid br-2px br-black-transp-10 mn-t-small"
-    @click="backSelection"
-  >
-    {{ t('backToSelection') }}
-  </button>
-</template>
-
-<script setup>
-  import text from '@pf/src/modules/wallet/localization/Wallet.json'
-  import Field from '@pf/src/components/Field/Field.vue'
-  import { useI18n } from 'vue-i18n'
-
-  const emits = defineEmits(['back-selection', 'switch-menu'])
-
-  // Localization
-  const { t } = useI18n({
-    useScope: 'global', 
-    ...text
-  })
-
-  function backSelection() {
-    emits("back-selection")
-  }
-
-  function switchMenu(screen = 0) {
-    emits("switch-menu", screen)
-  }
-</script>
-
-<style scoped>
-</style>

package/src/modules/wallet/controllers/factories/rewards.factory.aggr.js

@@ -1,181 +0,0 @@
-const ObjectId = require('mongoose').Types.ObjectId;
-const { BigNumber } = require('bignumber.js');
-
-const queryProcessorGlobals = require('@pf/src/modules/globals/controllers/utils/queryProcessor');
-
-const VIEWS_REWARD_COEFF = '0.1';
-const WDT_DECIMALS = 8;
-
-const calculateRewardForPost = (snapshot, viewsCount, reactionsCount, commentsCount) => {
-
-  console.log('views',viewsCount)
-  console.log('reactions',reactionsCount)
-  console.log('comments',commentsCount)
-  
-  if (snapshot) {
-    return new BigNumber(Math.max(viewsCount - snapshot.views, 0))
-      .multipliedBy(VIEWS_REWARD_COEFF)
-      .plus(Math.max(reactionsCount - snapshot.reactions, 0))
-      .plus(Math.max(commentsCount - snapshot.comments, 0));
-  }
-
-  return new BigNumber('10')
-    .plus(new BigNumber(viewsCount).multipliedBy(VIEWS_REWARD_COEFF))
-    .plus(reactionsCount)
-    .plus(commentsCount);
-};
-
-const rewardsControllerFactory = (db, wdmClient) => {
-  const Blogpost = db.blogpost;
-  const Reaction = db.reaction;
-  const Comment = db.comment;
-  const Reward = db.reward;
-
-
-
-  const listRewards = async (req, res) => {
-    try {
-      const aggregationResults = await Blogpost.aggregate([
-        // Соответствие блогпостов для данного пользователя
-        { $match: { "creator.target": new ObjectId(req.userId) } },
-        
-        // Добавление информации о реакциях и комментариях
-        {
-          $lookup: {
-            from: "reactions",
-            localField: "_id",
-            foreignField: "target",
-            as: "reactions"
-          }
-        },
-        {
-          $lookup: {
-            from: "comments",
-            localField: "_id",
-            foreignField: "target",
-            as: "comments"
-          }
-        },
-        
-        // Добавление информации о предыдущей награде
-        {
-          $lookup: {
-            from: "rewards",
-            let: { blogId: "$_id" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: {
-                    $and: [
-                      { $eq: ["$user", req.userId] },
-                      { $eq: ["$type", "blogpost"] },
-                      { $eq: ["$target", "$$blogId"] }
-                    ]
-                  }
-                }
-              },
-              { $sort: { createdAt: -1 } },
-              { $limit: 1 }
-            ],
-            as: "previousReward"
-          }
-        },
-        
-        // Преобразование результатов
-        {
-          $project: {
-            _id: 1,
-            user: req.userId,
-            type: "blogpost",
-            views: 1,
-            reactionsCount: { $size: "$reactions" },
-            commentsCount: { $size: "$comments" },
-            previousReward: { $arrayElemAt: ["$previousReward", 0] },
-            name: 1,
-            content: 1,
-            url: 1
-          }
-        }
-      ])
-
-      const rewards = aggregationResults.map(result => ({
-        user: result.user,
-        type: result.type,
-        amount: calculateRewardForPost(
-          result.previousReward?.snapshot,
-          result.views,
-          result.reactionsCount,
-          result.commentsCount
-        ),
-        name: result.name,
-        content: result.content,
-        url: result.url
-      }));
-
-      res.status(200).send(rewards);
-    } catch (error) {
-      res.status(500).send({ message: "Произошла ошибка при получении наград", error: error.message });
-    }
-  };
-
-  const collectTokens = async (req, res) => {
-    const blogs = await Blogpost.find({ "creator.target": req.userId }).exec();
-
-    let totalRewards = new BigNumber(0);
-
-    for (const blog of blogs) {
-      const reactions = await Reaction.countDocuments({ target: { $in: blog._id } }).exec();
-      const comments = await Comment.countDocuments({ target: { $in: blog._id } }).exec();
-
-      const previousReward = await Reward
-        .findOne({ user: req.userId, type: 'blogpost', target: blog._id })
-        .sort({ createdAt: -1 })
-        .exec();
-
-      const reward = calculateRewardForPost(
-        previousReward?.snapshot,
-        blog.views,
-        reactions,
-        comments
-      );
-
-      if (reward.gt(0)) {
-        totalRewards = totalRewards.plus(reward);
-
-        const snapshot = {
-          views: previousReward ?
-            previousReward.snapshot.views < blog.views ? blog.views : previousReward.snapshot.views
-            : blog.views,
-          reactions: previousReward ?
-            previousReward.snapshot.reactions < reactions ? reactions : previousReward.snapshot.reactions
-            : reactions,
-          comments: previousReward ?
-            previousReward.snapshot.comments < comments ? comments : previousReward.snapshot.comments
-            : comments,
-        };
-
-        await Reward.create({
-          user: req.userId,
-          type: 'blogpost',
-          target: blog._id,
-          amount: reward.toString(),
-          snapshot: snapshot,
-        });
-      }
-    }
-
-    if (totalRewards.gt(0)) {
-      await wdmClient.transfer(
-        totalRewards.shiftedBy(WDT_DECIMALS).toString(),
-        req.body.recipient,
-        req.userId
-      );
-    }
-
-    res.status(200).send();
-  };
-
-  return { listRewards, collectTokens };
-};
-
-module.exports = rewardsControllerFactory;

package/src/modules/wallet/controllers/factories/rewards.factory.population.js

@@ -1,213 +0,0 @@
-const ObjectId = require('mongoose').Types.ObjectId;
-const { BigNumber } = require('bignumber.js');
-
-const queryProcessorGlobals = require('@pf/src/modules/globals/controllers/utils/queryProcessor');
-
-const VIEWS_REWARD_COEFF = '0.1';
-const WDT_DECIMALS = 8;
-
-const calculateRewardForPost = (snapshot, viewsCount, reactionsCount, commentsCount) => {
-   console.log('views',viewsCount)
-  console.log('reactions',reactionsCount)
-  console.log('comments',commentsCount)
-  
-  
-  if (snapshot) {
-    return new BigNumber(Math.max(viewsCount - snapshot.views, 0))
-      .multipliedBy(VIEWS_REWARD_COEFF)
-      .plus(Math.max(reactionsCount - snapshot.reactions, 0))
-      .plus(Math.max(commentsCount - snapshot.comments, 0));
-  }
-
-  return new BigNumber('10')
-    .plus(new BigNumber(viewsCount).multipliedBy(VIEWS_REWARD_COEFF))
-    .plus(reactionsCount)
-    .plus(commentsCount);
-};
-
-const rewardsControllerFactory = (db, wdmClient) => {
-  const Blogpost = db.blogpost;
-  const Reaction = db.reaction;
-  const Comment = db.comment;
-  const Reward = db.reward;
-
-  // const listRewards = async (req, res) => {
-  //   try {
-  //     const rewards = await Blogpost.aggregate([
-  //       // Шаг 1: Фильтрация блогпостов по создателю
-  //       { $match: { "creator.target": req.userId } },
-  //       // Шаг 2: Соединение с Reaction для подсчета реакций
-  //       {
-  //         $lookup: {
-  //           from: "reactions",
-  //           localField: "_id",
-  //           foreignField: "target",
-  //           as: "reactions"
-  //         }
-  //       },
-  //       // Шаг 3: Соединение с Comment для подсчета комментариев
-  //       {
-  //         $lookup: {
-  //           from: "comments",
-  //           localField: "_id",
-  //           foreignField: "target",
-  //           as: "comments"
-  //         }
-  //       },
-  //       // Шаг 4: Соединение с Reward для получения предыдущих наград
-  //       {
-  //         $lookup: {
-  //           from: "rewards",
-  //           let: { blogId: "$_id", userId: req.userId },
-  //           pipeline: [
-  //             { $match: { 
-  //                 $expr: { 
-  //                   $and: [
-  //                     { $eq: ["$user", "$$userId"] },
-  //                     { $eq: ["$type", "blogpost"] },
-  //                     { $eq: ["$target", "$$blogId"] }
-  //                   ] 
-  //                 } 
-  //               } 
-  //             },
-  //             { $sort: { createdAt: -1 } },
-  //             { $limit: 1 }
-  //           ],
-  //           as: "previousReward"
-  //         }
-  //       },
-  //       // Шаг 5: Проецирование результата и преобразование массивов в счетчики
-  //       {
-  //         $project: {
-  //           user: req.userId,
-  //           type: 'blogpost',
-  //           name: "$name",
-  //           content: "$content",
-  //           url: "$url",
-  //           views: "$views",
-  //           reactionsCount: { $size: "$reactions" },
-  //           commentsCount: { $size: "$comments" },
-  //           previousRewardSnapshot: { $arrayElemAt: ["$previousReward.snapshot", 0] },
-  //         }
-  //       }
-  //     ]).exec();
-
-  //     // Пересчет наград на основе полученных данных
-  //     const calculatedRewards = rewards.map(reward => ({
-  //       ...reward,
-  //       amount: calculateRewardForPost(
-  //         reward.previousRewardSnapshot,
-  //         reward.views,
-  //         reward.reactionsCount,
-  //         reward.commentsCount
-  //       ).toString(),
-  //     }));
-
-  //     res.status(200).send(calculatedRewards);
-  //   } catch (error) {
-  //     console.error("Error listing rewards:", error);
-  //     res.status(500).send({ message: "Internal server error" });
-  //   }
-  // };
-
-  const listRewards = async (req, res) => {
-    const blogs = await Blogpost.find({ "creator.target": req.userId }).exec();
-
-    const rewards = [];
-
-    for (const blog of blogs) {
-      const reactions = await Reaction.countDocuments({ target: { $in: blog._id } }).exec();
-      const comments = await Comment.countDocuments({ target: { $in: blog._id } }).exec();
-
-      const previousReward = await Reward
-        .findOne({ user: req.userId, type: 'blogpost', target: blog._id })
-        .populate({
-          path: 'target',
-          model: 'Blogpost' // Убедитесь, что 'Blogpost' соответствует имени вашей модели блогпоста
-        })
-        .sort({ createdAt: -1 })
-        .exec();
-
-      const reward = calculateRewardForPost(
-        previousReward?.snapshot,
-        blog.views,
-        reactions,
-        comments
-      );
-
-      rewards.push({
-        user: req.userId,
-        type: 'blogpost',
-        amount: reward.toString(),
-        name: blog.name,
-        content: blog.content,
-        url: blog.url 
-      });
-
-      // console.log(rewards)
-    }
-
-    res.status(200).send(rewards);
-  };
-
-  const collectTokens = async (req, res) => {
-    const blogs = await Blogpost.find({ "creator.target": req.userId }).exec();
-
-    let totalRewards = new BigNumber(0);
-
-    for (const blog of blogs) {
-      const reactions = await Reaction.countDocuments({ target: { $in: blog._id } }).exec();
-      const comments = await Comment.countDocuments({ target: { $in: blog._id } }).exec();
-
-      const previousReward = await Reward
-        .findOne({ user: req.userId, type: 'blogpost', target: blog._id })
-        .sort({ createdAt: -1 })
-        .exec();
-
-      const reward = calculateRewardForPost(
-        previousReward?.snapshot,
-        blog.views,
-        reactions,
-        comments
-      );
-
-      if (reward.gt(0)) {
-        totalRewards = totalRewards.plus(reward);
-
-        const snapshot = {
-          views: previousReward ?
-            previousReward.snapshot.views < blog.views ? blog.views : previousReward.snapshot.views
-            : blog.views,
-          reactions: previousReward ?
-            previousReward.snapshot.reactions < reactions ? reactions : previousReward.snapshot.reactions
-            : reactions,
-          comments: previousReward ?
-            previousReward.snapshot.comments < comments ? comments : previousReward.snapshot.comments
-            : comments,
-        };
-
-        await Reward.create({
-          user: req.userId,
-          type: 'blogpost',
-          target: blog._id,
-          amount: reward.toString(),
-          snapshot: snapshot,
-        });
-      }
-    }
-
-    if (totalRewards.gt(0)) {
-      await wdmClient.transfer(
-        totalRewards.shiftedBy(WDT_DECIMALS).toString(),
-        req.body.recipient,
-        req.userId
-      );
-    }
-
-    res.status(200).send();
-  };
-
-  return { listRewards, collectTokens };
-};
-
-module.exports = rewardsControllerFactory;

package/src/modules/wallet/localization/Wallet.json

@@ -1,22 +0,0 @@
-{
-  "messages": {
-    "en-default": {
-      "pay": "pay",
-      "youReceived": "you received",
-      "enterAmount": "enter amount to top up",
-      "backToWallet": "back to wallet",
-      "backToSelection": "back to selection",
-      "balanceReplenished": "balance replenished",
-      "depositeWithCrypto": "deposite with crypto"
-    },
-    "ru-default": {
-      "pay": "купить",
-      "youReceived": "вы пополнили на сумму",
-      "enterAmount": "введите сумму для пополнения",
-      "backToWallet": "назад к кошельку",
-      "backToSelection": "назад к списку",
-      "balanceReplenished": "баланс пополнен",
-      "depositeWithCrypto": "пополнение криптовалютой"
-    }
-  }
-}