Merge branch 'develop' of https://github.com/mars-protocol/mars-v2-frontend into linkielink-patch-1

# Conflicts:
#	.env
#	.env.production
#	src/components/perps/BalancesTable/index.tsx

.github/workflows/publish-to-registry.yml

@@ -1,34 +0,0 @@
-name: Publish ApplicationRecord to Registry
-on:
-  release:
-    types: [published]
-  push:
-    branches:
-      - publish-to-registry
-
-env:
-  CERC_REGISTRY_USER_KEY: ${{ secrets.CICD_LACONIC_USER_KEY }}
-  CERC_REGISTRY_BOND_ID: ${{ secrets.CICD_LACONIC_BOND_ID }}
-
-jobs:
-  cns_publish:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      - name: Use Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-      - name: "Install Yarn"
-        run: npm install -g yarn
-      - name: "Install registry CLI"
-        run: |
-          npm config set @cerc-io:registry https://git.vdb.to/api/packages/cerc-io/npm/
-          yarn global add @cerc-io/laconic-registry-cli
-      - name: "Install jq"
-        run: apt -y update && apt -y install jq
-      - name: "Publish Application Record"
-        run: scripts/publish-app-record.sh
-      - name: "Request Deployment"
-        run: scripts/request-app-deployment.sh

README.md

@@ -1,7 +1,5 @@
 # Mars Protocol v2 Outpost Frontend
 
