Ethereum/Solana: Support additional tokens from info server #826
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
samholmes
requested changes
Sep 2, 2024
src/common/innerPlugin.ts
Outdated
| // Merge token maps | ||
| for (const [tokenId, incomingToken] of Object.entries(cleanTokens)) { | ||
| if (builtinTokens[tokenId] != null) continue | ||
| if (currencyInfo.currencyCode === incomingToken.currencyCode) continue // TODO: Remove after migrating away from currencyCode keyed objects |
There was a problem hiding this comment.
This TODO comment confuses me. Is this for line 151 or 152?
src/common/innerPlugin.ts
Outdated
Comment on lines
152
to
154
| const matchingToken = Object.values(builtinTokens).find( | ||
| token => token.currencyCode === incomingToken.currencyCode | ||
| ) |
There was a problem hiding this comment.
So we don't allow for info server tokens to stomp on our built-in list if a currency code is already in-use. So, info server can only provide additional tokens and no updates to existing token information.
src/ethereum/EthereumTools.ts
Outdated
Comment on lines
39
to
55
| export const createEvmToken = ( | ||
| rawToken: unknown | ||
| ): { tokenId: string; token: EdgeToken } => { | ||
| const token = asEdgeToken(rawToken) | ||
| const cleanLocation = asMaybeContractLocation(token.networkLocation) | ||
| if ( | ||
| cleanLocation == null || | ||
| !EthereumUtil.isValidAddress(cleanLocation.contractAddress) | ||
| ) { | ||
| throw new Error('ErrorInvalidContractAddress') | ||
| } | ||
|
|
||
| return { | ||
| tokenId: cleanLocation.contractAddress.toLowerCase().replace(/^0x/, ''), | ||
| token | ||
| } | ||
| } |
There was a problem hiding this comment.
Why isn't this function in tokenHelpers.ts? Does it belong in the tools file?
src/ethereum/info/amoyInfo.ts
Outdated
| @@ -5,6 +5,7 @@ import { makeMetaTokens } from '../../common/tokenHelpers' | |||
| import type { EthereumTools } from '../EthereumTools' | |||
| import { | |||
| asEthereumInfoPayload, | |||
| createEvmToken, | |||
There was a problem hiding this comment.
How is it possible to be importing this function from ethereumTypes.ts if it's defined in EthereumTools.ts?
src/solana/solanaInfo.ts
Outdated
| @@ -5,6 +5,7 @@ import { makeMetaTokens } from '../common/tokenHelpers' | |||
| import type { SolanaTools } from './SolanaTools' | |||
| import { | |||
| asSolanaInfoPayload, | |||
| createSolanaToken, | |||
peachbits
force-pushed
the
mattthew/info-server-tokens
branch
from
04a7824
to
ebf313a
Compare
samholmes
reviewed
Sep 5, 2024
| @@ -91,3 +93,7 @@ export const createTokenIdFromContractAddress = (token: EdgeToken): string => { | |||
| } | |||
| return cleanLocation.contractAddress | |||
| } | |||
|
|
|||
| export const createEvmTokenId = (token: EdgeToken): string => { | |||
| return normalizeAddress(createTokenIdFromContractAddress(token)) | |||
There was a problem hiding this comment.
This function is named normalizeAddress yet we're using it to get a "token ID". Weird. Oh well.
samholmes
approved these changes
Sep 5, 2024
peachbits
force-pushed
the
mattthew/info-server-tokens
branch
from
ebf313a
to
7705dbb
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
CHANGELOG
Does this branch warrant an entry to the CHANGELOG?
Dependencies
noneDescription
none