Merge branch 'main' into mulan/ct-1267-unflagged-update-trade-form-fo…

…r-mobile-view

.github/workflows/validate-other-market-data.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
     paths:
       - 'public/configs/otherMarketData.json'
-      - 'scripts/validate-other-market-data.ts'
+      - 'scripts/markets/validate-other-market-data.ts'
 
 jobs:
   validate:
@@ -22,6 +22,19 @@ jobs:
           node-version: 18
           cache: pnpm
 
+      - name: Initialize password store
+        run: |
+          gpg --batch --gen-key <<EOF
+          Key-Type: RSA
+          Key-Length: 2048
+          Name-Real: GitHub Actions
+          Name-Email: [email protected]
+          Expire-Date: 0
+          %no-protection
+          EOF
+          GPG_ID=$(gpg --list-keys --with-colons | awk -F: '/^pub:/ { print $5 }')
+          pass init $GPG_ID
+
       - name: Install dependencies
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -37,7 +50,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: 'dydxprotocol/v4-chain'
-          ref: '725ad716cbe9e9aebf2472e877fe2a71e8a63d87'
+          ref: '6a45430024d66bf10577e13b1d0698fd86b0ad32'
           path: 'v4-chain'
 
       - name: Start v4 localnet
@@ -48,12 +61,7 @@ jobs:
           make build
           echo "Starting localnet..."
           DOCKER_BUILDKIT=1 make localnet-init
-          DOCKER_BUILDKIT=1 make localnet-compose-upd -e RAYDIUM_URL=${{ secrets.RAYDIUM_URL }}
-
-      - name: Get diff of otherMarketData.json
-        run: |
-          git fetch origin
-          git diff remotes/origin/main -- public/configs/otherMarketData.json > otherMarketDiff.txt
+          DOCKER_BUILDKIT=1 make localnet-compose-upd -e RAYDIUM_URL=${{ secrets.RAYDIUM_URL }} -e UNISWAPV3_BASE_URL=${{ secrets.UNISWAPV3_BASE_URL }} -e UNISWAPV3_ETHEREUM_URL=${{ secrets.UNISWAPV3_ETHEREUM_URL }}
       
       - name: Checkout main branch
         uses: actions/checkout@v3

package.json

@@ -23,6 +23,7 @@
     "build:generate-entry-points": "node scripts/generate-entry-points.js",
     "build:generate-sitemap": "node scripts/generate-sitemap.js",
     "assets": "node scripts/check-assets.js",
+    "merge-asset-icons": "node scripts/merge-asset-icon-maps.js >> assets.txt",
     "deploy:ipfs": "node scripts/upload-ipfs.js --verbose",
     "deploy:update-ipns": "node scripts/update-ipns.js",
     "deploy:update-dnslink": "node scripts/update-dnslink.js",
@@ -56,9 +57,9 @@
     "@cosmjs/stargate": "^0.32.1",
     "@cosmjs/tendermint-rpc": "^0.32.1",
     "@datadog/browser-logs": "^5.23.3",
-    "@dydxprotocol/v4-abacus": "1.12.18",
+    "@dydxprotocol/v4-abacus": "1.12.23",
     "@dydxprotocol/v4-client-js": "1.10.0",
-    "@dydxprotocol/v4-localization": "^1.1.215",
+    "@dydxprotocol/v4-localization": "^1.1.217",
     "@dydxprotocol/v4-proto": "^7.0.0-dev.0",
     "@emotion/is-prop-valid": "^1.3.0",
     "@ethersproject/providers": "^5.7.2",

public/configs/markets.json

@@ -1995,6 +1995,13 @@
         "websiteLink": "https://egoco.in/en/",
         "whitepaperLink": "https://docs.paysenger.com/"
     },
+    "EIGEN-USD": {
+        "coinMarketCapsLink": "https://coinmarketcap.com/currencies/eigenlayer/",
+        "name": "EigenLayer",
+        "tags": ["Defi"],
+        "websiteLink": "https://www.eigenlayer.xyz/",
+        "whitepaperLink": "https://docs.eigenlayer.xyz/assets/files/EIGEN_Token_Whitepaper-0df8e17b7efa052fd2a22e1ade9c6f69.pdf/"
+    },
     "ELA-USD": {
         "coinMarketCapsLink": "https://coinmarketcap.com/currencies/elastos/",
         "name": "Elastos",