project-serum
/
spl-token-wallet
mirror of https://github.com/project-serum/spl-token-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix erc20 to spl swap rounding

This commit is contained in:
Gary Wang 2020-09-16 05:22:09 -07:00
parent 1c99575490
commit cfc57a0a37
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/DepositDialog.js
View File

@ -218,7 +218,7 @@ function MetamaskDeposit({ swapInfo }) {
(async () => {
let parsedAmount = parseFloat(amount);
if (!parsedAmount || parsedAmount > maxAmount) {
if (!parsedAmount || parsedAmount > maxAmount || parsedAmount <= 0) {
throw new Error('Invalid amount');
}
await swapErc20ToSpl({
@ -226,7 +226,7 @@ function MetamaskDeposit({ swapInfo }) {
erc20Address,
swapAddress,
destination,
amount: parsedAmount,
amount,
onStatusChange: (e) => setStatus((status) => ({ ...status, ...e })),
});
})(),

23
src/utils/swap/eth.js
View File

@ -42,7 +42,7 @@ export async function swapErc20ToSpl({
erc20Address,
swapAddress,
destination,
amount,
amount, // string
onStatusChange,
}) {
if (!erc20Address) {
@ -59,7 +59,7 @@ export async function swapErc20ToSpl({
const swap = new web3.eth.Contract(SWAP_ABI, swapAddress);
const decimals = parseInt(await erc20.methods.decimals().call(), 10);
const encodedAmount = Math.round(amount * 10 ** decimals).toFixed();
const encodedAmount = addDecimals(amount, decimals);
const approveTx = erc20.methods
.approve(swapAddress, encodedAmount)
@ -93,9 +93,10 @@ export async function swapEthToSpl({
}) {
const swap = new web3.eth.Contract(SWAP_ABI, swapAddress);
const encodedAmount = addDecimals(amount, 18);
const swapTx = swap.methods
.swapEth(destination)
.send({ from: ethAccount, value: Math.floor(amount * 1e18) });
.send({ from: ethAccount, value: encodedAmount });
const swapTxid = await waitForTxid(swapTx);
onStatusChange({ step: 2, txid: swapTxid, confirms: 0 });
@ -105,6 +106,22 @@ export async function swapEthToSpl({
onStatusChange({ step: 3 });
}
function addDecimals(str, decimals) {
if (!/^\d*\.?\d*$/.test(str)) {
throw new Error('Invalid number');
}
if (!str.includes('.')) {
str += '.';
}
let [intStr, fractionStr] = str.split('.');
if (fractionStr.length > decimals) {
fractionStr = fractionStr.slice(0, decimals);
} else {
fractionStr += '0'.repeat(decimals - fractionStr.length);
}
return (intStr + fractionStr).replace(/^0+/, '') || '0';
}
const pendingNonces = new Set();
export async function withdrawEth(from, withdrawal, callAsync) {