Skip to content

Commit d4e35ef

Browse files
committed
chore: merge develop into release for v1.1057.0
2 parents 15bf358 + 52aebb2 commit d4e35ef

99 files changed

Lines changed: 1453 additions & 1575 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.claude/contracts/second-class-evm-chain.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,6 @@ All integration points required when adding a new second-class EVM chain to Shap
9090
- NO per-chain tx status util file needed (the `default` case in `useSendActionSubscriber.tsx` uses `getSecondClassEvmTxStatus()` which detects any `SecondClassEvmAdapter` via `isSecondClassEvmAdapter` type guard)
9191
- Only non-EVM chains (Tron, Sui, Near, Ton, Starknet) have individual cases
9292

93-
16b. **State Migration** - `src/state/migrations/index.ts`
94-
- A new `clearAssets` migration entry is REQUIRED when adding a chain
95-
- Bump the migration version number (next sequential integer)
96-
- Without this, existing users with persisted state won't see the new chain's assets until they manually clear cache
97-
9893
16c. **Market Service Test** - `src/lib/market-service/coingecko/coingecko.test.ts`
9994
- **ONLY for ETH-native chains** (where CoinGecko maps the native asset to `'ethereum'`):
10095
- Expected result counts in both `can flatten multiple responses` and `can return some results if partially rate limited` tests need incrementing (one more ETH-native chain = one more result in each)

‎.github/workflows/cloudflare.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
- name: Install Dependencies
7979
run: pnpm install --frozen-lockfile
8080
- name: Build Web
81-
run: MODE=${{ env.BUILD_MODE }} DEPLOY=true VITE_VERSION=${{ env.version }} pnpm run build:web
81+
run: MODE=${{ env.BUILD_MODE }} DEPLOY=true VITE_VERSION=${{ env.version }} VITE_COMMIT_HASH=${{ env.COMMIT_SHORT_HASH }} pnpm run build:web
8282
# a poor mans extension of cloudflare/pages-action@1 https://github.com/cloudflare/pages-action/blob/main/src/index.ts
8383
# passing more params directly to wrangler to control commit hash and message
8484
# https://developers.cloudflare.com/workers/wrangler/commands/#publish-1

‎.github/workflows/sentry.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@ jobs:
5656
echo "version=$VERSION" >> $GITHUB_OUTPUT
5757
5858
- name: Build Web
59-
run: MODE=production DEPLOY=true VITE_VERSION=${{ steps.version.outputs.version }} pnpm run build:web
59+
# The commit hash must match the deployed build, which is built from the merge commit on main
60+
run: |
61+
COMMIT_HASH="${{ github.event.pull_request.merge_commit_sha }}"
62+
MODE=production DEPLOY=true VITE_VERSION=${{ steps.version.outputs.version }} VITE_COMMIT_HASH=${COMMIT_HASH:0:7} pnpm run build:web
6063
6164
- name: Sentry Release
6265
uses: getsentry/action-release@v3

