refactor: transaction sign permission count amount spend instead of a…

…mount left
superhero-com · Oct 23, 2023 · 53cae92 · 53cae92
1 parent 1d929cd
commit 53cae92
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 43 deletions.
diff --git a/src/composables/permissions.ts b/src/composables/permissions.ts
@@ -1,4 +1,5 @@
 import { METHODS } from '@aeternity/aepp-sdk';
+
 import type {
   IAppData,
   IPermission,
@@ -22,9 +23,10 @@ import { useStorageRef } from './storageRef';
 import { IModalProps, useModals } from './modals';
 
 interface ITransactionSignPermissionOptions {
-  amount?: number;
-  fee?: number;
-  nameFee?: number;
+  amount?: number | string;
+  fee?: number | string;
+  nameFee?: number | string;
+  [x: string]: any;
 }
 
 const permissions = useStorageRef<PermissionRegistry>(
@@ -61,17 +63,10 @@ const modalAndPopupTypes: Partial<Record<METHODS, { modal: string, popup: PopupT
 export function usePermissions() {
   const { openModal } = useModals();
 
-  function setTransactionSignLimitLeft(host: string, value: number) {
+  function resetTransactionSignSpent(host: string) {
     permissions.value[host] = {
       ...permissions.value[host],
-      transactionSignLimitLeft: value,
-    };
-  }
-
-  function resetTransactionSignLimitLeft(host: string) {
-    permissions.value[host] = {
-      ...permissions.value[host],
-      transactionSignLimitLeft: permissions.value[host].transactionSignLimit,
+      transactionSignSpent: 0,
       transactionSignFirstAskedOn: (new Date()).toISOString(),
     };
   }
@@ -98,19 +93,19 @@ export function usePermissions() {
     } = permissions.value[host] || {};
 
     if (!transactionSignLimit) {
-      return false; // Always ask for permission if no limit is set
+      return false; // Always ask for permission if limit is not set
     }
     if (!transactionSignFirstAskedOn || hasDayPassed(transactionSignFirstAskedOn)) {
-      resetTransactionSignLimitLeft(host);
+      resetTransactionSignSpent(host);
     }
 
     const totalCost = +aettosToAe(+amount + +fee + +nameFee);
-    const futureLimitLeft = permissions.value[host].transactionSignLimitLeft - totalCost;
-    if (futureLimitLeft < 0) {
-      return false;
+    const currentAmountSpent = (permissions.value[host].transactionSignSpent || 0) + totalCost;
+    if (currentAmountSpent > transactionSignLimit) {
+      return false; // Transaction is out of the limit
     }
 
-    setTransactionSignLimitLeft(host, futureLimitLeft);
+    permissions.value[host].transactionSignSpent = currentAmountSpent;
     return true;
   }
 

diff --git a/src/constants/common.ts b/src/constants/common.ts
@@ -376,7 +376,7 @@ export const PERMISSION_DEFAULTS: IPermission = {
   messageSign: false,
   dailySpendLimit: false,
   transactionSignLimit: 0,
-  transactionSignLimitLeft: 0,
+  transactionSignSpent: 0,
   transactionSignFirstAskedOn: null,
 };
 

diff --git a/src/lib/accounts/AccountSuperhero.ts b/src/lib/accounts/AccountSuperhero.ts
@@ -43,7 +43,7 @@ export class AccountSuperhero extends AccountBase {
       if (IS_EXTENSION_BACKGROUND && aeppOrigin) {
         const txObject = unpackTx(txBase64);
         if (
-          (checkPermission(new URL(aeppOrigin).host, METHODS.sign, txObject as any))
+          (checkPermission(new URL(aeppOrigin).host, METHODS.sign, txObject))
           || (await openPopup(
             POPUP_TYPE_SIGN,
             aeppOrigin,

diff --git a/src/popup/pages/Names/AuctionHistory.vue b/src/popup/pages/Names/AuctionHistory.vue
@@ -9,7 +9,7 @@
         <div class="item">
           <AccountItem
             :address="highestBid.accountId"
-            :name="getName(highestBid.accountId).value"
+            :name="getName(highestBid.accountId)"
             :protocol="PROTOCOL_AETERNITY"
           />
           <AuctionOverview :name="name" />
@@ -26,7 +26,7 @@
           <AccountItem
             :protocol="PROTOCOL_AETERNITY"
             :address="bid.accountId"
-            :name="getName(bid.accountId).value"
+            :name="getName(bid.accountId)"
           />
         </div>
       </div>

diff --git a/src/popup/pages/PermissionManager.vue b/src/popup/pages/PermissionManager.vue
@@ -107,14 +107,14 @@
             <div class="limit-info">
               <TokenAmount
                 :label="$t('pages.permissions.spent-today')"
-                :amount="permission.transactionSignLimit - permission.transactionSignLimitLeft"
+                :amount="permission.transactionSignSpent"
                 :protocol="PROTOCOL_AETERNITY"
               />
             </div>
             <div class="limit-info">
               <TokenAmount
                 :label="$t('pages.permissions.left-today')"
-                :amount="permission.transactionSignLimitLeft"
+                :amount="permission.transactionSignLimit - permission.transactionSignSpent"
                 :protocol="PROTOCOL_AETERNITY"
               />
             </div>
@@ -210,7 +210,6 @@ export default defineComponent({
 
     const permission = ref<IPermission>({ ...PERMISSION_DEFAULTS });
     const permissionChanged = ref(false);
-    const originalTransactionSignLimit = ref<number>(0);
 
     const selectedAsset = computed(() => ({
       contractId: AE_CONTRACT_ID,
@@ -240,10 +239,6 @@ export default defineComponent({
 
       if (!permission.value.dailySpendLimit) {
         permission.value.transactionSignLimit = 0;
-      } else if (originalTransactionSignLimit.value !== permission.value.transactionSignLimit) {
-        permission.value.transactionSignLimitLeft += (
-          permission.value.transactionSignLimit - originalTransactionSignLimit.value
-        );
       }
 
       addPermission({ ...permission.value, host });
@@ -256,22 +251,11 @@ export default defineComponent({
         router.replace({ name: ROUTE_NOT_FOUND });
       } else {
         if (typeof savedPermission.transactionSignLimit === 'string') {
-          savedPermission.transactionSignLimit = parseInt(
-            savedPermission.transactionSignLimit,
-            10,
-          );
-          originalTransactionSignLimit.value = savedPermission.transactionSignLimit;
-        }
-
-        if (typeof savedPermission.transactionSignLimitLeft === 'string') {
-          savedPermission.transactionSignLimitLeft = parseInt(
-            savedPermission.transactionSignLimitLeft,
-            10,
-          );
+          savedPermission.transactionSignLimit = +savedPermission.transactionSignLimit;
         }
 
         setValues({ url: savedPermission.host, ...savedPermission });
-        permission.value = savedPermission;
+        permission.value = { ...PERMISSION_DEFAULTS, ...savedPermission };
       }
     }
 

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -263,8 +263,14 @@ export interface IPermission {
   name: string;
   dailySpendLimit: boolean;
   transactionSignFirstAskedOn: string | null;
+  /**
+   * Daily limit for transactions
+   */
   transactionSignLimit: number;
-  transactionSignLimitLeft: number;
+  /**
+   * Amount spent during that day
+   */
+  transactionSignSpent: number;
 }
 
 /**