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

Develop to beta #1549

Merged
merged 2 commits into from
Aug 10, 2023
Merged

Develop to beta #1549

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d49bf83
ticket-847 fixed support for old IMA smart contracts without getLastO…
sergiy-skalelabs Aug 8, 2023
ffe25ba
Merge pull request #1545 from skalenetwork/ticket-847/getLastOutgoing…
sergiy-skalelabs Aug 9, 2023
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
81 changes: 59 additions & 22 deletions npms/skale-ima/index.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,35 +272,72 @@ async function doQueryOutgoingMessageCounter( optsTransfer ) {
cc.debug( "Result of " ) + cc.notice( optsTransfer.strActionName ) +
cc.debug( " call: " ) + cc.info( idxLastToPopNotIncluding ) + "\n" );
}

// optimized scanner
const bnBlockId =
owaspUtils.toBN(
await optsTransfer.joMessageProxySrc.callStatic.getLastOutgoingMessageBlockId(
optsTransfer.chainNameDst,
{ from: optsTransfer.joAccountSrc.address() } ) );
// first, try optimized scanner
optsTransfer.arrLogRecordReferences = [];
try {
optsTransfer.arrLogRecordReferences =
await findOutAllReferenceLogRecords(
optsTransfer.details, optsTransfer.strLogPrefixShort,
optsTransfer.ethersProviderSrc, optsTransfer.joMessageProxySrc,
bnBlockId, optsTransfer.nIncMsgCnt, optsTransfer.nOutMsgCnt, true
);
optsTransfer.strActionName =
"in-getOutgoingMessagesCounter()--joMessageProxySrc.getLastOutgoingMessageBlockId()";
const bnBlockId =
owaspUtils.toBN(
await optsTransfer.joMessageProxySrc.callStatic.getLastOutgoingMessageBlockId(
optsTransfer.chainNameDst,
{ from: optsTransfer.joAccountSrc.address() } ) );
try {
optsTransfer.strActionName =
"in-getOutgoingMessagesCounter()--findOutAllReferenceLogRecords()";
optsTransfer.arrLogRecordReferences =
await findOutAllReferenceLogRecords(
optsTransfer.details, optsTransfer.strLogPrefixShort,
optsTransfer.ethersProviderSrc, optsTransfer.joMessageProxySrc,
bnBlockId, optsTransfer.nIncMsgCnt, optsTransfer.nOutMsgCnt, true
);
return true; // success, finish at this point
} catch ( err ) {
optsTransfer.arrLogRecordReferences = [];
if( log.verboseGet() >= log.verboseReversed().error ) {
optsTransfer.details.write(
optsTransfer.strLogPrefix + cc.warning( "Optimized log search is " ) +
cc.error( "off" ) + cc.warning( " Running old IMA smart contracts?" ) +
cc.success( " Please upgrade, if possible." ) +
cc.warning( " This message is based on error: " ) +
cc.success( " Please upgrade, if possible." ) +
cc.warning( " Error is: " ) +
cc.error( owaspUtils.extractErrorMessage( err ) ) +
cc.warning( ", stack is: " ) + "\n" + cc.stack( err.stack ) + "\n" );
}
}
} catch ( err ) {
optsTransfer.arrLogRecordReferences = [];
if( log.verboseGet() >= log.verboseReversed().error ) {
optsTransfer.details.write(
optsTransfer.strLogPrefix + cc.warning( "Optimized log search is " ) +
cc.error( "off" ) + cc.warning( ". Running old IMA smart contracts?" ) +
cc.success( " Please upgrade, if possible." ) +
cc.warning( " This message is based on error: " ) +
cc.success( " Please upgrade, if possible." ) +
cc.warning( " Error is: " ) +
cc.error( owaspUtils.extractErrorMessage( err ) ) +
cc.warning( ", stack is: " ) + "\n" + cc.stack( err.stack ) + "\n" );
optsTransfer.details.write( optsTransfer.strLogPrefix +
cc.warning( "Optimized log search is un-available." ) + "\n" );
}
}
// second, use classic raw events search
optsTransfer.strActionName =
"in-getOutgoingMessagesCounter()--classic-records-scanner";
const attempts = 10;
const strEventName = "OutgoingMessage";
const nBlockFrom = 0;
const nBlockTo = "latest";
for( let nWalkMsgNumber = optsTransfer.nIncMsgCnt;
nWalkMsgNumber < optsTransfer.nOutMsgCnt;
++ nWalkMsgNumber
) {
const joFilter = optsTransfer.joMessageProxySrc.filters[strEventName](
owaspUtils.ethersMod.ethers.utils.id( optsTransfer.chainIdDst ), // dstChainHash
nWalkMsgNumber
);
const arrLogRecordReferencesWalk = await imaEventLogScan.safeGetPastEventsProgressive(
optsTransfer.details, optsTransfer.strLogPrefixShort,
optsTransfer.ethersProviderSrc, attempts, optsTransfer.joMessageProxySrc,
strEventName,
nBlockFrom, nBlockTo, joFilter
);
optsTransfer.arrLogRecordReferences =
optsTransfer.arrLogRecordReferences.concat( arrLogRecordReferencesWalk );
}

return true;
}

Expand Down
Loading