Hackishly remove Elysium support.

firoorg · Jan 2, 2024 · 3b66154 · 3b66154
1 parent b1fe309
commit 3b66154
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/renderer/components/SettingsPage.vue b/src/renderer/components/SettingsPage.vue
@@ -38,10 +38,12 @@
                 </select>
             </div>
 
+<!--
             <div class="checkbox-option" @click="enableElysium = !enableElysium">
                 <label>Enable Experimental Elysium Features (Requires Rescan)</label>
                 <input id="enable-elysium-checkbox" type="checkbox" :checked="enableElysium" />
             </div>
+-->
 
             <div class="checkbox-option" @click="useTor = !useTor">
                 <label>Connect to other nodes via Tor</label>

diff --git a/src/renderer/renderer.ts b/src/renderer/renderer.ts
@@ -75,9 +75,10 @@ window.addEventListener('beforeunload', async () => await $daemon?.closeSockets(
         store.commit('App/setColorTheme', settings.colorTheme);
     }
 
-    if (settings.enableElysium) {
-        store.commit('App/setEnableElysium', settings.enableElysium);
-    }
+    // if (settings.enableElysium) {
+    //     store.commit('App/setEnableElysium', settings.enableElysium);
+    // }
+    store.commit('App/setEnableElysium', false);
 
     if (settings.selectedElysiumTokens) {
         store.commit('Elysium/initSelectedTokens', settings.selectedElysiumTokens);

diff --git a/src/store/modules/Elysium.ts b/src/store/modules/Elysium.ts
@@ -143,7 +143,7 @@ const getters = {
                 txo.elysium.type != "Grant Property Tokens"
             ) continue;
 
-            r[p] = (r[p] || 0n) + (txo.elysium.amount || 0n);
+            r[p] = (r[p] || 0n) + (txo?.elysium.amount || 0n);
         }
         return r;
     },

diff --git a/src/store/modules/Transactions.ts b/src/store/modules/Transactions.ts
@@ -66,7 +66,7 @@ function txosFromTx(tx: Transaction, mySparkOutputAmounts: Map<string, bigint>,
         }
 
         // This is for txouts of multi-recipient transactions that we've received funds from that go to other wallets.
-        if (!isFromMe && !txout.isToMe && !tx.elysium.isToMe) continue;
+        if (!isFromMe && !txout.isToMe && !tx.elysium?.isToMe) continue;
 
         let privacyUse: PrivacyType;
         let spendSize = undefined;
@@ -202,7 +202,9 @@ function selectUTXOs(privacy: PrivacyType, amount: bigint, feePerKb: bigint, sub
     else if (privacy == 'lelantus')
         constantSize = 1234n;
     else if (privacy == 'spark')
-    constantSize = 1281n;
+        constantSize = 1281n;
+    else if (privacy == 'exchange')
+        constantSize = 11n;
 
     if (coinControl) {
         let totalSize = 0n;