From 668b4a4d2acc2d4ce8b7ea0ddc12f7f39c4b1d87 Mon Sep 17 00:00:00 2001 From: swimdrew Date: Fri, 28 Oct 2022 11:52:05 -0400 Subject: [PATCH 1/7] feat(token-projects): Create USDTe project and replace mentions of aurora usdt --- ...lp_aurora_usdt.svg => lp_aurora_usdte.svg} | 0 packages/token-projects/src/projects.ts | 24 +++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) rename packages/token-projects/images/{lp_aurora_usdt.svg => lp_aurora_usdte.svg} (100%) diff --git a/packages/token-projects/images/lp_aurora_usdt.svg b/packages/token-projects/images/lp_aurora_usdte.svg similarity index 100% rename from packages/token-projects/images/lp_aurora_usdt.svg rename to packages/token-projects/images/lp_aurora_usdte.svg diff --git a/packages/token-projects/src/projects.ts b/packages/token-projects/src/projects.ts index d68a68e94..3d1ebef29 100644 --- a/packages/token-projects/src/projects.ts +++ b/packages/token-projects/src/projects.ts @@ -6,7 +6,7 @@ import GMT_SVG from "./images/gmt"; import GST_SVG from "./images/gst"; import LP_ACALA_AUSD_SVG from "./images/lp_acala_ausd"; import LP_AURORA_USDC_SVG from "./images/lp_aurora_usdc"; -import LP_AURORA_USDT_SVG from "./images/lp_aurora_usdt"; +import LP_AURORA_USDTE_SVG from "./images/lp_aurora_usdte"; import LP_AURORA_USN_SVG from "./images/lp_aurora_usn"; import LP_AVALANCHE_USDC_SVG from "./images/lp_avalanche_usdc"; import LP_AVALANCHE_USDT_SVG from "./images/lp_avalanche_usdt"; @@ -32,7 +32,7 @@ export enum TokenProjectId { Swim = "swim", SwimAcalaAusdLp = "swim-acala-ausd-lp", SwimAuroraUsdcLp = "swim-aurora-usdc-lp", - SwimAuroraUsdtLp = "swim-aurora-usdt-lp", + SwimAuroraUsdteLp = "swim-aurora-usdte-lp", SwimAuroraUsnLp = "swim-aurora-usn-lp", SwimAvalancheUsdcLp = "swim-avalanche-usdc-lp", SwimAvalancheUsdtLp = "swim-avalanche-usdt-lp", @@ -46,6 +46,7 @@ export enum TokenProjectId { SwimUsd = "swim-usd", Usdc = "usdc", Usdt = "usdt", + Usdte = "usdte", Usn = "usn", XSwim = "xswim", // V2 @@ -127,6 +128,15 @@ export const TOKEN_PROJECTS_BY_ID: ReadonlyRecord< isLp: false, tokenNumber: 0x0104, }, + [TokenProjectId.Usdte]: { + id: TokenProjectId.Usdte, + symbol: "USDT.e", + displayName: "Tether USD", + icon: USDT_SVG, + isStablecoin: true, + isLp: false, + tokenNumber: 0x0105, + }, [TokenProjectId.Gst]: { id: TokenProjectId.Gst, symbol: "GST", @@ -235,11 +245,11 @@ export const TOKEN_PROJECTS_BY_ID: ReadonlyRecord< isLp: true, tokenNumber: null, }, - [TokenProjectId.SwimAuroraUsdtLp]: { - id: TokenProjectId.SwimAuroraUsdtLp, - symbol: "SWIM-AURORA-USDT-LP", - displayName: "Aurora USDT LP", - icon: LP_AURORA_USDT_SVG, + [TokenProjectId.SwimAuroraUsdteLp]: { + id: TokenProjectId.SwimAuroraUsdteLp, + symbol: "SWIM-AURORA-USDTE-LP", + displayName: "Aurora USDTe LP", + icon: LP_AURORA_USDTE_SVG, isStablecoin: false, isLp: true, tokenNumber: null, From 95fd3e205bcbd43f4a525ff73bbe00b2fcfb2d03 Mon Sep 17 00:00:00 2001 From: swimdrew Date: Fri, 28 Oct 2022 11:52:50 -0400 Subject: [PATCH 2/7] feat(evm): replace Aurora USDT with USDTe --- packages/evm/src/ecosystems/aurora.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/evm/src/ecosystems/aurora.ts b/packages/evm/src/ecosystems/aurora.ts index aa51b9ac2..ecdc5a5c9 100644 --- a/packages/evm/src/ecosystems/aurora.ts +++ b/packages/evm/src/ecosystems/aurora.ts @@ -50,8 +50,8 @@ const mainnet: EvmChainConfig = { ]), }, { - id: "mainnet-aurora-usdt", - projectId: TokenProjectId.Usdt, + id: "mainnet-aurora-usdte", + projectId: TokenProjectId.Usdte, nativeDetails: { address: "0x4988a896b1227218e4A686fdE5EabdcAbd91571f", decimals: 6, @@ -119,8 +119,8 @@ const testnet: EvmChainConfig = { ]), }, { - id: "testnet-aurora-usdt", - projectId: TokenProjectId.Usdt, + id: "testnet-aurora-usdte", + projectId: TokenProjectId.Usdte, nativeDetails: { address: "0x489dDcd070b6c4e0373FBB5d529Cc06328E048c3", decimals: 6, @@ -153,8 +153,8 @@ const testnet: EvmChainConfig = { ]), }, { - id: "testnet-aurora-lp-usdc-usdt", - projectId: TokenProjectId.SwimLpAuroraUsdcUsdt, + id: "testnet-aurora-lp-usdc-usdte", + projectId: TokenProjectId.SwimLpAuroraUsdcUsdte, nativeDetails: { address: "0x1111111111111111111111111111111111111111", // TODO: Update decimals: 8, From 07f79bedbddd3880352451818e56623529766881 Mon Sep 17 00:00:00 2001 From: swimdrew Date: Fri, 28 Oct 2022 11:53:57 -0400 Subject: [PATCH 3/7] feat(solana): Replace lp-meta-aurora-usdt with usdte --- packages/solana/src/ecosystem.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/solana/src/ecosystem.ts b/packages/solana/src/ecosystem.ts index ddc6cdecd..e7c62c1fc 100644 --- a/packages/solana/src/ecosystem.ts +++ b/packages/solana/src/ecosystem.ts @@ -188,8 +188,8 @@ const mainnet: SolanaChainConfig = { wrappedDetails: EMPTY_MAP, }, { - id: "mainnet-solana-lp-meta-aurora-usdt", - projectId: TokenProjectId.SwimAuroraUsdtLp, + id: "mainnet-solana-lp-meta-aurora-usdte", + projectId: TokenProjectId.SwimAuroraUsdteLp, nativeDetails: { address: "4XPDxtGbcM7bAPKZxALd2s862n3WoG4xPPvyCPVULKAb", decimals: 8, @@ -421,8 +421,8 @@ const testnet: SolanaChainConfig = { wrappedDetails: EMPTY_MAP, }, { - id: "testnet-solana-lp-meta-aurora-usdt", - projectId: TokenProjectId.SwimAuroraUsdtLp, + id: "testnet-solana-lp-meta-aurora-usdte", + projectId: TokenProjectId.SwimAuroraUsdteLp, nativeDetails: { address: "utXdXdUMaS5qrBDDUg5btQMGL2CedouzmMPbYMJPEZD", decimals: 8, From 87442a738e958ca6c4ce45d629e4af2a0a57de78 Mon Sep 17 00:00:00 2001 From: swimdrew Date: Fri, 28 Oct 2022 12:02:02 -0400 Subject: [PATCH 4/7] feat(scripts): replace aurora usdt with usdte --- apps/scripts/src/config/tokens.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/scripts/src/config/tokens.ts b/apps/scripts/src/config/tokens.ts index 2ba22d25e..004b4983a 100644 --- a/apps/scripts/src/config/tokens.ts +++ b/apps/scripts/src/config/tokens.ts @@ -138,8 +138,8 @@ export const DEVNET_TOKENS_FOR_RESTRUCTURE: readonly TokenConfig[] = [ }, { isDisabled: !isPoolRestructureEnabled(), - id: "devnet-aurora-lp-usdc-usdt", - projectId: TokenProjectId.SwimLpAuroraUsdcUsdt, + id: "devnet-aurora-lp-usdc-usdte", + projectId: TokenProjectId.SwimLpAuroraUsdcUsdte, nativeEcosystemId: EvmEcosystemId.Aurora, nativeDetails: { address: "0x1111111111111111111111111111111111111111", // TODO: Update @@ -363,8 +363,8 @@ export const DEVNET_TOKENS: readonly TokenConfig[] = [ wrappedDetails: EMPTY_MAP, }, { - id: "devnet-solana-lp-meta-aurora-usdt", - projectId: TokenProjectId.SwimAuroraUsdtLp, + id: "devnet-solana-lp-meta-aurora-usdte", + projectId: TokenProjectId.SwimAuroraUsdteLp, nativeEcosystemId: SOLANA_ECOSYSTEM_ID, nativeDetails: { address: "utXdXdUMaS5qrBDDUg5btQMGL2CedouzmMPbYMJPEZD", @@ -626,8 +626,8 @@ export const DEVNET_TOKENS: readonly TokenConfig[] = [ ]), }, { - id: "devnet-aurora-usdt", - projectId: TokenProjectId.Usdt, + id: "devnet-aurora-usdte", + projectId: TokenProjectId.Usdte, nativeEcosystemId: EvmEcosystemId.Aurora, nativeDetails: { address: "0x489dDcd070b6c4e0373FBB5d529Cc06328E048c3", From 036ddfb32b4e518f2ead196c53c1e86580bf3513 Mon Sep 17 00:00:00 2001 From: swimdrew Date: Fri, 28 Oct 2022 12:06:56 -0400 Subject: [PATCH 5/7] feat(ui): Replace aurora usdt with usdte --- apps/ui/src/config/pools.ts | 28 ++++++++++++++-------------- apps/ui/src/config/tokens.ts | 16 ++++++++-------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/apps/ui/src/config/pools.ts b/apps/ui/src/config/pools.ts index f955da968..79c9dbd97 100644 --- a/apps/ui/src/config/pools.ts +++ b/apps/ui/src/config/pools.ts @@ -223,9 +223,9 @@ const MAINNET_POOLS: readonly PoolSpec[] = [ tokens: ["mainnet-aurora-usdc", "mainnet-solana-lp-hexapool"], }, { - id: "meta-aurora-usdt", + id: "meta-aurora-usdte", ecosystem: SOLANA_ECOSYSTEM_ID, - displayName: "Aurora USDT", + displayName: "Aurora USDT.e", isStakingPool: false, isStableSwap: true, isLegacyPool: true, @@ -233,15 +233,15 @@ const MAINNET_POOLS: readonly PoolSpec[] = [ address: "4t1cfAbmLjyLuBo1gsvCVKjVUR48ixqvS4dLKW8dtRvm", authority: "23CU3bqMJoRTpvyti84CmPbkAyNJDnTZE7DYj6MnhGdK", feeDecimals: 6, - lpToken: "mainnet-solana-lp-meta-aurora-usdt", + lpToken: "mainnet-solana-lp-meta-aurora-usdte", tokenAccounts: new Map([ - ["mainnet-aurora-usdt", "6VtNuUZR1CxBunrQBoNtjC2ZZWqhpmkWwdY8zhbFBcie"], + ["mainnet-aurora-usdte", "6VtNuUZR1CxBunrQBoNtjC2ZZWqhpmkWwdY8zhbFBcie"], [ "mainnet-solana-lp-hexapool", "CpMPTJ72mqeVRK6569sGqkWCV5B6dSZpTCD7BAKW2QPo", ], ]), - tokens: ["mainnet-aurora-usdt", "mainnet-solana-lp-hexapool"], + tokens: ["mainnet-aurora-usdte", "mainnet-solana-lp-hexapool"], }, { isDisabled: !process.env.REACT_APP_ENABLE_AURORA_USN, @@ -457,16 +457,16 @@ export const TESTNET_POOLS_FOR_RESTRUCTURE: readonly PoolSpec[] = [ }, { isDisabled: true, // TODO: Update !isPoolRestructureEnabled(), - id: "testnet-aurora-usdc-usdt", + id: "testnet-aurora-usdc-usdte", ecosystem: EvmEcosystemId.Aurora, - displayName: "Aurora USDC USDT", + displayName: "Aurora USDC USDT.e", isStakingPool: false, isStableSwap: true, isLegacyPool: false, address: "11111111111111111111111111111111", // TODO: Update feeDecimals: 6, - lpToken: "testnet-aurora-lp-usdc-usdt", - tokens: ["testnet-swimusd", "testnet-aurora-usdc", "testnet-aurora-usdt"], + lpToken: "testnet-aurora-lp-usdc-usdte", + tokens: ["testnet-swimusd", "testnet-aurora-usdc", "testnet-aurora-usdte"], }, { isDisabled: true, @@ -716,9 +716,9 @@ export const TESTNET_POOLS: readonly PoolSpec[] = [ tokens: ["testnet-aurora-usdc", "testnet-solana-lp-hexapool"], }, { - id: "meta-aurora-usdt", + id: "meta-aurora-usdte", ecosystem: SOLANA_ECOSYSTEM_ID, - displayName: "Aurora USDT", + displayName: "Aurora USDT.e", isStakingPool: false, isStableSwap: true, isLegacyPool: true, @@ -726,15 +726,15 @@ export const TESTNET_POOLS: readonly PoolSpec[] = [ address: "t6JAmJWDi4y6pp32p268ru3GrHEBXdoHERVqSjek3XY", authority: "ETywNpF1gsXmmPLSavw563Mr4FaCLmVxcupdWxPZ8nxw", feeDecimals: 6, - lpToken: "testnet-solana-lp-meta-aurora-usdt", + lpToken: "testnet-solana-lp-meta-aurora-usdte", tokenAccounts: new Map([ - ["testnet-aurora-usdt", "DpBhN9UoHh4RGGHcoGBfqeqKndstiTXup6pwhcBxXFFA"], + ["testnet-aurora-usdte", "DpBhN9UoHh4RGGHcoGBfqeqKndstiTXup6pwhcBxXFFA"], [ "testnet-solana-lp-hexapool", "Gmd1KvrLonD6pzeMz2U1nTJVgG4yv9LySpYQZVLV8eBm", ], ]), - tokens: ["testnet-aurora-usdt", "testnet-solana-lp-hexapool"], + tokens: ["testnet-aurora-usdte", "testnet-solana-lp-hexapool"], }, { isDisabled: !process.env.REACT_APP_ENABLE_AURORA_USN, // TODO: Enable when deployed on testnet diff --git a/apps/ui/src/config/tokens.ts b/apps/ui/src/config/tokens.ts index 04c43e65a..de9b55469 100644 --- a/apps/ui/src/config/tokens.ts +++ b/apps/ui/src/config/tokens.ts @@ -190,8 +190,8 @@ const MAINNET_TOKENS: readonly TokenConfig[] = [ wrappedDetails: EMPTY_MAP, }, { - id: "mainnet-solana-lp-meta-aurora-usdt", - projectId: TokenProjectId.SwimAuroraUsdtLp, + id: "mainnet-solana-lp-meta-aurora-usdte", + projectId: TokenProjectId.SwimAuroraUsdteLp, nativeEcosystemId: SOLANA_ECOSYSTEM_ID, nativeDetails: { address: "4XPDxtGbcM7bAPKZxALd2s862n3WoG4xPPvyCPVULKAb", @@ -451,8 +451,8 @@ const MAINNET_TOKENS: readonly TokenConfig[] = [ ]), }, { - id: "mainnet-aurora-usdt", - projectId: TokenProjectId.Usdt, + id: "mainnet-aurora-usdte", + projectId: TokenProjectId.Usdte, nativeEcosystemId: EvmEcosystemId.Aurora, nativeDetails: { address: "0x4988a896b1227218e4A686fdE5EabdcAbd91571f", @@ -946,8 +946,8 @@ export const TESTNET_TOKENS: readonly TokenConfig[] = [ wrappedDetails: EMPTY_MAP, }, { - id: "testnet-solana-lp-meta-aurora-usdt", - projectId: TokenProjectId.SwimAuroraUsdtLp, + id: "testnet-solana-lp-meta-aurora-usdte", + projectId: TokenProjectId.SwimAuroraUsdteLp, nativeEcosystemId: SOLANA_ECOSYSTEM_ID, nativeDetails: { address: "utXdXdUMaS5qrBDDUg5btQMGL2CedouzmMPbYMJPEZD", @@ -1206,8 +1206,8 @@ export const TESTNET_TOKENS: readonly TokenConfig[] = [ ]), }, { - id: "testnet-aurora-usdt", - projectId: TokenProjectId.Usdt, + id: "testnet-aurora-usdte", + projectId: TokenProjectId.Usdte, nativeEcosystemId: EvmEcosystemId.Aurora, nativeDetails: { address: "0x489dDcd070b6c4e0373FBB5d529Cc06328E048c3", From 4e1f947f5df0083955de0c2c7ec15f6e30a4237c Mon Sep 17 00:00:00 2001 From: swimdrew Date: Fri, 28 Oct 2022 12:13:45 -0400 Subject: [PATCH 6/7] fix(token-projects): fix aurora-lp-usdc-usdt to aurora-lp-usdc-usdte --- packages/token-projects/src/projects.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/token-projects/src/projects.ts b/packages/token-projects/src/projects.ts index 3d1ebef29..a91016d07 100644 --- a/packages/token-projects/src/projects.ts +++ b/packages/token-projects/src/projects.ts @@ -55,7 +55,7 @@ export enum TokenProjectId { SwimLpBnbBusdUsdt = "swim-lp-bnb-busd-usdt", SwimLpAvalancheUsdcUsdt = "swim-lp-avalanche-usdc-usdt", SwimLpPolygonUsdcUsdt = "swim-lp-polygon-usdc-usdt", - SwimLpAuroraUsdcUsdt = "swim-lp-aurora-usdc-usdt", + SwimLpAuroraUsdcUsdte = "swim-lp-aurora-usdc-usdte", SwimLpAuroraUsn = "swim-lp-aurora-usn", SwimLpFantomUsdc = "swim-lp-fantom-usdc", SwimLpKaruraUsdt = "swim-lp-karura-usdt", @@ -248,7 +248,7 @@ export const TOKEN_PROJECTS_BY_ID: ReadonlyRecord< [TokenProjectId.SwimAuroraUsdteLp]: { id: TokenProjectId.SwimAuroraUsdteLp, symbol: "SWIM-AURORA-USDTE-LP", - displayName: "Aurora USDTe LP", + displayName: "Aurora USDT.e LP", icon: LP_AURORA_USDTE_SVG, isStablecoin: false, isLp: true, @@ -346,10 +346,10 @@ export const TOKEN_PROJECTS_BY_ID: ReadonlyRecord< isLp: true, tokenNumber: null, }, - [TokenProjectId.SwimLpAuroraUsdcUsdt]: { - id: TokenProjectId.SwimLpAuroraUsdcUsdt, - symbol: "SWIM-LP-AURORA-USDC-USDT", - displayName: "Aurora USDC/USDT Pool LP", + [TokenProjectId.SwimLpAuroraUsdcUsdte]: { + id: TokenProjectId.SwimLpAuroraUsdcUsdte, + symbol: "SWIM-LP-AURORA-USDC-USDT.e", + displayName: "Aurora USDC/USDT.e Pool LP", icon: SWIM_USD_SVG, // TODO: update isStablecoin: false, isLp: true, From 95945602c5b766eb8ebe7273777607fdb232562b Mon Sep 17 00:00:00 2001 From: swimdrew Date: Fri, 28 Oct 2022 12:14:29 -0400 Subject: [PATCH 7/7] fix(ui): fix aurora-lp-usdc-usdt to aurora-lp-usdc-usdte --- apps/ui/src/config/tokens.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/ui/src/config/tokens.ts b/apps/ui/src/config/tokens.ts index de9b55469..7046f7f9d 100644 --- a/apps/ui/src/config/tokens.ts +++ b/apps/ui/src/config/tokens.ts @@ -701,8 +701,8 @@ export const TESTNET_TOKENS_FOR_RESTRUCTURE: readonly TokenConfig[] = [ }, { isDisabled: !isPoolRestructureEnabled(), - id: "testnet-aurora-lp-usdc-usdt", - projectId: TokenProjectId.SwimLpAuroraUsdcUsdt, + id: "testnet-aurora-lp-usdc-usdte", + projectId: TokenProjectId.SwimLpAuroraUsdcUsdte, nativeEcosystemId: EvmEcosystemId.Aurora, nativeDetails: { address: "0x1111111111111111111111111111111111111111", // TODO: Update