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

Fixed old-style event log scanner for IMA messages #1633

Merged
merged 2 commits into from
Nov 3, 2023
Merged

Fixed old-style event log scanner for IMA messages #1633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fc5d13
added details about iterative event search
sergiy-skalelabs Nov 2, 2023
f0ab2aa
Merge branch 'develop' into hotfix/old-event-scan-fix-in-2.0
sergiy-skalelabs Nov 3, 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
4 changes: 3 additions & 1 deletion npms/skale-ima/imaEventLogScan.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,9 @@ export async function safeGetPastEventsProgressive(
cc.j( strEventName ) + cc.info( " via URL " ) +
cc.u( owaspUtils.ethersProviderToUrl( ethersProvider ) ) +
generateWhileTransferringLogMessageSuffix( optsChainPair ) +
cc.info( "..." ) );
cc.info( ", from block " ) + cc.notice( nBlockFrom ) +
cc.info( ", to block " ) + cc.notice( nBlockTo ) +
cc.info( "..." ) + "\n" );
}
const nLatestBlockNumber = owaspUtils.toBN(
await imaHelperAPIs.safeGetBlockNumber( details, 10, ethersProvider ) );
Expand Down
84 changes: 39 additions & 45 deletions npms/skale-ima/index.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,14 +278,16 @@ async function doQueryOutgoingMessageCounter( optsTransfer ) {
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, optsTransfer.optsChainPair );
return true; // success, finish at this point
if( bnBlockId ) {
optsTransfer.strActionName =
"in-getOutgoingMessagesCounter()--findOutAllReferenceLogRecords()";
optsTransfer.arrLogRecordReferences =
await findOutAllReferenceLogRecords( optsTransfer.details,
optsTransfer.strLogPrefixShort, optsTransfer.ethersProviderSrc,
optsTransfer.joMessageProxySrc, bnBlockId, optsTransfer.nIncMsgCnt,
optsTransfer.nOutMsgCnt, true, optsTransfer.optsChainPair );
return true; // success, finish at this point
}
} catch ( err ) {
optsTransfer.arrLogRecordReferences = [];
if( log.verboseGet() >= log.verboseReversed().error ) {
Expand Down Expand Up @@ -405,16 +407,18 @@ async function gatherMessages( optsTransfer ) {
for( let idxInBlock = 0; // inner loop wil create block of transactions
optsTransfer.nIdxCurrentMsg < optsTransfer.nOutMsgCnt &&
idxInBlock < optsTransfer.nTransactionsCountInBlock;
++optsTransfer.nIdxCurrentMsg, ++idxInBlock, ++optsTransfer.cntAccumulatedForBlock
) {
++optsTransfer.nIdxCurrentMsg, ++idxInBlock, ++optsTransfer.cntAccumulatedForBlock ) {
const idxProcessing = optsTransfer.cntProcessed + idxInBlock;
if( idxProcessing > optsTransfer.nMaxTransactionsCount )
break;
let nBlockFrom = 0, nBlockTo = "latest";
if( optsTransfer.arrLogRecordReferences.length > 0 ) {
const joReferenceLogRecord = optsTransfer.arrLogRecordReferences.shift();
nBlockFrom = joReferenceLogRecord.currentBlockId;
nBlockTo = joReferenceLogRecord.currentBlockId;
if( joReferenceLogRecord && "currentBlockId" in joReferenceLogRecord &&
joReferenceLogRecord.currentBlockId ) {
nBlockFrom = joReferenceLogRecord.currentBlockId;
nBlockTo = joReferenceLogRecord.currentBlockId;
}
}
optsTransfer.strActionName = "src-chain->MessageProxy->scan-past-events()";
const strEventName = "OutgoingMessage";
Expand All @@ -440,38 +444,36 @@ async function gatherMessages( optsTransfer ) {
try {
const transactionHash = r[0].transactionHash;
if( log.verboseGet() >= log.verboseReversed().debug ) {
optsTransfer.details.write( optsTransfer.strLogPrefix +
cc.debug( "Event transactionHash is " ) + cc.info( transactionHash ) +
"\n" );
optsTransfer.details.write( optsTransfer.strLogPrefix + cc.debug( "Event " +
"transactionHash is " ) + cc.info( transactionHash ) + "\n" );
}
const blockNumber = r[0].blockNumber;
optsTransfer.details.write( optsTransfer.strLogPrefix +
cc.debug( "Event blockNumber is " ) + cc.info( blockNumber ) + "\n" );
const nLatestBlockNumber = await imaHelperAPIs.safeGetBlockNumber(
optsTransfer.details, 10, optsTransfer.ethersProviderSrc );
if( log.verboseGet() >= log.verboseReversed().debug ) {
optsTransfer.details.write( optsTransfer.strLogPrefix +
cc.debug( "Latest blockNumber is " ) + cc.info( nLatestBlockNumber ) +
"\n" );
optsTransfer.details.write( optsTransfer.strLogPrefix + cc.debug( "Latest " +
"blockNumber is " ) + cc.info( nLatestBlockNumber ) + "\n" );
}
const nDist = nLatestBlockNumber - blockNumber;
if( nDist < optsTransfer.nBlockAwaitDepth )
bSecurityCheckPassed = false;
if( log.verboseGet() >= log.verboseReversed().debug ) {
optsTransfer.details.write( optsTransfer.strLogPrefix +
cc.debug( "Distance by blockNumber is " ) + cc.info( nDist ) +
cc.debug( ", await check is " ) + ( bSecurityCheckPassed
? cc.success( "PASSED" ) : cc.error( "FAILED" ) ) + "\n" );
const cp = bSecurityCheckPassed ? cc.success( "PASSED" ) : cc.error( "FAILED" );
optsTransfer.details.write( optsTransfer.strLogPrefix + cc.debug( "Distance " +
"by blockNumber is " ) + cc.info( nDist ) + cc.debug( ", await check " +
"is " ) + cp + "\n" );
}
} catch ( err ) {
bSecurityCheckPassed = false;
if( log.verboseGet() >= log.verboseReversed().critical ) {
const strError = owaspUtils.extractErrorMessage( err );
const s = optsTransfer.strLogPrefix + cc.fatal( "CRITICAL ERROR:" ) +
cc.error( " Exception(evaluate block depth) while " +
"getting transaction hash and block number during " +
optsTransfer.strActionName + ": " ) + cc.error( strError ) +
cc.error( ", stack is: " ) + "\n" + cc.stack( err.stack ) + "\n";
cc.error( " Exception(evaluate block depth) while getting transaction " +
"hash and block number during " + optsTransfer.strActionName + ": " ) +
cc.error( strError ) + cc.error( ", stack is: " ) +
"\n" + cc.stack( err.stack ) + "\n";
optsTransfer.details.write( s );
if( log.id != optsTransfer.details.id )
log.write( s );
Expand Down Expand Up @@ -502,9 +504,8 @@ async function gatherMessages( optsTransfer ) {
try {
const transactionHash = r[0].transactionHash;
if( log.verboseGet() >= log.verboseReversed().debug ) {
optsTransfer.details.write( optsTransfer.strLogPrefix +
cc.debug( "Event transactionHash is " ) + cc.info( transactionHash ) +
"\n" );
optsTransfer.details.write( optsTransfer.strLogPrefix + cc.debug( "Event " +
"transactionHash is " ) + cc.info( transactionHash ) + "\n" );
}
const blockNumber = r[0].blockNumber;
if( log.verboseGet() >= log.verboseReversed().debug ) {
Expand Down Expand Up @@ -561,27 +562,21 @@ async function gatherMessages( optsTransfer ) {
optsTransfer.strActionName = "" + strActionNameOld;
if( !bSecurityCheckPassed ) {
if( log.verboseGet() >= log.verboseReversed().warning ) {
optsTransfer.details.write( optsTransfer.strLogPrefix +
cc.warning( "Block age check was not passed, " +
"canceling search for transfer events" ) + "\n" );
optsTransfer.details.write( optsTransfer.strLogPrefix + cc.warning( "Block " +
"age check was not passed, canceling search for transfer events" ) + "\n" );
}
break;
}
}
if( log.verboseGet() >= log.verboseReversed().debug ) {
optsTransfer.details.write( optsTransfer.strLogPrefix +
cc.success( "Got event optsTransfer.details from " ) +
cc.notice( "getPastEvents()" ) + cc.success( " event invoked with " ) +
cc.notice( "msgCounter" ) + cc.success( " set to " ) +
cc.info( optsTransfer.nIdxCurrentMsg ) + cc.success( " and " ) +
cc.notice( "dstChain" ) + cc.success( " set to " ) +
cc.success( "Got event optsTransfer.details from getPastEvents() event invoked " +
"with msgCounter set to " ) + cc.info( optsTransfer.nIdxCurrentMsg ) +
cc.success( " and " ) + cc.notice( "dstChain" ) + cc.success( " set to " ) +
cc.info( optsTransfer.chainNameDst ) + cc.success( ", event description: " ) +
cc.j( joValues ) +
// + cc.j(evs) +
"\n" );
optsTransfer.details.write( optsTransfer.strLogPrefix +
cc.debug( "Will process message counter value " ) +
cc.info( optsTransfer.nIdxCurrentMsg ) + "\n" );
cc.j( joValues ) + "\n" );
optsTransfer.details.write( optsTransfer.strLogPrefix + cc.debug( "Will process " +
"message counter value " ) + cc.info( optsTransfer.nIdxCurrentMsg ) + "\n" );
}
optsTransfer.arrMessageCounters.push( optsTransfer.nIdxCurrentMsg );
const joMessage = {
Expand All @@ -590,8 +585,7 @@ async function gatherMessages( optsTransfer ) {
"to": joValues.to,
"amount": joValues.amount,
"data": joValues.data,
"savedBlockNumberForOptimizations":
joValues.savedBlockNumberForOptimizations
"savedBlockNumberForOptimizations": joValues.savedBlockNumberForOptimizations
};
optsTransfer.jarrMessages.push( joMessage );
}
Expand Down
Loading