chore: release v1.653.0

.env.base

@@ -40,7 +40,7 @@ REACT_APP_FEATURE_ARBITRUM_BRIDGE=false
 REACT_APP_FEATURE_CUSTOM_TOKEN_IMPORT=true
 REACT_APP_FEATURE_ARBITRUM_BRIDGE_CLAIMS=false
 REACT_APP_FEATURE_USDT_APPROVAL_RESET=true
-REACT_APP_FEATURE_PORTALS_SWAPPER=false
+REACT_APP_FEATURE_PORTALS_SWAPPER=true
 REACT_APP_FEATURE_RUNEPOOL=false
 
 # absolute URL prefix

.env.dev

@@ -2,7 +2,6 @@
 REACT_APP_FEATURE_ARBITRUM_BRIDGE=true
 REACT_APP_FEATURE_ARBITRUM_BRIDGE_CLAIMS=true
 REACT_APP_FEATURE_RUNEPOOL=true
-REACT_APP_FEATURE_PORTALS_SWAPPER=true
 
 # logging
 REACT_APP_REDUX_WINDOW=false

.env.develop

@@ -2,7 +2,6 @@
 REACT_APP_FEATURE_CHATWOOT=true
 REACT_APP_FEATURE_ARBITRUM_BRIDGE=true
 REACT_APP_FEATURE_RUNEPOOL=true
-REACT_APP_FEATURE_PORTALS_SWAPPER=true
 
 # mixpanel
 REACT_APP_MIXPANEL_TOKEN=1c1369f6ea23a6404bac41b42817cc4b

packages/swapper/src/thorchain-utils/memo/assertAndProcessMemo.ts

@@ -217,6 +217,14 @@ export const assertAndProcessMemo = (memo: string): string => {
     case 'pool+': {
       return memo
     }
+    case 'pool-': {
+      // RUNEPOOL:BASISPOINTS
+      const [_action, basisPoints] = memo.split(':')
+
+      assertIsValidBasisPoints(basisPoints, memo)
+
+      return `${_action}:${basisPoints}:${THORCHAIN_AFFILIATE_NAME}:0`
+    }
     default:
       throw new Error(`unsupported memo: ${memo}`)
   }

packages/types/src/base.ts

@@ -58,6 +58,7 @@ export type Asset = {
   explorerTxLink: string
   explorerAddressLink: string
   relatedAssetKey: AssetId | null | undefined
+  isPool?: boolean
 }
 
 export type AssetsById = Record<AssetId, Asset>

packages/types/src/market.ts

@@ -1,3 +1,5 @@
+import type { AssetId } from '@shapeshiftoss/caip'
+
 export type MarketData = {
   price: string
   marketCap: string
@@ -39,5 +41,5 @@ export type FindAllMarketArgs = {
 }
 
 export type MarketCapResult = {
-  [k: string]: MarketData
+  [k: AssetId]: MarketData
 }

scripts/generateAssetData/arbitrum/index.ts

@@ -1,5 +1,6 @@
 import { arbitrumChainId } from '@shapeshiftoss/caip'
 import type { Asset } from '@shapeshiftoss/types'
+import partition from 'lodash/partition'
 import uniqBy from 'lodash/uniqBy'
 
 import { arbitrum } from '../baseAssets'
@@ -11,12 +12,20 @@ export const getAssets = async (): Promise<Asset[]> => {
     coingecko.getAssets(arbitrumChainId),
     getPortalTokens(arbitrum),
   ])
-  const [assets, portalsAssets] = results.map(result => {
+  const [assets, _portalsAssets] = results.map(result => {
     if (result.status === 'fulfilled') return result.value
     console.error(result.reason)
     return []
   })
-  const allAssets = uniqBy(assets.concat(portalsAssets).concat([arbitrum]), 'assetId')
+
+  // Order matters here - We do a uniqBy and only keep the first of each asset using assetId as a criteria
+  // portals pools *have* to be first since Coingecko may also contain the same asset, but won't be able to get the `isPool` info
+  // Regular Portals assets however, should be last, as Coingecko is generally more reliable in terms of e.g names and images
+  const [portalsPools, portalsAssets] = partition(_portalsAssets, 'isPool')
+  const allAssets = uniqBy(
+    portalsPools.concat(assets).concat(portalsAssets).concat([arbitrum]),
+    'assetId',
+  )
 
   return allAssets
 }

scripts/generateAssetData/avalanche/index.ts

@@ -1,5 +1,6 @@
 import { avalancheChainId } from '@shapeshiftoss/caip'
 import type { Asset } from '@shapeshiftoss/types'
+import partition from 'lodash/partition'
 import uniqBy from 'lodash/uniqBy'
 
 import { avax } from '../baseAssets'
@@ -12,13 +13,21 @@ export const getAssets = async (): Promise<Asset[]> => {
     getPortalTokens(avax),
   ])
 
