Skip to content

fix(nextjs): parse the unshield amount in confidential decimals #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dusk1e wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(nextjs): parse the unshield amount in confidential decimals #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 14 additions & 8 deletions packages/nextjs/services/store/encryptDecrypt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useCallback, useMemo } from "react";
import { useDecryptValue } from "./decrypted";
import { useConfidentialTokenPair, useConfidentialTokenPairBalances } from "./tokenStore";
import { ConfidentialTokenPair, useConfidentialTokenPair, useConfidentialTokenPairBalances } from "./tokenStore";
import { FheTypes } from "@cofhe/sdk";
import { Address, formatUnits, parseUnits } from "viem";
import { useAccount, useChainId } from "wagmi";
Expand Down Expand Up @@ -29,6 +29,14 @@ export const useEncryptDecryptStore = create<EncryptDecryptStore>()(
})),
);

/**
* Decimals of the amount being entered. Encrypting (shield) moves the underlying token, so the
* amount is in public decimals. Decrypting (unshield) moves the confidential balance, which the
* FHERC20 denominates in its own (capped) decimals.
*/
const inputDecimals = (pair: ConfidentialTokenPair | undefined, isEncrypt: boolean) =>
isEncrypt ? (pair?.publicToken.decimals ?? 18) : (pair?.confidentialToken?.decimals ?? 6);

// Actions

const selectToken = (chain: number, account: Address, pairPublicToken: Address | null, isEncrypt?: boolean) => {
Expand Down Expand Up @@ -105,7 +113,7 @@ export const useUpdateEncryptDecryptValue = () => {
// Allow only numbers and optional single decimal point, no negatives
if (/^\d*\.?\d*$/.test(sanitized)) {
try {
const amount = parseUnits(sanitized, pair.publicToken.decimals);
const amount = parseUnits(sanitized, inputDecimals(pair, state.isEncrypt));
if (state.isEncrypt) {
state.encryptValue = amount;
} else {
Expand Down Expand Up @@ -134,11 +142,12 @@ export const useEncryptDecryptRawInputValue = () => {
export const useEncryptDecryptInputValue = () => {
const rawInputValue = useEncryptDecryptRawInputValue();
const pair = useEncryptDecryptPair();
const isEncrypt = useEncryptDecryptIsEncrypt();

return useMemo(() => {
if (pair == null) return "";
return formatUnits(rawInputValue, pair.publicToken.decimals);
}, [pair, rawInputValue]);
return formatUnits(rawInputValue, inputDecimals(pair, isEncrypt));
}, [pair, isEncrypt, rawInputValue]);
};

export const useEncryptDecryptInputString = () => {
Expand All @@ -164,10 +173,7 @@ export const useUpdateEncryptDecryptValueByPercent = () => {
state.decryptValue = amount;
}
// Update the input string with the formatted amount
const currentTokenDecimals = !state.isEncrypt
? (pair?.confidentialToken?.decimals ?? 6)
: (pair?.publicToken.decimals ?? 18);
state.inputString = formatUnits(amount, currentTokenDecimals);
state.inputString = formatUnits(amount, inputDecimals(pair, state.isEncrypt));
});
},
[pair, balances],
Expand Down