Skip to content
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

Jump to bottom

[APIS-343] Fix fee coin selection in cosmos sign page #348

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
+137 −26
Open

[APIS-343] Fix fee coin selection in cosmos sign page #348

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c5ceab
refactor((cosmos sign page)): edit fee coin selection logic
G-Gamja Jun 7, 2024
7f9baa4
chore: Update gas rate calculation logic in Cosmos sign pages
G-Gamja Jun 10, 2024
34aeea4
refactor(cosmos sign page): delete meaningless using spread operator
G-Gamja Jun 10, 2024
1095f31
refactor: Edit fee coin selection logic in Cosmos sign pages
G-Gamja Jun 10, 2024
dd35aa7
fix: Checking unknown fee coin balance
G-Gamja Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
80 changes: 67 additions & 13 deletions src/Popup/pages/Popup/Cosmos/Sign/Amino/entry.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import Tooltip from '~/Popup/components/common/Tooltip';
import Fee from '~/Popup/components/Fee';
import LedgerToTab from '~/Popup/components/Loading/LedgerToTab';
import PopupHeader from '~/Popup/components/PopupHeader';
import { useAssetsSWR } from '~/Popup/hooks/SWR/cosmos/useAssetsSWR';
import { useBalanceSWR } from '~/Popup/hooks/SWR/cosmos/useBalanceSWR';
import { useCurrentFeesSWR } from '~/Popup/hooks/SWR/cosmos/useCurrentFeesSWR';
import { useSimulateSWR } from '~/Popup/hooks/SWR/cosmos/useSimulateSWR';
import { useCurrentAccount } from '~/Popup/hooks/useCurrent/useCurrentAccount';
Expand All @@ -20,14 +22,14 @@ import { useCurrentQueue } from '~/Popup/hooks/useCurrent/useCurrentQueue';
import { useLedgerTransport } from '~/Popup/hooks/useLedgerTransport';
import { useLoading } from '~/Popup/hooks/useLoading';
import { useTranslation } from '~/Popup/hooks/useTranslation';
import { ceil, divide, equal, gte, times } from '~/Popup/utils/big';
import { ceil, divide, equal, gt, gte, times } from '~/Popup/utils/big';
import { getAddress, getKeyPair } from '~/Popup/utils/common';
import { cosmosURL, getDefaultAV, getPublicKeyType, signAmino } from '~/Popup/utils/cosmos';
import CosmosApp from '~/Popup/utils/ledger/cosmos';
import { responseToWeb } from '~/Popup/utils/message';
import { broadcast, protoTx, protoTxBytes } from '~/Popup/utils/proto';
import { isEqualsIgnoringCase } from '~/Popup/utils/string';
import type { CosmosChain, GasRateKey } from '~/types/chain';
import type { CosmosChain, FeeCoin, GasRateKey } from '~/types/chain';
import type { Queue } from '~/types/extensionStorage';
import type { CosSignAmino, CosSignAminoResponse } from '~/types/message/cosmos';
import type { Path } from '~/types/route';
Expand Down Expand Up @@ -59,7 +61,32 @@ export default function Entry({ queue, chain }: EntryProps) {

const [isProgress, setIsProgress] = useState(false);

const { feeCoins, defaultGasRateKey } = useCurrentFeesSWR(chain, { suspense: true });
const assets = useAssetsSWR(chain);

const balance = useBalanceSWR(chain);

const { feeCoins: supportedFeeCoins, defaultGasRateKey } = useCurrentFeesSWR(chain, { suspense: true });

const availableFeeCoins = useMemo(() => {
const availableCoins = assets.data.map((asset) => ({
originBaseDenom: asset.origin_denom,
baseDenom: asset.denom,
decimals: asset.decimals,
displayDenom: asset.symbol,
coinGeckoId: asset.coinGeckoId,
availableAmount: balance.data?.balance?.find((item) => item.denom === asset.denom)?.amount || '0',
}));

const aggregatedFeeCoins = [...supportedFeeCoins, ...availableCoins];

const uniqueFeeCoins = aggregatedFeeCoins.reduce((acc: FeeCoin[], current) => {
if (!acc.find((coin) => coin.baseDenom === current.baseDenom)) {
return [...acc, current];
}
return acc;
}, []);
return uniqueFeeCoins;
}, [assets.data, balance.data?.balance, supportedFeeCoins]);

const { message, messageId, origin, channel } = queue;

Expand All @@ -83,21 +110,29 @@ export default function Entry({ queue, chain }: EntryProps) {

const inputFee = useMemo(
() =>
fee.amount?.find((item) => feeCoins.map((feeCoin) => feeCoin.baseDenom).includes(item.denom)) ||
fee.amount?.find((item) => availableFeeCoins.map((feeCoin) => feeCoin.baseDenom).includes(item.denom)) ||
fee.amount?.[0] || {
denom: chain.baseDenom,
amount: '0',
},
[chain.baseDenom, fee.amount, feeCoins],
[chain.baseDenom, fee.amount, availableFeeCoins],
);

const inputFeeAmount = useMemo(() => inputFee.amount, [inputFee.amount]);

const [currentFeeBaseDenom, setCurrentFeeBaseDenom] = useState(
feeCoins.find((item) => item.baseDenom === inputFee.denom)?.baseDenom ?? feeCoins[0].baseDenom,
);
const [currentFeeBaseDenom, setCurrentFeeBaseDenom] = useState(inputFee.denom);

const currentFeeCoin = useMemo(() => feeCoins.find((item) => item.baseDenom === currentFeeBaseDenom) ?? feeCoins[0], [currentFeeBaseDenom, feeCoins]);
const currentFeeCoin = useMemo(
() =>
availableFeeCoins.find((item) => item.baseDenom === currentFeeBaseDenom) || {
availableAmount: '0',
decimals: 0,
baseDenom: inputFee.denom,
originBaseDenom: inputFee.denom,
displayDenom: 'UNKNOWN',
},
[currentFeeBaseDenom, inputFee.denom, availableFeeCoins],
);

const memoizedProtoTx = useMemo(() => {
if (isEditFee) {
Expand All @@ -124,16 +159,34 @@ export default function Entry({ queue, chain }: EntryProps) {
[customGas, inputGas, simulatedGas],
);

const currentFeeGasRate = useMemo(() => currentFeeCoin.gasRate || gasRate || chain.gasRate, [chain.gasRate, currentFeeCoin.gasRate, gasRate]);
const initialGasRate = useMemo(() => (equal(inputGas, '0') ? '0' : divide(inputFeeAmount, inputGas)), [inputFeeAmount, inputGas]);

const currentFeeGasRate = useMemo(() => {
if (currentFeeCoin.gasRate) {
return currentFeeCoin.gasRate;
}

if (gasRate) {
return gasRate;
}

if (gt(initialGasRate, '0')) {
return {
average: initialGasRate,
low: initialGasRate,
tiny: initialGasRate,
};
}

return chain.gasRate;
}, [chain.gasRate, currentFeeCoin.gasRate, gasRate, initialGasRate]);

const signingMemo = useMemo(() => (isEditMemo ? memo : doc.memo), [doc.memo, isEditMemo, memo]);

const isFeeCustomed = useMemo(() => !!customGas || !!customGasRateKey, [customGasRateKey, customGas]);

const isFeeUpdateAllowed = useMemo(() => isEditFee || isFeeCustomed, [isFeeCustomed, isEditFee]);

const initialGasRate = useMemo(() => (equal(inputGas, '0') ? '0' : divide(inputFeeAmount, inputGas)), [inputFeeAmount, inputGas]);

const baseFee = useMemo(
() => (isFeeUpdateAllowed ? times(currentGas, currentGasRateKey ? currentFeeGasRate[currentGasRateKey] : initialGasRate) : inputFeeAmount),
[currentFeeGasRate, currentGas, currentGasRateKey, initialGasRate, inputFeeAmount, isFeeUpdateAllowed],
Expand Down Expand Up @@ -187,12 +240,13 @@ export default function Entry({ queue, chain }: EntryProps) {
<FeeContainer>
<Fee
feeCoin={currentFeeCoin}
feeCoinList={feeCoins}
feeCoinList={supportedFeeCoins}
gasRate={currentFeeGasRate}
baseFee={baseFee}
gas={currentGas}
onChangeFeeCoin={(selectedFeeCoin) => {
setCurrentFeeBaseDenom(selectedFeeCoin.baseDenom);
setCustomGasRateKey('low');
}}
onChangeGas={(g) => setCustomGas(g)}
onChangeGasRateKey={(gasRateKey) => {
Expand Down
83 changes: 70 additions & 13 deletions src/Popup/pages/Popup/Cosmos/Sign/Direct/entry.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,22 @@ import { Tab, TabPanel, Tabs } from '~/Popup/components/common/Tab';
import Tooltip from '~/Popup/components/common/Tooltip';
import Fee from '~/Popup/components/Fee';
import PopupHeader from '~/Popup/components/PopupHeader';
import { useAssetsSWR } from '~/Popup/hooks/SWR/cosmos/useAssetsSWR';
import { useBalanceSWR } from '~/Popup/hooks/SWR/cosmos/useBalanceSWR';
import { useCurrentFeesSWR } from '~/Popup/hooks/SWR/cosmos/useCurrentFeesSWR';
import { useProtoBuilderDecodeSWR } from '~/Popup/hooks/SWR/cosmos/useProtoBuilderDecodeSWR';
import { useSimulateSWR } from '~/Popup/hooks/SWR/cosmos/useSimulateSWR';
import { useCurrentAccount } from '~/Popup/hooks/useCurrent/useCurrentAccount';
import { useCurrentPassword } from '~/Popup/hooks/useCurrent/useCurrentPassword';
import { useCurrentQueue } from '~/Popup/hooks/useCurrent/useCurrentQueue';
import { useTranslation } from '~/Popup/hooks/useTranslation';
import { ceil, divide, equal, gte, times } from '~/Popup/utils/big';
import { ceil, divide, equal, gt, gte, times } from '~/Popup/utils/big';
import { getAddress, getKeyPair } from '~/Popup/utils/common';
import { cosmosURL, getDefaultAV, getPublicKeyType, signDirect } from '~/Popup/utils/cosmos';
import { responseToWeb } from '~/Popup/utils/message';
import { broadcast, decodeProtobufMessage, protoTxBytes } from '~/Popup/utils/proto';
import { cosmos } from '~/proto/cosmos-v0.44.2.js';
import type { CosmosChain, GasRateKey } from '~/types/chain';
import type { CosmosChain, FeeCoin, GasRateKey } from '~/types/chain';
import type { Queue } from '~/types/extensionStorage';
import type { CosSignDirect, CosSignDirectResponse } from '~/types/message/cosmos';
import type { Path } from '~/types/route';
Expand Down Expand Up @@ -50,7 +52,32 @@ export default function Entry({ queue, chain }: EntryProps) {

const [isProgress, setIsProgress] = useState(false);

const { feeCoins, defaultGasRateKey } = useCurrentFeesSWR(chain, { suspense: true });
const assets = useAssetsSWR(chain);

const balance = useBalanceSWR(chain);

const { feeCoins: supportedFeeCoins, defaultGasRateKey } = useCurrentFeesSWR(chain, { suspense: true });

const availableFeeCoins = useMemo(() => {
const availableCoins = assets.data.map((asset) => ({
originBaseDenom: asset.origin_denom,
baseDenom: asset.denom,
decimals: asset.decimals,
displayDenom: asset.symbol,
coinGeckoId: asset.coinGeckoId,
availableAmount: balance.data?.balance?.find((item) => item.denom === asset.denom)?.amount || '0',
}));

const aggregatedFeeCoins = [...supportedFeeCoins, ...availableCoins];

const uniqueFeeCoins = aggregatedFeeCoins.reduce((acc: FeeCoin[], current) => {
if (!acc.find((coin) => coin.baseDenom === current.baseDenom)) {
return [...acc, current];
}
return acc;
}, []);
return uniqueFeeCoins;
}, [assets.data, balance.data?.balance, supportedFeeCoins]);

const { message, messageId, origin, channel } = queue;

Expand Down Expand Up @@ -79,7 +106,9 @@ export default function Entry({ queue, chain }: EntryProps) {
const inputGas = useMemo(() => (fee?.gas_limit ? String(fee.gas_limit) : '0'), [fee?.gas_limit]);

const inputFee = useMemo(() => {
const foundFee = fee?.amount?.find((item) => item?.denom && item?.amount && feeCoins.map((feeCoin) => feeCoin.baseDenom).includes(item?.denom || ''));
const foundFee = fee?.amount?.find(
(item) => item?.denom && item?.amount && availableFeeCoins.map((feeCoin) => feeCoin.baseDenom).includes(item?.denom || ''),
);

if (foundFee) return foundFee;

Expand All @@ -91,15 +120,23 @@ export default function Entry({ queue, chain }: EntryProps) {
denom: chain.baseDenom,
amount: '0',
};
}, [chain.baseDenom, fee?.amount, feeCoins]);
}, [chain.baseDenom, fee?.amount, availableFeeCoins]);

const inputFeeAmount = useMemo(() => inputFee.amount || '0', [inputFee.amount]);

const [currentFeeBaseDenom, setCurrentFeeBaseDenom] = useState(
feeCoins.find((item) => item.baseDenom === inputFee.denom)?.baseDenom ?? feeCoins[0].baseDenom,
);
const [currentFeeBaseDenom, setCurrentFeeBaseDenom] = useState(inputFee.denom);

const currentFeeCoin = useMemo(() => feeCoins.find((item) => item.baseDenom === currentFeeBaseDenom) ?? feeCoins[0], [currentFeeBaseDenom, feeCoins]);
const currentFeeCoin = useMemo(
() =>
availableFeeCoins.find((item) => item.baseDenom === currentFeeBaseDenom) || {
availableAmount: '0',
decimals: 0,
baseDenom: inputFee.denom || '',
originBaseDenom: inputFee.denom || '',
displayDenom: 'UNKNOWN',
},
[currentFeeBaseDenom, inputFee.denom, availableFeeCoins],
);

const memoizedProtoTx = useMemo(() => {
if (isEditFee) {
Expand All @@ -123,14 +160,33 @@ export default function Entry({ queue, chain }: EntryProps) {
() => customGas || (gte(simulatedGas || '0', inputGas) ? simulatedGas || inputGas : inputGas),
[customGas, inputGas, simulatedGas],
);
const currentFeeGasRate = useMemo(() => currentFeeCoin.gasRate || gasRate || chain.gasRate, [chain.gasRate, currentFeeCoin.gasRate, gasRate]);

const initialGasRate = useMemo(() => (equal(inputGas, '0') ? '0' : divide(inputFeeAmount, inputGas)), [inputFeeAmount, inputGas]);

const currentFeeGasRate = useMemo(() => {
if (currentFeeCoin.gasRate) {
return currentFeeCoin.gasRate;
}

if (gasRate) {
return gasRate;
}

if (gt(initialGasRate, '0')) {
return {
average: initialGasRate,
low: initialGasRate,
tiny: initialGasRate,
};
}

return chain.gasRate;
}, [chain.gasRate, currentFeeCoin.gasRate, gasRate, initialGasRate]);

const isFeeCustomed = useMemo(() => !!customGas || !!customGasRateKey, [customGasRateKey, customGas]);

const isFeeUpdateAllowed = useMemo(() => isEditFee || isFeeCustomed, [isFeeCustomed, isEditFee]);

const initialGasRate = useMemo(() => (equal(inputGas, '0') ? '0' : divide(inputFeeAmount, inputGas)), [inputFeeAmount, inputGas]);

const baseFee = useMemo(
() => (isFeeUpdateAllowed ? times(currentGas, currentGasRateKey ? currentFeeGasRate[currentGasRateKey] : initialGasRate) : inputFeeAmount),
[currentFeeGasRate, currentGas, currentGasRateKey, initialGasRate, inputFeeAmount, isFeeUpdateAllowed],
Expand Down Expand Up @@ -226,12 +282,13 @@ export default function Entry({ queue, chain }: EntryProps) {
<FeeContainer>
<Fee
feeCoin={currentFeeCoin}
feeCoinList={feeCoins}
feeCoinList={supportedFeeCoins}
gasRate={currentFeeGasRate}
baseFee={baseFee}
gas={currentGas}
onChangeFeeCoin={(selectedFeeCoin) => {
setCurrentFeeBaseDenom(selectedFeeCoin.baseDenom);
setCustomGasRateKey('low');
}}
onChangeGas={(g) => setCustomGas(g)}
onChangeGasRateKey={(gasRateKey) => {
Expand Down