Skip to content

Commit e1a07e1

Browse files
committed
chore: disable Solana Testnet and Devnet
1 parent 2d96e51 commit e1a07e1

File tree

4 files changed

+98
-7
lines changed

4 files changed

+98
-7
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
diff --git a/dist/constants.cjs b/dist/constants.cjs
2+
index c2a8ba970e2a58c4e93c98ba7bf42fdfae0ece3b..03d8e0d8af6acfdaf572f1c4298e05f31108a315 100644
3+
--- a/dist/constants.cjs
4+
+++ b/dist/constants.cjs
5+
@@ -37,18 +37,19 @@ exports.AVAILABLE_MULTICHAIN_NETWORK_CONFIGURATIONS = {
6+
nativeCurrency: exports.SOL_NATIVE_ASSET,
7+
isEvm: false,
8+
},
9+
- [keyring_api_1.SolScope.Testnet]: {
10+
- chainId: keyring_api_1.SolScope.Testnet,
11+
- name: 'Solana Testnet',
12+
- nativeCurrency: exports.SOL_TESTNET_NATIVE_ASSET,
13+
- isEvm: false,
14+
- },
15+
- [keyring_api_1.SolScope.Devnet]: {
16+
- chainId: keyring_api_1.SolScope.Devnet,
17+
- name: 'Solana Devnet',
18+
- nativeCurrency: exports.SOL_DEVNET_NATIVE_ASSET,
19+
- isEvm: false,
20+
- },
21+
+ // PATCH: Uncomment when Solana Testnet and Devnet are supported
22+
+ // [keyring_api_1.SolScope.Testnet]: {
23+
+ // chainId: keyring_api_1.SolScope.Testnet,
24+
+ // name: 'Solana Testnet',
25+
+ // nativeCurrency: exports.SOL_TESTNET_NATIVE_ASSET,
26+
+ // isEvm: false,
27+
+ // },
28+
+ // [keyring_api_1.SolScope.Devnet]: {
29+
+ // chainId: keyring_api_1.SolScope.Devnet,
30+
+ // name: 'Solana Devnet',
31+
+ // nativeCurrency: exports.SOL_DEVNET_NATIVE_ASSET,
32+
+ // isEvm: false,
33+
+ // },
34+
};
35+
/**
36+
* Array of all the Non-EVM chain IDs.
37+
diff --git a/dist/constants.mjs b/dist/constants.mjs
38+
index fa324b8067e8701c82b87442db845718fcfe6f3e..55b494cef22ae0550ea266261496825c69f4582b 100644
39+
--- a/dist/constants.mjs
40+
+++ b/dist/constants.mjs
41+
@@ -34,18 +34,19 @@ export const AVAILABLE_MULTICHAIN_NETWORK_CONFIGURATIONS = {
42+
nativeCurrency: SOL_NATIVE_ASSET,
43+
isEvm: false,
44+
},
45+
- [SolScope.Testnet]: {
46+
- chainId: SolScope.Testnet,
47+
- name: 'Solana Testnet',
48+
- nativeCurrency: SOL_TESTNET_NATIVE_ASSET,
49+
- isEvm: false,
50+
- },
51+
- [SolScope.Devnet]: {
52+
- chainId: SolScope.Devnet,
53+
- name: 'Solana Devnet',
54+
- nativeCurrency: SOL_DEVNET_NATIVE_ASSET,
55+
- isEvm: false,
56+
- },
57+
+ // PATCH: Uncomment when Solana Testnet and Devnet are supported
58+
+ // [SolScope.Testnet]: {
59+
+ // chainId: SolScope.Testnet,
60+
+ // name: 'Solana Testnet',
61+
+ // nativeCurrency: SOL_TESTNET_NATIVE_ASSET,
62+
+ // isEvm: false,
63+
+ // },
64+
+ // [SolScope.Devnet]: {
65+
+ // chainId: SolScope.Devnet,
66+
+ // name: 'Solana Devnet',
67+
+ // nativeCurrency: SOL_DEVNET_NATIVE_ASSET,
68+
+ // isEvm: false,
69+
+ // },
70+
};
71+
/**
72+
* Array of all the Non-EVM chain IDs.

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@
229229
"gridplus-sdk/elliptic": "^6.6.1",
230230
"@ethereumjs/tx": "patch:@ethereumjs/tx@npm%3A5.4.0#~/.yarn/patches/@ethereumjs-tx-npm-5.4.0-0c4a0f973e.patch",
231231
"@keystonehq/metamask-airgapped-keyring": "patch:@keystonehq/metamask-airgapped-keyring@npm%3A0.15.2#~/.yarn/patches/@keystonehq-metamask-airgapped-keyring-npm-0.15.2-94dd4b40d7.patch",
232-
"@trezor/connect-web": "~9.4.7"
232+
"@trezor/connect-web": "~9.4.7",
233+
"@metamask/multichain-network-controller@npm:^0.5.1": "patch:@metamask/multichain-network-controller@npm%3A0.5.1#~/.yarn/patches/@metamask-multichain-network-controller-npm-0.5.1-6e4a60e4b5.patch"
233234
},
234235
"dependencies": {
235236
"@babel/runtime": "patch:@babel/runtime@npm%3A7.25.9#~/.yarn/patches/@babel-runtime-npm-7.25.9-fe8c62510a.patch",
@@ -304,7 +305,7 @@
304305
"@metamask/metamask-eth-abis": "^3.1.1",
305306
"@metamask/multichain-api-client": "^0.5.0",
306307
"@metamask/multichain-api-middleware": "^0.1.1",
307-
"@metamask/multichain-network-controller": "^0.5.1",
308+
"@metamask/multichain-network-controller": "patch:@metamask/multichain-network-controller@npm%3A0.5.1#~/.yarn/patches/@metamask-multichain-network-controller-npm-0.5.1-6e4a60e4b5.patch",
308309
"@metamask/multichain-transactions-controller": "^0.9.0",
309310
"@metamask/name-controller": "^8.0.3",
310311
"@metamask/network-controller": "patch:@metamask/network-controller@npm%3A23.2.0#~/.yarn/patches/@metamask-network-controller-npm-23.2.0-0223efb98a.patch",

ui/selectors/multichain/networks.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@ export const getMultichainNetworkConfigurationsByChainId =
134134
if (solanaEnabled) {
135135
filteredNonEvmNetworkConfigurationsByChainId[SolScope.Mainnet] =
136136
nonEvmNetworkConfigurationsByChainId[SolScope.Mainnet];
137-
// TODO: Uncomment this when we want to support testnet
137+
// TODO: Uncomment this when we want to support testnet and devnet
138138
// filteredNonEvmNetworkConfigurationsByChainId[SolScope.Testnet] =
139139
// nonEvmNetworkConfigurationsByChainId[SolScope.Testnet];
140-
filteredNonEvmNetworkConfigurationsByChainId[SolScope.Devnet] =
141-
nonEvmNetworkConfigurationsByChainId[SolScope.Devnet];
140+
// filteredNonEvmNetworkConfigurationsByChainId[SolScope.Devnet] =
141+
// nonEvmNetworkConfigurationsByChainId[SolScope.Devnet];
142142
}
143143
///: END:ONLY_INCLUDE_IF
144144

yarn.lock

+20-2
Original file line numberDiff line numberDiff line change
@@ -5944,7 +5944,7 @@ __metadata:
59445944
languageName: node
59455945
linkType: hard
59465946

5947-
"@metamask/multichain-network-controller@npm:^0.5.1":
5947+
"@metamask/multichain-network-controller@npm:0.5.1":
59485948
version: 0.5.1
59495949
resolution: "@metamask/multichain-network-controller@npm:0.5.1"
59505950
dependencies:
@@ -5962,6 +5962,24 @@ __metadata:
59625962
languageName: node
59635963
linkType: hard
59645964

5965+
"@metamask/multichain-network-controller@patch:@metamask/multichain-network-controller@npm%3A0.5.1#~/.yarn/patches/@metamask-multichain-network-controller-npm-0.5.1-6e4a60e4b5.patch":
5966+
version: 0.5.1
5967+
resolution: "@metamask/multichain-network-controller@patch:@metamask/multichain-network-controller@npm%3A0.5.1#~/.yarn/patches/@metamask-multichain-network-controller-npm-0.5.1-6e4a60e4b5.patch::version=0.5.1&hash=dd3b1e"
5968+
dependencies:
5969+
"@metamask/base-controller": "npm:^8.0.0"
5970+
"@metamask/controller-utils": "npm:^11.7.0"
5971+
"@metamask/keyring-api": "npm:^17.4.0"
5972+
"@metamask/keyring-internal-api": "npm:^6.0.1"
5973+
"@metamask/superstruct": "npm:^3.1.0"
5974+
"@metamask/utils": "npm:^11.2.0"
5975+
"@solana/addresses": "npm:^2.0.0"
5976+
peerDependencies:
5977+
"@metamask/accounts-controller": ^27.0.0
5978+
"@metamask/network-controller": ^23.0.0
5979+
checksum: 10/6c459cc4c89c9b790beec2a0455645f806f2ff1fd17eabbdf446309cc788831b55560a80756f8d6070cbf86cbab26c9127d470eda1ef31952a38856485634c11
5980+
languageName: node
5981+
linkType: hard
5982+
59655983
"@metamask/multichain-transactions-controller@npm:^0.9.0":
59665984
version: 0.9.0
59675985
resolution: "@metamask/multichain-transactions-controller@npm:0.9.0"
@@ -30085,7 +30103,7 @@ __metadata:
3008530103
"@metamask/metamask-eth-abis": "npm:^3.1.1"
3008630104
"@metamask/multichain-api-client": "npm:^0.5.0"
3008730105
"@metamask/multichain-api-middleware": "npm:^0.1.1"
30088-
"@metamask/multichain-network-controller": "npm:^0.5.1"
30106+
"@metamask/multichain-network-controller": "patch:@metamask/multichain-network-controller@npm%3A0.5.1#~/.yarn/patches/@metamask-multichain-network-controller-npm-0.5.1-6e4a60e4b5.patch"
3008930107
"@metamask/multichain-transactions-controller": "npm:^0.9.0"
3009030108
"@metamask/name-controller": "npm:^8.0.3"
3009130109
"@metamask/network-controller": "patch:@metamask/network-controller@npm%3A23.2.0#~/.yarn/patches/@metamask-network-controller-npm-23.2.0-0223efb98a.patch"

0 commit comments

Comments
 (0)