‎package.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"clean:web": "rm -rf build",
2626
"clean:dist": "find packages -maxdepth 2 -name dist -type d -exec rm -rf {} +",
2727
"clean:packages": "pnpm -r --filter=\"!@shapeshiftoss/web\" clean",
28-
"codemod:clear-assets-migration": "jscodeshift -t src/state/migrations/transformClearAssets.ts --parser=ts --extensions=ts src/state/migrations/index.ts",
2928
"deadcode": "pnpm exec ts-prune",
3029
"dev:web": "NODE_OPTIONS=--max-old-space-size=8192 portless run vite",
3130
"dev:web:localhost": "PORTLESS=0 NODE_OPTIONS=--max-old-space-size=8192 vite --host 0.0.0.0",
@@ -42,8 +41,8 @@
4241
"add-chain": "pnpm exec tsx ./scripts/addChain/index.ts",
4342
"generate:chain": "pnpm exec tsx ./scripts/generateChainAssetData.ts",
4443
"generate:caip-adapters": "pnpm --filter @shapeshiftoss/caip generate",
45-
"generate:asset-data": "pnpm exec tsx ./scripts/generateAssetData/generateAssetData.ts && pnpm run codemod:clear-assets-migration",
46-
"generate:related-asset-index": "pnpm exec tsx ./scripts/generateAssetData/generateRelatedAssetIndex.ts && pnpm run codemod:clear-assets-migration",
44+
"generate:asset-data": "pnpm exec tsx ./scripts/generateAssetData/generateAssetData.ts",
45+
"generate:related-asset-index": "pnpm exec tsx ./scripts/generateAssetData/generateRelatedAssetIndex.ts",
4746
"generate:color-map": "pnpm exec tsx ./scripts/generateAssetData/generateColorMap.ts",
4847
"generate:tradable-asset-map": "pnpm exec tsx ./scripts/generateTradableAssetMap/index.ts",
4948
"generate:thor-longtail-tokens": "pnpm exec tsx ./scripts/generateThorLongtailTokens/generateThorLongtailTokens.ts",
@@ -256,7 +255,6 @@
256255
"@types/dompurify": "^2.3.2",
257256
"@types/eth-url-parser": "^1.0.0",
258257
"@types/history": "^4.7.11",
259-
"@types/jscodeshift": "^0.11.11",
260258
"@types/lodash": "^4.14.178",
261259
"@types/mixpanel-browser": "^2.38.1",
262260
"@types/node": "^22.13.14",
@@ -301,7 +299,6 @@
301299
"happy-dom": "^20.0.2",
302300
"http-proxy-middleware": "^2.0.9",
303301
"inquirer": "8.2.4",
304-
"jscodeshift": "^0.15.2",
305302
"jsdom": "^28.0.0",
306303
"limiter": "^2.1.0",
307304
"lit-html": "^2.6.1",

