@ozdao/prometheus-framework 0.2.133 → 0.2.134

package/src/modules/community/components/pages/Blog.vue

@@ -23,7 +23,7 @@
       v-slot="{ 
         items 
       }"
-      class="mobile:w-50 desktop:w-100 tablet:w-75 row-1 gap-thin"
+      class="row-1 gap-thin"
     >
       <CardBlogpost 
         v-for="item in items" 

package/src/modules/globals/components/partials/Header.vue

@@ -172,7 +172,7 @@
 		</Button>
 
 
-		<!-- <Select 
+		<Select 
 			v-model:select="$i18n.locale"
 		  :options="[{name: '🌎&nbsp;En', value: 'en'}, {name: '🇷🇺&nbsp;Ru', value: 'ru'}]"
 		  :property="'value'"
@@ -181,7 +181,7 @@
     		'bg-light t-black': theme === 'light',
     		'bg-dark t-white': theme === 'dark'  
     	}"
-    /> -->
+    />
 	</header>
 </template>
 

package/src/modules/globals/localization/vue-i18n.js

@@ -20,11 +20,11 @@ const i18n = createI18n({
   locale: 'en',
   fallbackLocale: {
     'en': ['en-default'],
-    'ru': ['ru-default'],
-    'zh': ['zh-default'],
-    'fr': ['fr-default'],
-    'de': ['de-default'],
-    'it': ['it-default'],
+    'ru': ['ru-default', 'en-default'],
+    'zh': ['zh-default', 'en-default'],
+    'fr': ['fr-default', 'en-default'],
+    'de': ['de-default', 'en-default'],
+    'it': ['it-default', 'en-default'],
   },
   legacy: false,
   globalInjection: true,

package/src/modules/landing/components/sections/HowToBuyWDR.vue

@@ -41,9 +41,8 @@
 
 <script setup>
 import { useI18n } from 'vue-i18n';
-import ConnectMetamask        from '@/components/elements/ConnectMetamask.vue'
-import ButtonAddWDT        from '@/components/elements/ButtonAddWDT.vue'
-import ButtonSwitchToPolygon        from '@/components/elements/ButtonSwitchToPolygon.vue'
+
+import ConnectMetamask from '@pf/src/modules/wallet/views/components/elements/ConnectMetamask.vue'
 
 const text = {
   messages: {

package/src/modules/landing/components/sections/SectionEarn.vue

@@ -48,14 +48,9 @@ import { useI18n } from 'vue-i18n';
 import Shader from '@pf/src/components/Shader/Shader.vue'
 
 import IconEarn from '@pf/src/modules/icons/entities/IconEarn.vue'
-
 import IconInfo from '@pf/src/modules/icons/navigation/IconInfo.vue'
 
-
-import ConnectMetamask        from '@/components/elements/ConnectMetamask.vue'
-
-import ButtonAddWDT        from '@/components/elements/ButtonAddWDT.vue'
-import ButtonSwitchToPolygon        from '@/components/elements/ButtonSwitchToPolygon.vue'
+import ConnectMetamask from '@pf/src/modules/wallet/views/components/elements/ConnectMetamask.vue'
 
 const props = defineProps({
   mockupImage: {

package/src/modules/middlewares/server/authSecret.js

@@ -0,0 +1,22 @@
+const crypto = require('crypto');
+
+const middlewareFactory = () => {
+  const verifySecret = (method, endpoint, secret) => async (req, res, next) => {
+    const requestSignature = req.headers.signature;
+
+    const signature = crypto
+      .createHmac('sha256', secret)
+      .update(method + endpoint)
+      .digest('hex');
+
+    if (signature === requestSignature) {
+      return next();
+    }
+
+    res.status(403).send('Forbidden');
+  };
+
+  return { verifySecret };
+};
+
+module.exports = middlewareFactory;

package/src/modules/middlewares/server/index.js

@@ -1,14 +1,16 @@
 // middlewareIndexFactory.js
 
 const middlewareIndexFactory = (db) => {
-  const authJwt = require("./authJwt")(db);;
-  const verifySignUp = require("./verifySignUp")(db);;
-  const verifyUser = require("./verifyUser")(db);;
-  const verifyInvites = require("./verifyInvites")(db);;
-  const verifyCategory = require("./verifyCategory")(db);;
+  const authJwt = require("./authJwt")(db);
+  const authSecret = require("./authSecret")();
+  const verifySignUp = require("./verifySignUp")(db);
+  const verifyUser = require("./verifyUser")(db);
+  const verifyInvites = require("./verifyInvites")(db);
+  const verifyCategory = require("./verifyCategory")(db);
 
   return {
     authJwt,
+    authSecret,
     verifySignUp,
     verifyUser,
     verifyInvites,

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

@@ -3,6 +3,10 @@ const { BigNumber } = require('bignumber.js');
 
 const queryProcessorGlobals = require('@pf/src/modules/globals/controllers/utils/queryProcessor');
 
+BigNumber.config({
+  EXPONENTIAL_AT: [-1000, 2000],
+});
+
 const VIEWS_REWARD_COEFF = '0.1';
 const WDT_DECIMALS = 8;
 
@@ -23,13 +27,24 @@ const calculateRewardForPost = (snapshot, viewsCount, reactionsCount, commentsCo
     .plus(commentsCount);
 };
 
-const rewardsControllerFactory = (db, wdmClient) => {
+const rewardsControllerFactory = (db, wdmClient, wss) => {
   const Blogpost = db.blogpost;
   const Reaction = db.reaction;
   const Comment = db.comment;
   const Reward = db.reward;
+  const Wallet = db.wallet;
+
+  const lookup = {};
 
+  wss.on('connection', (ws, req) => {
+    if (req.userId) {
+      lookup[req.userId] = ws;
 
+      ws.on('close', () => {
+        delete lookup[req.userId];
+      });
+    }
+  });
 
   const listRewards = async (req, res) => {
 
@@ -176,7 +191,77 @@ const rewardsControllerFactory = (db, wdmClient) => {
     res.status(200).send();
   };
 
-  return { listRewards, collectTokens };
+  const requestDeposit = async (req, res) => {
+    const response = await wdmClient.createDepositRequest(
+      req.body.network,
+      req.body.amount,
+      req.body.token,
+      req.userId
+    );
+
+    res.status(200).send(response.data);
+  };
+
+  const cancelDeposit = async (req, res) => {
+    const response = await wdmClient.cancelDeposit(
+      req.body.id,
+      req.userId
+    );
+
+    res.status(200).send(response.data);
+  };
+
+  const getDepositConfig = async (req, res) => {
+    const response = await wdmClient.getDepositConfig();
+
+    res.status(200).send(response.data);
+  };
+
+  const handleDepositUpdate = async (req, res) => {
+    if (req.body.status === "TRANSFER_STATUS_COMPLETED") {
+      const userWallet = await Wallet.findOne({ owner: new ObjectId(req.body.user) });
+      const amount = new BigNumber(req.body.amount)
+        .shiftedBy(-WDT_DECIMALS)
+        .dividedBy(process.env.TOKEN_EXCHANGE_RATE)
+        .toString();
+
+      if (userWallet) {
+        const topupIndex = userWallet.balances.findIndex((b) => b.name === 'WDT');
+
+        if (topupIndex < 0) {
+          userWallet.balances.push({ name: 'WDT', amount: +amount, locked_amount: 0 });
+        } else {
+          userWallet.balances[topupIndex] = {
+            name: 'WDT',
+            amount: userWallet.balances[topupIndex].amount + +amount,
+            locked_amount: userWallet.balances[topupIndex].locked_amount
+          };
+        }
+
+        await userWallet.save();
+      } else {
+        await Wallet.create({
+          owner: new ObjectId(req.body.user),
+          balances: [{ name: 'WDT', amount: +amount, locked_amount: 0 }],
+        });
+      }
+    }
+
+    if (lookup[req.body.user]) {
+      lookup[req.body.user].send(JSON.stringify(req.body));
+    }
+
+    res.status(200).send();
+  }
+
+  return {
+    listRewards,
+    collectTokens,
+    requestDeposit,
+    getDepositConfig,
+    cancelDeposit,
+    handleDepositUpdate
+  };
 };
 
 module.exports = rewardsControllerFactory;

package/src/modules/wallet/controllers/routes/rewards.routes.js

@@ -5,10 +5,10 @@ const rewardsControllerFactory = require('../factories/rewards.factory');
 const middlewareFactory = require('@pf/src/modules/middlewares/server');
 
 // Routes
-module.exports = (app, db, wdmClient, origins) => {
-  const controller = rewardsControllerFactory(db, wdmClient);
+module.exports = (app, db, wss, wdmClient, origins) => {
+  const controller = rewardsControllerFactory(db, wdmClient, wss);
 
-  const { authJwt } = middlewareFactory(db);
+  const { authJwt, authSecret } = middlewareFactory(db);
 
   app.use((req, res, next) => {
     const origin = req.headers.origin;
@@ -33,4 +33,28 @@ module.exports = (app, db, wdmClient, origins) => {
     [authJwt.verifyToken],
     controller.collectTokens
   );
+
+  app.post(
+    "/api/crypto/deposit",
+    [authJwt.verifyToken],
+    controller.requestDeposit
+  );
+
+  app.post(
+    "/api/crypto/deposit/cancel",
+    [authJwt.verifyToken],
+    controller.cancelDeposit
+  );
+
+  app.post(
+    "/api/crypto/deposit/update",
+    [authSecret.verifySecret('POST', '/api/crypto/deposit/update', process.env.WDM_SECRET)],
+    controller.handleDepositUpdate
+  );
+
+  app.get(
+    "/api/crypto/deposit/config",
+    [],
+    controller.getDepositConfig
+  )
 };

package/src/modules/wallet/models/wallet.model.js

@@ -9,11 +9,11 @@ module.exports = (db) => {
         },
         required: true,
       },
-      amount: {
-        type: Number,
-        required: true,
-        default: 0
-      },
+      balances: [{
+        name: String,  // Name of currency
+        amount: Number, // Amount
+        locked_amount: Number,
+      }]
     },
     {
       timestamps: {

package/src/modules/wallet/{components → views/components}/blocks/CardBalanceReplenished.vue

@@ -1,27 +1,30 @@
 <template>
-  <h2 class="mn-b-small t-center t-bold">{{ t('balanceReplenished') }}</h2>
+  <h2 class="mn-b-small t-center t-bold">{{ t('wallet.balanceReplenished') }}</h2>
 
   <div class="radius-medium br-1px br-black br-solid pd-big flex flex-column flex-justify-center flex-items-center">
     <h3 class="t-semi">
-      {{ t('youReceived') }}
+      {{ t('wallet.youReceived') }}
     </h3>
     <h3 class="t-semi">
-      500 WDT
+      {{ receiveAmount }} WDT
     </h3>
-
   </div>
 
   <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="close"
   >
-    {{ t('backToWallet') }}
+    {{ t('wallet.backToWallet') }}
   </button>
 </template>
 
 <script setup>
-  import text from '@pf/src/modules/wallet/localization/Wallet.json'
   import { useI18n } from 'vue-i18n'
+  import { computed } from 'vue'
+  import { BigNumber } from 'bignumber.js'
+
+  import text from '@pf/src/modules/wallet/views/localization/wallet.json'
+  import { state } from '@pf/src/modules/wallet/views/store/wallet.store';
 
   const emits = defineEmits(['close'])
 
@@ -31,10 +34,17 @@
     ...text
   })
 
+  const receiveAmount = computed(() =>
+    new BigNumber(state.depositInfo.amount)
+      .shiftedBy(-8)
+      .dividedBy(process.env.TOKEN_EXCHANGE_RATE)
+      .toString()
+  )
+
   function close() {
     emits("close")
   }
 </script>
 
 <style scoped>
-</style>
+</style>

package/src/modules/wallet/{components/blocks/CardDeposite.vue → views/components/blocks/CardDeposit.vue}

@@ -3,7 +3,7 @@
 
   <div class="bg-grey radius-big mn-t-semi mn-b-semi flex flex-justify-between">
     <Field
-      :placeholder="t('enterAmount')"
+      :placeholder="t('wallet.enterAmount')"
       class="pd-medium radius-small"
     />
 
@@ -18,19 +18,19 @@
     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') }}
+    {{ t('wallet.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') }}
+    {{ t('wallet.backToSelection') }}
   </button>
 </template>
 
 <script setup>
-  import text from '@pf/src/modules/wallet/localization/Wallet.json'
+  import text from '@pf/src/modules/wallet/views/localization/wallet.json'
   import Field from '@pf/src/components/Field/Field.vue'
   import { useI18n } from 'vue-i18n'
 

package/src/modules/wallet/views/components/blocks/CryptoDeposit.vue

@@ -0,0 +1,98 @@
+<template>
+  <h3 class="mn-b-small t-center t-bold">{{ t('wallet.depositWithCrypto') }}</h3>
+
+  <Field 
+    v-if="state.config"
+    v-model:field="amount"
+    :placeholder="t('wallet.enterAmount')"
+    class="mn-b-thin bg-white w-100 br-solid br-1px br-black-transp-5 pd-small radius-small" 
+  >
+    <Select 
+      :options="depositOptions"
+      v-model:select="state.chosenNetwork"
+      class="bg-light t-nowrap pd-r-thin pd-l-thin pd-t-nano pd-b-nano radius-thin"
+    />
+  </Field>
+
+  <p class="t-semi">You will receive: {{ receiveAmount }} {{t('wallet.token')}}</p>
+
+  <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="actions.requestCryptoDeposit(amount).then(() => switchMenu(5))"
+    :disabled="state.depositRequestIsActive || !state.config"
+  >
+    {{ t('wallet.pay') }}
+  </button>
+
+  <button
+    class="uppercase w-100 t-center mn-t-small"
+    @click="backSelection"
+  >
+    {{ t('wallet.backToSelection') }}
+  </button>
+</template>
+
+<script setup>
+  import { useI18n } from 'vue-i18n'
+  import { ref, onMounted, computed } from 'vue';
+  import { BigNumber } from 'bignumber.js';
+
+  import { state, actions } from '@pf/src/modules/wallet/views/store/wallet.store';
+  import text from '@pf/src/modules/wallet/views/localization/wallet.json'
+  import Field from '@pf/src/components/Field/Field.vue'
+  import Select from '@pf/src/components/Select/Select.vue'
+
+  BigNumber.config({
+    EXPONENTIAL_AT: [-1000, 20000]
+  });
+
+  const amount = ref(1);
+  const emits = defineEmits(['back-selection', 'switch-menu'])
+
+  // Localization
+  const { t } = useI18n({
+    useScope: 'global', 
+    ...text
+  })
+
+  const receiveAmount = computed(() =>
+    new BigNumber(amount.value)
+      .dividedBy(process.env.TOKEN_EXCHANGE_RATE)
+      .toString()
+  )
+
+  const depositOptions = computed(() => {
+    const options = [];
+
+    const networks = Object.keys(state.config || {});
+
+    for (const network of networks) {
+      for (const token of Object.keys(state.config[network].tokens)) {
+        options.push({
+          name: `${network}-${token}`,
+          value: {
+            token: state.config[network].tokens[token],
+            network: network
+          }
+        });
+      }
+    }
+
+    return options;
+  });
+
+  onMounted(() => {
+    actions.loadConfig();
+  })
+
+  function backSelection() {
+    emits("back-selection")
+  }
+
+  function switchMenu(screen = 0) {
+    emits("switch-menu", screen)
+  }
+</script>
+
+<style scoped>
+</style>

package/src/modules/wallet/views/components/blocks/CryptoDepositProcessing.vue

@@ -0,0 +1,144 @@
+<template>
+  <h2 class="mn-b-small t-center t-bold">{{ t('wallet.depositWithCrypto') }}</h2>
+
+  <div class="flex flex-justify-between">
+    <h3 class="t-semi">Amount: {{ amount }} {{ state.chosenNetwork.name.toUpperCase() }}</h3>
+    <button
+      class="uppercase t-main cursor-pointer"
+      @click="() => copy(amount)"
+    >
+      copy
+    </button>
+  </div>
+
+  <div class="flex flex-justify-between">
+    <h3 class="t-semi t-truncate address">Wallet: {{ state.depositInfo.to }}</h3>
+    <button
+      class="uppercase t-main cursor-pointer"
+      @click="() => copy(state.depositInfo.to)"
+    >
+      copy
+    </button>
+  </div>
+
+  <div class="flex flex-justify-around radius-big br-solid br-2px br-black-transp-10">
+    <canvas id="qrcode_address_deposit"></canvas>
+  </div>
+
+  <div class="flex flex-justify-between">
+    <h3 class="t-semi">You will receive:</h3>
+    <h3 class="t-semi">{{ receive }} WDT</h3>
+  </div>
+  <div v-if="state.depositInfo.status === 'TRANSFER_STATUS_WAITING_FOR_TX'" class="flex flex-justify-between">
+    <h3 class="t-semi">Times left:</h3>
+    <h3 class="t-semi">{{ remainingTime }}</h3>
+  </div>
+  <div class="flex flex-justify-between">
+    <h3 class="t-semi">Status:</h3>
+    <h3 class="t-semi">{{ status }}</h3>
+  </div>
+
+  <button
+    v-if="state.depositInfo.status === 'TRANSFER_STATUS_WAITING_FOR_TX'"
+    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="actions.cancelDeposit().then(() => backSelection())"
+  >
+    {{ t('wallet.cancel') }}
+  </button>
+</template>
+
+<script setup>
+  import QRCode from 'qrcode';
+  import { useI18n } from 'vue-i18n';
+  import { watch, computed, onMounted } from 'vue';
+  import { BigNumber } from 'bignumber.js';
+
+  import text from '@pf/src/modules/wallet/views/localization/wallet.json';
+  import { state, actions, timer } from '@pf/src/modules/wallet/views/store/wallet.store';
+
+  BigNumber.config({
+    EXPONENTIAL_AT: [-1000, 20000]
+  });
+
+  const emits = defineEmits(['back-selection', 'switch-menu']);
+
+  // Localization
+  const { t } = useI18n({
+    useScope: 'global',
+    ...text
+  });
+
+  const remainingTime = computed(() => {
+    const mins = Math.floor(timer.remaining / 60);
+    const secs = Math.floor(timer.remaining % 60);
+
+    return `${mins}:${secs < 10 ? `0${secs}` : secs}`;
+  });
+
+  const amount = computed(() =>
+    new BigNumber(state.depositInfo.amount)
+      .shiftedBy(-8)
+      .toString()
+  );
+
+  const receive = computed(() =>
+    new BigNumber(amount.value)
+      .dividedBy(process.env.TOKEN_EXCHANGE_RATE)
+      .toString()
+  )
+
+  const status = computed(() => {
+    switch (state.depositInfo.status) {
+      case 'TRANSFER_STATUS_WAITING_FOR_TX':
+        return 'Waiting for payment';
+      case 'TRANSFER_STATUS_SENT':
+        const confirmations = `${state.depositInfo.confirmations || 0} / ${state.config[state.chosenNetwork.value.network].confirmations}`;
+        return `Confirming (${confirmations})`;
+      default:
+        return 'Superposition.';
+    }
+  });
+
+  function backSelection() {
+    emits("back-selection");
+  }
+
+  function switchMenu(screen = 0) {
+    emits("switch-menu", screen);
+  }
+
+  function copy(text) {
+    navigator.clipboard.writeText(text);
+  }
+
+  onMounted(() => {
+    QRCode.toCanvas(
+      document.getElementById('qrcode_address_deposit'),
+      state.depositInfo.to,
+      { width: 300 },
+      (error) =>  { if (error) { console.error(error); } }
+    )
+  })
+
+  watch(
+    state,
+    async () => {
+      if (state.depositInfo.status === 'TRANSFER_STATUS_SENT') {
+        actions.stopTimer();
+      }
+
+      if (state.depositInfo.status === 'TRANSFER_STATUS_COMPLETED') {
+        actions.disconnectWebSocket();
+        switchMenu(3);
+      }
+    },
+    { deep: true },
+  )
+</script>
+
+<style scoped>
+  .address {
+    text-wrap: nowrap;
+    display: block;
+  }
+</style>