Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ export const useRepayFormData = () => {
liabilityQuery.isLoading;

const maxRepayableStETH =
stethBalanceQuery.data && liabilityQuery.data
stethBalanceQuery.data !== undefined && liabilityQuery.data
? bigIntMin(stethBalanceQuery.data, liabilityQuery.data.liabilitySteth)
: undefined;

const maxRepayableWstETH =
wstethBalanceQuery.data && liabilityQuery.data
wstethBalanceQuery.data !== undefined && liabilityQuery.data
? bigIntMin(wstethBalanceQuery.data, liabilityQuery.data.liabilityWsteth)
: undefined;

Expand Down
6 changes: 1 addition & 5 deletions features/adjustment/repay/form/submit-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@ export const SubmitButton = () => {
const isDisabled = isSubmitting || disabled;

return (
<PermissionedSubmitButton
dashboardRole="repayer"
type="submit"
disabled={isDisabled}
>
<PermissionedSubmitButton dashboardRole="repayer" disabled={isDisabled}>
{vaultTexts.actions.repay.submit(token, amount)}
</PermissionedSubmitButton>
);
Expand Down
1 change: 0 additions & 1 deletion features/claim/claim-form/form/submit-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export const SubmitButton = () => {
return (
<PermissionedSubmitButton
dashboardRole="nodeOperatorFeeClaimer"
type="submit"
disabled={isDisabled}
>
{vaultTexts.actions.claim.claimButton(claimableFeeQuery.data)}
Expand Down
40 changes: 21 additions & 19 deletions features/report/ipfs/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,28 @@ import { CID_TO_GATEWAY } from './ipfs-gateways';
import { StandardMerkleTree } from '@openzeppelin/merkle-tree';

type IPFSReport = {
blockNumber: bigint;
format: 'standard-v1';
refSlot: bigint;
timestamp: bigint;
leafEncoding: ['address', 'uint256', 'uint256', 'uint256', 'uint256'];
leafIndexToData: {
0: 'vault_address';
1: 'total_value_wei';
2: 'in_out_delta';
3: 'fee';
4: 'liability_shares';
};
merkleTreeRoot: Hex;
blockNumber: number;
refSlot: number;
timestamp: number;

prevTreeCID: string;
proofsCID: string;
tree: string[];

merkleTreeRoot: Hex;
tree: Hex[];
values: {
treeIndex: bigint;
value: [Address, bigint, bigint, bigint, bigint];
value: [Address, string, string, string, string];
}[];
format: 'standard-v1';
leafEncoding: ['address', 'uint256', 'uint256', 'uint256', 'int256'];
leafIndexToData: {
'0': 'vault_address';
'1': 'total_value_wei';
'2': 'fee';
'3': 'liability_shares';
'4': 'slashing_reserve';
};
};

const fetchIPFS = async <TResult>(cid: string): Promise<TResult> => {
Expand Down Expand Up @@ -78,10 +80,10 @@ const extractProofFromIPFS = async (cid: string, vault: Address) => {

return {
vault: vaultEntry.value[0],
totalValueWei: vaultEntry.value[1],
inOutDelta: vaultEntry.value[2],
fee: vaultEntry.value[3],
liabilityShares: vaultEntry.value[4],
totalValueWei: BigInt(vaultEntry.value[1]),
fee: BigInt(vaultEntry.value[2]),
liabilityShares: BigInt(vaultEntry.value[3]),
slashingReserve: BigInt(vaultEntry.value[4]),
proof: merkleTree.getProof(vaultIndex) as Hex[],
};
};
Expand Down
2 changes: 1 addition & 1 deletion features/report/use-report.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ export const useReportStatus = () => {
args: [
activeVault.address,
report.totalValueWei,
report.inOutDelta,
report.fee,
report.liabilityShares,
report.slashingReserve,
report.proof,
],
}),
Expand Down
6 changes: 1 addition & 5 deletions features/supply/withdraw/form/submit-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ export const SubmitButton = () => {
const isDisabled = isSubmitting || disabled;

return (
<PermissionedSubmitButton
type="submit"
dashboardRole="withdrawer"
disabled={isDisabled}
>
<PermissionedSubmitButton dashboardRole="withdrawer" disabled={isDisabled}>
{vaultTexts.actions.withdraw.submit(token, amount)}
</PermissionedSubmitButton>
);
Expand Down
2 changes: 1 addition & 1 deletion modules/vaults/components/permissioned-submit-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const MultiplePermissionedSubmitButton = forwardRef<

return (
<ConnectWalletButton>
<Button disabled={shouldDisable} ref={ref} {...rest}>
<Button type="submit" disabled={shouldDisable} ref={ref} {...rest}>
{shouldShowPermissionError
? vaultTexts.common.errors.noRoles(missingRoles)
: children}
Expand Down
2 changes: 1 addition & 1 deletion networks/hoodi-devnet-1.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"predepositGuarantee": "0xAcb99d36e19763C210A548019C6F238B67644417",
"vaultFactory": "0x74808E3Fe5B7714b580067Ab02032d19E0cD9f5f",
"vaultHub": "0x26b92f0fdfeBAf43E5Ea5b5974EeBee95F17Fe08",
"vaultViewer": "0xA49da29B3C37fb192dD87C9ED5b16d6e40C9736C",
"vaultViewer": "0xcA7fD5b9bD19B840c20C8a65dd8cFd1273e557c4",
"lazyOracle": "0xdF66Fb038CbB7587cC52A397CA88143657f3Ae4A",
"operatorGrid": "0x35dd33A473D492745eD5226Cf940b5b1ef4C111D"
},
Expand Down
Loading