‎packages/caip/src/adapters/coincap/generated/eip155_1/adapter.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"eip155:10/erc20:0x94b008aa00579c1307b0ef2c499ad98a8ce58e58":"tether","eip155:10/erc20:0x0b2c639c533813f4aa9d7837caf62653d097ff85":"usd-coin","eip155:10/erc20:0x1f32b1c2345538c0c6f582fcb022739c4a194ebb":"lido-finance-wsteth","eip155:10/erc20:0x350a791bfc2c21f9ed5d10980dad2e2638ffa7f6":"chainlink","eip155:10/erc20:0x68f180fcce6836688e9084f035309e29bf0a2095":"wrapped-bitcoin","eip155:10/erc20:0x4200000000000000000000000000000000000006":"weth","eip155:10/erc20:0x5a7facb970d094b6c7ff1df0ea68d99e6e73cbff":"wrapped-eeth","eip155:10/erc20:0x6fd9d7ad17242c41f7131d257212c54a0e816691":"uniswap","eip155:10/erc20:0xdc6ff44d5d932cbd77b52e5612ba0529dc6226f1":"worldcoin-org","eip155:10/erc20:0x9bcef72be871e61ed4fbbc7630889bee758eb81d":"rocket-pool-eth","eip155:10/erc20:0x6985884c4392d348587b19cb9eaaf157f13271cd":"layerzero","eip155:10/erc20:0x0994206dfe8de6ec6920ff4d779b0d950605fb53":"curve-dao-token","eip155:10/erc20:0x4200000000000000000000000000000000000042":"optimism-ethereum","eip155:10/erc20:0x33800de7e817a70a694f31476313a7c572bba100":"derive","eip155:10/erc20:0x2e3d870790dc77a83dd1d18184acc7439a53f475":"frax","eip155:10/erc20:0xc6bdfc4f2e90196738873e824a9efa03f7c64176":"vicicoin","eip155:10/erc20:0x80eede496655fb9047dd39d9f418d5483ed600df":"frax-usd","eip155:10/erc20:0xb0ffa8000886e57f86dd5264b9582b2ad87b2b91":"wormhole","eip155:10/erc20:0x3eaeb77b03dbc0f6321ae1b72b2e9adb0f60112b":"sushiswap","eip155:10/erc20:0x8700daec35af8ff88c16bdf0418774cb3d7599b4":"synthetix-network-token","eip155:10/erc20:0xaeaeed23478c3a4b798e4ed40d8b7f41366ae861":"ankr","eip155:10/erc20:0x4f8a84c442f9675610c680990eddb2ccddb8ab6f":"frankencoin","eip155:10/erc20:0x5a5fff6f753d7c11a56a52fe47a177a87e431655":"synapse-2","eip155:10/erc20:0x03569cc076654f82679c4ba2124d64774781b01d":"liquity-v2","eip155:10/erc20:0x9923db8d7fbacc2e69e87fad19b886c81cd74979":"hyperlane","eip155:10/erc20:0xa00e3a3511aac35ca78530c85007afcd31753819":"kyber-network","eip155:10/erc20:0xec6adef5e1006bb305bb1975333e8fc4071295bf":"cartesi","eip155:10/erc20:0x14778860e937f509e651192a90589de711fb88a9":"cyberconnect","eip155:10/erc20:0xe05a08226c49b636acf99c40da8dc6af83ce5bb3":"ankreth","eip155:10/erc20:0x8c6f28f2f1a3c87f0f938b96d27520d9751ec8d9":"susd","eip155:10/erc20:0xaf9fe3b5ccdae78188b1f8b9a49da7ae9510f151":"dhedge-dao","eip155:10/erc20:0xd6909e9e702024eb93312b989ee46794c0fb1c9d":"biconomy","eip155:10/erc20:0xef4461891dfb3ac8572ccf7c794664a8dd927945":"walletconnect-token","eip155:10/erc20:0x4e200fe2f3efb977d5fd9c430a41531fb04d97b8":"orderly-network","eip155:10/erc20:0xfc2e6e6bcbd49ccf3a5f029c79984372dcbfe527":"autonolas","eip155:10/erc20:0xbfd5206962267c7b4b4a8b3d76ac2e1b2a5c4d5e":"osaka-protocol","eip155:10/erc20:0x528cdc92eab044e1e39fe43b9514bfdab4412b98":"giveth","eip155:10/erc20:0x6a661312938d22a2a0e27f585073e4406903990a":"mahadao","eip155:10/erc20:0x5f8d72676e37197b5011afc64d8641af2fe41fdb":"measurable-data-token","eip155:10/erc20:0xc7edf7b7b3667a06992508e7b156eff794a9e1c8":"persistence","eip155:10/erc20:0xe453d6649643f1f460c371dc3d1da98f7922fe51":"fuse-network","eip155:10/erc20:0x1da650c3b2daa8aa9ff6f661d4156ce24d08a062":"dentacoin"}
1+
{"eip155:10/erc20:0x94b008aa00579c1307b0ef2c499ad98a8ce58e58":"tether","eip155:10/erc20:0x0b2c639c533813f4aa9d7837caf62653d097ff85":"usd-coin","eip155:10/erc20:0x1f32b1c2345538c0c6f582fcb022739c4a194ebb":"lido-finance-wsteth","eip155:10/erc20:0x350a791bfc2c21f9ed5d10980dad2e2638ffa7f6":"chainlink","eip155:10/erc20:0x68f180fcce6836688e9084f035309e29bf0a2095":"wrapped-bitcoin","eip155:10/erc20:0x4200000000000000000000000000000000000006":"weth","eip155:10/erc20:0x5a7facb970d094b6c7ff1df0ea68d99e6e73cbff":"wrapped-eeth","eip155:10/erc20:0x6fd9d7ad17242c41f7131d257212c54a0e816691":"uniswap","eip155:10/erc20:0xdc6ff44d5d932cbd77b52e5612ba0529dc6226f1":"worldcoin-org","eip155:10/erc20:0x9bcef72be871e61ed4fbbc7630889bee758eb81d":"rocket-pool-eth","eip155:10/erc20:0x6985884c4392d348587b19cb9eaaf157f13271cd":"layerzero","eip155:10/erc20:0x0994206dfe8de6ec6920ff4d779b0d950605fb53":"curve-dao-token","eip155:10/erc20:0x4200000000000000000000000000000000000042":"optimism-ethereum","eip155:10/erc20:0x33800de7e817a70a694f31476313a7c572bba100":"derive","eip155:10/erc20:0x2e3d870790dc77a83dd1d18184acc7439a53f475":"frax","eip155:10/erc20:0xc6bdfc4f2e90196738873e824a9efa03f7c64176":"vicicoin","eip155:10/erc20:0x80eede496655fb9047dd39d9f418d5483ed600df":"frax-usd","eip155:10/erc20:0xb0ffa8000886e57f86dd5264b9582b2ad87b2b91":"wormhole","eip155:10/erc20:0x3eaeb77b03dbc0f6321ae1b72b2e9adb0f60112b":"sushiswap","eip155:10/erc20:0x8700daec35af8ff88c16bdf0418774cb3d7599b4":"synthetix-network-token","eip155:10/erc20:0xaeaeed23478c3a4b798e4ed40d8b7f41366ae861":"ankr","eip155:10/erc20:0x4f8a84c442f9675610c680990eddb2ccddb8ab6f":"frankencoin","eip155:10/erc20:0x5a5fff6f753d7c11a56a52fe47a177a87e431655":"synapse-2","eip155:10/erc20:0x03569cc076654f82679c4ba2124d64774781b01d":"liquity-v2","eip155:10/erc20:0x9923db8d7fbacc2e69e87fad19b886c81cd74979":"hyperlane","eip155:10/erc20:0xa00e3a3511aac35ca78530c85007afcd31753819":"kyber-network","eip155:10/erc20:0xec6adef5e1006bb305bb1975333e8fc4071295bf":"cartesi","eip155:10/erc20:0x14778860e937f509e651192a90589de711fb88a9":"cyberconnect","eip155:10/erc20:0xe05a08226c49b636acf99c40da8dc6af83ce5bb3":"ankreth","eip155:10/erc20:0xaf9fe3b5ccdae78188b1f8b9a49da7ae9510f151":"dhedge-dao","eip155:10/erc20:0xd6909e9e702024eb93312b989ee46794c0fb1c9d":"biconomy","eip155:10/erc20:0x8c6f28f2f1a3c87f0f938b96d27520d9751ec8d9":"susd","eip155:10/erc20:0xef4461891dfb3ac8572ccf7c794664a8dd927945":"walletconnect-token","eip155:10/erc20:0xbfd5206962267c7b4b4a8b3d76ac2e1b2a5c4d5e":"osaka-protocol","eip155:10/erc20:0x4e200fe2f3efb977d5fd9c430a41531fb04d97b8":"orderly-network","eip155:10/erc20:0xfc2e6e6bcbd49ccf3a5f029c79984372dcbfe527":"autonolas","eip155:10/erc20:0x528cdc92eab044e1e39fe43b9514bfdab4412b98":"giveth","eip155:10/erc20:0x6a661312938d22a2a0e27f585073e4406903990a":"mahadao","eip155:10/erc20:0x5f8d72676e37197b5011afc64d8641af2fe41fdb":"measurable-data-token","eip155:10/erc20:0xc7edf7b7b3667a06992508e7b156eff794a9e1c8":"persistence","eip155:10/erc20:0xe453d6649643f1f460c371dc3d1da98f7922fe51":"fuse-network","eip155:10/erc20:0x1da650c3b2daa8aa9ff6f661d4156ce24d08a062":"dentacoin"}

‎packages/caip/src/adapters/coincap/generated/eip155_137/adapter.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)