Telos Cloud Wallet (powered by Metakeep)

.gitignore

@@ -34,5 +34,5 @@ yarn-error.log*
 *.ntvs*
 *.njsproj
 *.sln
-
+.vscode
 .env

env.js

@@ -9,6 +9,9 @@ const sharedEnv = {
     IMGUR_CLIENT_ID: 'b6f46df9d1da9d9',
     EVM_CONTRACT: 'eosio.evm',
     PROJECT_ID: '2392473d6d98499c7138cd2d705a791f',
+    METAKEEP_APP_ID_NATIVE: 'ad5e05fb-280a-41ae-b186-5a2654567b92',
+    METAKEEP_APP_ID_EVM: 'd190c88f-1bb5-4e16-bc48-96dbf33b77e0',
+    GOOGLE_APP_ID: '56634824599-ff3iu788c32c3s7ec65cs4bieop9gpgv.apps.googleusercontent.com',
 };
 
 const TESTNET = {
@@ -22,8 +25,6 @@ const TESTNET = {
     HYPERION_ENDPOINT: 'https://testnet.telos.net',
     NETWORK_EXPLORER: 'https://explorer-test.telos.net',
     CHAIN_NAME: 'telos-testnet',
-    OREID_APP_ID: 't_75a4d9233ec441d18c4221e92b379197',
-    OREID_APP_ID_NATIVE: 't_a61e9926d5204387a9ac113dfce7cbc5',
 };
 
 const MAINNET = {
@@ -37,8 +38,6 @@ const MAINNET = {
     HYPERION_ENDPOINT: 'https://mainnet.telos.net',
     NETWORK_EXPLORER: 'https://explorer.telos.net',
     CHAIN_NAME: 'telos',
-    OREID_APP_ID: 'p_e5b81fcc20a04339993b0cc80df7e3fd',
-    OREID_APP_ID_NATIVE: 'p_751f87258d5b40998b55c626d612fd4e',
 };
 
 const env = process.env.NETWORK === 'mainnet' ? MAINNET : TESTNET;

package.json

@@ -32,21 +32,19 @@
     "eosjs": "^21.0.3",
     "eosjs-ecc": "^4.0.7",
     "erc-20-abi": "^1.0.0",
-    "ethers": "^5.5.1",
+    "ethers": "5.7.0",
     "jdenticon": "^3.1.1",
+    "metakeep": "^2.2.0",
     "mitt": "^3.0.0",
     "node-polyfill-webpack-plugin": "^2.0.1",
     "numeral": "^2.0.6",
-    "oreid-js": "^4.7.1",
-    "oreid-webpopup": "^2.4.0",
     "pinia": "^2.0.33",
     "ptokens": "^0.14.0",
     "qrcanvas-vue": "^3.0.0",
     "qrious": "4.0.2",
     "quasar": "2",
     "rxjs": "^7.8.0",
     "ual-anchor": "^1.1.2",
-    "ual-oreid": "^1.0.0",
     "ual-wombat": "^0.3.3",
     "universal-authenticator-library": "^0.3.0",
     "vue": "3",

src/App.vue

@@ -1,12 +1,10 @@
 <script lang="ts">
-import { getAntelope, useChainStore } from 'src/antelope';
+import { useChainStore } from 'src/antelope';
 import EVMChainSettings from 'src/antelope/chains/EVMChainSettings';
 import { TELOS_CHAIN_IDS } from 'src/antelope/chains/chain-constants';
 import packageInfo from '../package.json';
 import { defineComponent } from 'vue';
 
-export const isTodayBeforeTelosCloudDown = new Date().getTime() < new Date('2023-12-31').getTime();
-
 export default defineComponent({
     name: 'App',
     created() {
@@ -44,16 +42,15 @@ export default defineComponent({
         }
     },
     mounted() {
-        const chainSettings = useChainStore().currentChain.settings as EVMChainSettings;
-        // if the organization using this application is Telos, import Fathom analytics
-        if (TELOS_CHAIN_IDS.includes(chainSettings.getChainId())) {
-            const script = document.createElement('script');
-            script.src = 'https://cdn.usefathom.com/script.js';
-            script.dataset.site = 'ISPYEAKT';
-            script.dataset.spa = 'auto';
-            script.defer = true;
-            document.body.appendChild(script);
-        }
+
+        // Telos Wallet allows users to switch between Telos Zero and Telos EVM.
+        // The loading of this script should be independent of the chain the user is on.
+        const script = document.createElement('script');
+        script.src = 'https://cdn.usefathom.com/script.js';
+        script.dataset.site = 'ISPYEAKT';
+        script.dataset.spa = 'auto';
+        script.defer = true;
+        document.body.appendChild(script);
     },
 });
 </script>

src/antelope/chains/chain-constants.ts

@@ -10,8 +10,6 @@ export const TELOS_ANALYTICS_EVENT_NAMES = {
     loginFailedMetamask: 'Login Failed - Metamask',
     loginSuccessfulSafepal: 'Login Successful - Safepal',
     loginFailedSafepal: 'Login Failed - Safepal',
-    loginSuccessfulOreId: 'Login Successful - OreId',
-    loginFailedOreId: 'Login Failed - OreId',
     loginFailedWalletConnect: 'Login Failed - WalletConnect',
     loginSuccessfulWalletConnect: 'Login Successful - WalletConnect',
     loginSuccessfulBrave: 'Login Successful - Brave',

src/antelope/config/AntelopeConfig.ts

@@ -10,11 +10,6 @@ export interface ComplexMessage {
     text: string,
 }
 
-export const chainNetworkNames: Record<string, string> = {
-    telos: 'telos-evm',
-    'telos-testnet': 'telos-evm-testnet',
-};
-
 export const errorToString = (error: unknown) =>
     getAntelope().config.errorToStringHandler(error);
 

src/antelope/index.ts

@@ -3,7 +3,7 @@ import { App, toRaw } from 'vue';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { Store } from 'pinia';
 
-import { AntelopeConfig, AntelopeDebug, chainNetworkNames } from 'src/antelope/config';
+import { AntelopeConfig, AntelopeDebug } from 'src/antelope/config';
 import installPinia from 'src/antelope/stores';
 
 import { ChainModel } from 'src/antelope/stores/chain';
@@ -75,17 +75,6 @@ export class Antelope {
             }
         });
 
-        const chainStore = useChainStore();
-
-        if (!chainStore.currentChain) {
-            if (!process.env.CHAIN_NAME) {
-                console.error('No chain name specified in environment config; the application will not run correctly');
-            } else {
-                const network: string = chainNetworkNames[process.env.CHAIN_NAME];
-                chainStore.setChain(CURRENT_CONTEXT, network);
-            }
-        }
-
         // Initializing store
         stores.user.loadUsers();
     }

src/antelope/stores/account.ts

@@ -20,7 +20,6 @@ import { initFuelUserWrapper } from 'src/api/fuel';
 import { createTraceFunction, errorToString } from 'src/antelope/config';
 import NativeChainSettings from 'src/antelope/chains/NativeChainSettings';
 import {
-    Action,
     Label,
     NativeTransactionResponse,
     addressString,
@@ -29,7 +28,6 @@ import { EVMAuthenticator } from 'src/antelope/wallets';
 import { truncateAddress } from 'src/antelope/stores/utils/text-utils';
 import { toRaw } from 'vue';
 import { getAddress } from 'ethers/lib/utils';
-import { OreIdAuthenticator } from 'ual-oreid';
 
 // dependencies --
 import {
@@ -119,8 +117,7 @@ export const useAccountStore = defineStore(store_name, {
                 await authenticator.init();
                 const ualUsers = await authenticator.login();
                 if (ualUsers?.length) {
-                    // OreId has it's own authorization service, only init fuel service for other ual users
-                    const ualUser = ualUsers[0] instanceof OreIdAuthenticator ? ualUsers[0] : await initFuelUserWrapper(ualUsers[0]);
+                    const ualUser = await initFuelUserWrapper(ualUsers[0]);
                     const permission = (ualUser as unknown as { requestPermission: string })
                         .requestPermission ?? 'active';
                     const account = await ualUser.getAccountName();
@@ -244,8 +241,10 @@ export const useAccountStore = defineStore(store_name, {
                 const account = localStorage.getItem('account');
                 const isNative = localStorage.getItem('isNative') === 'true';
                 const autoLogin = localStorage.getItem('autoLogin');
-                this.trace('autoLogin', account, isNative, autoLogin);
+                this.trace('autoLogin', account, network, autoLogin, isNative, this.__accounts[label]);
                 if (account && network && autoLogin && !this.__accounts[label]) {
+                    // Ensure we are working with the correct network
+                    useChainStore().setChain(label, network);
                     if (isNative) {
                         const authenticators = getAntelope().config.authenticatorsGetter();
                         const authenticator = authenticators.find(
@@ -270,6 +269,8 @@ export const useAccountStore = defineStore(store_name, {
                             network,
                         });
                     }
+                } else {
+                    this.trace('autoLogin', 'canceled!', account, network, autoLogin, !this.__accounts[label]);
                 }
             } catch (error) {
                 console.error('Error: ', errorToString(error));
@@ -297,7 +298,6 @@ export const useAccountStore = defineStore(store_name, {
             this.trace('sendAction', account, data, name, actor, permission);
             try {
                 useFeedbackStore().setLoading('account.sendAction');
-                console.error('Account.sendAction() not implemented', account, data, name, actor, permission);
                 return Promise.resolve({ hash: '0x0' } as NativeTransactionResponse);
             } catch (error) {
                 console.error('Error: ', errorToString(error));
@@ -307,16 +307,6 @@ export const useAccountStore = defineStore(store_name, {
             }
         },
 
-        async sendTransaction(actions: Action[]) {
-            this.trace('sendTransaction', actions);
-            try {
-                useFeedbackStore().setLoading('account.sendTransaction');
-                console.error('Account.sendTransaction() not implemented', actions);
-            } catch (error) {
-                console.error('Error: ', errorToString(error));
-            }
-        },
-
         async fetchAccountDataFor(label: string, account: AccountModel) {
             this.trace('fetchAccountDataFor', account);
             try {

src/antelope/stores/allowances.ts

@@ -239,6 +239,11 @@ export const useAllowancesStore = defineStore(store_name, {
 
             const chainSettings = useChainStore().currentChain.settings as EVMChainSettings;
 
+            if (chainSettings.isNative()) {
+                this.trace('fetchAllowancesForAccount', 'Native chain does not have allowances');
+                return;
+            }
+
             const erc20AllowancesPromise   = chainSettings.fetchErc20Allowances(account, { limit: ALLOWANCES_LIMIT });
             const erc721AllowancesPromise  = chainSettings.fetchErc721Allowances(account, { limit: ALLOWANCES_LIMIT });
             const erc1155AllowancesPromise = chainSettings.fetchErc1155Allowances(account, { limit: ALLOWANCES_LIMIT });

src/antelope/stores/chain.ts

@@ -180,23 +180,31 @@ export const useChainStore = defineStore(store_name, {
         },
         async updateStakedRatio(label: string): Promise<void> {
             // first we need the contract instance to be able to execute queries
-            this.trace('actualUpdateStakedRatio', label);
-            useFeedbackStore().setLoading('actualUpdateStakedRatio');
-            const chain_settings = useChainStore().getChain(label).settings as EVMChainSettings;
-            const sysToken = chain_settings.getSystemToken();
-            const stkToken = chain_settings.getStakedSystemToken();
+            this.trace('updateStakedRatio', label);
+            const chain = this.getChain(label);
+            try {
+                useFeedbackStore().setLoading('updateStakedRatio');
+                if (!chain.settings.isNative()) {
+                    const chain_settings = chain.settings as EVMChainSettings;
+                    const sysToken = chain_settings.getSystemToken();
+                    const stkToken = chain_settings.getStakedSystemToken();
 
-            const abi = [stlosAbiPreviewDeposit[0], stlosAbiPreviewRedeem[0]];
-            const provider = await getAntelope().wallets.getWeb3Provider();
-            const contractInstance = new ethers.Contract(stkToken.address, abi, provider);
-            // Now we preview a deposit of 1 SYS to get the ratio
-            const oneSys = ethers.utils.parseUnits('1.0', sysToken.decimals);
-            const stakedRatio = await contractInstance.previewDeposit(oneSys.toString());
-            const unstakedRatio:ethers.BigNumber = await contractInstance.previewRedeem(oneSys);
-            // Finally we update the store
-            this.setStakedRatio(label, stakedRatio);
-            this.setUnstakedRatio(label, unstakedRatio);
-            useFeedbackStore().unsetLoading('actualUpdateStakedRatio');
+                    const abi = [stlosAbiPreviewDeposit[0], stlosAbiPreviewRedeem[0]];
+                    const provider = await getAntelope().wallets.getWeb3Provider();
+                    const contractInstance = new ethers.Contract(stkToken.address, abi, provider);
+                    // Now we preview a deposit of 1 SYS to get the ratio
+                    const oneSys = ethers.utils.parseUnits('1.0', sysToken.decimals);
+                    const stakedRatio = await contractInstance.previewDeposit(oneSys.toString());
+                    const unstakedRatio:ethers.BigNumber = await contractInstance.previewRedeem(oneSys);
+                    // Finally we update the store
+                    this.setStakedRatio(label, stakedRatio);
+                    this.setUnstakedRatio(label, unstakedRatio);
+                }
+            } catch (error) {
+                console.error(error);
+            } finally {
+                useFeedbackStore().unsetLoading('updateStakedRatio');
+            }
         },
         async updateGasPrice(label: string): Promise<void> {
             useFeedbackStore().setLoading('updateGasPrice');
@@ -206,6 +214,8 @@ export const useChainStore = defineStore(store_name, {
                 if (!chain.settings.isNative()) {
                     const wei = await (chain.settings as EVMChainSettings).getGasPrice();
                     (chain as EvmChainModel).gasPrice = wei;
+                } else {
+                    this.trace('updateGasPrice', label, 'Native chain has no gas costs');
                 }
             } catch (error) {
                 console.error(error);
@@ -237,7 +247,6 @@ export const useChainStore = defineStore(store_name, {
                 // make the change only if they are different
                 if (network !== this.__chains[label]?.settings.getNetwork()) {
                     this.__chains[label] = newChainModel(network, settings[network].isNative());
-                    this.trace('setChain', label, network, '--> void this.updateChainData(label);');
                     void this.updateChainData(label);
                     getAntelope().events.onNetworkChanged.next(
                         { label, chain: this.__chains[label] },
@@ -248,16 +257,43 @@ export const useChainStore = defineStore(store_name, {
             }
         },
         setStakedRatio(label: string, ratio: ethers.BigNumber) {
-            const decimals = (this.getChain(label).settings as EVMChainSettings).getStakedSystemToken().decimals;
-            const ratioNumber = parseFloat(ethers.utils.formatUnits(ratio, decimals));
-            this.trace('setStakedRatio', label, ratio.toString(), ratioNumber);
-            (this.__chains[label] as EvmChainModel).stakeRatio = ratio;
+            this.trace('setStakedRatio', label, ratio.toString());
+            const chain = this.getChain(label);
+            try {
+                if (!chain.settings.isNative()) {
+                    const decimals = (this.getChain(label).settings as EVMChainSettings).getStakedSystemToken().decimals;
+                    const ratioNumber = parseFloat(ethers.utils.formatUnits(ratio, decimals));
+                    this.trace('setStakedRatio', label, ratio.toString(), ratioNumber);
+                    (this.__chains[label] as EvmChainModel).stakeRatio = ratio;
+                } else {
+                    this.trace('setStakedRatio', label, 'Native chain has no staked ratio');
+                }
+            } catch (error) {
+                console.error(error);
+                throw new Error('antelope.chain.error_token_list');
+            } finally {
+                useFeedbackStore().unsetLoading('updateTokenList');
+            }
+
         },
         setUnstakedRatio(label: string, ratio: ethers.BigNumber) {
-            const decimals = (this.getChain(label).settings as EVMChainSettings).getStakedSystemToken().decimals;
-            const ratioNumber = parseFloat(ethers.utils.formatUnits(ratio, decimals));
-            this.trace('setUnstakedRatio', label, ratio.toString(), ratioNumber);
-            (this.__chains[label] as EvmChainModel).unstakeRatio = ratio;
+            this.trace('setUnstakedRatio', label, ratio.toString());
+            const chain = this.getChain(label);
+            try {
+                if (!chain.settings.isNative()) {
+                    const decimals = (this.getChain(label).settings as EVMChainSettings).getStakedSystemToken().decimals;
+                    const ratioNumber = parseFloat(ethers.utils.formatUnits(ratio, decimals));
+                    this.trace('setUnstakedRatio', label, ratio.toString(), ratioNumber);
+                    (this.__chains[label] as EvmChainModel).unstakeRatio = ratio;
+                } else {
+                    this.trace('setUnstakedRatio', label, 'Native chain has no unstaked ratio');
+                }
+            } catch (error) {
+                console.error(error);
+                throw new Error('antelope.chain.error_token_list');
+            } finally {
+                useFeedbackStore().unsetLoading('updateTokenList');
+            }
         },
     },
 });

src/antelope/stores/history.ts

@@ -190,11 +190,14 @@ export const useHistoryStore = defineStore(store_name, {
             const contractStore = useContractStore();
 
             this.trace('fetchEvmNftTransfersForAccount', label);
-
-            feedbackStore.setLoading('history.fetchEvmNftTransfersForAccount');
-
             const chainSettings = useChainStore().getChain(label).settings as EVMChainSettings;
 
+            if (chainSettings.isNative()) {
+                this.trace('fetchEvmNftTransfersForAccount', 'Native networks not supported yet');
+                return;
+            }
+
+            feedbackStore.setLoading('history.fetchEvmNftTransfersForAccount');
             try {
                 // get all erc721 and erc1155 transfers for the given account
                 const [