Skip to content

feat: solana explorer to solscan #31276

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Mar 25, 2025
+38 −32
Merged

feat: solana explorer to solscan #31276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
98d1526
feat: solana explorer to solscan
aganglada Mar 25, 2025
2bbbd70
chore: update solscan path
zone-live Mar 25, 2025
6c71bf4
chore: update solana version
aganglada Mar 25, 2025
f3e0828
chore: update to /account
zone-live Mar 25, 2025
7cadebf
Merge branch 'feat/move-solana-to-solscan' of github.com:MetaMask/met…
zone-live Mar 25, 2025
02386e1
Merge branch 'main' into feat/move-solana-to-solscan
zone-live Mar 25, 2025
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@
"@metamask/snaps-rpc-methods": "^12.0.0",
"@metamask/snaps-sdk": "^6.19.0",
"@metamask/snaps-utils": "^9.0.1",
"@metamask/solana-wallet-snap": "^1.14.0",
"@metamask/solana-wallet-snap": "^1.15.1",
"@metamask/transaction-controller": "^52.1.0",
"@metamask/user-operation-controller": "^24.0.1",
"@metamask/utils": "^11.1.0",
Expand Down
33 changes: 18 additions & 15 deletions shared/constants/multichain/networks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,35 +57,38 @@ export const MULTICHAIN_NETWORK_TO_NICKNAME: Record<CaipChainId, string> = {
export const BITCOIN_TOKEN_IMAGE_URL = './images/bitcoin-logo.svg';
export const SOLANA_TOKEN_IMAGE_URL = './images/solana-logo.svg';

export const BITCOIN_BLOCK_EXPLORER_URL = 'https://mempool.space';
export const SOLANA_BLOCK_EXPLORER_URL = 'https://solscan.io';

export const MULTICHAIN_NETWORK_BLOCK_EXPLORER_FORMAT_URLS_MAP: Record<
CaipChainId,
MultichainBlockExplorerFormatUrls
> = {
[MultichainNetworks.BITCOIN]: {
url: 'https://mempool.space',
address: 'https://mempool.space/address/{address}',
transaction: 'https://mempool.space/tx/{txId}',
url: BITCOIN_BLOCK_EXPLORER_URL,
address: `${BITCOIN_BLOCK_EXPLORER_URL}/address/{address}`,
transaction: `${BITCOIN_BLOCK_EXPLORER_URL}/tx/{txId}`,
},
[MultichainNetworks.BITCOIN_TESTNET]: {
url: 'https://mempool.space',
address: 'https://mempool.space/testnet/address/{address}',
transaction: 'https://mempool.space/testnet/tx/{txId}',
url: BITCOIN_BLOCK_EXPLORER_URL,
address: `${BITCOIN_BLOCK_EXPLORER_URL}/testnet/address/{address}`,
transaction: `${BITCOIN_BLOCK_EXPLORER_URL}/testnet/tx/{txId}`,
},

[MultichainNetworks.SOLANA]: {
url: 'https://explorer.solana.com',
address: 'https://explorer.solana.com/address/{address}',
transaction: 'https://explorer.solana.com/tx/{txId}',
url: SOLANA_BLOCK_EXPLORER_URL,
address: `${SOLANA_BLOCK_EXPLORER_URL}/account/{address}`,
transaction: `${SOLANA_BLOCK_EXPLORER_URL}/tx/{txId}`,
},
[MultichainNetworks.SOLANA_DEVNET]: {
url: 'https://explorer.solana.com',
address: 'https://explorer.solana.com/address/{address}?cluster=devnet',
transaction: 'https://explorer.solana.com/tx/{txId}?cluster=devnet',
url: SOLANA_BLOCK_EXPLORER_URL,
address: `${SOLANA_BLOCK_EXPLORER_URL}/account/{address}?cluster=devnet`,
transaction: `${SOLANA_BLOCK_EXPLORER_URL}/tx/{txId}?cluster=devnet`,
},
[MultichainNetworks.SOLANA_TESTNET]: {
url: 'https://explorer.solana.com',
address: 'https://explorer.solana.com/address/{address}?cluster=testnet',
transaction: 'https://explorer.solana.com/tx/{txId}?cluster=testnet',
url: SOLANA_BLOCK_EXPLORER_URL,
address: `${SOLANA_BLOCK_EXPLORER_URL}/account/{address}?cluster=testnet`,
transaction: `${SOLANA_BLOCK_EXPLORER_URL}/tx/{txId}?cluster=testnet`,
},
} as const;

Expand Down
4 changes: 2 additions & 2 deletions test/e2e/page-objects/pages/home/transaction-details.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Driver } from '../../../webdriver/driver';
class TransactionDetailsPage {
private readonly driver: Driver;

private readonly solanaExplorerUrl = 'https://explorer.solana.com';
private readonly solanaExplorerUrl = 'https://solscan.io';

private readonly transactionFromToLink = (accountAddress: string) => {
return {
Expand Down Expand Up @@ -55,7 +55,7 @@ class TransactionDetailsPage {

async check_transactionFromToLink(fromToAddress: string): Promise<void> {
await this.driver.waitForSelector(
By.css(`a[href='${this.solanaExplorerUrl}/address/${fromToAddress}']`),
By.css(`a[href='${this.solanaExplorerUrl}/account/${fromToAddress}']`),
);
}

Expand Down
8 changes: 4 additions & 4 deletions ui/components/app/multichain-transaction-details-modal/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import {
* Different networks have different URL patterns:
* Bitcoin Mainnet: https://mempool.space/tx/{txId}
* Bitcoin Testnet: https://mempool.space/testnet/tx/{txId}
* Solana Mainnet: https://explorer.solana.com/tx/{txId}
* Solana Devnet: https://explorer.solana.com/tx/{txId}?cluster=devnet
* Solana Mainnet: https://solscan.io/tx/{txId}
* Solana Devnet: https://solscan.io/tx/{txId}?cluster=devnet
*
* @param txId - Transaction ID
* @param chainId - Network chain ID
Expand All @@ -41,8 +41,8 @@ export const getTransactionUrl = (txId: string, chainId: string): string => {
* Different networks have different URL patterns:
* Bitcoin Mainnet: https://mempool.space/address/{address}
* Bitcoin Testnet: https://mempool.space/testnet/address/{address}
* Solana Mainnet: https://explorer.solana.com/address/{address}
* Solana Devnet: https://explorer.solana.com/address/{address}?cluster=devnet
* Solana Mainnet: https://solscan.io/account/{address}
* Solana Devnet: https://solscan.io/account/{address}?cluster=devnet
*
* @param address - Wallet address
* @param chainId - Network chain ID
Expand Down
13 changes: 8 additions & 5 deletions ...ts/app/multichain-transaction-details-modal/multichain-transaction-details-modal.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ import { useI18nContext } from '../../../hooks/useI18nContext';
import { renderWithProvider } from '../../../../test/lib/render-helpers';
import { MOCK_ACCOUNT_SOLANA_MAINNET } from '../../../../test/data/mock-accounts';
import { MetaMetricsContext } from '../../../contexts/metametrics';
import { MultichainNetworks } from '../../../../shared/constants/multichain/networks';
import {
MultichainNetworks,
SOLANA_BLOCK_EXPLORER_URL,
} from '../../../../shared/constants/multichain/networks';
import mockState from '../../../../test/data/mock-state.json';
import configureStore from '../../../store/store';
import { MultichainTransactionDetailsModal } from './multichain-transaction-details-modal';
Expand Down Expand Up @@ -241,7 +244,7 @@ describe('MultichainTransactionDetailsModal', () => {
const chainId = MultichainNetworks.SOLANA;

expect(getTransactionUrl(txId, chainId)).toBe(
`https://explorer.solana.com/tx/${txId}`,
`${SOLANA_BLOCK_EXPLORER_URL}/tx/${txId}`,
);
});

Expand All @@ -251,7 +254,7 @@ describe('MultichainTransactionDetailsModal', () => {
const chainId = MultichainNetworks.SOLANA_DEVNET;

expect(getTransactionUrl(txId, chainId)).toBe(
`https://explorer.solana.com/tx/${txId}?cluster=devnet`,
`${SOLANA_BLOCK_EXPLORER_URL}/tx/${txId}?cluster=devnet`,
);
});

Expand All @@ -260,7 +263,7 @@ describe('MultichainTransactionDetailsModal', () => {
const chainId = MultichainNetworks.SOLANA;

expect(getAddressUrl(address, chainId)).toBe(
`https://explorer.solana.com/address/${address}`,
`${SOLANA_BLOCK_EXPLORER_URL}/account/${address}`,
);
});

Expand All @@ -269,7 +272,7 @@ describe('MultichainTransactionDetailsModal', () => {
const chainId = MultichainNetworks.SOLANA_DEVNET;

expect(getAddressUrl(address, chainId)).toBe(
`https://explorer.solana.com/address/${address}?cluster=devnet`,
`${SOLANA_BLOCK_EXPLORER_URL}/account/${address}?cluster=devnet`,
);
});

Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6474,10 +6474,10 @@ __metadata:
languageName: node
linkType: hard

"@metamask/solana-wallet-snap@npm:^1.14.0":
version: 1.14.0
resolution: "@metamask/solana-wallet-snap@npm:1.14.0"
checksum: 10/f09baf18f259ad560877230859ebed88fb816fde8a4057794b477f72af838b202811a39133a8771561a12973755f1ca3f635095ed281656a51dfc4a68cb2bf58
"@metamask/solana-wallet-snap@npm:^1.15.1":
version: 1.15.1
resolution: "@metamask/solana-wallet-snap@npm:1.15.1"
checksum: 10/f6a63cb410b0267ed29824095cedcafbc87e9bcb82690e4ade75537a33e5c7baadcb2b5e6148eae8ab732b140f52b7222fdb48a18f62222271d11e8c99f10769
languageName: node
linkType: hard

Expand Down Expand Up @@ -27346,7 +27346,7 @@ __metadata:
"@metamask/snaps-rpc-methods": "npm:^12.0.0"
"@metamask/snaps-sdk": "npm:^6.19.0"
"@metamask/snaps-utils": "npm:^9.0.1"
"@metamask/solana-wallet-snap": "npm:^1.14.0"
"@metamask/solana-wallet-snap": "npm:^1.15.1"
"@metamask/test-bundler": "npm:^1.0.0"
"@metamask/test-dapp": "npm:9.1.0"
"@metamask/test-dapp-multichain": "npm:^0.6.0"
Expand Down
Loading