telosnetwork · Viterbo · Dec 6, 2023 · Dec 8, 2023 · Dec 13, 2023 · Dec 18, 2023
diff --git a/.gitignore b/.gitignore
@@ -34,5 +34,5 @@ yarn-error.log*
 *.ntvs*
 *.njsproj
 *.sln
-
+.vscode
 .env
diff --git a/env.js b/env.js
@@ -9,6 +9,7 @@ const sharedEnv = {
  IMGUR_CLIENT_ID: 'b6f46df9d1da9d9',
  EVM_CONTRACT: 'eosio.evm',
  PROJECT_ID: '2392473d6d98499c7138cd2d705a791f',
+ GOOGLE_APP_ID: '639241197544-kcubenhmti6u7ef3uj360n2lcl5cmn8c.apps.googleusercontent.com', // Viter's client id
 };
 
 const TESTNET = {
@@ -22,8 +23,9 @@ 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',
+ DEFAULT_NETWORK: 'telos-evm-testnet',
+ METAKEEP_APP_ID_NATIVE: 'ad5e05fb-280a-41ae-b186-5a2654567b92', // Viter's app id
+ METAKEEP_APP_ID_EVM: 'd190c88f-1bb5-4e16-bc48-96dbf33b77e0', // Viter's app id
 };
 
 const MAINNET = {
@@ -37,8 +39,9 @@ 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',
+ DEFAULT_NETWORK: 'telos-evm',
+ METAKEEP_APP_ID_NATIVE: 'ad5e05fb-280a-41ae-b186-5a2654567b92', // Viter's app id - TODO: WE NEED TO CHANGE THIS
+ METAKEEP_APP_ID_EVM: 'd190c88f-1bb5-4e16-bc48-96dbf33b77e0', // Viter's app id - TODO: WE NEED TO CHANGE THIS
 };
 
 const env = process.env.NETWORK === 'mainnet' ? MAINNET : TESTNET;

diff --git a/package.json b/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",

diff --git a/quasar.conf.js b/quasar.conf.js
@@ -30,7 +30,7 @@ module.exports = function(/* ctx */) {
  // app boot file (/src/boot)
  // --> boot files are part of "main.js"
  // https://quasar.dev/quasar-cli/boot-files
- boot: ['ual', 'hyperion', 'i18n', 'fuel', 'api', 'errorHandling', 'helpers', 'mixin', 'emitter', 'telosApi', 'wagmi', 'antelope'],
+ boot: ['ual', 'hyperion', 'i18n', 'fuel', 'api', 'errorHandling', 'helpers', 'mixin', 'emitter', 'telosApi', 'wagmi', 'antelope', 'telosCloudJs'],
 
  // https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css
  css: ['index.scss'],

diff --git a/src/App.vue b/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>

diff --git a/src/antelope/chains/NativeChainSettings.ts b/src/antelope/chains/NativeChainSettings.ts
@@ -411,6 +411,16 @@ export default abstract class NativeChainSettings implements ChainSettings {
  return this.eosioCore.v1.chain.get_account(address);
  }
 
+ async isAccountNameAvailable(accountName: string): Promise<boolean> {
+ return new Promise((resolve) => {
+ this.eosioCore.v1.chain.get_account(accountName).then(() => {
+ resolve(false);
+ }).catch(() => {
+ resolve(true);
+ });
+ });
+ }
+
  async getKeyAccounts(key: string): Promise<KeyAccounts> {
  return (await this.eosioCore.v1.history.get_key_accounts(key)) as unknown as KeyAccounts;
  }

diff --git a/src/antelope/chains/chain-constants.ts b/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',

diff --git a/src/antelope/config/AntelopeConfig.ts b/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);
 

diff --git a/src/antelope/index.ts b/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();
  }

diff --git a/src/antelope/stores/account.ts b/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 {
@@ -40,7 +38,7 @@ import {
 } from 'src/antelope';
 
 
-export interface LoginNativeActionData {
+export interface loginZeroActionData {
  authenticator: Authenticator,
  network: string,
 }
@@ -112,15 +110,17 @@ export const useAccountStore = defineStore(store_name, {
  },
  actions: {
  trace: createTraceFunction(store_name),
- async loginNative({ authenticator, network }: LoginNativeActionData): Promise<boolean> {
- this.trace('loginNative', authenticator, network);
+ async loginZero({ authenticator, network }: loginZeroActionData): Promise<boolean> {
+ this.trace('loginZero', authenticator, network);
  let success = false;
  try {
+ this.trace('loginZero', 'authenticator.init()...');
  await authenticator.init();
+ this.trace('loginZero', 'authenticator.login()...');
  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]);
+ this.trace('loginZero', 'authenticator.login() OK! ualUsers:', ualUsers);
+ const ualUser = await initFuelUserWrapper(ualUsers[0]);
  const permission = (ualUser as unknown as { requestPermission: string })
  .requestPermission ?? 'active';
  const account = await ualUser.getAccountName();
@@ -244,8 +244,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(
@@ -255,7 +257,7 @@ export const useAccountStore = defineStore(store_name, {
  console.error(authenticators.map(a => a.getName()).join(', '));
  throw new Error('antelope.account.error_auto_login');
  }
- this.loginNative({
+ this.loginZero({
  authenticator,
  network,
  });
@@ -270,6 +272,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 +301,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 +310,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 {

diff --git a/src/antelope/stores/allowances.ts b/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 });