Skip to content

fix: wrap getContract in try-catch + null guards + user rejection handling (fixes #152) #245

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
jiangyj545 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: wrap getContract in try-catch + null guards + user rejection handling (fixes #152) #245

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
42 changes: 30 additions & 12 deletions src/api/assets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,29 +48,47 @@ export async function getAllowance(assetLabel, spenderName) {
}
const _address = get(address);
if (!_address) return;
const contract = await getContract(assetLabel);
const spenderContract = await getContract(spenderName);
const allowance = formatUnits(await contract.allowance(_address, spenderContract.address), CURRENCY_DECIMALS[assetLabel]);
allowances.update((x) => {
if (!x[assetLabel]) x[assetLabel] = {};
x[assetLabel][spenderName] = allowance;
return x;
});
try {
const contract = await getContract(assetLabel);
const spenderContract = await getContract(spenderName);
if (!contract || !spenderContract) return;
const allowance = formatUnits(await contract.allowance(_address, spenderContract.address), CURRENCY_DECIMALS[assetLabel]);
allowances.update((x) => {
if (!x[assetLabel]) x[assetLabel] = {};
x[assetLabel][spenderName] = allowance;
return x;
});
} catch (e) {
// Silently fail — allowance will remain at last known value
}
}

export async function approveAsset(assetLabel, spenderName) {
const contract = await getContract(assetLabel, true);
const spenderContract = await getContract(spenderName);
const spenderAddress = spenderContract.address;
try {
const contract = await getContract(assetLabel, true);
const spenderContract = await getContract(spenderName);

if (!contract) {
showError(`Asset contract not found for ${assetLabel}. Are you on the correct network?`);
return;
}
if (!spenderContract) {
showError(`Spender contract not found for ${spenderName}. Are you on the correct network?`);
return;
}

const spenderAddress = spenderContract.address;
let tx = await contract.approve(spenderAddress, ethers.constants.MaxUint256);
let receipt = await tx.wait();
if (receipt && receipt.status == 1) {
showToast('Approved asset.', 1);
getAllowance(assetLabel, spenderName);
return true;
}
} catch(e) {
} catch (e) {
// Suppress user-rejection errors (MetaMask ACTION_REJECTED / code 4001)
if (e?.code === 4001 || e?.error?.code === 4001) return;
if (e?.code === 'ACTION_REJECTED') return;
showError(e);
}
}