From 396650865ce0d868af00a33ad2ef049ee3b6578a Mon Sep 17 00:00:00 2001
From: Hau Nguyen Van <nguyenvanhauit1997@gmail.com>
Date: Thu, 19 Sep 2024 17:38:00 +0700
Subject: [PATCH] remove duplicat token pepe cat in oraichain

---
 packages/oraidex-common/package.json          |  2 +-
 packages/oraidex-common/src/network.ts        | 25 ----------------
 .../universal-demos/from-oraichain-to-evm.ts  | 29 +++++++++++--------
 3 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/packages/oraidex-common/package.json b/packages/oraidex-common/package.json
index 46418ef6..25fd0825 100644
--- a/packages/oraidex-common/package.json
+++ b/packages/oraidex-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oraichain/oraidex-common",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "main": "build/index.js",
   "files": [
     "build/"
diff --git a/packages/oraidex-common/src/network.ts b/packages/oraidex-common/src/network.ts
index badcea9e..dea95c5b 100644
--- a/packages/oraidex-common/src/network.ts
+++ b/packages/oraidex-common/src/network.ts
@@ -525,22 +525,6 @@ export const oraichainNetwork: CustomChainInfo = {
       coinDecimals: 9,
       coinGeckoId: "the-open-network",
       coinImageUrl: "https://assets.coingecko.com/coins/images/17980/standard/ton_symbol.png?1696517498"
-    },
-    {
-      coinDenom: "PEPE",
-      coinMinimalDenom: PEPE_ORAICHAIN_DENOM,
-      coinDecimals: 18,
-      coinGeckoId: "pepe",
-      bridgeTo: ["0x01", "0x38"],
-      coinImageUrl: "https://assets.coingecko.com/coins/images/29850/standard/pepe-token.jpeg?1696528776"
-    },
-    {
-      coinDenom: "CAT",
-      coinMinimalDenom: CAT_ORAICHAIN_DENOM,
-      coinDecimals: 18,
-      bridgeTo: ["0x38"],
-      coinGeckoId: "simon-s-cat",
-      coinImageUrl: "https://assets.coingecko.com/coins/images/39765/standard/Simon's_Cat_Logo.png?1724017505"
     }
   ]
 };
@@ -1045,15 +1029,6 @@ export const chainInfos: CustomChainInfo[] = [
         coinGeckoId: "tron",
         prefixToken: ORAI_BRIDGE_EVM_TRON_DENOM_PREFIX,
         coinImageUrl: "https://s2.coinmarketcap.com/static/img/coins/64x64/1958.png"
-      },
-      {
-        coinDenom: "PEPE",
-        coinMinimalDenom: "pepe",
-        contractAddress: PEPE_ETH_CONTRACT,
-        coinDecimals: 18,
-        coinGeckoId: "pepe",
-        bridgeTo: ["Oraichain"],
-        coinImageUrl: "https://assets.coingecko.com/coins/images/29850/standard/pepe-token.jpeg?1696528776"
       }
     ],
     bip44: {
diff --git a/packages/universal-swap/src/universal-demos/from-oraichain-to-evm.ts b/packages/universal-swap/src/universal-demos/from-oraichain-to-evm.ts
index ae1cc9b2..76fdf915 100644
--- a/packages/universal-swap/src/universal-demos/from-oraichain-to-evm.ts
+++ b/packages/universal-swap/src/universal-demos/from-oraichain-to-evm.ts
@@ -11,34 +11,39 @@ const oraichainToEvm = async () => {
   const wallet = new CosmosWalletImpl(process.env.MNEMONIC);
 
   const sender = await wallet.getKeplrAddr(chainId);
-  const fromAmount = 100;
-  let originalFromToken = flattenTokens.find((t) => t.chainId === chainId && t.coinGeckoId === "pepe");
+  const fromAmount = 10000;
+  let originalToToken = flattenTokens.find((t) => t.chainId === chainId && t.coinGeckoId === "pepe");
 
-  let originalToToken = flattenTokens.find((t) => t.chainId === "0x38" && t.coinGeckoId === "pepe");
+  let originalFromToken = flattenTokens.find((t) => t.chainId === "0x38" && t.coinGeckoId === "pepe");
 
   if (!originalFromToken) throw generateError("Could not find original from token");
   if (!originalToToken) throw generateError("Could not find original to token");
 
-  const smartRoutes = await UniversalSwapHelper.simulateSwapUsingSmartRoute({
-    fromInfo: originalFromToken,
-    toInfo: originalToToken,
-    amount: toAmount(fromAmount, originalToToken.decimals).toString()
+  console.log({
+    originalToToken,
+    originalFromToken
   });
 
-  console.log("expected amount: ", smartRoutes.returnAmount);
+  // const smartRoutes = await UniversalSwapHelper.simulateSwapUsingSmartRoute({
+  //   fromInfo: originalFromToken,
+  //   toInfo: originalToToken,
+  //   amount: toAmount(fromAmount, originalToToken.decimals).toString()
+  // });
+
+  // console.log("expected amount: ", smartRoutes.returnAmount);
   const universalHandler = new UniversalSwapHandler(
     {
       originalFromToken,
       originalToToken,
-      sender: { cosmos: sender },
+      sender: { cosmos: sender, evm: "0x8c7E0A841269a01c0Ab389Ce8Fb3Cf150A94E797" },
       relayerFee: {
-        relayerAmount: "0",
+        relayerAmount: "100000",
         relayerDecimals: 6
       },
-      simulatePrice: "1",
+      simulatePrice: "10000000",
       fromAmount,
       simulateAmount: toAmount(fromAmount, originalToToken.decimals).toString(),
-      userSlippage: 0.01
+      userSlippage: 1
     },
     { cosmosWallet: wallet, swapOptions: {} }
   );