Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .env.base
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ REACT_APP_FEATURE_MARKETS=true
REACT_APP_FEATURE_FOX_PAGE=false
REACT_APP_FEATURE_FOX_PAGE_RFOX=false
REACT_APP_FEATURE_FOX_PAGE_FOX_SECTION=true
REACT_APP_FEATURE_PHANTOM_WALLET=false
REACT_APP_FEATURE_PHANTOM_WALLET=true

# absolute URL prefix
REACT_APP_ABSOLUTE_URL_PREFIX=https://app.shapeshift.com
Expand Down
2 changes: 0 additions & 2 deletions .env.dev
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,3 @@ REACT_APP_THORCHAIN_NODE_URL=https://dev-daemon.thorchain.shapeshift.com

# thorchain
REACT_APP_MIDGARD_URL=https://dev-indexer.thorchain.shapeshift.com/v2

REACT_APP_FEATURE_PHANTOM_WALLET=true
2 changes: 0 additions & 2 deletions .env.develop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,3 @@ REACT_APP_THORCHAIN_NODE_URL=https://dev-daemon.thorchain.shapeshift.com

# thorchain
REACT_APP_MIDGARD_URL=https://dev-indexer.thorchain.shapeshift.com/v2

REACT_APP_FEATURE_PHANTOM_WALLET=true
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ ShapeShift's OSS 2nd generation Web application. (Under Development)
- [Helpful Docs](#helpful-docs)
- [Resources](#resources)
- [Requirements](#requirements)
- [Developer Onboarding](#developer-onboarding)
- [Commands](#commands)
- [Debugging](#debugging)

- [Quick Start](#quick-start)
- [Commands](#commands)
- [Developer Onboarding](#developer-onboarding)
- [Releases](#releases)
- [MixPanel](#mixpanel)

## Helpful Docs

- [Architecture](docs/architecture.md)
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/caip/src/adapters/coingecko/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ describe('adapters:coingecko', () => {
const usdcOnSolana = toAssetId({
chainNamespace: CHAIN_NAMESPACE.Solana,
chainReference: CHAIN_REFERENCE.SolanaMainnet,
assetNamespace: 'spl',
assetNamespace: 'token',
assetReference: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
})
expect(coingeckoToAssetIds('usd-coin')).toEqual([
Expand Down
2 changes: 1 addition & 1 deletion packages/caip/src/adapters/coingecko/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ export const parseData = (coins: CoingeckoCoin[]): AssetMap => {
const assetId = toAssetId({
chainNamespace: CHAIN_NAMESPACE.Solana,
chainReference: CHAIN_REFERENCE.SolanaMainnet,
assetNamespace: 'spl',
assetNamespace: 'token',
assetReference: platforms[CoingeckoAssetPlatform.Solana],
})
prev[solanaChainId][assetId] = id
Expand Down
4 changes: 2 additions & 2 deletions packages/caip/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export const ASSET_NAMESPACE = {
bep1155: 'bep1155',
slip44: 'slip44',
ibc: 'ibc',
spl: 'spl',
splToken: 'token',
} as const

export const ASSET_REFERENCE = {
Expand Down Expand Up @@ -158,7 +158,7 @@ export const VALID_ASSET_NAMESPACE: ValidAssetNamespace = Object.freeze({
ASSET_NAMESPACE.bep1155,
],
[CHAIN_NAMESPACE.CosmosSdk]: [ASSET_NAMESPACE.ibc, ASSET_NAMESPACE.slip44],
[CHAIN_NAMESPACE.Solana]: [ASSET_NAMESPACE.spl, ASSET_NAMESPACE.slip44],
[CHAIN_NAMESPACE.Solana]: [ASSET_NAMESPACE.splToken, ASSET_NAMESPACE.slip44],
})

// We should prob change this once we add more chains
Expand Down
2 changes: 1 addition & 1 deletion scripts/generateAssetData/coingecko.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export async function getAssets(chainId: ChainId): Promise<Asset[]> {
}
case solanaChainId:
return {
assetNamespace: ASSET_NAMESPACE.spl,
assetNamespace: ASSET_NAMESPACE.splToken,
category: adapters.chainIdToCoingeckoAssetPlatform(chainId),
explorer: solana.explorer,
explorerAddressLink: solana.explorerAddressLink,
Expand Down
163 changes: 84 additions & 79 deletions scripts/generateAssetData/color-map.json

Large diffs are not rendered by default.

Loading