@ozdao/prometheus-framework 0.2.132 → 0.2.134

package/dist/wallet.server.mjs

@@ -1,5 +1,5 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
-import { s as server } from "./index-DKtnWDNC.mjs";
+import { s as server } from "./index-C-8xOJnM.mjs";
 import "axios";
 import "bcryptjs";
 import "crypto";
@@ -20,11 +20,13 @@ var wallet_model = (db) => {
         },
         required: true
       },
-      amount: {
-        type: Number,
-        required: true,
-        default: 0
-      }
+      balances: [{
+        name: String,
+        // Name of currency
+        amount: Number,
+        // Amount
+        locked_amount: Number
+      }]
     },
     {
       timestamps: {
@@ -318,6 +320,9 @@ var payments_routes = function(app, db, origins, publicPath) {
 };
 const ObjectId = require$$0.Types.ObjectId;
 const { BigNumber } = require$$1$1;
+BigNumber.config({
+  EXPONENTIAL_AT: [-1e3, 2e3]
+});
 const VIEWS_REWARD_COEFF = "0.1";
 const WDT_DECIMALS = 8;
 const calculateRewardForPost = (snapshot, viewsCount, reactionsCount, commentsCount) => {
@@ -327,11 +332,21 @@ const calculateRewardForPost = (snapshot, viewsCount, reactionsCount, commentsCo
   }
   return new BigNumber("10").plus(new BigNumber(viewsCount).multipliedBy(VIEWS_REWARD_COEFF)).plus(reactionsCount).plus(commentsCount);
 };
-const rewardsControllerFactory$1 = (db, wdmClient) => {
+const rewardsControllerFactory$1 = (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) => {
     const userId = new ObjectId(req.userId);
     try {
@@ -450,14 +465,69 @@ const rewardsControllerFactory$1 = (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
+  };
 };
 var rewards_factory = rewardsControllerFactory$1;
 const rewardsControllerFactory = rewards_factory;
 const middlewareFactory = server;
-var rewards_routes = (app, db, wdmClient, origins) => {
-  const controller = rewardsControllerFactory(db, wdmClient);
-  const { authJwt } = middlewareFactory(db);
+var rewards_routes = (app, db, wss, wdmClient, origins) => {
+  const controller = rewardsControllerFactory(db, wdmClient, wss);
+  const { authJwt, authSecret } = middlewareFactory(db);
   app.use((req, res, next) => {
     const origin = req.headers.origin;
     if (origins.includes(origin)) {
@@ -476,6 +546,26 @@ var rewards_routes = (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
+  );
 };
 const ModelWallet = wallet_model;
 const ModelPayment = payment_model;
@@ -483,13 +573,13 @@ const ModelReward = reward_model;
 const RoutesPayments = payments_routes;
 const RoutesRewards = rewards_routes;
 const FactoryPayments = payments_factory;
-function initializePayments(app, db, wdmClient, origins, publicPath) {
+function initializePayments(app, db, wss, wdmClient, origins, publicPath) {
   db.wallet = ModelWallet(db);
   db.payment = ModelPayment(db);
   db.reward = ModelReward(db);
   if (app) {
     RoutesPayments(app, db, origins, publicPath);
-    RoutesRewards(app, db, wdmClient, origins);
+    RoutesRewards(app, db, wss, wdmClient, origins);
   }
 }
 var wallet_server = {

package/dist/web-5eyiz9L7.mjs

@@ -0,0 +1,54 @@
+import { W as p } from "./main-BY2OvGB9.mjs";
+class f extends p {
+  constructor() {
+    super(...arguments), this.group = "CapacitorStorage";
+  }
+  async configure({ group: e }) {
+    typeof e == "string" && (this.group = e);
+  }
+  async get(e) {
+    return { value: this.impl.getItem(this.applyPrefix(e.key)) };
+  }
+  async set(e) {
+    this.impl.setItem(this.applyPrefix(e.key), e.value);
+  }
+  async remove(e) {
+    this.impl.removeItem(this.applyPrefix(e.key));
+  }
+  async keys() {
+    return { keys: this.rawKeys().map((t) => t.substring(this.prefix.length)) };
+  }
+  async clear() {
+    for (const e of this.rawKeys())
+      this.impl.removeItem(e);
+  }
+  async migrate() {
+    var e;
+    const t = [], s = [], n = "_cap_", o = Object.keys(this.impl).filter((i) => i.indexOf(n) === 0);
+    for (const i of o) {
+      const r = i.substring(n.length), a = (e = this.impl.getItem(i)) !== null && e !== void 0 ? e : "", { value: l } = await this.get({ key: r });
+      typeof l == "string" ? s.push(r) : (await this.set({ key: r, value: a }), t.push(r));
+    }
+    return { migrated: t, existing: s };
+  }
+  async removeOld() {
+    const e = "_cap_", t = Object.keys(this.impl).filter((s) => s.indexOf(e) === 0);
+    for (const s of t)
+      this.impl.removeItem(s);
+  }
+  get impl() {
+    return window.localStorage;
+  }
+  get prefix() {
+    return this.group === "NativeStorage" ? "" : `${this.group}.`;
+  }
+  rawKeys() {
+    return Object.keys(this.impl).filter((e) => e.indexOf(this.prefix) === 0);
+  }
+  applyPrefix(e) {
+    return this.prefix + e;
+  }
+}
+export {
+  f as PreferencesWeb
+};

package/dist/web-C04IcLk4.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./main-5IrI2IOV.js");class p extends c.WebPlugin{constructor(){super(...arguments),this.group="CapacitorStorage"}async configure({group:e}){typeof e=="string"&&(this.group=e)}async get(e){return{value:this.impl.getItem(this.applyPrefix(e.key))}}async set(e){this.impl.setItem(this.applyPrefix(e.key),e.value)}async remove(e){this.impl.removeItem(this.applyPrefix(e.key))}async keys(){return{keys:this.rawKeys().map(t=>t.substring(this.prefix.length))}}async clear(){for(const e of this.rawKeys())this.impl.removeItem(e)}async migrate(){var e;const t=[],s=[],n="_cap_",o=Object.keys(this.impl).filter(i=>i.indexOf(n)===0);for(const i of o){const r=i.substring(n.length),a=(e=this.impl.getItem(i))!==null&&e!==void 0?e:"",{value:l}=await this.get({key:r});typeof l=="string"?s.push(r):(await this.set({key:r,value:a}),t.push(r))}return{migrated:t,existing:s}}async removeOld(){const e="_cap_",t=Object.keys(this.impl).filter(s=>s.indexOf(e)===0);for(const s of t)this.impl.removeItem(s)}get impl(){return window.localStorage}get prefix(){return this.group==="NativeStorage"?"":`${this.group}.`}rawKeys(){return Object.keys(this.impl).filter(e=>e.indexOf(this.prefix)===0)}applyPrefix(e){return this.prefix+e}}exports.PreferencesWeb=p;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.2.132",
+  "version": "0.2.134",
   "description": "Web3 Framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/components/Field/Field.vue

@@ -88,7 +88,7 @@
   </transition>
 </template>
 
-<style lang="scss" scoped>
+<style lang="scss" >
   input, textarea, span {
     line-height: 1;
     color: inherit;

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'