-  const [assets, portalsAssets] = results.map(result => {
+  const [assets, _portalsAssets] = results.map(result => {
     if (result.status === 'fulfilled') return result.value
     console.error(result.reason)
     return []
   })
 
-  const allAssets = uniqBy(assets.concat(portalsAssets).concat([avax]), 'assetId')
+  // Order matters here - We do a uniqBy and only keep the first of each asset using assetId as a criteria
+  // portals pools *have* to be first since Coingecko may also contain the same asset, but won't be able to get the `isPool` info
+  // Regular Portals assets however, should be last, as Coingecko is generally more reliable in terms of e.g names and images
+  const [portalsPools, portalsAssets] = partition(_portalsAssets, 'isPool')
+
+  const allAssets = uniqBy(
+    portalsPools.concat(assets).concat(portalsAssets).concat([avax]),
+    'assetId',
+  )
 
   return allAssets
 }

scripts/generateAssetData/base/index.ts

@@ -1,5 +1,6 @@
 import { baseChainId } from '@shapeshiftoss/caip'
 import type { Asset } from '@shapeshiftoss/types'
+import partition from 'lodash/partition'
 import uniqBy from 'lodash/uniqBy'
 
 import { base } from '../baseAssets'
@@ -12,13 +13,21 @@ export const getAssets = async (): Promise<Asset[]> => {
     getPortalTokens(base),
   ])
 
-  const [assets, portalsAssets] = results.map(result => {
+  const [assets, _portalsAssets] = results.map(result => {
     if (result.status === 'fulfilled') return result.value
     console.error(result.reason)
     return []
   })
 
-  const allAssets = uniqBy(assets.concat(portalsAssets).concat([base]), 'assetId')
+  // Order matters here - We do a uniqBy and only keep the first of each asset using assetId as a criteria
+  // portals pools *have* to be first since Coingecko may also contain the same asset, but won't be able to get the `isPool` info
+  // Regular Portals assets however, should be last, as Coingecko is generally more reliable in terms of e.g names and images
+  const [portalsPools, portalsAssets] = partition(_portalsAssets, 'isPool')
+
+  const allAssets = uniqBy(
+    portalsPools.concat(assets).concat(portalsAssets).concat([base]),
+    'assetId',
+  )
 
   return allAssets
 }

scripts/generateAssetData/bnbsmartchain/index.ts

@@ -1,5 +1,6 @@
 import { bscChainId } from '@shapeshiftoss/caip'
 import type { Asset } from '@shapeshiftoss/types'
+import { partition } from 'lodash'
 import uniqBy from 'lodash/uniqBy'
 
 import { bnbsmartchain } from '../baseAssets'
@@ -12,13 +13,21 @@ export const getAssets = async (): Promise<Asset[]> => {
     getPortalTokens(bnbsmartchain),
   ])
 
-  const [assets, portalsAssets] = results.map(result => {
+  const [assets, _portalsAssets] = results.map(result => {
     if (result.status === 'fulfilled') return result.value
     console.error(result.reason)
     return []
   })
 
-  const allAssets = uniqBy(assets.concat(portalsAssets).concat([bnbsmartchain]), 'assetId')
+  // Order matters here - We do a uniqBy and only keep the first of each asset using assetId as a criteria
+  // portals pools *have* to be first since Coingecko may also contain the same asset, but won't be able to get the `isPool` info
+  // Regular Portals assets however, should be last, as Coingecko is generally more reliable in terms of e.g names and images
+  const [portalsPools, portalsAssets] = partition(_portalsAssets, 'isPool')
+
+  const allAssets = uniqBy(
+    portalsPools.concat(assets).concat(portalsAssets).concat([bnbsmartchain]),
+    'assetId',
+  )
 
   return allAssets
 }