Global mutex + output already signed healer + tokenv4 base64 keyset i…

…d fix (#224) * global mutex wip * fix outputs already signed healer * fix mutex and animate * fix animations * update cashu-ts-rc3 self healing on mint * async mutex lock * remove unneded code * fix counter for pay invoice and mutex lock on mint activation * counter for send
cashubtc · Aug 31, 2024 · 3d2f829 · 3d2f829
1 parent 13882b9
commit 3d2f829
Show file tree

Hide file tree

Showing 13 changed files with 160 additions and 57 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     "@capacitor/clipboard": "^6.0.0",
     "@capacitor/core": "^6.0.0",
     "@capacitor/ios": "^6.0.0",
-    "@cashu/cashu-ts": "^1.1.0-2",
+    "@cashu/cashu-ts": "^1.1.0-3",
     "@cashu/crypto": "^0.2.7",
     "@chenfengyuan/vue-qrcode": "^2.0.0",
     "@gandlaf21/bc-ur": "^1.1.12",

diff --git a/src/components/BalanceView.vue b/src/components/BalanceView.vue
@@ -2,8 +2,25 @@
   <!-- <q-card class="q-my-md q-py-sm">
     <q-card-section class="q-mt-sm q-py-xs"> -->
   <div class="q-pt-xl q-pb-md">
-    <div class="row justify-center q-pb-lg">
-      <ToggleUnit class="q-mt-lg q-mb-none" :balanceView="true" />
+    <div class="row justify-center q-pb-lg" style="height:80px">
+      <div v-if="globalMutexLock">
+        <transition
+          appear
+          enter-active-class="animated fadeIn"
+          leave-active-class="animated fadeOut"
+        >
+        <q-spinner-hourglass  class="q-mt-lg q-mb-none" size="lg" color="primary" />
+      </transition>
+      </div>
+      <div v-else >
+        <transition
+          appear
+          enter-active-class="animated fadeIn"
+          leave-active-class="animated fadeOut"
+        >
+          <ToggleUnit class="q-mt-lg q-mb-none" :balanceView="true" />
+        </transition>
+      </div>
     </div>
     <transition
       appear
@@ -142,6 +159,7 @@ export default defineComponent({
     ]),
     ...mapState(useTokensStore, ["historyTokens"]),
     ...mapState(useSettingsStore, ["getBitcoinPrice"]),
+    ...mapState(useUiStore, ["globalMutexLock"]),
     ...mapWritableState(useMintsStore, ["activeUnit"]),
     ...mapWritableState(useUiStore, ["hideBalance"]),
     pendingBalance: function () {

diff --git a/src/components/InvoiceDetailDialog.vue b/src/components/InvoiceDetailDialog.vue
@@ -51,11 +51,13 @@
                 ? 'Creating invoice...'
                 : 'Create Invoice'
             "
-            ><q-spinner-hourglass
-              v-if="createInvoiceButtonBlocked"
-              color="white"
-              size="1em"
-          /></q-btn>
+            :loading="globalMutexLock"
+            >
+          <template v-slot:loading>
+                <q-spinner-hourglass />
+                Creating
+              </template>
+          </q-btn>
           <q-btn v-close-popup rounded flat color="grey" class="q-ml-auto"
             >Close</q-btn
           >
@@ -173,7 +175,7 @@ export default defineComponent({
     ...mapState(useWalletStore, ["invoiceData"]),
     ...mapState(useMintsStore, ["activeUnit", "activeUnitLabel"]),
     ...mapState(useWorkersStore, ["invoiceWorkerRunning"]),
-    ...mapWritableState(useUiStore, ["showInvoiceDetails", "tickerShort"]),
+    ...mapWritableState(useUiStore, ["showInvoiceDetails", "tickerShort", "globalMutexLock"]),
     displayUnit: function () {
       let display = this.formatCurrency(
         this.invoiceData.amount,

diff --git a/src/components/MintSettings.vue b/src/components/MintSettings.vue
@@ -660,6 +660,10 @@ export default defineComponent({
       }
     },
     sanitizeMintUrlAndShowAddDialog: function () {
+      // if no protocol is given, add https
+      if (!this.addMintData.url.match(/^[a-zA-Z]+:\/\//)) {
+        this.addMintData.url = "https://" + this.addMintData.url;
+      }
       if (!this.validateMintUrl(this.addMintData.url)) {
         notifyError("Invalid URL");
         return;

diff --git a/src/components/PayInvoiceDialog.vue b/src/components/PayInvoiceDialog.vue
@@ -55,12 +55,14 @@
               payInvoiceData.blocking || payInvoiceData.meltQuote.error != ''
             "
             @click="melt"
-            :label="!payInvoiceData.blocking ? 'Pay' : 'Processing...'"
-            ><q-spinner-hourglass
-              v-if="payInvoiceData.blocking"
-              color="primary"
-              size="1em"
-          /></q-btn>
+            :label="payInvoiceData.meltQuote.error != '' ? 'Error' : !payInvoiceData.blocking ? 'Pay' : 'Processing...'"
+            :loading="globalMutexLock && !payInvoiceData.blocking"
+            class="q-px-lg"
+            >
+          <template v-slot:loading >
+              <q-spinner-hourglass />
+            </template>
+          </q-btn>
           <q-btn v-close-popup flat color="grey" class="q-ml-auto">Close</q-btn>
         </div>
         <div v-else class="row q-mt-lg">
@@ -248,7 +250,7 @@ export default defineComponent({
     },
   },
   computed: {
-    ...mapState(useUiStore, ["tickerShort"]),
+    ...mapState(useUiStore, ["tickerShort", "globalMutexLock"]),
     ...mapWritableState(useCameraStore, ["camera", "hasCamera"]),
     ...mapState(useWalletStore, ["payInvoiceData"]),
     ...mapState(useMintsStore, [

diff --git a/src/components/ReceiveTokenDialog.vue b/src/components/ReceiveTokenDialog.vue
@@ -59,7 +59,7 @@
           />
         </div>
       </div>
-      <div class="row q-mt-lg">
+      <div class="row q-mt-lg q-pl-xs">
         <q-btn
           @click="receveIfDecodes"
           color="primary"

diff --git a/src/components/SendTokenDialog.vue b/src/components/SendTokenDialog.vue
@@ -134,7 +134,12 @@
               color="primary"
               rounded
               type="submit"
-              >Send</q-btn
+              :loading="globalMutexLock"
+              >Send
+              <template v-slot:loading>
+                <q-spinner-hourglass />
+              </template>
+              </q-btn
             >
             <div
               v-if="sendData.p2pkPubkey && isValidPubkey(sendData.p2pkPubkey)"
@@ -398,7 +403,7 @@ export default defineComponent({
     ]),
     ...mapWritableState(useSendTokensStore, ["sendData"]),
     ...mapWritableState(useCameraStore, ["camera", "hasCamera"]),
-    ...mapState(useUiStore, ["tickerShort", "canPasteFromClipboard"]),
+    ...mapState(useUiStore, ["tickerShort", "canPasteFromClipboard", "globalMutexLock"]),
     ...mapState(useMintsStore, [
       "activeProofs",
       "activeUnit",
@@ -590,14 +595,18 @@ export default defineComponent({
       // if the token starts with 'cashuA', it is a v3 token
       // if it starts with 'cashuB', it is a v4 token
       if (this.sendData.tokensBase64.startsWith("cashuA")) {
-        this.sendData.tokensBase64 = getEncodedTokenV4(
+        try {
+          this.sendData.tokensBase64 = getEncodedTokenV4(decodedToken)
+        } catch {
+          console.log("### Could not encode token to V4");
+          this.sendData.tokensBase64 = getEncodedToken(
           decodedToken
         );
+        }
       } else {
         this.sendData.tokensBase64 = getEncodedToken(
           decodedToken
         );
-
       }
     },
     deleteThisToken: function () {

diff --git a/src/components/TokenInformation.vue b/src/components/TokenInformation.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="row text-left q-py-none q-my-none">
     <div class="col-12 q-px-none">
-      <q-chip v-if="showAmount" outline class="q-mr-md q-pa-md">
+      <q-chip v-if="showAmount" outline class="q-pa-md" style="border-width: 2px;">
         <q-icon name="toll" size="xs" class="q-mr-sm" />
         <strong>{{ displayUnit }} </strong>
       </q-chip>
-      <q-chip outline class="q-pa-md q-ml-md">
+      <q-chip outline class="q-pa-md">
         <q-icon name="account_balance" size="xs" class="q-mr-xs" />
         {{ tokenMintUrl }}
         <q-spinner-hourglass v-if="addMintBlocking" size="sm" class="q-ml-sm" />

diff --git a/src/stores/mints.ts b/src/stores/mints.ts
@@ -3,7 +3,7 @@ import { useLocalStorage } from "@vueuse/core";
 import { useWorkersStore } from "./workers";
 import { notifyApiError, notifyError, notifySuccess } from "src/js/notify";
 import { CashuMint, MintKeys, MintAllKeysets, Proof, SerializedBlindedSignature, MintKeyset } from "@cashu/cashu-ts";
-
+import { useUiStore } from "./ui";
 export type Mint = {
   url: string;
   keys: MintKeys[];
@@ -282,6 +282,7 @@ export const useMintsStore = defineStore("mints", {
     },
     activateMint: async function (mint: Mint, verbose = false, force = false) {
       const workers = useWorkersStore();
+      const uIStore = useUiStore();
       if (mint.url === this.activeMintUrl && !force) {
         // return here because this function is called repeatedly by the
         // invoice check and token spendable check workers and would otherwise
@@ -293,6 +294,7 @@ export const useMintsStore = defineStore("mints", {
 
       // create new mint.api instance because we can't store it in local storage
       let previousUrl = this.activeMintUrl;
+      await uIStore.lockMutex();
       try {
         this.activeMintUrl = mint.url;
         console.log("### this.activeMintUrl", this.activeMintUrl);
@@ -316,6 +318,8 @@ export const useMintsStore = defineStore("mints", {
         }
         await notifyError(err_msg, "Mint activation failed");
         throw error;
+      } finally {
+        await uIStore.unlockMutex();
       }
     },
     fetchMintInfo: async function (mint: Mint) {
@@ -332,6 +336,7 @@ export const useMintsStore = defineStore("mints", {
       }
     },
     fetchMintKeys: async function (mint: Mint) {
+
       try {
         const mintClass = new MintClass(mint);
         const keysets = await this.fetchMintKeysets(mint);

diff --git a/src/stores/proofs.ts b/src/stores/proofs.ts
@@ -49,7 +49,13 @@ export const useProofsStore = defineStore("proofs", {
         token: [{ proofs: proofs, mint: mints[0].url }],
         unit: unit,
       } as Token;
-      return getEncodedTokenV4(token);
+      try {
+        return getEncodedTokenV4(token);
+      } catch (e) {
+        console.log("Could not encode TokenV4, defaulting to TokenV3", e);
+        return getEncodedToken(token);
+      }
+
 
       // // what we put into the JSON
       // let mintsJson = mints.map((m) => [{ url: m.url, ids: m.keysets }][0]);

diff --git a/src/stores/ui.ts b/src/stores/ui.ts
@@ -1,6 +1,7 @@
 import { defineStore } from "pinia";
 import { useMintsStore } from "./mints";
 import { useLocalStorage } from "@vueuse/core";
+import { notifyApiError, notifyError, notifySuccess, notifyWarning, notify } from "../js/notify";
 
 const unitTickerShortMap = {
   sat: "sats",
@@ -19,8 +20,28 @@ export const useUiStore = defineStore("ui", {
     tab: useLocalStorage("cashu.ui.tab", "history" as string),
     expandHistory:
       useLocalStorage("cashu.ui.expandHistory", true as boolean),
+    globalMutexLock: false,
   }),
   actions: {
+    async lockMutex() {
+      const nRetries = 10;
+      const retryInterval = 500;
+      let retries = 0;
+
+      while (this.globalMutexLock) {
+        if (retries >= nRetries) {
+          notify("Please try again.")
+          throw new Error("Failed to acquire global mutex lock");
+        }
+        retries++;
+        await new Promise(resolve => setTimeout(resolve, retryInterval));
+      }
+
+      this.globalMutexLock = true;
+    },
+    unlockMutex() {
+      this.globalMutexLock = false;
+    },
     setTab(tab: string) {
       this.tab = tab;
     },