Skip to content

Commit

Permalink
Merge pull request #1594 from skalenetwork/enchancement/BLS-signature…
Browse files Browse the repository at this point in the history 
…-gathering-analysis

Echancement: BLS signatures are gathered more asynchronously
  • Loading branch information
@sergiy-skalelabs
sergiy-skalelabs authored Sep 19, 2023
2 parents 024521c + 952815b commit db2d16a
Showing 1 changed file with 53 additions and 15 deletions.
68 changes: 53 additions & 15 deletions agent/bls.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1207,7 +1207,8 @@ async function prepareSignMessagesImpl( optsSignOperation ) {
optsSignOperation.nCountOfBlsPartsToCollect = 0 + optsSignOperation.nThreshold;
if( log.verboseGet() >= log.verboseReversed().trace ) {
optsSignOperation.details.write( optsSignOperation.strLogPrefix +
cc.debug( "Will collect " ) + cc.info( optsSignOperation.nCountOfBlsPartsToCollect ) +
cc.debug( "Will BLS-collect " ) +
cc.info( optsSignOperation.nCountOfBlsPartsToCollect ) +
cc.debug( " from " ) + cc.info( optsSignOperation.jarrNodes.length ) +
cc.debug( " nodes" ) + cc.debug( ", " ) + cc.notice( "sequence ID" ) +
cc.debug( " is " ) + cc.attention( optsSignOperation.sequenceId ) + "\n" );
Expand All @@ -1223,6 +1224,24 @@ async function gatherSigningStartImpl( optsSignOperation ) {
optsSignOperation.errGathering = null;
optsSignOperation.promiseCompleteGathering = new Promise( ( resolve, reject ) => {
const iv = setInterval( function() {
if( optsSignOperation.joGatheringTracker.nCountReceivedPrevious !=
optsSignOperation.joGatheringTracker.nCountReceived ) {
if( log.verboseGet() >= log.verboseReversed().debug ) {
optsSignOperation.details.write(
cc.bright( optsSignOperation.strDirection ) + cc.debug( "/" ) +
cc.attention( "#" ) + cc.sunny( optsSignOperation.nTransferLoopCounter ) +
cc.debug( " BLS signature gathering progress updated, now have " ) +
cc.info( optsSignOperation.joGatheringTracker.nCountReceived ) +
cc.debug( " BLS parts of " ) +
cc.info( optsSignOperation.nCountOfBlsPartsToCollect ) +
cc.debug( " arrived, have " ) + cc.info( optsSignOperation.cntSuccess ) +
cc.debug( " success(es) and " ) +
cc.info( optsSignOperation.joGatheringTracker.nCountErrors ) +
cc.debug( " error(s)" ) + "\n" );
}
optsSignOperation.joGatheringTracker.nCountReceivedPrevious =
0 + optsSignOperation.joGatheringTracker.nCountReceived;
}
++ optsSignOperation.joGatheringTracker.nWaitIntervalStepsDone;
optsSignOperation.cntSuccess =
optsSignOperation.joGatheringTracker.nCountReceived -
Expand Down Expand Up @@ -1297,7 +1316,7 @@ async function gatherSigningStartImpl( optsSignOperation ) {
cc.debug( ", glue result is " ) + cc.j( joGlueResult ) + "\n";
if( log.verboseGet() >= log.verboseReversed().trace )
optsSignOperation.details.write( strCallbackCallDescription );
optsSignOperation.fn( // NOTICE: no await here, executed async
optsSignOperation.fn(
strError, optsSignOperation.jarrMessages, joGlueResult )
.catch( ( err ) => {
if( log.verboseGet() >= log.verboseReversed().critical ) {
Expand Down Expand Up @@ -1325,7 +1344,7 @@ async function gatherSigningStartImpl( optsSignOperation ) {
if( optsSignOperation.joGatheringTracker.nCountReceived >=
optsSignOperation.jarrNodes.length ) {
clearInterval( iv );
optsSignOperation.fn( // NOTICE: no await here, executed async
optsSignOperation.fn(
"signature error(2), got " +
optsSignOperation.joGatheringTracker.nCountErrors +
" errors(s) for " + optsSignOperation.jarrNodes.length +
Expand Down Expand Up @@ -1360,7 +1379,7 @@ async function gatherSigningStartImpl( optsSignOperation ) {
optsSignOperation.joGatheringTracker.nWaitIntervalMaxSteps
) {
clearInterval( iv );
optsSignOperation.fn( // NOTICE: no await here, executed async
optsSignOperation.fn(
"signature error(3), got " +
optsSignOperation.joGatheringTracker.nCountErrors +
" errors(s) for " + optsSignOperation.jarrNodes.length + " node(s)",
Expand Down Expand Up @@ -1548,7 +1567,7 @@ async function doSignProcessHandleCall(
joNode, joParams,
joIn, joOut, err, strNodeURL, i
) {
++optsSignOperation.joGatheringTracker.nCountReceived; // including errors
++optsSignOperation.joGatheringTracker.nCountReceived;
if( err ) {
++optsSignOperation.joGatheringTracker.nCountErrors;
const strErrorMessage =
Expand Down Expand Up @@ -1742,10 +1761,10 @@ async function doSignProcessOneImpl( i, optsSignOperation ) {
cc.debug( ", " ) + cc.notice( "sequence ID" ) + cc.debug( " is " ) +
cc.attention( optsSignOperation.sequenceId );
const rpcCallOpts = null;
rpcCall.create( // NOTICE: no await here, executed async
rpcCall.create(
strNodeURL, rpcCallOpts, async function( joCall, err ) {
if( err ) {
++optsSignOperation.joGatheringTracker.nCountReceived; // including errors
++optsSignOperation.joGatheringTracker.nCountReceived;
++optsSignOperation.joGatheringTracker.nCountErrors;
const strErrorMessage =
optsSignOperation.strLogPrefix + cc.fatal( "CRITICAL ERROR:" ) +
Expand Down Expand Up @@ -1844,7 +1863,8 @@ async function doSignMessagesImpl(
cc.attention( optsSignOperation.imaState.isCrossImaBlsMode ? "IMA agent" : "skaled" ) +
cc.info( ":" ) + " ";
optsSignOperation.joGatheringTracker = {
nCountReceived: 0, // including errors
nCountReceivedPrevious: 0,
nCountReceived: 0,
nCountErrors: 0,
nCountSkipped: 0,
nWaitIntervalStepMilliseconds: 100,
Expand Down Expand Up @@ -1877,7 +1897,7 @@ async function doSignMessagesImpl(
}
break;
}
await doSignProcessOneImpl( i, optsSignOperation );
doSignProcessOneImpl( i, optsSignOperation );
}
await gatherSigningStartImpl( optsSignOperation );
await gatherSigningFinishImpl( optsSignOperation );
Expand Down Expand Up @@ -2032,8 +2052,8 @@ async function doSignU256OneImpl( optsSignU256 ) {
cc.debug( ", ID " ) + cc.info( joNode.nodeID ) + cc.debug( ")" );
const rpcCallOpts = null;
await rpcCall.create( strNodeURL, rpcCallOpts, async function( joCall, err ) {
++optsSignU256.joGatheringTracker.nCountReceived;
if( err ) {
++optsSignU256.joGatheringTracker.nCountReceived; // including errors
++optsSignU256.joGatheringTracker.nCountErrors;
const strErrorMessage =
optsSignU256.strLogPrefix + cc.fatal( "CRITICAL ERROR:" ) +
Expand Down Expand Up @@ -2062,7 +2082,7 @@ async function doSignU256OneImpl( optsSignU256 ) {
"valueToSign": optsSignU256.u256 // must be 0x string, came from outside 0x string
}
}, async function( joIn, joOut, err ) {
++optsSignU256.joGatheringTracker.nCountReceived; // including errors
++optsSignU256.joGatheringTracker.nCountReceived;
if( err ) {
++optsSignU256.joGatheringTracker.nCountErrors;
const strErrorMessage =
Expand Down Expand Up @@ -2220,6 +2240,23 @@ async function doSignU256Gathering( optsSignU256 ) {
optsSignU256.errGathering = null;
optsSignU256.promiseCompleteGathering = new Promise( ( resolve, reject ) => {
const iv = setInterval( function() {
if( optsSignU256.joGatheringTracker.nCountReceivedPrevious !=
optsSignU256.joGatheringTracker.nCountReceived ) {
if( log.verboseGet() >= log.verboseReversed().debug ) {
optsSignU256.details.write(
cc.info( "BLS u256" ) +
cc.debug( " BLS signature gathering progress updated, now have " ) +
cc.info( optsSignU256.joGatheringTracker.nCountReceived ) +
cc.debug( " BLS parts of " ) +
cc.info( optsSignU256.nCountOfBlsPartsToCollect ) +
cc.debug( " arrived, have " ) + cc.info( optsSignU256.cntSuccess ) +
cc.debug( " success(es) and " ) +
cc.info( optsSignU256.joGatheringTracker.nCountErrors ) +
cc.debug( " error(s)" ) + "\n" );
}
optsSignU256.joGatheringTracker.nCountReceivedPrevious =
0 + optsSignU256.joGatheringTracker.nCountReceived;
}
++ optsSignU256.joGatheringTracker.nWaitIntervalStepsDone;
const cntSuccess =
optsSignU256.joGatheringTracker.nCountReceived -
Expand Down Expand Up @@ -2291,7 +2328,7 @@ async function doSignU256Gathering( optsSignU256 ) {
cc.debug( ", glue result is " ) + cc.j( joGlueResult ) + "\n";
if( log.verboseGet() >= log.verboseReversed().trace )
optsSignU256.details.write( strCallbackCallDescription );
optsSignU256.fn( // NOTICE: no await here, executed async
optsSignU256.fn(
strError, optsSignU256.u256, joGlueResult )
.catch( ( err ) => {
if( log.verboseGet() >= log.verboseReversed().critical ) {
Expand All @@ -2318,7 +2355,7 @@ async function doSignU256Gathering( optsSignU256 ) {
if( optsSignU256.joGatheringTracker.nCountReceived >=
optsSignU256.jarrNodes.length ) {
clearInterval( iv );
optsSignU256.fn( // NOTICE: no await here, executed async
optsSignU256.fn(
"signature error(2, u256), got " +
optsSignU256.joGatheringTracker.nCountErrors +
" errors(s) for " + optsSignU256.jarrNodes.length + " node(s)",
Expand Down Expand Up @@ -2350,7 +2387,7 @@ async function doSignU256Gathering( optsSignU256 ) {
optsSignU256.joGatheringTracker.nWaitIntervalMaxSteps
) {
clearInterval( iv );
optsSignU256.fn( // NOTICE: no await here, executed async
optsSignU256.fn(
"signature error(3, u256), got " +
optsSignU256.joGatheringTracker.nCountErrors +
" errors(s) for " + optsSignU256.jarrNodes.length + " node(s)",
Expand Down Expand Up @@ -2389,7 +2426,8 @@ export async function doSignU256( u256, details, fn ) {
imaState: state.get(),
strLogPrefix: cc.info( "Sign u256:" ) + " ",
joGatheringTracker: {
nCountReceived: 0, // including errors
nCountReceivedPrevious: 0,
nCountReceived: 0,
nCountErrors: 0,
nCountSkipped: 0,
nWaitIntervalStepMilliseconds: 100,
Expand Down

0 comments on commit db2d16a

Please sign in to comment.