diff --git a/.env.example b/.env.example index 73d3a30d..09cff896 100644 --- a/.env.example +++ b/.env.example @@ -1,26 +1,52 @@ -NEXT_PUBLIC_NETWORK=testnet -NEXT_PUBLIC_CHAIN_ID=osmo-test-5 -NEXT_PUBLIC_RPC=https://testnet-osmosis-node.marsprotocol.io/XF32UOOU55CX/osmosis-rpc-front/ -NEXT_PUBLIC_GQL=https://testnet-osmosis-node.marsprotocol.io/XF32UOOU55CX/osmosis-hive-front/graphql -NEXT_PUBLIC_REST=https://testnet-osmosis-node.marsprotocol.io/XF32UOOU55CX/osmosis-lcd-front/ +NEXT_PUBLIC_NETWORK=devnet +NEXT_PUBLIC_CHAIN_ID=devnet +NEXT_PUBLIC_RPC=https://rpc.devnet.osmosis.zone/ +NEXT_PUBLIC_GQL=https://devnet-osmosis-gql.marsprotocol.io/graphql +NEXT_PUBLIC_REST=https://lcd.devnet.osmosis.zone/ NEXT_PUBLIC_SWAP=https://testnet.osmosis.zone -NEXT_PUBLIC_APOLLO_APR=https://api.apollo.farm/api/vault_infos/v2/osmo-test-5 -NEXT_PUBLIC_ACCOUNT_NFT=osmo1hdk6nps2l2tdfgly0tegcgwl239l45etuae7nsc6s93u0yrqk4rqv489kl -NEXT_PUBLIC_ORACLE=osmo1dxu93scjdnx42txdp9d4hm3snffvnzmkp4jpc9sml8xlu3ncgamsl2lx58 -NEXT_PUBLIC_RED_BANK=osmo1hs4sm0fah9rk4mz8e56v4n76g0q9fffdkkjm3f8tjagkdx78pqcq75pk0a -NEXT_PUBLIC_CREDIT_MANAGER=osmo1zwugj8tz9nq63m3lxcfpunp0xr5lnlxdr0yyn4gpftx3ham09m4skn73ew -NEXT_PUBLIC_INCENTIVES=osmo1nu0k6g294jela67vyth6nwr3l42gutq2m07pg9927f7v7tuv0d4sre9fr7 -NEXT_PUBLIC_ZAPPER=osmo1jwtmujld4ew2vt67qnmpdxr3fmmle2yg823de5ygvf47uvhpu76qlhf82q -NEXT_PUBLIC_SWAPPER=osmo1ee9cq8dcknmw43znznx6vuupx5ku0tt505agccgaz5gn48mhe45s3kwwfm -NEXT_PUBLIC_PARAMS=osmo1h334tvddn82m4apm08rm9k6kt32ws7vy0c4n30ngrvu6h6yxh8eq9l9jfh +NEXT_PUBLIC_APOLLO_APR=https://api.apollo.farm/api/vault_infos/v2/osmosis-1 +NEXT_PUBLIC_ACCOUNT_NFT=osmo1j0m37hqpaeh79cjrdna4sep6yfyu278rrm4qta6s4hjq6fv3njxqsvhcex +NEXT_PUBLIC_ORACLE=osmo1dh8f3rhg4eruc9w7c9d5e06eupqqrth7v32ladwkyphvnn66muzqxcfe60 +NEXT_PUBLIC_RED_BANK=osmo1pvrlpmdv3ee6lgmxd37n29gtdahy4tec7c5nyer9aphvfr526z6sff9zdg +NEXT_PUBLIC_CREDIT_MANAGER=osmo12wd0rwuvu7wwujztkww5c7sg4fw4e6t235jyftwy5ydc48uxd24q4s9why +NEXT_PUBLIC_INCENTIVES=osmo1aemnaq5x3jkttnd38g7lewh24nh90r9zwh8853qv3tkf47p2hnasaae0e4 +NEXT_PUBLIC_ZAPPER=osmo1yhh8mhthj5jn5c6ty59z3tpsk554qxmlkrkcderw6jls0pcg8zxsdjdj94 +NEXT_PUBLIC_SWAPPER=osmo17c4retwuyxjxzv9f2q9r0272s8smktpzhjetssttxxdavarjtujsjqafa2 +NEXT_PUBLIC_PARAMS=osmo1dpwu03xc45vpqur6ry69xjhltq4v0snrhaukcp4fvhucx0wypzhs978lnp +NEXT_PUBLIC_PYTH=osmo13ge29x4e2s63a8ytz2px8gurtyznmue4a69n5275692v3qn3ks8q7cwck7 NEXT_PUBLIC_API=http://localhost:3000/api -NEXT_PUBLIC_CANDLES_ENDPOINT="https://api.thegraph.com/subgraphs/name/{NAME}/{GRAPH_NAME}" -CHARTING_LIBRARY_USERNAME="username_with_access_to_charting_library" -CHARTING_LIBRARY_ACCESS_TOKEN="access_token_with_access_to_charting_library" -CHARTING_LIBRARY_REPOSITORY="github.com/username/charting_library/" NEXT_PUBLIC_PYTH_ENDPOINT=https://xc-mainnet.pyth.network/api NEXT_PUBLIC_MAINNET_REST=https://osmosis-node.marsprotocol.io/GGSFGSFGFG34/osmosis-lcd-front/ +NEXT_PUBLIC_CANDLES_ENDPOINT=https://api.thegraph.com/subgraphs/name/donovansolms/osmosis-tv-candles-test NEXT_PUBLIC_WALLET_CONNECT_ID=d93fdffb159bae5ec87d8fee4cdbb045 +CHARTING_LIBRARY_REPOSITORY=github.com/tradingview/charting_library +CHARTING_LIBRARY_ACCESS_TOKEN=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 +CHARTING_LIBRARY_USERNAME=mars-git-demo + +# TESTNET # +# NEXT_PUBLIC_NETWORK=testnet +# NEXT_PUBLIC_CHAIN_ID=osmo-test-5 +# NEXT_PUBLIC_RPC=https://testnet-osmosis-node.marsprotocol.io/XF32UOOU55CX/osmosis-rpc-front/ +# NEXT_PUBLIC_GQL=https://testnet-osmosis-node.marsprotocol.io/XF32UOOU55CX/osmosis-hive-front/graphql +# NEXT_PUBLIC_REST=https://testnet-osmosis-node.marsprotocol.io/XF32UOOU55CX/osmosis-lcd-front/ +# NEXT_PUBLIC_SWAP=https://testnet.osmosis.zone +# NEXT_PUBLIC_APOLLO_APR=https://api.apollo.farm/api/vault_infos/v2/osmo-test-5 +# NEXT_PUBLIC_ACCOUNT_NFT=osmo1hdk6nps2l2tdfgly0tegcgwl239l45etuae7nsc6s93u0yrqk4rqv489kl +# NEXT_PUBLIC_ORACLE=osmo1dxu93scjdnx42txdp9d4hm3snffvnzmkp4jpc9sml8xlu3ncgamsl2lx58 +# NEXT_PUBLIC_RED_BANK=osmo1hs4sm0fah9rk4mz8e56v4n76g0q9fffdkkjm3f8tjagkdx78pqcq75pk0a +# NEXT_PUBLIC_CREDIT_MANAGER=osmo1zwugj8tz9nq63m3lxcfpunp0xr5lnlxdr0yyn4gpftx3ham09m4skn73ew +# NEXT_PUBLIC_INCENTIVES=osmo1nu0k6g294jela67vyth6nwr3l42gutq2m07pg9927f7v7tuv0d4sre9fr7 +# NEXT_PUBLIC_ZAPPER=osmo1jwtmujld4ew2vt67qnmpdxr3fmmle2yg823de5ygvf47uvhpu76qlhf82q +# NEXT_PUBLIC_SWAPPER=osmo1ee9cq8dcknmw43znznx6vuupx5ku0tt505agccgaz5gn48mhe45s3kwwfm +# NEXT_PUBLIC_PARAMS=osmo1h334tvddn82m4apm08rm9k6kt32ws7vy0c4n30ngrvu6h6yxh8eq9l9jfh +# NEXT_PUBLIC_API=http://localhost:3000/api +# NEXT_PUBLIC_CANDLES_ENDPOINT="https://api.thegraph.com/subgraphs/name/{NAME}/{GRAPH_NAME}" +# CHARTING_LIBRARY_USERNAME="username_with_access_to_charting_library" +# CHARTING_LIBRARY_ACCESS_TOKEN="access_token_with_access_to_charting_library" +# CHARTING_LIBRARY_REPOSITORY="github.com/username/charting_library/" +# NEXT_PUBLIC_PYTH_ENDPOINT=https://xc-mainnet.pyth.network/api +# NEXT_PUBLIC_MAINNET_REST=https://osmosis-node.marsprotocol.io/GGSFGSFGFG34/osmosis-lcd-front/ +# NEXT_PUBLIC_WALLET_CONNECT_ID=d93fdffb159bae5ec87d8fee4cdbb045 # MAINNET # # NEXT_PUBLIC_NETWORK=mainnet diff --git a/public/images/tokens/axl.svg b/public/images/tokens/axl.svg new file mode 100644 index 00000000..69026781 --- /dev/null +++ b/public/images/tokens/axl.svg @@ -0,0 +1,15 @@ + + + + + + + diff --git a/public/images/tokens/cro.svg b/public/images/tokens/cro.svg deleted file mode 100644 index cfe70fb0..00000000 --- a/public/images/tokens/cro.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - diff --git a/public/images/tokens/injective.svg b/public/images/tokens/injective.svg deleted file mode 100644 index d01adbe3..00000000 --- a/public/images/tokens/injective.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - diff --git a/public/images/tokens/juno.svg b/public/images/tokens/juno.svg deleted file mode 100644 index c4486716..00000000 --- a/public/images/tokens/juno.svg +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/api/prices/getOraclePrices.ts b/src/api/prices/getOraclePrices.ts index ef6529b2..9f76119c 100644 --- a/src/api/prices/getOraclePrices.ts +++ b/src/api/prices/getOraclePrices.ts @@ -16,7 +16,6 @@ export default async function getOraclePrices(...assets: Asset[]): Promise { const priceResponse = priceResults.find(byDenom(asset.denom)) as PriceResponse const decimalDiff = asset.decimals - PRICE_ORACLE_DECIMALS - return BNCoin.fromDenomAndBigNumber( asset.denom, BN(priceResponse.price).shiftedBy(decimalDiff), diff --git a/src/api/prices/getPrices.ts b/src/api/prices/getPrices.ts index d7519fea..28c36631 100644 --- a/src/api/prices/getPrices.ts +++ b/src/api/prices/getPrices.ts @@ -19,7 +19,6 @@ export default async function getPrices(): Promise { ]) ).flat() const poolPrices = await requestPoolPrices(assetsWithPoolIds, pythAndOraclePrices) - return [...pythAndOraclePrices, ...poolPrices, usdPrice] } catch (ex) { console.error(ex) diff --git a/src/components/Account/AccountDetails/index.tsx b/src/components/Account/AccountDetails/index.tsx index d49f821a..00b92fcb 100644 --- a/src/components/Account/AccountDetails/index.tsx +++ b/src/components/Account/AccountDetails/index.tsx @@ -114,7 +114,7 @@ function AccountDetails(props: Props) {
- + Net worth diff --git a/src/components/Wallet/WalletBridges.tsx b/src/components/Wallet/WalletBridges.tsx index f4a406bd..3352ad4e 100644 --- a/src/components/Wallet/WalletBridges.tsx +++ b/src/components/Wallet/WalletBridges.tsx @@ -87,7 +87,7 @@ export default function WalletBridges() { ))}
- {IS_TESTNET && ( + {ENV.NETWORK !== 'mainnet' && (
Need Testnet Funds? @@ -95,7 +95,11 @@ export default function WalletBridges() {
diff --git a/src/components/Wallet/WalletConnectedButton.tsx b/src/components/Wallet/WalletConnectedButton.tsx index 4cb3f012..6d1b7fae 100644 --- a/src/components/Wallet/WalletConnectedButton.tsx +++ b/src/components/Wallet/WalletConnectedButton.tsx @@ -13,7 +13,7 @@ import Overlay from 'components/Overlay' import Text from 'components/Text' import RecentTransactions from 'components/Wallet/RecentTransactions' import { CHAINS } from 'constants/chains' -import { IS_TESTNET } from 'constants/env' +import { ENV } from 'constants/env' import { BN_ZERO } from 'constants/math' import useCurrentWallet from 'hooks/useCurrentWallet' import useToggle from 'hooks/useToggle' @@ -80,7 +80,7 @@ export default function WalletConnectedButton() { return (
- {IS_TESTNET && ( + {ENV.NETWORK !== 'mainnet' && (