-ci
-
 ![mars-banner-1200w](https://marsprotocol.io/banner.png)
 
 ## 1. Web App

package.json

@@ -1,6 +1,5 @@
 {
-  "name": "@lx-mars/mars-v2-frontend",
-  "repository": "https://git.vdb.to/LaconicNetwork/mars-v2-frontend",
+  "name": "mars-v2-frontend",
   "version": "2.2.4",
   "homepage": "./",
   "private": false,

public/images/tokens/stdydx.svg

@@ -1,36 +0,0 @@
-<svg viewBox="0 0 240 240" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <rect width="240" height="240" rx="120" fill="#E50571" />
-  <path d="M149.107 60.9396L63.3276 181.702H89.6637L175.888 60.9396H149.107Z" fill="white" />
-  <path
-    d="M92.4053 60.9396L117.644 96.5239L104.476 115.934L65.5205 60.9396H92.4053Z"
-    fill="url(#paint0_linear_6269_3439)"
-  />
-  <path
-    d="M151.664 181.712L123.682 142.354L136.851 123.483L178 181.712H151.664Z"
-    fill="url(#paint1_linear_6269_3439)"
-  />
-  <defs>
-    <linearGradient
-      id="paint0_linear_6269_3439"
-      x1="86.3698"
-      y1="68.4878"
-      x2="121.753"
-      y2="111.957"
-      gradientUnits="userSpaceOnUse"
-    >
-      <stop stop-color="white" />
-      <stop offset="1" stop-color="white" stop-opacity="0.75" />
-    </linearGradient>
-    <linearGradient
-      id="paint1_linear_6269_3439"
-      x1="157.7"
-      y1="172.547"
-      x2="114.305"
-      y2="113.014"
-      gradientUnits="userSpaceOnUse"
-    >
-      <stop stop-color="white" stop-opacity="0.68" />
-      <stop offset="1" stop-color="white" stop-opacity="0.1" />
-    </linearGradient>
-  </defs>
-</svg>

scripts/publish-app-record.sh

@@ -1,69 +0,0 @@
-#!/bin/bash
-
-set -e
-
-RECORD_FILE=tmp.rf.$$
-CONFIG_FILE=`mktemp`
-
-CERC_APP_TYPE=${CERC_APP_TYPE:-"webapp"}
-CERC_REPO_REF=${CERC_REPO_REF:-${GITHUB_SHA:-`git log -1 --format="%H"`}}
-CERC_IS_LATEST_RELEASE=${CERC_IS_LATEST_RELEASE:-"true"}
-
-rcd_name=$(jq -r '.name' package.json | sed 's/null//')
-rcd_desc=$(jq -r '.description' package.json | sed 's/null//')
-rcd_repository=$(jq -r '.repository' package.json | sed 's/null//')
-rcd_homepage=$(jq -r '.homepage' package.json | sed 's/null//')
-rcd_license=$(jq -r '.license' package.json | sed 's/null//')
-rcd_author=$(jq -r '.author' package.json | sed 's/null//')
-rcd_app_version=$(jq -r '.version' package.json | sed 's/null//')
-
-cat <<EOF > "$CONFIG_FILE"
-services:
-  cns:
-    restEndpoint: '${CERC_REGISTRY_REST_ENDPOINT:-http://console.laconic.com:1317}'
-    gqlEndpoint: '${CERC_REGISTRY_GQL_ENDPOINT:-http://console.laconic.com:9473/api}'
-    chainId: ${CERC_REGISTRY_CHAIN_ID:-laconic_9000-1}
-    gas: 1750000
-    fees: 20000aphoton
-EOF
-
-next_ver=$(laconic -c $CONFIG_FILE cns record list --type ApplicationRecord --all --name "$rcd_name" 2>/dev/null | jq -r -s ".[] | sort_by(.createTime) | reverse | [ .[] | select(.bondId == \"$CERC_REGISTRY_BOND_ID\") ] | .[0].attributes.version" | awk -F. -v OFS=. '{$NF += 1 ; print}')
-
-if [ -z "$next_ver" ] || [ "1" == "$next_ver" ]; then
-  next_ver=0.0.1
-fi
-
-cat <<EOF | sed '/.*: ""$/d' > "$RECORD_FILE"
-record:
-  type: ApplicationRecord
-  version: ${next_ver}
-  name: "$rcd_name"
-  description: "$rcd_desc"
-  homepage: "$rcd_homepage"
-  license: "$rcd_license"
-  author: "$rcd_author"
-  repository:
-    - "$rcd_repository"
-  repository_ref: "$CERC_REPO_REF"
-  app_version: "$rcd_app_version"
-  app_type: "$CERC_APP_TYPE"
-EOF
-
-
-cat $RECORD_FILE
-RECORD_ID=$(laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} | jq -r '.id')
-echo $RECORD_ID
-
-if [ -z "$CERC_REGISTRY_APP_CRN" ]; then
-  authority=$(echo "$rcd_name" | cut -d'/' -f1 | sed 's/@//')
-  app=$(echo "$rcd_name" | cut -d'/' -f2-)
-  CERC_REGISTRY_APP_CRN="crn://$authority/applications/$app"
-fi
-
-laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN@${rcd_app_version}" "$RECORD_ID"
-laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN@${CERC_REPO_REF}" "$RECORD_ID"
-if [ "true" == "$CERC_IS_LATEST_RELEASE" ]; then
-  laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN" "$RECORD_ID"
-fi
-
-rm -f $RECORD_FILE $CONFIG_FILE

scripts/request-app-deployment.sh

@@ -1,59 +0,0 @@
-#!/bin/bash
-
-set -e
-
-RECORD_FILE=tmp.rf.$$
-CONFIG_FILE=`mktemp`
-
-rcd_name=$(jq -r '.name' package.json | sed 's/null//' | sed 's/^@//')
-rcd_app_version=$(jq -r '.version' package.json | sed 's/null//')
-
-cat <<EOF > "$CONFIG_FILE"
-services:
-  cns:
-    restEndpoint: '${CERC_REGISTRY_REST_ENDPOINT:-http://console.laconic.com:1317}'
-    gqlEndpoint: '${CERC_REGISTRY_GQL_ENDPOINT:-http://console.laconic.com:9473/api}'
-    chainId: ${CERC_REGISTRY_CHAIN_ID:-laconic_9000-1}
-    gas: 1550000
-    fees: 20000aphoton
-EOF
-
-if [ -z "$CERC_REGISTRY_APP_CRN" ]; then
-  authority=$(echo "$rcd_name" | cut -d'/' -f1 | sed 's/@//')
-  app=$(echo "$rcd_name" | cut -d'/' -f2-)
-  CERC_REGISTRY_APP_CRN="crn://$authority/applications/$app"
-fi
-
-APP_RECORD=$(laconic -c $CONFIG_FILE cns name resolve "$CERC_REGISTRY_APP_CRN" | jq '.[0]')
-if [ -z "$APP_RECORD" ] || [ "null" == "$APP_RECORD" ]; then
-  echo "No record found for $CERC_REGISTRY_APP_CRN."
-  exit 1
-fi
-
-cat <<EOF | sed '/.*: ""$/d' > "$RECORD_FILE"
-record:
-  type: ApplicationDeploymentRequest
-  version: 1.0.0
-  name: "$rcd_name@$rcd_app_version"
-  application: "$CERC_REGISTRY_APP_CRN@$rcd_app_version"
-  dns: "$CERC_REGISTRY_DEPLOYMENT_SHORT_HOSTNAME"
-  deployment: "$CERC_REGISTRY_DEPLOYMENT_CRN"
-  config:
-    env:
-      CERC_WEBAPP_DEBUG: "$rcd_app_version"
-      CERC_MAX_GENERATE_TIME: 180
-      CERC_NEXT_VERSION: 13.4.2
-      URL_OSMOSIS_REST: "https://lcd-osmosis.blockapsis.com"
-      URL_OSMOSIS_RPC: "https://rpc-osmosis.blockapsis.com"
-      WALLET_CONNECT_ID: "0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0x0"
-  meta:
-    note: "Added by CI @ `date`"
-    repository: "`git remote get-url origin`"
-    repository_ref: "${GITHUB_SHA:-`git log -1 --format="%H"`}"
-EOF
-
-cat $RECORD_FILE
-RECORD_ID=$(laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} | jq -r '.id')
-echo $RECORD_ID
-
-rm -f $RECORD_FILE $CONFIG_FILE

