Merge branch 'develop' into price-impace-ui

shapeshift · Sep 26, 2024 · 732eed7 · 732eed7
2 parents b190fba + 1029292
commit 732eed7
Show file tree

Hide file tree

Showing 12 changed files with 2,641 additions and 3,395 deletions.
diff --git a/packages/caip/src/adapters/coincap/generated/eip155_1/adapter.json b/packages/caip/src/adapters/coincap/generated/eip155_1/adapter.json
diff --git a/packages/caip/src/adapters/coingecko/generated/eip155_1/adapter.json b/packages/caip/src/adapters/coingecko/generated/eip155_1/adapter.json
diff --git a/packages/caip/src/adapters/coingecko/generated/eip155_137/adapter.json b/packages/caip/src/adapters/coingecko/generated/eip155_137/adapter.json
diff --git a/packages/caip/src/adapters/coingecko/generated/eip155_42161/adapter.json b/packages/caip/src/adapters/coingecko/generated/eip155_42161/adapter.json
diff --git a/packages/caip/src/adapters/coingecko/generated/eip155_43114/adapter.json b/packages/caip/src/adapters/coingecko/generated/eip155_43114/adapter.json
diff --git a/packages/caip/src/adapters/coingecko/generated/eip155_56/adapter.json b/packages/caip/src/adapters/coingecko/generated/eip155_56/adapter.json
diff --git a/packages/caip/src/adapters/coingecko/generated/eip155_8453/adapter.json b/packages/caip/src/adapters/coingecko/generated/eip155_8453/adapter.json
diff --git a/...aip/src/adapters/coingecko/generated/solana_5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/adapter.json b/...aip/src/adapters/coingecko/generated/solana_5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/adapter.json
diff --git a/src/lib/address/address.ts b/src/lib/address/address.ts
@@ -252,6 +252,8 @@ type ValidateAddressReturn = boolean
 export type ValidateAddressByChainId = (args: ValidateAddressArgs) => Promise<ValidateAddressReturn>
 
 export const validateAddress: ValidateAddressByChainId = async ({ chainId, maybeAddress }) => {
+  // Invalidate taproot addresses for BTC
+  if (chainId === btcChainId && maybeAddress.startsWith('bc1p')) return false
   try {
     const adapter = getChainAdapterManager().get(chainId)
     if (!adapter) return false

diff --git a/src/lib/asset-service/service/color-map.json b/src/lib/asset-service/service/color-map.json
diff --git a/src/lib/asset-service/service/generatedAssetData.json b/src/lib/asset-service/service/generatedAssetData.json
diff --git a/src/state/migrations/index.ts b/src/state/migrations/index.ts
@@ -24,6 +24,7 @@ export const clearNftsMigrations = {
 
 export const clearAssetsMigrations = {
   0: clearAssets,
+  1: clearAssets,
 } as unknown as Omit<MigrationManifest, '_persist'>
 
 export const clearMarketDataMigrations = {