Skip to content

fix: process approvals from quote #26

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

Merged
MakMuftic merged 6 commits into from
Aug 8, 2024
Merged

fix: process approvals from quote #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ef54573
add processing approvals from endpoint
MakMuftic Aug 7, 2024
6ae5f28
chore: fix linter error
sztok7 Aug 7, 2024
d5136e8
wip debugging approval fails
MakMuftic Aug 7, 2024
cf6df5f
Merge branch 'mmuftic/fix-poc' of github.com:ChainSafe/sprinter-ts in…
MakMuftic Aug 7, 2024
609509d
linter fix
MakMuftic Aug 7, 2024
d9111fd
fix iterating approvals
MakMuftic Aug 7, 2024
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
1 change: 1 addition & 0 deletions packages/sdk/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export interface Solution {
name: string;
};
transaction: Transaction;
approvals?: Transaction[];
}

export interface Transaction {
Expand Down
34 changes: 22 additions & 12 deletions web/src/lib/components/TransactionCard.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,21 +51,31 @@
// @ts-expect-error // chainId is missing in web3js call options type
const callOptions: NonPayableCallOptions = { chainId: quotaRecord.sourceChain };

console.info('Quote', quotaRecord);

// Approval sniff etc...\
const erc20 = new web3.eth.Contract(erc20Abi, quotaRecord.sourceTokenAddress);
if (quotaRecord.approvals?.length > 0) {
for (const approval of quotaRecord.approvals) {
console.log('Requesting approval:', approval);
const receipt = await web3.eth.sendTransaction(approval);
console.warn(`Approval receipt: `, receipt);
}
} else {
const erc20 = new web3.eth.Contract(erc20Abi, quotaRecord.sourceTokenAddress);

const allowed = await erc20.methods
.allowance(ownerAddress, quotaRecord.transaction.to)
.call(callOptions);
const allowed = await erc20.methods
.allowance(ownerAddress, quotaRecord.transaction.to)
.call(callOptions);

if (BigInt(quotaRecord.amount) > BigInt(allowed)) {
const approval = await erc20.methods
.approve(quotaRecord.transaction.to, quotaRecord.amount)
.send({
...callOptions,
from: ownerAddress
});
if (!approval.status) throw new Error('Not Approved!'); // To stop execution
if (BigInt(quotaRecord.amount) > BigInt(allowed)) {
const approval = await erc20.methods
.approve(quotaRecord.transaction.to, quotaRecord.amount)
.send({
...callOptions,
from: ownerAddress
});
if (!approval.status) throw new Error('Not Approved!'); // To stop execution
}
}

// FINAL STEP!
Expand Down