src/configs/assets/stDYDX.ts

@@ -1,15 +0,0 @@
-const stDYDX: AssetMetaData = {
-  symbol: 'stDYDX',
-  id: 'stDYDX',
-  name: 'Stride dYdX',
-  color: '#e50571',
-  logo: '/images/tokens/stdydx.svg',
-  decimals: 18,
-  hasOraclePrice: true,
-  isEnabled: true,
-  isMarket: true,
-  isDisplayCurrency: true,
-  isAutoLendEnabled: false,
-  isStaking: true,
-}
-export default stDYDX

src/configs/chains/osmosis/osmosis-1.ts

@@ -5,24 +5,23 @@ import ATOM from 'configs/assets/ATOM'
 import AXL from 'configs/assets/AXL'
 import DYDX from 'configs/assets/DYDX'
 import INJ from 'configs/assets/INJ'
-import MARS from 'configs/assets/MARS'
-import OSMO from 'configs/assets/OSMO'
-import TIA from 'configs/assets/TIA'
-import USDC from 'configs/assets/USDC'
-import USDCaxl from 'configs/assets/USDC.axl'
-import USDT from 'configs/assets/USDT'
-import USDollar from 'configs/assets/USDollar'
-import WBTCaxl from 'configs/assets/WBTC.axl'
-import WETHaxl from 'configs/assets/WETH.xal'
 import OSMO_ATOM from 'configs/assets/lp/OSMO-ATOM'
 import OSMO_USDC from 'configs/assets/lp/OSMO_USDC'
 import OSMO_WBTC from 'configs/assets/lp/OSMO_WBTC'
 import OSMO_WETH from 'configs/assets/lp/OSMO_WETH'
 import stATOM_ATOM from 'configs/assets/lp/stATOM_ATOM'
+import MARS from 'configs/assets/MARS'
 import milkTIA from 'configs/assets/milkTIA'
+import OSMO from 'configs/assets/OSMO'
 import stATOM from 'configs/assets/stATOM'
-import stDYDX from 'configs/assets/stDYDX'
 import stOSMO from 'configs/assets/stOSMO'
+import TIA from 'configs/assets/TIA'
+import USDC from 'configs/assets/USDC'
+import USDCaxl from 'configs/assets/USDC.axl'
+import USDollar from 'configs/assets/USDollar'
+import USDT from 'configs/assets/USDT'
+import WBTCaxl from 'configs/assets/WBTC.axl'
+import WETHaxl from 'configs/assets/WETH.xal'
 import { VAULTS_META_DATA } from 'constants/vaults'
 import { NETWORK } from 'types/enums/network'
 import { ChainInfoID } from 'types/enums/wallet'
@@ -46,20 +45,15 @@ const ASSETS = [
     poolId: 712,
     denom: 'ibc/D1542AA8762DB13087D8364F3EA6509FD6F009A34F00426AF9E4F9FA85CBBF1F',
   },
-  {
-    ...stATOM,
-    poolId: 803,
-    denom: 'ibc/C140AFD542AE77BD7DCC83F13FDD8C5E5BB8C4929785E6EC2F4C636F98F17901',
-  },
   {
     ...stOSMO,
     poolId: 833,
     denom: 'ibc/D176154B0C63D1F9C6DCFB4F70349EBF2E2B5A87A05902F57A6AE92B863E9AEC',
   },
   {
-    ...stDYDX,
-    poolId: 1423,
-    denom: 'ibc/980E82A9F8E7CA8CD480F4577E73682A6D3855A267D1831485D7EBEF0E7A6C2C',
+    ...stATOM,
+    poolId: 803,
+    denom: 'ibc/C140AFD542AE77BD7DCC83F13FDD8C5E5BB8C4929785E6EC2F4C636F98F17901',
   },
   {
     ...USDCaxl,