Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#753 | Crosschain - Step Four: change hardcoded telos id for dynamic chain id #769

Open
wants to merge 32 commits into
base: 741-epic-crosschain-compatable
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b24d932
TransactionAction cases: Function call, TLOS transfer, Contract Creation
Viterbo May 14, 2024
a71816a
Merge pull request #749 from telosnetwork/master
pmjanus May 21, 2024
54ca852
fix Metamask popup problem
Viterbo May 21, 2024
644119f
saving wip
Viterbo May 22, 2024
7920f6d
bugfix - avoid using null contract
Viterbo May 24, 2024
6c455d0
Update ContractManager.js
Viterbo May 24, 2024
74f4cd4
Merge pull request #756 from telosnetwork/755-cant-load-internal-tran…
pmjanus May 24, 2024
48f895f
proposing a popup Image viewr as a solution for the image download pr…
Viterbo May 26, 2024
84cd55e
add TransactionInputViewer component
Viterbo May 27, 2024
7ac362a
Merge pull request #750 from telosnetwork/715-site-asks-for-metamask-…
pmjanus May 28, 2024
54fd79b
Hide the Default View on input Viewer
Viterbo May 28, 2024
1801156
fixing transaction page design for mobile
Viterbo May 28, 2024
f900c42
Input Viewer with multiline data table + copy to cliboard button
Viterbo May 29, 2024
bd3c5cf
fix mobile + added copy to clip by line
Viterbo May 29, 2024
f82b350
workaround for the NaN age issue
Viterbo May 29, 2024
8817abc
Now the boolean queries show false boolean value
Viterbo May 29, 2024
a2ce76d
first part
Viterbo May 30, 2024
8bc625e
make current chan dependant of env.NETWORK_EVM_NAME
Viterbo May 31, 2024
5755105
Merge branch '751-crosschain--bring-all-chain-settings-from-telos-wal…
Viterbo May 31, 2024
083952c
Merge pull request #764 from telosnetwork/737-teloscan-date-nan-issues
pmjanus May 31, 2024
f34dccf
Merge pull request #759 from telosnetwork/747-decode-trx-input-to-sho…
pmjanus May 31, 2024
79cd79b
Merge pull request #742 from telosnetwork/739-transaction-action-fiel…
pmjanus May 31, 2024
4c2f93c
Merge branch 'dev' into 740-stop-downloading-nft-preview-image-on-cli…
Viterbo May 31, 2024
6efbda3
hide tooltip on mobile
Viterbo May 31, 2024
3d472be
hide another tooltip on mobile
Viterbo May 31, 2024
604d0d7
Merge pull request #758 from telosnetwork/740-stop-downloading-nft-pr…
pmjanus May 31, 2024
0547879
saving wip
Viterbo Jun 3, 2024
5a0b6fb
all environment vars were moved to the dynamic chain settings
Viterbo Jun 4, 2024
623d0d0
pull dev into this branch
Viterbo Jun 4, 2024
89eaf0d
first approach
Viterbo Jun 5, 2024
a149826
all pages update when network changes
Viterbo Jun 7, 2024
b4a7f98
Cross chain support ready!
Viterbo Jun 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ module.exports = {
'curly': 'error',
'brace-style': ['error', '1tbs', { 'allowSingleLine': false }],
'no-restricted-imports': ['error', {
'patterns': ['.*'], // disallow relative imports
}],
'no-return-assign': ['error', 'always'],
'no-param-reassign': 'error',
Expand Down
41 changes: 3 additions & 38 deletions env.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,59 +2,24 @@
The environment variables ares set based on the single variable `MAINNET=true`
(or absence thereof) in the root `.env` file. The following env vars are then assigned in
`quasar.config.js`.
*/

Cross chain support: most of the variables that were here have been moved to `src/antelope/chains/evm`

*/
const sharedEnv = {
NETWORK_PROTOCOL: 'https',
NETWORK_PORT: 443,
NETWORK_EVM_CONTRACT: 'eosio.evm',
PROJECT_ID: '14ec76c44bae7d461fa0f5fd5f8a9da1',
};

const TESTNET = {
...sharedEnv,
APP_NAME: 'Teloscan (testnet)',
NETWORK_HOST: 'testnet.telos.net',
NETWORK_CHAIN_ID:
'1eaa0824707c8c16bd25145493bf062aecddfeb56c736f6ba6397f3195f33c9f',
NETWORK_EVM_RPC: 'https://testnet.telos.net/evm',
NETWORK_EVM_ENDPOINT: 'https://testnet.telos.net',
NETWORK_EVM_CHAIN_ID: 41,
NETWORK_EVM_DISPLAY: 'Telos Testnet',
NETWORK_EVM_NAME: 'telos-evm-testnet',
HYPERION_ENDPOINT: 'https://testnet.telos.net',
NETWORK_EXPLORER: 'https://explorer-test.telos.net',
TELOS_API_ENDPOINT: 'https://api-dev.telos.net/v1', //'http://localhost:9999/v1', //for local instance of api
INDEXER_API_ENDPOINT: 'https://api.testnet.teloscan.io/v1',
VERIFIED_CONTRACTS_BUCKET: 'verified-evm-contracts-testnet',
STAKED_TLOS_CONTRACT_ADDRESS: '0xa9991E4daA44922D00a78B6D986cDf628d46C4DD',
TELOS_ESCROW_CONTRACT_ADDRESS: '0x7E9cF9fBc881652B05BB8F26298fFAB538163b6f',
MULTICALL_CONTRACT_ADDRESS: '0x39b0CF441E616e4e21a5f7b37c9CE0Ca750bd05B',
OREID_APP_ID: 't_1e0417d2456e401893ec106e5e4c6314',
OREID_APP_ID_NATIVE: 't_a61e9926d5204387a9ac113dfce7cbc5',
};

const MAINNET = {
...sharedEnv,
APP_NAME: 'Teloscan',
NETWORK_HOST: 'mainnet.telos.net',
NETWORK_CHAIN_ID:
'4667b205c6838ef70ff7988f6e8257e8be0e1284a2f59699054a018f743b1d11',
NETWORK_EVM_RPC: 'https://mainnet.telos.net/evm',
NETWORK_EVM_ENDPOINT: 'https://mainnet.telos.net',
NETWORK_EVM_CHAIN_ID: 40,
NETWORK_EVM_DISPLAY: 'Telos',
NETWORK_EVM_NAME: 'telos-evm',
HYPERION_ENDPOINT: 'https://mainnet.telos.net',
NETWORK_EXPLORER: 'https://explorer.telos.net',
TELOS_API_ENDPOINT: 'https://api.telos.net/v1', //'http://localhost:9999/v1', //for local instance of api
INDEXER_API_ENDPOINT: 'https://api.teloscan.io/v1',
VERIFIED_CONTRACTS_BUCKET: 'verified-evm-contracts',
STAKED_TLOS_CONTRACT_ADDRESS: '0xB4B01216a5Bc8F1C8A33CD990A1239030E60C905',
TELOS_ESCROW_CONTRACT_ADDRESS: '0x95F5713A1422Aa3FBD3DCB8D553945C128ee3855',
MULTICALL_CONTRACT_ADDRESS: '0xdDCbf776dF3dE60163066A5ddDF2277cB445E0F3',
OREID_APP_ID: 'p_b5cfbadeb17a44bdaf01e73b3120d202',
OREID_APP_ID_NATIVE: 'p_751f87258d5b40998b55c626d612fd4e',
};

const env = process.env.NETWORK === 'mainnet' ? MAINNET : TESTNET;
Expand Down
4 changes: 0 additions & 4 deletions quasar.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,8 @@ module.exports = function(/* ctx */) {
// --> boot files are part of "main.js"
// https://quasar.dev/quasar-cli/boot-files
boot: [
'ual',
'hyperion',
'i18n',
'api',
'errorHandling',
'telosApi',
'evm',
'q-component-defaults',
'antelope',
Expand Down
8 changes: 3 additions & 5 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import moment from 'moment';

import { getAntelope, useChainStore } from 'src/antelope';
import { TELOS_NETWORK_NAMES } from 'src/antelope/mocks/chain-constants';
import { indexerApi } from 'src/boot/telosApi';
import { ual } from 'src/boot/ual';
import { providerManager } from 'src/boot/evm';

const $store = useStore();
Expand All @@ -28,8 +26,8 @@ onMounted(async () => {
script.defer = true;
document.body.appendChild(script);
}

const health = await indexerApi.get('/health');
const indexerApi = useChainStore().currentChain.settings.getIndexerApi();
const health = await indexerApi.get('/v1/health');

if (health.data?.secondsBehind > 3) {
let behindBy = moment(health.data.secondsBehind * 1000).utc().format('HH:mm:ss');
Expand Down Expand Up @@ -63,7 +61,7 @@ onMounted(async () => {
return;
}
const loginObj = JSON.parse(loginData);
const wallet = ual.getAuthenticators().availableAuthenticators.find(a => a.getName() === loginObj.provider);
const wallet = getAntelope().config.authenticatorsGetter().find(a => a.getName() === loginObj.provider);
wallet?.logout();
}
$store.commit('login/setLogin', {});
Expand Down
Loading
Loading