Fixes & cleanup

Fix private key signup method
Removed TUSC
Reset prompt operation permission scope upon switching blockchain accounts

README.md

@@ -40,7 +40,7 @@ The EOS blockchain has their own native javascript library that can be used (e.g
 
 The wallet now also supports deeplinks, encrypted deeplinks, qr codes and local json files for generating blockchain request prompts for approval & broadcast with the BeetEOS wallet. These input methods do not require external packages, and can be stored for later use.
 
-Supported blockchains: Bitshares, Bitshares testnet, TUSC, EOS, BEOS, TLOS.
+Supported blockchains: Bitshares, Bitshares testnet, EOS, BEOS, TLOS.
 
 ## For end users
 
@@ -56,7 +56,7 @@ BeetEOS is an [electron-based app](https://www.electronjs.org) for [cross-platfo
 
 To run BeetEOS it's simply a case of
 
-``` bash
+```bash
 # clone
 git clone https://github.com/beetapp/beeteos
 cd beeteos

src/background.js

@@ -423,8 +423,9 @@ async function _parseDeeplink(
     }
 
     if (request.payload.method === Actions.INJECTED_CALL) {
+        console.log({req: request.payload.params})
         let authorizedUse = false;
-        if (["BTS", "BTS_TEST", "TUSC"].includes(chain)) {
+        if (["BTS", "BTS_TEST"].includes(chain)) {
             let tr;
             try {
                 tr = await blockchain._parseTransactionBuilder(
@@ -443,16 +444,20 @@ async function _parseDeeplink(
                 }
             }
         } else if (["EOS", "BEOS", "TLOS"].includes(chain)) {
-            if (request.payload.params.actions) {
-                for (
-                    let i = 0;
-                    i < request.payload.params.actions.length;
-                    i++
-                ) {
-                    let operation = request.payload.params.actions[i];
-                    if (settingsRows && settingsRows.includes(operation.name)) {
-                        authorizedUse = true;
-                        break;
+            if (request.payload.params && request.payload.params.length > 1) {
+                const actions = JSON.parse(request.payload.params[1]).actions;
+
+                if (actions) {
+                    for (
+                        let i = 0;
+                        i < actions.length;
+                        i++
+                    ) {
+                        let operation = actions[i];
+                        if (settingsRows && settingsRows.includes(operation.name)) {
+                            authorizedUse = true;
+                            break;
+                        }
                     }
                 }
             }
@@ -680,6 +685,10 @@ const createWindow = async () => {
             responses["getAccessType"] = blockchain.getAccessType();
         }
 
+        if (methods.includes("getSignUpInput")) {
+            responses["getSignUpInput"] = blockchain.getSignUpInput();
+        }
+
         if (methods.includes("getImportOptions")) {
             responses["getImportOptions"] = blockchain.getImportOptions();
         }
@@ -917,7 +926,7 @@ const createWindow = async () => {
 
             let parsedData = JSON.parse(qrData);
             let authorizedUse = false;
-            if (["BTS", "BTS_TEST", "TUSC"].includes(chain)) {
+            if (["BTS", "BTS_TEST"].includes(chain)) {
                 const ops = parsedData.operations[0].operations;
                 for (let i = 0; i < ops.length; i++) {
                     let operation = ops[i];
@@ -946,7 +955,7 @@ const createWindow = async () => {
             if (authorizedUse) {
                 let qrTX;
                 try {
-                    qrTX = ["BTS", "BTS_TEST", "TUSC"].includes(chain)
+                    qrTX = ["BTS", "BTS_TEST"].includes(chain)
                         ? await blockchain.handleQR(
                               JSON.stringify(parsedData.operations[0])
                           )
@@ -964,7 +973,7 @@ const createWindow = async () => {
                         origin: "localhost",
                         appName: "qr",
                         browser: qrChoice,
-                        params: ["BTS", "BTS_TEST", "TUSC"].includes(chain)
+                        params: ["BTS", "BTS_TEST"].includes(chain)
                             ? qrTX.toObject()
                             : qrTX,
                         chain: chain,
@@ -1121,7 +1130,6 @@ const createWindow = async () => {
         "explore.beos.world",
         "blocksights.info",
         "telos.eosx.io",
-        "wallet.tusc.network",
     ];
     ipcMain.on("openURL", (event, arg) => {
         try {
@@ -1406,9 +1414,11 @@ if (currentOS === "win32" || currentOS === "linux") {
                 console.log(error);
                 return;
             }
-
-            let deeplinkingUrl = deeplink.includes("beeteos://api/") ? deeplink.split("beeteos://api/")[1] : deeplink.split("rawbeeteos://api/")[1];
-
+
+            let deeplinkingUrl = deeplink.includes("beeteos://api/")
+                ? deeplink.split("beeteos://api/")[1]
+                : deeplink.split("rawbeeteos://api/")[1];
+
             let qs;
             try {
                 qs = queryString.parse(deeplinkingUrl);
@@ -1419,9 +1429,7 @@ if (currentOS === "win32" || currentOS === "linux") {
 
             if (qs) {
                 mainWindow.webContents.send(
-                    deeplink.includes("raw")
-                        ? "rawdeeplink"
-                        : "deeplink",
+                    deeplink.includes("raw") ? "rawdeeplink" : "deeplink",
                     qs
                 );
             }
@@ -1478,7 +1486,7 @@ if (currentOS === "win32" || currentOS === "linux") {
         }
 
         if (qs) {
-            dialog.showErrorBox("Error", JSON.stringify({qs: qs}));
+            dialog.showErrorBox("Error", JSON.stringify({ qs: qs }));
             mainWindow.webContents.send(urlType, qs);
         }
     });

src/components/blockchains/ImportKeys.vue

@@ -48,7 +48,7 @@
     let privateKey = ref("");
     async function next() {
         let authorities = {};
-        if (requiredFields.value.privateKey != null) {
+        if (requiredFields.value && requiredFields.value.privateKey) {
             authorities.privateKey = privateKey.value;
         }
 
@@ -107,7 +107,7 @@
             {{ t('common.keys_cta') }}
         </p>
 
-        <template v-if="requiredFields.privateKey !== null">
+        <template v-if="requiredFields && requiredFields.privateKey">
             <p class="mb-2 font-weight-bold">
                 {{ t(accessType == 'account' ? 'common.active_authority' : 'common.public_authority') }}
             </p>
@@ -131,7 +131,7 @@
                     {{ t('common.back_btn') }}
                 </ui-button>
 
-                <span v-if="requiredFields.privateKey != null">
+                <span v-if="requiredFields && requiredFields.privateKey">
                     <ui-button
                         v-if="accountname !== '' && privateKey !== ''"
                         raised

src/components/blockchains/bitshares/ImportBinFile.vue

@@ -15,7 +15,7 @@
     const emit = defineEmits(['back', 'continue', 'imported']);
 
     onMounted(() => {
-        if (!["BTS", "BTS_TEST", "TUSC"].includes(props.chain)) {
+        if (!["BTS", "BTS_TEST"].includes(props.chain)) {
             throw "Unsupported chain!";
         }
     })

src/components/blockchains/bitshares/ImportCloudPass.vue

@@ -15,7 +15,7 @@
     const emit = defineEmits(['back', 'continue', 'imported']);
 
     onMounted(() => {
-        if (!["BTS", "BTS_TEST", "TUSC"].includes(props.chain)) {
+        if (!["BTS", "BTS_TEST"].includes(props.chain)) {
             throw "Unsupported chain!";
         }
     })

src/components/local.vue

@@ -1,5 +1,5 @@
 <script setup>
-    import { ref, computed, onMounted, toRaw } from 'vue';
+    import { ref, computed, onMounted, watch, toRaw } from 'vue';
     import { useI18n } from 'vue-i18n';
 
     import AccountSelect from "./account-select";
@@ -24,6 +24,19 @@
         return store.getters['AccountStore/getChain'];
     });
 
+    let selectedAccount = computed(() => {
+        if (!store.state.WalletStore.isUnlocked) {
+            return;
+        }
+        return store.getters["AccountStore/getCurrentSafeAccount"]()
+    })
+
+    watch(selectedAccount, async (newVal, oldVal) => {
+        console.log("User changed account - resetting configured scope!")
+        chosenScope.value = null;
+        selectedRows.value = null;
+    }, {immediate: true});
+
     let supportsLocal = ref(false);
     let operationTypes = ref([]);
     onMounted(async () => {

src/components/main-menu.vue

@@ -322,7 +322,7 @@
                 } = args;
 
                 if (
-                    (["BTS", "BTS_TEST", "TUSC"].includes(chain)) &&
+                    (["BTS", "BTS_TEST"].includes(chain)) &&
                     ((!visualizedAccount && account && !account.accountName) || !visualizedParams)
                 ) {
                     console.log("Missing required fields for injected call");
@@ -373,7 +373,7 @@
 
                 window.electron.popupApproved(request.id, async (args) => {
                     let _request = request;
-                    if (["BTS", "BTS_TEST", "TUSC"].includes(chain)) {        
+                    if (["BTS", "BTS_TEST"].includes(chain)) {        
                         if (request.payload.memo) {
                             let from;
                             let to;
@@ -441,7 +441,7 @@
                     }
 
                     let activeKey;
-                    if (["BTS", "BTS_TEST", "TUSC"].includes(chain)) {
+                    if (["BTS", "BTS_TEST"].includes(chain)) {
                         try {
                             activeKey = request.payload.account_id
                                 ? store.getters['AccountStore/getActiveKey'](request)
@@ -466,7 +466,7 @@
 
                     if (txType == "signAndBroadcast") {
                         try {
-                            if (["BTS", "BTS_TEST", "TUSC"].includes(chain)) {
+                            if (["BTS", "BTS_TEST"].includes(chain)) {
                                 finalResult = await window.electron.blockchainRequest({
                                     methods: ["signAndBroadcast"],
                                     account: null,
@@ -539,7 +539,7 @@
                 window.electron.popupApproved(request.id, async (result) => {
 
                     let activeKey;
-                    if (["BTS", "BTS_TEST", "TUSC"].includes(chain)) {
+                    if (["BTS", "BTS_TEST"].includes(chain)) {
                         try {
                             activeKey = request.payload.account_id
                                 ? store.getters['AccountStore/getActiveKey'](request)
@@ -564,7 +564,7 @@
 
                     let transaction;
                     try {
-                        if (["BTS", "BTS_TEST", "TUSC"].includes(chain)) {
+                        if (["BTS", "BTS_TEST"].includes(chain)) {
                             transaction = await window.electron.requestSignature(request.payload.params, signingKey);
                         } else if (["EOS", "BEOS", "TLOS"].includes(chain)) {
                             transaction = await window.electron.requestSignature(JSON.parse(request.payload.params[1]), signingKey);

src/components/qr.vue

@@ -1,5 +1,5 @@
 <script setup>
-    import { ref, computed, watchEffect, inject, onMounted, toRaw } from 'vue';
+    import { ref, computed, watchEffect, inject, watch, onMounted, toRaw } from 'vue';
     import { useI18n } from 'vue-i18n';
 
     import AccountSelect from "./account-select";
@@ -38,6 +38,19 @@
         return store.getters['AccountStore/getChain'];
     });
 
+    let selectedAccount = computed(() => {
+        if (!store.state.WalletStore.isUnlocked) {
+            return;
+        }
+        return store.getters["AccountStore/getCurrentSafeAccount"]()
+    })
+
+    watch(selectedAccount, async (newVal, oldVal) => {
+        console.log("User changed account - resetting configured scope!")
+        chosenScope.value = null;
+        selectedRows.value = null;
+    }, {immediate: true});
+
     async function evaluateQR (data) {
         if (!data) {
             return;

src/components/raw-link.vue

@@ -7,6 +7,7 @@
     
     import store from '../store/index.js';
     import router from '../router/index.js';
+    import { watch } from 'vue';
 
     const { t } = useI18n({ useScope: 'global' });
 
@@ -35,6 +36,19 @@
         }
     }
 
+    let selectedAccount = computed(() => {
+        if (!store.state.WalletStore.isUnlocked) {
+            return;
+        }
+        return store.getters["AccountStore/getCurrentSafeAccount"]()
+    })
+
+    watch(selectedAccount, async (newVal, oldVal) => {
+        console.log("User changed account - resetting configured scope!")
+        chosenScope.value = null;
+        selectedRows.value = null;
+    }, {immediate: true});
+
     let chain = computed(() => {
         return store.getters['AccountStore/getChain'];
     });

src/components/totp.vue

@@ -1,5 +1,5 @@
 <script setup>
-    import { watchEffect, ref, computed, onMounted, toRaw } from 'vue';
+    import { watchEffect, ref, computed, onMounted, watch, toRaw } from 'vue';
     import { useI18n } from 'vue-i18n';
 
     import AccountSelect from "./account-select";
@@ -13,6 +13,19 @@
     let chain = computed(() => {
         return store.getters['AccountStore/getChain'];
     });
+
+    let selectedAccount = computed(() => {
+        if (!store.state.WalletStore.isUnlocked) {
+            return;
+        }
+        return store.getters["AccountStore/getCurrentSafeAccount"]()
+    })
+
+    watch(selectedAccount, async (newVal, oldVal) => {
+        console.log("User changed account - resetting configured scope!")
+        chosenScope.value = null;
+        selectedRows.value = null;
+    }, {immediate: true});
     
     let compatible = ref(false);
     let operationTypes = ref([]);

src/config/config.js

@@ -52,26 +52,6 @@ let _blockchains = {
             },
         ],
     },
-    TUSC: {
-        coreSymbol: "TUSC",
-        name: "The Universal Settlement Coin",
-        chainId:
-            "eb938e2a955e39e335120d0a99f3b9f8c04a9ed5690275ea5037d6bbadfc6cf3",
-        nodeList: [
-            {
-                url: "wss://api.tusc.network/wallet",
-            },
-            {
-                url: "wss://api.cryptotusc.com",
-            },
-            {
-                url: "wss://tuscapi.gambitweb.com",
-            },
-            {
-                url: "wss://api.readyrhino.one",
-            },
-        ],
-    },
     EOS: {
         coreSymbol: "EOS",
         name: "EOSmainnet",