Skip to content

add extra logs for submit #69

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

add extra logs for submit #69

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
12 changes: 9 additions & 3 deletions ethInteractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1529,14 +1529,18 @@ exports.submitImports = async(CTransferArray) => {
if (!processed) {
submitArray.push(CTempArray[0])
} else {
log("SubmitImports: Import already processed, skipping...");
return { result: globalsubmitimports.transactionHash };
}
} else {
log("SubmitImports: No imports to submit.");
return { result: globalsubmitimports.transactionHash };
}
// catch any errors and return
const testcall = await delegatorContract.methods.submitImports(submitArray[0]).call(); //test call
// prevent revert if gas limit is exceeded
const gascalc = await delegatorContract.methods.submitImports(submitArray[0]).estimateGas({ from: account.address });
if (CTempArray)

log("Submitting transfers to ETH, total: " + CTempArray[0].transfers.length);

const pendingTransactions = await web3.eth.getBlock('pending', true);
Expand All @@ -1553,13 +1557,15 @@ exports.submitImports = async(CTransferArray) => {
log("Submitimports: Pending transaction found, skipping...");
} else if (submitArray.length > 0 && (parseInt(gascalc) < parseInt(submitImportMaxGas))) {
// Get median gas price from the last block's transactions
log("Calculating Median Gas Price for submitImports...");
const gasPrice = await getMedianGasPrice();

log("Using gas price: " + gasPrice);
globalsubmitimports = await delegatorContract.methods.submitImports(submitArray[0]).send({
from: account.address,
gas: submitImportMaxGas,
gasPrice: gasPrice
});
log("submitImports: success");
// if the submit import spend succeeds then we can cache the last submit import.
await setCachedApi(CTransferArray, 'lastsubmitImports');
} else {
Expand All @@ -1574,7 +1580,7 @@ exports.submitImports = async(CTransferArray) => {
if (error.receipt)
console.log( "submitImports:" + error.receipt);

console.log( "submitImports:" + error.message);
console.log( "submitImports:" + (error?.message ? error.message : error));
}
return { result: { result: error.message, error: true } };
}
Expand Down