From d19d68b05c375da4bb9922bc9898bf6dd4d4d887 Mon Sep 17 00:00:00 2001 From: Danny Delott Date: Mon, 16 Oct 2023 15:45:35 -0700 Subject: [PATCH 1/6] Fix bug in ReadHyperdrive.getClosedLpShares --- .../src/hyperdrive/ReadHyperdrive.ts | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/packages/hyperdrive-sdk/src/hyperdrive/ReadHyperdrive.ts b/packages/hyperdrive-sdk/src/hyperdrive/ReadHyperdrive.ts index 4496dbc70..8ca99d272 100644 --- a/packages/hyperdrive-sdk/src/hyperdrive/ReadHyperdrive.ts +++ b/packages/hyperdrive-sdk/src/hyperdrive/ReadHyperdrive.ts @@ -979,18 +979,22 @@ export class ReadHyperdrive implements IReadHyperdrive { ...options, }, ); - return removeLiquidityEvents.map(({ data, args }) => { - const { baseAmount, lpAmount, withdrawalShareAmount } = args; - return { - hyperdriveAddress: this.contract.address, - lpAmount, - baseAmount, - withdrawalShareAmount, - closedTimestamp: decodeAssetFromTransferSingleEventData( - data as `0x${string}`, - ).timestamp, - }; - }); + return Promise.all( + removeLiquidityEvents.map(async ({ blockNumber, data, args }) => { + const { baseAmount, lpAmount, withdrawalShareAmount } = args; + return { + hyperdriveAddress: this.contract.address, + lpAmount, + baseAmount, + withdrawalShareAmount, + closedTimestamp: ( + await this.network.getBlock({ + blockNumber, + }) + ).timestamp, + }; + }), + ); } async getWithdrawalShares({ From c656b4cdec2cf85012edf928210fd1f509e8c174 Mon Sep 17 00:00:00 2001 From: Danny Delott Date: Mon, 16 Oct 2023 15:45:44 -0700 Subject: [PATCH 2/6] Fix closed date in lp table --- .../portfolio/ClosedLpTable/ClosedLpTable.tsx | 60 ++++++++++--------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/apps/hyperdrive-trading/src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx b/apps/hyperdrive-trading/src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx index d1bf96ed2..2b6c0352b 100644 --- a/apps/hyperdrive-trading/src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx +++ b/apps/hyperdrive-trading/src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx @@ -34,35 +34,37 @@ export function ClosedLpTable({ if (closedLpShares) { rows.push( ...closedLpShares.map( - ({ lpAmount, baseAmount, closedTimestamp, withdrawalShareAmount }) => [ - - LP - , - - {formatBalance({ - balance: lpAmount, - decimals: hyperdrive.baseToken.decimals, - })} - , - - {`${formatBalance({ - balance: baseAmount, - decimals: hyperdrive.baseToken.decimals, - })} ${hyperdrive.baseToken.symbol}`} - , - - {`${formatBalance({ - balance: withdrawalShareAmount, - decimals: hyperdrive.baseToken.decimals, - })}`} - , - - {new Date(Number(closedTimestamp * 1000n)).toLocaleDateString()} - , - ], + ({ lpAmount, baseAmount, closedTimestamp, withdrawalShareAmount }) => { + return [ + + LP + , + + {formatBalance({ + balance: lpAmount, + decimals: hyperdrive.baseToken.decimals, + })} + , + + {`${formatBalance({ + balance: baseAmount, + decimals: hyperdrive.baseToken.decimals, + })} ${hyperdrive.baseToken.symbol}`} + , + + {`${formatBalance({ + balance: withdrawalShareAmount, + decimals: hyperdrive.baseToken.decimals, + })}`} + , + + {new Date(Number(closedTimestamp * 1000n)).toLocaleDateString()} + , + ]; + }, ), ); } From dc921074bd412ff3a8f29297dde661fa7057e5d6 Mon Sep 17 00:00:00 2001 From: Danny Delott Date: Mon, 16 Oct 2023 15:46:48 -0700 Subject: [PATCH 3/6] Update label to Withdrawal Shares --- .../src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/hyperdrive-trading/src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx b/apps/hyperdrive-trading/src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx index 2b6c0352b..167a91078 100644 --- a/apps/hyperdrive-trading/src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx +++ b/apps/hyperdrive-trading/src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx @@ -74,7 +74,7 @@ export function ClosedLpTable({ ...redeemedWithdrawalShares.map( ({ baseAmount, timestamp, withdrawalShareAmount }) => [ - Pending Withdrawal + Withdrawal shares , {`${formatBalance({ From a61cd9ea1e1d320c6fd03e890c2ad2f1bf0d85c1 Mon Sep 17 00:00:00 2001 From: Danny Delott Date: Mon, 16 Oct 2023 15:56:22 -0700 Subject: [PATCH 4/6] Fix redeemedTimestamp in ReadHyperdrive --- .../src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx | 6 +++--- packages/hyperdrive-sdk/src/hyperdrive/ReadHyperdrive.ts | 7 +++---- .../src/withdrawalShares/RedeemedWithdrawalShares.ts | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/apps/hyperdrive-trading/src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx b/apps/hyperdrive-trading/src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx index 167a91078..e4d3bcfb7 100644 --- a/apps/hyperdrive-trading/src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx +++ b/apps/hyperdrive-trading/src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx @@ -72,7 +72,7 @@ export function ClosedLpTable({ if (redeemedWithdrawalShares) { rows.push( ...redeemedWithdrawalShares.map( - ({ baseAmount, timestamp, withdrawalShareAmount }) => [ + ({ baseAmount, redeemedTimestamp, withdrawalShareAmount }) => [ Withdrawal shares , @@ -92,7 +92,7 @@ export function ClosedLpTable({ 0 , - {new Date(Number(timestamp * 1000n)).toLocaleDateString()} + {new Date(Number(redeemedTimestamp * 1000n)).toLocaleDateString()} , ], ), @@ -123,7 +123,7 @@ export function ClosedLpTable({ { cell: ( ), diff --git a/packages/hyperdrive-sdk/src/hyperdrive/ReadHyperdrive.ts b/packages/hyperdrive-sdk/src/hyperdrive/ReadHyperdrive.ts index 8ca99d272..26706853c 100644 --- a/packages/hyperdrive-sdk/src/hyperdrive/ReadHyperdrive.ts +++ b/packages/hyperdrive-sdk/src/hyperdrive/ReadHyperdrive.ts @@ -1028,15 +1028,14 @@ export class ReadHyperdrive implements IReadHyperdrive { ); return Promise.all( - redeemedWithdrawalShareEvents.map(async ({ data, args }) => { + redeemedWithdrawalShareEvents.map(async ({ blockNumber, args }) => { const { withdrawalShareAmount, baseAmount } = args; return { hyperdriveAddress: this.contract.address, withdrawalShareAmount, baseAmount, - timestamp: decodeAssetFromTransferSingleEventData( - data as `0x${string}`, - ).timestamp, + redeemedTimestamp: (await this.network.getBlock({ blockNumber })) + .timestamp, }; }), ); diff --git a/packages/hyperdrive-sdk/src/withdrawalShares/RedeemedWithdrawalShares.ts b/packages/hyperdrive-sdk/src/withdrawalShares/RedeemedWithdrawalShares.ts index 3596b068f..3a0d6f067 100644 --- a/packages/hyperdrive-sdk/src/withdrawalShares/RedeemedWithdrawalShares.ts +++ b/packages/hyperdrive-sdk/src/withdrawalShares/RedeemedWithdrawalShares.ts @@ -4,5 +4,5 @@ export interface RedeemedWithdrawalShares { hyperdriveAddress: Address; withdrawalShareAmount: bigint; baseAmount: bigint; - timestamp: bigint; + redeemedTimestamp: bigint; } From ae8022dda5ad9203b5e5d580672dd66e18836f40 Mon Sep 17 00:00:00 2001 From: Danny Delott Date: Mon, 16 Oct 2023 16:19:44 -0700 Subject: [PATCH 5/6] Update Transaction table styling to default daisy --- .../ui/hyperdrive/TransactionTable/TransactionsTable.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/hyperdrive-trading/src/ui/hyperdrive/TransactionTable/TransactionsTable.tsx b/apps/hyperdrive-trading/src/ui/hyperdrive/TransactionTable/TransactionsTable.tsx index e2fdf8163..d473093c2 100644 --- a/apps/hyperdrive-trading/src/ui/hyperdrive/TransactionTable/TransactionsTable.tsx +++ b/apps/hyperdrive-trading/src/ui/hyperdrive/TransactionTable/TransactionsTable.tsx @@ -84,12 +84,12 @@ export function TransactionTable({ return (
- +
{tableInstance.getHeaderGroups().map((headerGroup) => ( {headerGroup.headers.map((header) => ( - {tableInstance.getRowModel().rows.map((row) => ( {row.getVisibleCells().map((cell) => { From 856cdfc9fbc4bdbbaf3cd58a9768c674835f0e9b Mon Sep 17 00:00:00 2001 From: Danny Delott Date: Mon, 16 Oct 2023 16:20:00 -0700 Subject: [PATCH 6/6] Cleanup column label text --- .../src/ui/hyperdrive/TransactionTable/TransactionsTable.tsx | 2 +- .../src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/hyperdrive-trading/src/ui/hyperdrive/TransactionTable/TransactionsTable.tsx b/apps/hyperdrive-trading/src/ui/hyperdrive/TransactionTable/TransactionsTable.tsx index d473093c2..c8c5af0e1 100644 --- a/apps/hyperdrive-trading/src/ui/hyperdrive/TransactionTable/TransactionsTable.tsx +++ b/apps/hyperdrive-trading/src/ui/hyperdrive/TransactionTable/TransactionsTable.tsx @@ -84,7 +84,7 @@ export function TransactionTable({ return (
-
+ {header.isPlaceholder ? null : ( <>
@@ -137,7 +137,7 @@ export function TransactionTable({
+
{tableInstance.getHeaderGroups().map((headerGroup) => ( diff --git a/apps/hyperdrive-trading/src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx b/apps/hyperdrive-trading/src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx index e4d3bcfb7..e313cc511 100644 --- a/apps/hyperdrive-trading/src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx +++ b/apps/hyperdrive-trading/src/ui/portfolio/ClosedLpTable/ClosedLpTable.tsx @@ -52,7 +52,7 @@ export function ClosedLpTable({ {`${formatBalance({ balance: baseAmount, decimals: hyperdrive.baseToken.decimals, - })} ${hyperdrive.baseToken.symbol}`} + })}`} , {`${formatBalance({ @@ -116,7 +116,7 @@ export function ClosedLpTable({ cell: ( ), },