Include new mainnet fork changes (#1218)

* Fix convertToShares when StETH (#1169)

* check if shares is pegged

* move into variable

* adds adjust slippage error (#1166)

* Show effective short apr in preview (#1165)

* show short apr after open

* adds short apr after open

* Rename label

* updates per comments

* Fix total values to include closed (#1175)

* check if closed longs

* fix total values for closed

* remove console log

* remove typecasting

* move total variable

* split into two hooks

* moved is loading

* adds enabled param

* Migrate steth -> lidoShares conversion from sdk to frontend (#1176)

* Remove conversions from ReadStethHyperdrive and ReadWriteStethHyperdrive

* Create usePrepareSharesIn and usePrepareSharesOut

* minor cleanup in aisle useAccruedYield

* Update usePreviewOpenLong to prepare shares in

* Update usePreviewCloseLong to prepare shares out

* Update useMaxLong to prepare shares out

* Update useCloseLong to prepare shares in

* Update useOpenLong to prepare shares in

* Update useAddLiquidity to prepare shares in

* Update usePreviewAddLiquidity to prepare shares in

* Update usePreviewRedeemWithdrawalShares to convert shares out

* Update useRedeemWithdrawalShares to prepare shares in

* Update useRemoveLiquidity to prepare shares in

* Update usePreviewRemoveLiquidity to prepare shares in and out

* Update useMaxShort to prepare shares out

* Update useOpenShort to prepare shares in

* Update usePreviewOpenShort to prepare shares out

* Update useCloseShort to prepare shares in

* Update usePreviewCloseShort to prepare shares out

* Fix sign in prepareSharesOut

* Remove unnecessary extra conversions that caused loss of precision

* early return

* color net short rate red/green (#1177)

* anonymize ip (#1178)

* Polish modal forms for all position types (#1181)

* Upgrade to latest daisy

* Add texture svgs

* Darken backdrop on modals

* Add size prop to LabelValue

* Add size and horizontal props to Stat

* Add modalHeader prop to Modal

* Remove Well from TransactionPreview component

* Add header to open long modal

* Re-organize the OpenLongPreview, put market impact in daisy-collapse

* Refactor to ModalHeader component

* Fix layout shift on focus

* Add xsmall size to Stat component

* move getRemainingTimeLabel to own file

* Refactor CloseLongForm and CloseLongModalButton to use new modal style

* Create base component for CollapseSection

* Refactor OpenShort

* Refactor Close Short

* Tweak stat size

* Add '.00' if rate is a whole number

* tweak spacing

* Slightly dim the before text color for market impact

* Refactor Add Liquidity modal

* Refactor Remove liquidity form

* Refactor withdrawal shares

* Throw error in getSubheadingLabel utils

* inline

* Throw test error for rollbar (#1182)

* throw test error

* updates per comments

* udpate footer links, adds icons (#1183)

* remove unused tableheader on mobile (#1184)

* Polish open and close position modals (#1188)

* Fix gap when using stat without a label

* Prevent wrapping by using condensed label

* Simplify props to just what's used

* Code cleanups

* Polish Term Completed badges in close modals

* Add docblock

* adds error for total value (#1193)

* Add gopher package and /bridge route (#1195)

* add step to README

* add bridge page

* add gopher package

* cleanup

* Remove spark package (#1196)

* give tos modal some breating room (#1198)

* show insufficient balance second (#1199)

* Add calcShortMarketValue to hyperdrive-wasm (#1167)

Co-authored-by: MazyGio <[email protected]>

* Display Negative Short APR/ROI in Red in Yield Stats (#1200)

* Add VPN and Restricted Countries pages (#1201)

* Add VPN page

* Remove pasted code from trm message

* Add restricted countries route

* Fill out Bridge page with stats. (#1202)

* add gopher dependency

* move this to the consumer

* use index for file names, ignore out dir

* add hooks

* add stats to bridge page.

* update hooks to match repo style

* flatten, use makeQueryKey

* prevent error

TS18003: No inputs were found in config file

* Polish Preview Transaction sections in open position modals (#1203)

* Polish tooltips in OpenLong and OpenShort previews

* Remove bolding

* Make the text color less bright on zeros when empty state in OpenLongPreview

* Update tooltips and text brightness on OpenShortPreview

* Cleanup layout in AddLiquidityPreview, fix active color on LP stat

* Show market short rate by default in Open Short preview

* Indent balances for easier scanning

* Flip condition

* Add Your Transactions table to market details (#1204)

* Re-use type

* Add Your Transaction table

* Remove unused z index

* Default to all transactions if no account connected

* Add Gopher Stubs (#1207)

* add gopher stubs

* add comment

* Navbar Cleanup (#1206)

* updates connect button

* version picker added

* version picker cleanup

* cleanup

* updates per comments

* add ui to switch to bridge modal (#1208)

* add ui to switch to bridge modal

* refactor OpenLongModal

* add BridgeAssetsModal

* allow multi modal mode

* toggle between modal uis

* put behind feature flag

* capitalize DELV (#1209)

* capitalize delv

* cap github

* Update repo to 1.0.12 (#1210)

* Update artifacts to 1.0.12

* Update appconfig

* Add missing field to 42069 config.

* Fix SDK types

* Update hyperwasm

* Final fixes

* Add link to v1.0.6 pools in version picker (#1212)

* Add link to v1.0.6 pools in version picker"

* Add link to v1.0.6 pools in version picker, remove version picker from behind feature flag

* updates mainnet wagmi client (#1211)

* Fix flag for Bridge UI (#1213)

* Build mock app config for mainnet (#1214)

Co-authored-by: Danny Delott <[email protected]>

* adds new text (#1216)

* Add mainnet appconfig (#1215)

* Add registry address for mainnet and generation script

* Build appconfig for mainnet

* Bump husky version, use npx

---------

Co-authored-by: Ryan Goree <[email protected]>

* new fork appconfig (#1217)

---------

Co-authored-by: Jack Burrus <[email protected]>
Co-authored-by: Danny Delott <[email protected]>
Co-authored-by: Matthew Brown <[email protected]>
Co-authored-by: MazyGio <[email protected]>
Co-authored-by: Ryan Goree <[email protected]>
Co-authored-by: Danny Delott <[email protected]>

Author: 6 people

Cargo.lock

@@ -14,8 +14,11 @@ VITE_CUSTOM_CHAIN_CHAIN_ID=
 VITE_CAPSULE_API_KEY=
 VITE_CAPSULE_ENV=
 #
-# Sepolia 
+# Sepolia, or
 VITE_SEPOLIA_RPC_URL=
+#
+# Mainnet
+VITE_MAINNET_RPC_URL=
 ##################################################
 
 # Used to screen ineligible addresses.

apps/hyperdrive-trading/.env.sample

@@ -48,6 +48,8 @@ cd apps/hyperdrive-trading
 
 ### Run locally
 
+First, copy the .env.sample to .env and you'll need to set the VITE_SEPOLIA_RPC_URL variable to an active rpc url.
+
 Serve with hot reload at <http://localhost:5173>.
 
 ```bash

apps/hyperdrive-trading/README.md

@@ -26,62 +26,64 @@
     "gen:walletconnect": "bash ./scripts/generate-walletconnect.sh"
   },
   "dependencies": {
+    "@delvtech/gopher": "*",
+    "@delvtech/hyperdrive-viem": "^2.3.0",
     "@heroicons/react": "^2.0.16",
     "@hyperdrive/appconfig": "*",
-    "@delvtech/hyperdrive-viem": "^2.3.0",
     "@rainbow-me/rainbowkit": "^2.0.0",
+    "@rollbar/react": "^0.11.1",
     "@tanstack/react-query": "^4.29.12",
     "@tanstack/react-router": "^1.9.0",
     "@tanstack/react-table": "^8.10.3",
-    "@types/lodash.sortby": "^4.7.9",
-    "lodash.sortby": "^4.7.0",
     "@types/d3-format": "^3.0.4",
+    "@types/lodash.sortby": "^4.7.9",
     "assert-never": "^1.2.1",
     "buffer": "^6.0.3",
     "calendar-link": "^2.6.0",
     "classnames": "^2.3.2",
     "d3-format": "^3.1.0",
-    "daisyui": "^4.11.1",
+    "daisyui": "^4.12.2",
     "dnum": "^2.9.0",
+    "lodash.sortby": "^4.7.0",
     "process": "^0.11.10",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-helmet": "^6.1.0",
     "react-hot-toast": "^2.4.0",
     "react-loading-skeleton": "^3.3.1",
     "react-use": "^17.4.2",
-    "viem": "^2.7.8",
-    "@rollbar/react": "^0.11.1",
     "rollbar": "^2.26.4",
+    "viem": "^2.7.8",
     "wagmi": "^2.5.12"
   },
   "devDependencies": {
     "@hyperdrive/eslint-config": "*",
     "@hyperdrive/prettier-config": "*",
     "@hyperdrive/tsconfig": "*",
+    "@tanstack/eslint-plugin-query": "^5.28.11",
     "@tanstack/router-devtools": "^1.9.0",
     "@tanstack/router-vite-plugin": "^1.8.2",
-    "@tanstack/eslint-plugin-query": "^5.28.11",
     "@types/react": "^18.0.9",
     "@types/react-dom": "^18.0.10",
     "@types/react-helmet": "^6.1.6",
     "@typescript-eslint/eslint-plugin": "^7.5.0",
     "@typescript-eslint/parser": "^7.5.0",
+    "@usecapsule/rainbowkit-wallet": "^0.8.5",
     "@vitejs/plugin-react": "^3.1.0",
     "autoprefixer": "^10.4.13",
     "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-tailwindcss": "^3.15.1",
+    "msw": "^2.3.1",
     "postcss": "^8.4.21",
     "prettier": "3.2.5",
     "prettier-plugin-organize-imports": "3.2.4",
     "prettier-plugin-tailwindcss": "^0.5.13",
-    "vite-plugin-node-polyfills": "^0.21.0",
-    "@usecapsule/rainbowkit-wallet": "^0.8.5",
     "tailwindcss": "^3.4.3",
     "tailwindcss-debug-screens": "2.2.1",
     "typescript": "^5.0.2",
     "vite": "^4.1.0",
+    "vite-plugin-node-polyfills": "^0.21.0",
     "vite-tsconfig-paths": "^4.0.5",
     "vitest": "^0.28.5"
   }

apps/hyperdrive-trading/package.json

@@ -6,5 +6,8 @@ export function formatRate(rate: bigint, decimals = 18): string {
   // the decimal, and format those to a percent, eg: 0.0499999999 * 100 = 4.99.
   const truncatedAPR = +formatUnits(rate, decimals).slice(0, 10);
   const formatted = `${Number((100 * truncatedAPR).toFixed(2)).toLocaleString()}`;
+  if (formatted.indexOf(".") === -1) {
+    return `${formatted}.00`;
+  }
   return formatted;
 }

apps/hyperdrive-trading/src/base/formatRate.ts

@@ -12,7 +12,7 @@ import { cloudChain } from "src/chains/cloudChain";
 import { CreateWalletFn } from "src/wallets/CreateWalletFn";
 import { capsuleWallet } from "src/wallets/capsule";
 import { Transport } from "viem";
-import { foundry, sepolia } from "wagmi/chains";
+import { foundry, mainnet, sepolia } from "wagmi/chains";
 
 const {
   VITE_LOCALHOST_NODE_RPC_URL,
@@ -21,6 +21,7 @@ const {
   VITE_CUSTOM_CHAIN_CHAIN_ID,
   VITE_WALLET_CONNECT_PROJECT_ID,
   VITE_SEPOLIA_RPC_URL,
+  VITE_MAINNET_RPC_URL,
 } = import.meta.env;
 
 export const chains: Chain[] = [];
@@ -62,6 +63,17 @@ if (VITE_SEPOLIA_RPC_URL) {
   }
 }
 
+if (VITE_MAINNET_RPC_URL) {
+  chains.push(mainnet);
+  transports[mainnet.id] = http(VITE_MAINNET_RPC_URL);
+
+  // TODO: push this into the custom wallets for local and cloudchain once
+  // capsule support is verified
+  if (capsuleWallet) {
+    customWallets.push(capsuleWallet);
+  }
+}
+
 export const wagmiConfig = getDefaultConfig({
   appName: "Hyperdrive",
   projectId: VITE_WALLET_CONNECT_PROJECT_ID || "0",